From patchwork Thu Feb 1 11:54:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: alexs@kernel.org X-Patchwork-Id: 195248 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2719:b0:106:209c:c626 with SMTP id hl25csp91777dyb; Thu, 1 Feb 2024 03:52:14 -0800 (PST) X-Google-Smtp-Source: AGHT+IEsbLsn/zCu0YuDwWE4GS4qqx9JMiuraViG/ifqhcVX/t5Y5CJc4yOaTw7Yuaos3yle312Z X-Received: by 2002:a17:906:1b1b:b0:a36:1ea8:f412 with SMTP id o27-20020a1709061b1b00b00a361ea8f412mr3566632ejg.43.1706788333760; Thu, 01 Feb 2024 03:52:13 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706788333; cv=pass; d=google.com; s=arc-20160816; b=pfLzTtVy/JfQaMjFiLILVOslO7Loqx3+VI7CQC32aJRLemWxCusWpQ0iyssqt0cLzO SvYaAMzoXN3lOzCEwVBc39V8lpi/qexA4kfsA5GpSl1derUzfNCt/DXMLPOoP4XMllTq jIpc0YZg2HGC88ySAb46VlgmyHDgA4+5IvJA2xmCXYNeIL1zjn2G6Gn2+cyVlUZmtdjE GQFTFZkgofalHZvWKZt/vAj3p834akvg9xDb3/v4bu84YPETV3USGUR7Dx5wRVbNLwB+ +MxtA6Gp2woU7F7+dmXuAp2LNrd8qSxA84IFFh05SsGHl5ULeik4J3rBFlK25Eex369a sDQg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from:dkim-signature; bh=vwbaM/3Ok6BFupEQEfKmsk/rhQzDrt5l5M5o4Dnf3eM=; fh=l7KTJD5TBFImpjbowis79VllhSJ0PESSfD7dxg2eEmQ=; b=nl07X0gGjYzz6trriFM9QObBfV+7/vmz5cy8O3z0wv8ocxugCkE9HI12PO3Em8Bjbo 576rQf50dreiRpOvwQzZJIJJNh3ehEvYbRvJZdbw4PQa7BDWgA4A7ueuN67LnrNDsLzv 3G4AmDVEamkDx2vl3XrALlWQ3/cC6pTSuX9hCIePrC2+aCc56ubHT/kZN2K1hBx6XBaB 3mo7u/BQTN3rI/jLlmDu2ectKwrIOafGK4T8ZSD99w/tr0OwBlhOc76OiMTSSDzYVj/e XlOw0rfakQioc9Co7jAtXrRSf733YVUgUFFAXmgYrmgNfqKXLoZY6AKfCHo68naQQzNj hBxQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=sdyQcwWQ; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-48036-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-48036-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org X-Forwarded-Encrypted: i=1; AJvYcCWapJbwRpyrdwTzDwNjITs6PnwS4nTAJv5VNSJByn/mKmym/EFFhXsSLsYVkMtLxYEMmXoOr/A5kasvi9jgojLaP+2dTw== Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id gh25-20020a170906e09900b00a3656578442si2155060ejb.553.2024.02.01.03.52.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Feb 2024 03:52:13 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-48036-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=sdyQcwWQ; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-48036-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-48036-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 565EC1F232DB for ; Thu, 1 Feb 2024 11:52:13 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 84E3115D5CC; Thu, 1 Feb 2024 11:51:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="sdyQcwWQ" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D36614D9FF for ; Thu, 1 Feb 2024 11:51:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706788316; cv=none; b=uP0ztEszZZxKnW9iS4J1t9AAHm90zkpeCxw8fF0ittsUJ1L9yUyA6PG5u5ahpfqXueJJyWbBW4r4km384elLHzPYFSH/qYuBT31YmcTT0ZWhxZvLd4Yw/56fyrhnHaYKj/uOLexaTgso0Cjfakthi2tFmgHl9rFC2WEEDflg2zk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706788316; c=relaxed/simple; bh=O9lJmDiBxnZNyye1euS5klV+iMTllHBMyaYWSuHg2Sk=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=OzXGO805Yl5/PVWpFnSkDMCtLTujk5QpjTd9wHSGgmSdfmPzRBlg7JPofJJLRMTYuNoQUDKOvCDY1NrYAsZZ3HonLoIayxRk1yPNVfB9ZPx6l2w3Y7iz/ZRbsVeey8fn4spFbvOv+zbgudpNqOW2bCJx4DbrGCxyDFQHQuKSxe8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=sdyQcwWQ; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0E630C433C7; Thu, 1 Feb 2024 11:51:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1706788316; bh=O9lJmDiBxnZNyye1euS5klV+iMTllHBMyaYWSuHg2Sk=; h=From:To:Cc:Subject:Date:From; b=sdyQcwWQsCVyIqopa1k1f2BgcYqWMHQ5QtzFEJaeydc6127IZ3AxgVg3a9mhAoaQt WFvLMAHHQ5yg3szW4KTgDA9qZHo8mk5yC+el57i3+iGpSpyjGTilwbQGdGK4sqDmuA DulQ26fkpoUvsIVlQagwTlgVnmlx+HD5q8ZEvMuHS3lGCYJ9W46WPVxRhfJB8Q/TEg cILS689+hLoB6R5l/lDhNxALL8Vp+ujQLTXEGucse1pjX9v1onPuZEThHd7TwoJYx+ VsTEmX3I2jyglZpw5GfvJhdAtQ/LO4Z/mjHdCN+yBuQHXz1e5E+yGsqwhmuBP4kYok xpZh/tgXaz5Ew== From: alexs@kernel.org To: Ingo Molnar , Peter Zijlstra , Juri Lelli , Vincent Guittot , Dietmar Eggemann , Steven Rostedt , Ben Segall , Daniel Bristot de Oliveira , Valentin Schneider , linux-kernel@vger.kernel.org, ricardo.neri-calderon@linux.intel.com, sshegde@linux.ibm.com Cc: Alex Shi Subject: [PATCH v3 1/4] sched/fair: add SD_CLUSTER in comments Date: Thu, 1 Feb 2024 19:54:44 +0800 Message-ID: <20240201115447.522627-1-alexs@kernel.org> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789697284044472906 X-GMAIL-MSGID: 1789697284044472906 From: Alex Shi The description of SD_CLUSTER is missing. Add it. Signed-off-by: Alex Shi To: Ricardo Neri To: Valentin Schneider To: Vincent Guittot To: Juri Lelli To: Peter Zijlstra To: Ingo Molnar --- kernel/sched/topology.c | 1 + 1 file changed, 1 insertion(+) diff --git a/kernel/sched/topology.c b/kernel/sched/topology.c index 10d1391e7416..8b45f16a1890 100644 --- a/kernel/sched/topology.c +++ b/kernel/sched/topology.c @@ -1554,6 +1554,7 @@ static struct cpumask ***sched_domains_numa_masks; * function: * * SD_SHARE_CPUCAPACITY - describes SMT topologies + * SD_CLUSTER - describes CPU Cluster topologies * SD_SHARE_PKG_RESOURCES - describes shared caches * SD_NUMA - describes NUMA topologies * From patchwork Thu Feb 1 11:54:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: alexs@kernel.org X-Patchwork-Id: 195249 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2719:b0:106:209c:c626 with SMTP id hl25csp91858dyb; Thu, 1 Feb 2024 03:52:27 -0800 (PST) X-Google-Smtp-Source: AGHT+IEczjnWwXgy/C1MlANlEYjvrqfL1TmIBE/MUNghlHGbLppXgrlvP2PO9MWIKPHAkg51QAFR X-Received: by 2002:a17:906:1956:b0:a35:84fa:6d85 with SMTP id b22-20020a170906195600b00a3584fa6d85mr3045427eje.72.1706788347180; Thu, 01 Feb 2024 03:52:27 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706788347; cv=pass; d=google.com; s=arc-20160816; b=URkm0GfDFqAik3v8EuVffLkyO1A0qQETIk1ipf3g620lqtui9pba9U69XHpeaZRwBg N3/FljkwkyzMrsE4v0qbLkoE3Wd/JS5M4SKybDRK6g7RUklwwD86NF/wLIgDwLRHfhFu ZVXaYHWQxqRgTiEWDwF3xzpI9d3r7eny0rKxHmtJuxf8SXSt4lw/5oVSAHAaepvGFlkB 7IUCFgrCNph164CuAr8+x/WRJa3isg/w6LT0niJH0QaPCuBJn9qroJ4yMTonIgLQcYMF 5r4SXcgJPoaFt6f1hoQqxaayRnrqB1HOb8RWK42o67X3OxD2PyhQGyabGjMqexj6pmPM dOUg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=rovnZYMgdqdgO5q7kI7J3tmOYFmuTAdfJJw/mzec5tk=; fh=I2KJYv1GcBpKRgDJOLBA/xpdABjx+5AqvIGTHonka3E=; b=v90ePAycGWNxsrLltRZYbevabGdspW7YTdO+5ZhpJOBfmsKHm3SVQ9dcnnYFNSeGNu BY346fGByxgMX1hURgf3wPis8i9Z2Y3tjgfM785hWnu3k3QlKJwZ7o43kBZQL2DsNIqT 5ldTT2Q+LhFZylwN4EWNTd/ekME9acXlRwBHEQjEO99vUGGpqr7dW1ipW92YCPJng7RO 3E1F4QBZXWRHrV2DBEY3rwDQO/RYjzEP0DL2EU5PuwzXXDKgz9F9BJEQA92yb/Hfu+sB n61KxepHVnX1v0WcUkFl5BYKDlMrmTwJFEQk/GBgBqfnkGLgBpiwcXPxIr/a5jvbdXyG Fxfw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=j+KXnWMX; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-48037-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-48037-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org X-Forwarded-Encrypted: i=1; AJvYcCVZBuj0CpWHR4iaEwGEuW57dBYjk85iCcGQj1KxUiap2zfleXZXtd2ndcPiLfolKAJsGHgOjjPo9ei2za/Kz4byyRaBgg== Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id bg11-20020a170906a04b00b00a35b26330acsi4179357ejb.924.2024.02.01.03.52.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Feb 2024 03:52:27 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-48037-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=j+KXnWMX; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-48037-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-48037-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id B79A81F224DE for ; Thu, 1 Feb 2024 11:52:26 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 1B84C15DBA0; Thu, 1 Feb 2024 11:52:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="j+KXnWMX" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6C0D315D5BE for ; Thu, 1 Feb 2024 11:52:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706788320; cv=none; b=n7FNZ5ZDv2kE8jYYD1Y8UaEBCtJG82fqWHqgyqDaftRKjC/GtQ4z2i+PCfQWMGcTsQ6nBV2DuAwPmCg/aMVf72wLD+8+ircGpqEjVa2NrI49EZM5dEA642+whmgkUv8K2TjKJYbDnmE0r8+xDcrCH1eRjksS+meBTxDvBE8Lnx4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706788320; c=relaxed/simple; bh=ju/4UGtzVW6SMMVqyOTJ6eGP1qKCB+pqoyI2kbcnF5w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=otUe8GJ4a9SCqaJnihai60aUt4i6F93PH8YM18grSvyx35IFnjV4TnZb+rCnvBCpFBn6wqGCPojj09o9KzP30HJqlUv/X3vNGNWbNL0alxfjuI7vJVS2iw6n1iflrELoa033zTBLZFMbypdaO4BEVqnMBBkMXDwSzokUVdDR278= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=j+KXnWMX; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id CBE76C433F1; Thu, 1 Feb 2024 11:51:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1706788319; bh=ju/4UGtzVW6SMMVqyOTJ6eGP1qKCB+pqoyI2kbcnF5w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=j+KXnWMXwhwHFTKJt6QVUJNK6XtR8bwisq9pN4aKgCFMi8QvURWfxy7fv5OVpv923 mpKvjbVUd6HL5Max7LczCta8jXD2UJl0fruvMQsTNUvBZ8zxcC3YbQe40xHf7yojaT SBRPSqFCedZtI94XKAyVRrt4Yq1n/+ZLBixZOCqah2q3lq4PTXvOM/M//SyEbdY+66 4cyD83JcN++6cKgsvw34J0fW13E2k7TPVYEI/H/U58ClB4JgDVb5uuDmHPbsVKi3Jn ycxyLj9tbJVeyHkqfZ82CFStW4/H2l8RLB58DX2oh4XOsTJC+C9hnOsy2SvAYxsx8w 2TkFTxQjlqkHw== From: alexs@kernel.org To: Ingo Molnar , Peter Zijlstra , Juri Lelli , Vincent Guittot , Dietmar Eggemann , Steven Rostedt , Ben Segall , Daniel Bristot de Oliveira , Valentin Schneider , linux-kernel@vger.kernel.org, ricardo.neri-calderon@linux.intel.com, sshegde@linux.ibm.com Cc: Alex Shi Subject: [PATCH v3 2/4] sched/fair: remove unused parameters Date: Thu, 1 Feb 2024 19:54:45 +0800 Message-ID: <20240201115447.522627-2-alexs@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240201115447.522627-1-alexs@kernel.org> References: <20240201115447.522627-1-alexs@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789697298016210428 X-GMAIL-MSGID: 1789697298016210428 From: Alex Shi sds isn't used in function sched_asym(), so remove it to cleanup code. Signed-off-by: Alex Shi Reviewed-by: Ricardo Neri To: Valentin Schneider To: Vincent Guittot To: Juri Lelli To: Peter Zijlstra To: Ingo Molnar Reviewed-by: Valentin Schneider --- kernel/sched/fair.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 46ba8329b10a..8d70417f5125 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -9750,7 +9750,6 @@ static bool sched_use_asym_prio(struct sched_domain *sd, int cpu) /** * sched_asym - Check if the destination CPU can do asym_packing load balance * @env: The load balancing environment - * @sds: Load-balancing data with statistics of the local group * @sgs: Load-balancing statistics of the candidate busiest group * @group: The candidate busiest group * @@ -9769,8 +9768,7 @@ static bool sched_use_asym_prio(struct sched_domain *sd, int cpu) * otherwise. */ static inline bool -sched_asym(struct lb_env *env, struct sd_lb_stats *sds, struct sg_lb_stats *sgs, - struct sched_group *group) +sched_asym(struct lb_env *env, struct sg_lb_stats *sgs, struct sched_group *group) { /* Ensure that the whole local core is idle, if applicable. */ if (!sched_use_asym_prio(env->sd, env->dst_cpu)) @@ -9941,7 +9939,7 @@ static inline void update_sg_lb_stats(struct lb_env *env, /* Check if dst CPU is idle and preferred to this group */ if (!local_group && env->sd->flags & SD_ASYM_PACKING && env->idle != CPU_NOT_IDLE && sgs->sum_h_nr_running && - sched_asym(env, sds, sgs, group)) { + sched_asym(env, sgs, group)) { sgs->group_asym_packing = 1; } From patchwork Thu Feb 1 11:54:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: alexs@kernel.org X-Patchwork-Id: 195258 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2719:b0:106:209c:c626 with SMTP id hl25csp93570dyb; Thu, 1 Feb 2024 03:56:36 -0800 (PST) X-Google-Smtp-Source: AGHT+IFoJW7SY3F4PIObbGwIj7tfeGZUXU8ou6ryn612+39PonBwf3NbUbrXoAZT2sueDVAr4CsA X-Received: by 2002:a17:902:d50f:b0:1d8:b2e7:9e83 with SMTP id b15-20020a170902d50f00b001d8b2e79e83mr2332238plg.45.1706788596472; Thu, 01 Feb 2024 03:56:36 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706788596; cv=pass; d=google.com; s=arc-20160816; b=SU+vla9XrtguO0PHthfaI/w4N9gk6RRETX2gxrdxmwtN7hfgw+YIPSG+5g8g0cZM7h uuuHB2XWw8zbEIZEzjmARt3Gh1bPRXfOOS/1Iqq+p+fyhfY3ZkCAzIG8b9j4qTf9wAso bAcQN2EL42BdNjn6VMpx9RghePSyFNjZcSe7Q8Ej44WdTMACogFIjLlvAGv7e/OvRJ8w VPPT3Hmtc95iETnlTP4b2QkBpG43oXxBEfkLiuuSMdqYMRJaREg7EuHBYDC8g+SRA8nm wiT8wHVg1H/cC/Yl1b3zPrOFXPRLhHWURogvlEG42R6PKASE1Wsu7peNBk6PDRBIgb/V IoRg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=U4U/Oif9NJUc6RH0Ddj/zMn7/dvMCgb2SKFu3uxerws=; fh=kaT7q9MvNrAUZr8Or+8rx720+1Bb7DvcOL66KIVGafk=; b=AN1QPnOwuf3/GVdZf31BSXM4Uf73SnETmz9oQ1qzJ5pIsju5rIN6sbeAEr1qwPIvS+ pnTQcJ7fj4JjIFa3paUJP7HAccebi4L7B2Pagin/AnJOVt4FVczEKwc7Vav6Hm9EIzCm 30vkuI+asUNyPSC1rMjomS+gyLQyz4RZG4ZaM/hWMFRSmLJQ2KFXRiL1Mp+DCRiCDult UEjW1j3FObYVJNROqCSvU3oL0c78eJ3aVw28Z1IkVIRFVZ+xR94yba/6GXyty3UfukYi DivH9/bOuMJt2IjrxjTk3mT7uM/TiTATXJzTYFZTY8I2pRWOdRJ865FwO0jW7roJ49hd 6iTQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=RxVPFCiN; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-48038-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-48038-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org X-Forwarded-Encrypted: i=1; AJvYcCXwO5DNl7NlhfvRWc6zhwWWOr23i64ZxTXE+pHFabHY9H6xlhi31E1p0LJwUta8mbi0GlGuq78DqI/K3gxp3tI1sl44vA== Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id iw4-20020a170903044400b001d8aac54f37si10391405plb.311.2024.02.01.03.56.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Feb 2024 03:56:36 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-48038-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=RxVPFCiN; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-48038-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-48038-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id 3A270B27696 for ; Thu, 1 Feb 2024 11:52:40 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 7946615DBCE; Thu, 1 Feb 2024 11:52:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="RxVPFCiN" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C0E1D15DBB7 for ; Thu, 1 Feb 2024 11:52:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706788323; cv=none; b=uLGOzrltwwApJ5dTapXrcGvT5201TXucQNyrFvk52ZGy9tRKb3JNW3MPO94teQVpCnZ9tonJ+/gjwloYYTAHG9p/bkKI09Kqc8mylO3TTux5+tG6xljI3AQli7FqWZ8U1d82Cp215KBKV/TroHG6KXgwJes6xokpytRzMbvqnE4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706788323; c=relaxed/simple; bh=6fHb93UTc8nw6m+lpDs7DJDa48qUFCDPwdpwjwwbA0s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Qwlyq5qbt1nexHDvA6M+fkNjTtWoEv1pBrYKISawwgaGsTBHMcaX/+9UbIvlw4d6HwbWkbL7dHtYODWHRhtCZoxiAGUo4L8ks/vsH1dDTUiyvDuXMWmvdKF5Xrvz7gohUvjJb9Sp63+TH1nro5NT+QjXz+E909wzPyBQI/9ZlxY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=RxVPFCiN; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 62BFAC43399; Thu, 1 Feb 2024 11:52:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1706788323; bh=6fHb93UTc8nw6m+lpDs7DJDa48qUFCDPwdpwjwwbA0s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RxVPFCiN8OEYMF9FTlrwAuCaeLGsIRSzaMVRL+BVdbieJsfaDfWDqMPfgRGfhbqmz zgLCL5yX7umktKCuVTbTPc9kectKBzMw/rsWdh6zFTSGBE8NdEM5fValJhB73NIfGO nvafsEfEFu35DijHeLpqA3fnMz3FXCd4J+XMUe5rHjOptzOrG/Ss+/xMVNEmqPPPsD qMKFVJHgoKABTQPsulHyBvepMafTwjFoVk0Ne9sRUcCXa1XIRmOKDidWpFr7l9y6jB ejE3rRd3w5uw/AkmpD4P5SexVXkLuDZ3e4wZH7ah9SXO0LKvTH7Jea46dwYSinSvtI jNZkd+kkbe9rQ== From: alexs@kernel.org To: Ingo Molnar , Peter Zijlstra , Juri Lelli , Vincent Guittot , Dietmar Eggemann , Steven Rostedt , Ben Segall , Daniel Bristot de Oliveira , Valentin Schneider , linux-kernel@vger.kernel.org, ricardo.neri-calderon@linux.intel.com, sshegde@linux.ibm.com Cc: Alex Shi Subject: [PATCH v3 3/4] sched/fair: packing func sched_use_asym_prio()/sched_asym_prefer() Date: Thu, 1 Feb 2024 19:54:46 +0800 Message-ID: <20240201115447.522627-3-alexs@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240201115447.522627-1-alexs@kernel.org> References: <20240201115447.522627-1-alexs@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789697559110857260 X-GMAIL-MSGID: 1789697559110857260 From: Alex Shi Consolidate the functions sched_use_asym_prio() and sched_asym_prefer() into one. and rename sched_asym() as sched_group_asym(). This makes the code easier to read. No functional changes. Signed-off-by: Alex Shi To: Ricardo Neri To: Valentin Schneider To: Vincent Guittot To: Peter Zijlstra To: Ingo Molnar --- kernel/sched/fair.c | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 8d70417f5125..44fd5e2ca642 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -9747,8 +9747,15 @@ static bool sched_use_asym_prio(struct sched_domain *sd, int cpu) return sd->flags & SD_SHARE_CPUCAPACITY || is_core_idle(cpu); } +static inline bool sched_asym(struct sched_domain *sd, int dst_cpu, int src_cpu) +{ + /* Check if asym balance applicable, then check priorities.*/ + return sched_use_asym_prio(sd, dst_cpu) && + sched_asym_prefer(dst_cpu, src_cpu); +} + /** - * sched_asym - Check if the destination CPU can do asym_packing load balance + * sched_group_asym - Check if the destination CPU can do asym_packing balance * @env: The load balancing environment * @sgs: Load-balancing statistics of the candidate busiest group * @group: The candidate busiest group @@ -9768,22 +9775,18 @@ static bool sched_use_asym_prio(struct sched_domain *sd, int cpu) * otherwise. */ static inline bool -sched_asym(struct lb_env *env, struct sg_lb_stats *sgs, struct sched_group *group) +sched_group_asym(struct lb_env *env, struct sg_lb_stats *sgs, struct sched_group *group) { - /* Ensure that the whole local core is idle, if applicable. */ - if (!sched_use_asym_prio(env->sd, env->dst_cpu)) - return false; - /* - * CPU priorities does not make sense for SMT cores with more than one + * CPU priorities do not make sense for SMT cores with more than one * busy sibling. */ - if (group->flags & SD_SHARE_CPUCAPACITY) { - if (sgs->group_weight - sgs->idle_cpus != 1) - return false; - } - return sched_asym_prefer(env->dst_cpu, group->asym_prefer_cpu); + if ((group->flags & SD_SHARE_CPUCAPACITY) && + (sgs->group_weight - sgs->idle_cpus != 1)) + return false; + + return sched_asym(env->sd, env->dst_cpu, group->asym_prefer_cpu); } /* One group has more than one SMT CPU while the other group does not */ @@ -9939,7 +9942,7 @@ static inline void update_sg_lb_stats(struct lb_env *env, /* Check if dst CPU is idle and preferred to this group */ if (!local_group && env->sd->flags & SD_ASYM_PACKING && env->idle != CPU_NOT_IDLE && sgs->sum_h_nr_running && - sched_asym(env, sgs, group)) { + sched_group_asym(env, sgs, group)) { sgs->group_asym_packing = 1; } @@ -11038,8 +11041,7 @@ static struct rq *find_busiest_queue(struct lb_env *env, * SMT cores with more than one busy sibling. */ if ((env->sd->flags & SD_ASYM_PACKING) && - sched_use_asym_prio(env->sd, i) && - sched_asym_prefer(i, env->dst_cpu) && + sched_asym(env->sd, i, env->dst_cpu) && nr_running == 1) continue; @@ -11909,8 +11911,7 @@ static void nohz_balancer_kick(struct rq *rq) * preferred CPU must be idle. */ for_each_cpu_and(i, sched_domain_span(sd), nohz.idle_cpus_mask) { - if (sched_use_asym_prio(sd, i) && - sched_asym_prefer(i, cpu)) { + if (sched_asym(sd, i, cpu)) { flags = NOHZ_STATS_KICK | NOHZ_BALANCE_KICK; goto unlock; } From patchwork Thu Feb 1 11:54:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: alexs@kernel.org X-Patchwork-Id: 195250 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2719:b0:106:209c:c626 with SMTP id hl25csp92002dyb; Thu, 1 Feb 2024 03:52:53 -0800 (PST) X-Google-Smtp-Source: AGHT+IEj9fzGQu5joFFujZBHpL37QSCUFXildLUFNpY5NsUpaEz+/+nUlGjt6Z71saSree81kzUO X-Received: by 2002:a0d:eb49:0:b0:5ef:7f8d:bfcb with SMTP id u70-20020a0deb49000000b005ef7f8dbfcbmr4750266ywe.19.1706788372828; Thu, 01 Feb 2024 03:52:52 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706788372; cv=pass; d=google.com; s=arc-20160816; b=RKGCV9FthY0SM+iwR+skoFmZtzS568pJ/ttUaEJAeEcQcu9Hk2cOsg5KEGDyvljtZs 6oVQokxZgtstsNRw4C8JJkYXdaMG4VIRj2VMIYRZgQSkLtFCP1Y2gka1GCmbJb9paM5I jM0VfZIBjjK/HcMc+AgV+YH8+K7UoSUBEI0P8/JWkKiTPcQmp8UxyW0417gBXASYxt9g JZAfqrIV4evj7zxS6XrahKcOaVJgrWts8dDd2GWsGYl9JcGgFfpOZHrExuqKrp9wRP1o gTbETkhbSmuCZdFcjZCRiNV0i4ISMsHpg4ajs/BGx/1lMcQK6ucsezBFyNJdr9AGS/Jn A0TA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=q0B/PJFfhGo8HX5cn/JbQi6k1J8b1XBXe5Zk43LKv7c=; fh=Z4KBUtEsw48ChBWOpy2RC1j25PGllBZpj8ytfRhmpvA=; b=wNU8EbkC1iC4hsGUyywx26jnDOhx+xS/LUEtY3u7aUD7ALGRIKZwZpC+ufp6qkczKm 2q8ls2QB7ThXJhSuOEIhMICOHNzxrMrJxks7XjrSUO3OXPwKWXh0XqMHM+VuOngpgG7z OMEnAWNC8KvLP9r5Y69bpdjkPj0HO3pd7s3zUE1Ki7qgUcYl7Xqu3oFWOSTZ24g1K1pT XmpxOU8zDOcrx+vDzbgSDrralv8W4Z5R82lau84N2zjixr+UmDYEA+sjDaZKXl6Br7tL 3rHACmHf+z/Qa688eCzZPyTAfm2kCw7sgaRe/LvRSYM8Kf2xaDrCaS14FF2otGiAumSm bEGA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="PvtSU/P5"; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-48039-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-48039-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org X-Forwarded-Encrypted: i=1; AJvYcCWn9/me6tzRS346vnfuvtIexKloEL5OedsM+9WUX8uSawkCN/lc9DoCtcNYDS9sIZgUFIpm9izNKLEWrheCbIDfPL6FQw== Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id h17-20020ac85e11000000b0042a5254274fsi14185550qtx.427.2024.02.01.03.52.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Feb 2024 03:52:52 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-48039-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="PvtSU/P5"; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-48039-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-48039-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 9E22C1C2645E for ; Thu, 1 Feb 2024 11:52:52 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 6EC4C15D5BB; Thu, 1 Feb 2024 11:52:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="PvtSU/P5" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B6D3115DBB6 for ; Thu, 1 Feb 2024 11:52:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706788327; cv=none; b=A1Ap8deo2sleAz4j78ZOUDKibXDTwUP1SzSoVN1sntJaHKa1uHr0cu3GdqdeRxChFVXWZ31X9ti5acHC0s+z7Jc+TPAfTcRUkIYPBoTJnYCBHZvK6S74Oc4st63XTpXxxCO3p8wPgQBsZRczE7dVsYLhgcGxQBlLfyY1ESCdQ9Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706788327; c=relaxed/simple; bh=ka9LtoyCvE401Vfn0WS2/PpohTLrZ5ojjcAJZr5Z/Sc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gMCN5BtTsOw7vtUulWSQu4diEuULRM1/K36gTzFDq7wu4Y0iMJ+H8c8oVyEdQ6yeRyiPYZSHSgBFuItwe0V4qqOhWTydBStHVawV5c1M9p/vdMgrFg9bPcTFOzKW+BBK98VpCuouvLX/3Wwgz1pZ+XXCPeYtVrPejrSvEoRyqAo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=PvtSU/P5; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 25B6AC433F1; Thu, 1 Feb 2024 11:52:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1706788327; bh=ka9LtoyCvE401Vfn0WS2/PpohTLrZ5ojjcAJZr5Z/Sc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PvtSU/P5U1/N9frNC/ZxKjQ/19PoMB2HY3//vZU0Ut17zcqCLAOySDBQpJN8+KZks EpMFwaZ2kDkpbOPSVUxlwx6KuN9PO1Qlec+yyze3/5IIg9dWZd1Htw4Lead5h2gdIU +AirSq8I77DAeBvtJ4JNRPRxUopnRZwD3AiaPjgYPe1yUQ17uyQuY5jmAlhUPF5sB6 oq/MqXbHD2GT5viM2ftMQklatuKUTasGd31RDzJwBMyJSVRlKVdEXu7/iWhp+oUqqN wfjqCMo+W2qtWFcNcxxP9ViD/WZESlzgJLO0n2J5Huq3euqmNXWm+UcASryK6z/PUP Sfvw2XyAbSgKA== From: alexs@kernel.org To: Ingo Molnar , Peter Zijlstra , Juri Lelli , Vincent Guittot , Dietmar Eggemann , Steven Rostedt , Ben Segall , Daniel Bristot de Oliveira , Valentin Schneider , linux-kernel@vger.kernel.org, ricardo.neri-calderon@linux.intel.com, sshegde@linux.ibm.com Cc: Alex Shi Subject: [PATCH v3 4/4] sched/fair: Check the SD_ASYM_PACKING flag in sched_use_asym_prio() Date: Thu, 1 Feb 2024 19:54:47 +0800 Message-ID: <20240201115447.522627-4-alexs@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240201115447.522627-1-alexs@kernel.org> References: <20240201115447.522627-1-alexs@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789697324789363806 X-GMAIL-MSGID: 1789697324789363806 From: Alex Shi sched_use_asym_prio() checks whether CPU priorities should be used. It makes sense to check for the SD_ASYM_PACKING() inside the function. Since both sched_asym() and sched_group_asym() use sched_use_asym_prio(), remove the now superfluous checks for the flag in various places" Signed-off-by: Alex Shi To: Ricardo Neri To: Ben Segall To: Steven Rostedt To: Dietmar Eggemann To: Valentin Schneider To: Daniel Bristot de Oliveira To: Vincent Guittot To: Juri Lelli To: Peter Zijlstra To: Ingo Molnar --- kernel/sched/fair.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 44fd5e2ca642..bd32efbea688 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -9741,6 +9741,9 @@ group_type group_classify(unsigned int imbalance_pct, */ static bool sched_use_asym_prio(struct sched_domain *sd, int cpu) { + if (!(sd->flags & SD_ASYM_PACKING)) + return false; + if (!sched_smt_active()) return true; @@ -9940,11 +9943,9 @@ static inline void update_sg_lb_stats(struct lb_env *env, sgs->group_weight = group->group_weight; /* Check if dst CPU is idle and preferred to this group */ - if (!local_group && env->sd->flags & SD_ASYM_PACKING && - env->idle != CPU_NOT_IDLE && sgs->sum_h_nr_running && - sched_group_asym(env, sgs, group)) { + if (!local_group && env->idle != CPU_NOT_IDLE && sgs->sum_h_nr_running && + sched_group_asym(env, sgs, group)) sgs->group_asym_packing = 1; - } /* Check for loaded SMT group to be balanced to dst CPU */ if (!local_group && smt_balance(env, sgs, group)) @@ -11040,9 +11041,7 @@ static struct rq *find_busiest_queue(struct lb_env *env, * If balancing between cores, let lower priority CPUs help * SMT cores with more than one busy sibling. */ - if ((env->sd->flags & SD_ASYM_PACKING) && - sched_asym(env->sd, i, env->dst_cpu) && - nr_running == 1) + if (sched_asym(env->sd, i, env->dst_cpu) && nr_running == 1) continue; switch (env->migration_type) { @@ -11138,7 +11137,7 @@ asym_active_balance(struct lb_env *env) * the lower priority @env::dst_cpu help it. Do not follow * CPU priority. */ - return env->idle != CPU_NOT_IDLE && (env->sd->flags & SD_ASYM_PACKING) && + return env->idle != CPU_NOT_IDLE && sched_use_asym_prio(env->sd, env->dst_cpu) && (sched_asym_prefer(env->dst_cpu, env->src_cpu) || !sched_use_asym_prio(env->sd, env->src_cpu));