From nobody Sun Feb 8 12:37:07 2026 Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E1BC256761 for ; Fri, 8 Mar 2024 11:18:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709896721; cv=none; b=f+iQCrczfQNT/5QvN6oLY+jYvNG2X73MH8P0dZi5zwoBX2z/I4ZYnhIKJDbwt68QAANYAcewqUU6IAcCFl2NtMiZ/Kae8ZxK4NnIKnOcSEm6ZRSSfG+2SkldUYbxWBqP4giBJ26M/zNIdbGH3273XISP7BtkBu2fBWfMQTgeZPY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709896721; c=relaxed/simple; bh=+vVG2QYkF0mp4T5ALGhtl7UkYSxy7vS8aoVqlykA/50=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=Xuq3vjLm4T2R4BiqV+JFF/5m23L+uLr776fi1m5E7zXCmi66ptjV0v9IMUf6gC6syq17LCmmUh3VDhAmSqGJpHG4NvC0ZhIoii8Y6sM9XAmP91sboI/Lu1TBi7V+yCtR7aUfFEYUxhj1b2DevgA5tLWzFP0bAbN6SSF+AJlpGhg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=SNCZHDj0; arc=none smtp.client-ip=209.85.221.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="SNCZHDj0" Received: by mail-wr1-f52.google.com with SMTP id ffacd0b85a97d-33e1878e357so1288499f8f.3 for ; Fri, 08 Mar 2024 03:18:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709896717; x=1710501517; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=estP9Tu8p0RmYA73Y3Xz5YQtwlvzKHk4Qvv5GZzWF7s=; b=SNCZHDj05/cfAxHM3DXmxs4C4qNRP572GU4BHIXTPCsBjgC6KxUS3ZLi+8N+1KZ/qh S7B7Dzr1mz9+FtnOjnw6vstK3sRPHrBbzXej5NvvEOFjg3gLdClo/mIfjQ941ovcoHHU iLYV0dzkRAFudn2XIC+GbMeBmepo4X3b4psohFvDHtN0zH2lNv5UwfMR5oNY3hOFgSj+ oElaej9ty2x37jCpH2qmSjKcsEGlG1vpG1QrHxiB53Zv2jQPmKukJFjvDCudRmF+J9Ex GMHMmxlxrzbRSBU439iV0bP+u1vEEK+E9/Q6XD8lZIkbV0MRkzZ4u8sxYNhR5NtG/ZCn nFbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709896717; x=1710501517; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=estP9Tu8p0RmYA73Y3Xz5YQtwlvzKHk4Qvv5GZzWF7s=; b=tkqi+s/eAATzlSLf0PtYN2dxi0xqrlRJKA7Vcfo+E+YgaDCVHFPwRdhsGpdHwZzJ8T 0Vu+8eEbR7IbD6HkayBwTGRvMI485cfacbxmAcrcJFzl2N6zlttDfTtBQsWpPm/Bnltm U9nirOF4TTzcKK7BzLyPx8+U2ZYur1MEvD4rfPVJkXodJ35YpfnSqPS9A/gkLXucNDu1 PkFHq0WWIiikhwgXx1RLbGBOSj5CX2m6IFtXikIPzrk3I3GdRJMExL98cr9SOeTCjD1+ huwv2JQOBWB6cps6uJ/89oysE6+mIVBnduhvRlQB82K0EckeswU6yWwTtnLf0JKfcX2W dO1Q== X-Gm-Message-State: AOJu0YybBWSpByUuq3AgGPtbJB05MEMO1riiyy7S6WnnP+MiHHsAPrUl GSIWDWAu5pXwiXHqN4fznHihVflf6OwwlXC12NjEdRy9+1YyDz9P13ppBmUlOgo= X-Google-Smtp-Source: AGHT+IHDH8xDoNw2OwWwMve0rNWfpnp3DzzP5dVPbV06WxpJPSIdlcShVf1OSxsgKkAlGAYq356RIQ== X-Received: by 2002:adf:f350:0:b0:33e:592c:d7e5 with SMTP id e16-20020adff350000000b0033e592cd7e5mr5477886wrp.31.1709896716949; Fri, 08 Mar 2024 03:18:36 -0800 (PST) Received: from kepler.redhat.com (1F2EF3E5.nat.pool.telekom.hu. [31.46.243.229]) by smtp.gmail.com with ESMTPSA id v9-20020adfedc9000000b0033e712b1d9bsm2523884wro.77.2024.03.08.03.18.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Mar 2024 03:18:36 -0800 (PST) Sender: Ingo Molnar From: Ingo Molnar To: linux-kernel@vger.kernel.org Cc: Dietmar Eggemann , Linus Torvalds , Peter Zijlstra , Shrikanth Hegde , Valentin Schneider , Vincent Guittot Subject: [PATCH 05/13] sched/balancing: Rename load_balance() => sched_balance_rq() Date: Fri, 8 Mar 2024 12:18:11 +0100 Message-Id: <20240308111819.1101550-6-mingo@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240308111819.1101550-1-mingo@kernel.org> References: <20240308111819.1101550-1-mingo@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Standardize scheduler load-balancing function names on the sched_balance_() prefix. Also load_balance() has become somewhat of a misnomer: historically it was the first and primary load-balancing function that was called, but with the introduction of sched domains, it's become a lower layer function that balances runqueues. Rename it to sched_balance_rq() accordingly. Signed-off-by: Ingo Molnar Cc: Dietmar Eggemann Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Shrikanth Hegde Cc: Valentin Schneider Cc: Vincent Guittot Reviewed-by: Shrikanth Hegde --- Documentation/scheduler/sched-domains.rst | 4 ++-- Documentation/scheduler/sched-stats.rst | 32 ++++++++= ++++++++---------------- Documentation/translations/zh_CN/scheduler/sched-domains.rst | 4 ++-- Documentation/translations/zh_CN/scheduler/sched-stats.rst | 30 ++++++++= +++++++--------------- include/linux/sched/topology.h | 2 +- kernel/sched/fair.c | 10 +++++---= -- 6 files changed, 41 insertions(+), 41 deletions(-) diff --git a/Documentation/scheduler/sched-domains.rst b/Documentation/sche= duler/sched-domains.rst index 5d8e8b8b269e..5e996fe973b1 100644 --- a/Documentation/scheduler/sched-domains.rst +++ b/Documentation/scheduler/sched-domains.rst @@ -41,11 +41,11 @@ The latter function takes two arguments: the runqueue o= f current CPU and whether the CPU was idle at the time the sched_tick() happened and iterates over a= ll sched domains our CPU is on, starting from its base domain and going up th= e ->parent chain. While doing that, it checks to see if the current domain has exhaus= ted its -rebalance interval. If so, it runs load_balance() on that domain. It then = checks +rebalance interval. If so, it runs sched_balance_rq() on that domain. It t= hen checks the parent sched_domain (if it exists), and the parent of the parent and so forth. =20 -Initially, load_balance() finds the busiest group in the current sched dom= ain. +Initially, sched_balance_rq() finds the busiest group in the current sched= domain. If it succeeds, it looks for the busiest runqueue of all the CPUs' runqueu= es in that group. If it manages to find such a runqueue, it locks both our initi= al CPU's runqueue and the newly found busiest one and starts moving tasks fro= m it diff --git a/Documentation/scheduler/sched-stats.rst b/Documentation/schedu= ler/sched-stats.rst index 03c062915998..afb39be7d6d2 100644 --- a/Documentation/scheduler/sched-stats.rst +++ b/Documentation/scheduler/sched-stats.rst @@ -72,53 +72,53 @@ domain 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15= 16 17 18 19 20 21 22 23 =20 The first field is a bit mask indicating what cpus this domain operates ov= er. =20 -The next 24 are a variety of load_balance() statistics in grouped into typ= es +The next 24 are a variety of sched_balance_rq() statistics in grouped into= types of idleness (idle, busy, and newly idle): =20 - 1) # of times in this domain load_balance() was called when the + 1) # of times in this domain sched_balance_rq() was called when the cpu was idle - 2) # of times in this domain load_balance() checked but found + 2) # of times in this domain sched_balance_rq() checked but found the load did not require balancing when the cpu was idle - 3) # of times in this domain load_balance() tried to move one or + 3) # of times in this domain sched_balance_rq() tried to move one or more tasks and failed, when the cpu was idle 4) sum of imbalances discovered (if any) with each call to - load_balance() in this domain when the cpu was idle + sched_balance_rq() in this domain when the cpu was idle 5) # of times in this domain pull_task() was called when the cpu was idle 6) # of times in this domain pull_task() was called even though the target task was cache-hot when idle - 7) # of times in this domain load_balance() was called but did + 7) # of times in this domain sched_balance_rq() was called but did not find a busier queue while the cpu was idle 8) # of times in this domain a busier queue was found while the cpu was idle but no busier group was found - 9) # of times in this domain load_balance() was called when the + 9) # of times in this domain sched_balance_rq() was called when the cpu was busy - 10) # of times in this domain load_balance() checked but found the + 10) # of times in this domain sched_balance_rq() checked but found the load did not require balancing when busy - 11) # of times in this domain load_balance() tried to move one or + 11) # of times in this domain sched_balance_rq() tried to move one or more tasks and failed, when the cpu was busy 12) sum of imbalances discovered (if any) with each call to - load_balance() in this domain when the cpu was busy + sched_balance_rq() in this domain when the cpu was busy 13) # of times in this domain pull_task() was called when busy 14) # of times in this domain pull_task() was called even though the target task was cache-hot when busy - 15) # of times in this domain load_balance() was called but did not + 15) # of times in this domain sched_balance_rq() was called but did not find a busier queue while the cpu was busy 16) # of times in this domain a busier queue was found while the cpu was busy but no busier group was found =20 - 17) # of times in this domain load_balance() was called when the + 17) # of times in this domain sched_balance_rq() was called when the cpu was just becoming idle - 18) # of times in this domain load_balance() checked but found the + 18) # of times in this domain sched_balance_rq() checked but found the load did not require balancing when the cpu was just becoming idle - 19) # of times in this domain load_balance() tried to move one or more + 19) # of times in this domain sched_balance_rq() tried to move one or = more tasks and failed, when the cpu was just becoming idle 20) sum of imbalances discovered (if any) with each call to - load_balance() in this domain when the cpu was just becoming idle + sched_balance_rq() in this domain when the cpu was just becoming i= dle 21) # of times in this domain pull_task() was called when newly idle 22) # of times in this domain pull_task() was called even though the target task was cache-hot when just becoming idle - 23) # of times in this domain load_balance() was called but did not + 23) # of times in this domain sched_balance_rq() was called but did not find a busier queue while the cpu was just becoming idle 24) # of times in this domain a busier queue was found while the cpu was just becoming idle but no busier group was found diff --git a/Documentation/translations/zh_CN/scheduler/sched-domains.rst b= /Documentation/translations/zh_CN/scheduler/sched-domains.rst index e6590fd80640..06363169c56b 100644 --- a/Documentation/translations/zh_CN/scheduler/sched-domains.rst +++ b/Documentation/translations/zh_CN/scheduler/sched-domains.rst @@ -42,9 +42,9 @@ CPU=E5=85=B1=E4=BA=AB=E3=80=82=E4=BB=BB=E6=84=8F=E4=B8=A4= =E4=B8=AA=E7=BB=84=E7=9A=84CPU=E6=8E=A9=E7=A0=81=E7=9A=84=E4=BA=A4=E9=9B=86= =E4=B8=8D=E4=B8=80=E5=AE=9A=E4=B8=BA=E7=A9=BA=EF=BC=8C=E5=A6=82=E6=9E=9C=E6= =98=AF=E8=BF=99 =E5=90=8E=E4=B8=80=E4=B8=AA=E5=87=BD=E6=95=B0=E6=9C=89=E4=B8=A4=E4=B8=AA= =E5=85=A5=E5=8F=82=EF=BC=9A=E5=BD=93=E5=89=8DCPU=E7=9A=84=E8=BF=90=E8=A1=8C= =E9=98=9F=E5=88=97=E3=80=81=E5=AE=83=E5=9C=A8sched_tick()=E8=B0=83=E7=94=A8= =E6=97=B6=E6=98=AF=E5=90=A6=E7=A9=BA=E9=97=B2=E3=80=82=E5=87=BD=E6=95=B0=E4= =BC=9A=E4=BB=8E =E5=BD=93=E5=89=8DCPU=E6=89=80=E5=9C=A8=E7=9A=84=E5=9F=BA=E8=B0=83=E5=BA= =A6=E5=9F=9F=E5=BC=80=E5=A7=8B=E8=BF=AD=E4=BB=A3=E6=89=A7=E8=A1=8C=EF=BC=8C= =E5=B9=B6=E6=B2=BF=E7=9D=80parent=E6=8C=87=E9=92=88=E9=93=BE=E5=90=91=E4=B8= =8A=E8=BF=9B=E5=85=A5=E6=9B=B4=E9=AB=98=E5=B1=82=E7=BA=A7=E7=9A=84=E8=B0=83= =E5=BA=A6=E5=9F=9F=E3=80=82=E5=9C=A8=E8=BF=AD=E4=BB=A3 =E8=BF=87=E7=A8=8B=E4=B8=AD=EF=BC=8C=E5=87=BD=E6=95=B0=E4=BC=9A=E6=A3=80= =E6=9F=A5=E5=BD=93=E5=89=8D=E8=B0=83=E5=BA=A6=E5=9F=9F=E6=98=AF=E5=90=A6=E5= =B7=B2=E7=BB=8F=E8=80=97=E5=B0=BD=E4=BA=86=E5=86=8D=E5=B9=B3=E8=A1=A1=E7=9A= =84=E6=97=B6=E9=97=B4=E9=97=B4=E9=9A=94=EF=BC=8C=E5=A6=82=E6=9E=9C=E6=98=AF= =EF=BC=8C=E5=AE=83=E5=9C=A8=E8=AF=A5=E8=B0=83=E5=BA=A6=E5=9F=9F=E8=BF=90=E8= =A1=8C -load_balance()=E3=80=82=E6=8E=A5=E4=B8=8B=E6=9D=A5=E5=AE=83=E6=A3=80=E6=9F= =A5=E7=88=B6=E8=B0=83=E5=BA=A6=E5=9F=9F=EF=BC=88=E5=A6=82=E6=9E=9C=E5=AD=98= =E5=9C=A8=EF=BC=89=EF=BC=8C=E5=86=8D=E5=90=8E=E6=9D=A5=E7=88=B6=E8=B0=83=E5= =BA=A6=E5=9F=9F=E7=9A=84=E7=88=B6=E8=B0=83=E5=BA=A6=E5=9F=9F=EF=BC=8C=E4=BB= =A5=E6=AD=A4=E7=B1=BB=E6=8E=A8=E3=80=82 +sched_balance_rq()=E3=80=82=E6=8E=A5=E4=B8=8B=E6=9D=A5=E5=AE=83=E6=A3=80= =E6=9F=A5=E7=88=B6=E8=B0=83=E5=BA=A6=E5=9F=9F=EF=BC=88=E5=A6=82=E6=9E=9C=E5= =AD=98=E5=9C=A8=EF=BC=89=EF=BC=8C=E5=86=8D=E5=90=8E=E6=9D=A5=E7=88=B6=E8=B0= =83=E5=BA=A6=E5=9F=9F=E7=9A=84=E7=88=B6=E8=B0=83=E5=BA=A6=E5=9F=9F=EF=BC=8C= =E4=BB=A5=E6=AD=A4=E7=B1=BB=E6=8E=A8=E3=80=82 =20 -=E8=B5=B7=E5=88=9D=EF=BC=8Cload_balance()=E6=9F=A5=E6=89=BE=E5=BD=93=E5=89= =8D=E8=B0=83=E5=BA=A6=E5=9F=9F=E4=B8=AD=E6=9C=80=E7=B9=81=E5=BF=99=E7=9A=84= =E8=B0=83=E5=BA=A6=E7=BB=84=E3=80=82=E5=A6=82=E6=9E=9C=E6=88=90=E5=8A=9F=EF= =BC=8C=E5=9C=A8=E8=AF=A5=E8=B0=83=E5=BA=A6=E7=BB=84=E7=AE=A1=E8=BE=96=E7=9A= =84=E5=85=A8=E9=83=A8CPU +=E8=B5=B7=E5=88=9D=EF=BC=8Csched_balance_rq()=E6=9F=A5=E6=89=BE=E5=BD=93= =E5=89=8D=E8=B0=83=E5=BA=A6=E5=9F=9F=E4=B8=AD=E6=9C=80=E7=B9=81=E5=BF=99=E7= =9A=84=E8=B0=83=E5=BA=A6=E7=BB=84=E3=80=82=E5=A6=82=E6=9E=9C=E6=88=90=E5=8A= =9F=EF=BC=8C=E5=9C=A8=E8=AF=A5=E8=B0=83=E5=BA=A6=E7=BB=84=E7=AE=A1=E8=BE=96= =E7=9A=84=E5=85=A8=E9=83=A8CPU =E7=9A=84=E8=BF=90=E8=A1=8C=E9=98=9F=E5=88=97=E4=B8=AD=E6=89=BE=E5=87=BA= =E6=9C=80=E7=B9=81=E5=BF=99=E7=9A=84=E8=BF=90=E8=A1=8C=E9=98=9F=E5=88=97=E3= =80=82=E5=A6=82=E8=83=BD=E6=89=BE=E5=88=B0=EF=BC=8C=E5=AF=B9=E5=BD=93=E5=89= =8D=E7=9A=84CPU=E8=BF=90=E8=A1=8C=E9=98=9F=E5=88=97=E5=92=8C=E6=96=B0=E6=89= =BE=E5=88=B0=E7=9A=84=E6=9C=80=E7=B9=81=E5=BF=99=E8=BF=90=E8=A1=8C =E9=98=9F=E5=88=97=E5=9D=87=E5=8A=A0=E9=94=81=EF=BC=8C=E5=B9=B6=E6=8A=8A= =E4=BB=BB=E5=8A=A1=E4=BB=8E=E6=9C=80=E7=B9=81=E5=BF=99=E9=98=9F=E5=88=97=E4= =B8=AD=E8=BF=81=E7=A7=BB=E5=88=B0=E5=BD=93=E5=89=8DCPU=E4=B8=8A=E3=80=82=E8= =A2=AB=E8=BF=81=E7=A7=BB=E7=9A=84=E4=BB=BB=E5=8A=A1=E6=95=B0=E9=87=8F=E7=AD= =89=E4=BA=8E=E5=9C=A8=E5=85=88=E5=89=8D=E8=BF=AD=E4=BB=A3=E6=89=A7=E8=A1=8C =E4=B8=AD=E8=AE=A1=E7=AE=97=E5=87=BA=E7=9A=84=E8=AF=A5=E8=B0=83=E5=BA=A6= =E5=9F=9F=E7=9A=84=E8=B0=83=E5=BA=A6=E7=BB=84=E7=9A=84=E4=B8=8D=E5=9D=87=E8= =A1=A1=E5=80=BC=E3=80=82 diff --git a/Documentation/translations/zh_CN/scheduler/sched-stats.rst b/D= ocumentation/translations/zh_CN/scheduler/sched-stats.rst index c5e0be663837..09eee2517610 100644 --- a/Documentation/translations/zh_CN/scheduler/sched-stats.rst +++ b/Documentation/translations/zh_CN/scheduler/sched-stats.rst @@ -75,42 +75,42 @@ domain 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15= 16 17 18 19 20 21 22 23 =E7=B9=81=E5=BF=99=EF=BC=8C=E6=96=B0=E7=A9=BA=E9=97=B2=EF=BC=89=EF=BC=9A =20 =20 - 1) =E5=BD=93CPU=E7=A9=BA=E9=97=B2=E6=97=B6=EF=BC=8Cload_balance()=E5= =9C=A8=E8=BF=99=E4=B8=AA=E8=B0=83=E5=BA=A6=E5=9F=9F=E4=B8=AD=E8=A2=AB=E8=B0= =83=E7=94=A8=E4=BA=86#=E6=AC=A1 - 2) =E5=BD=93CPU=E7=A9=BA=E9=97=B2=E6=97=B6=EF=BC=8Cload_balance()=E5= =9C=A8=E8=BF=99=E4=B8=AA=E8=B0=83=E5=BA=A6=E5=9F=9F=E4=B8=AD=E8=A2=AB=E8=B0= =83=E7=94=A8=EF=BC=8C=E4=BD=86=E6=98=AF=E5=8F=91=E7=8E=B0=E8=B4=9F=E8=BD=BD= =E6=97=A0=E9=9C=80 + 1) =E5=BD=93CPU=E7=A9=BA=E9=97=B2=E6=97=B6=EF=BC=8Csched_balance_rq()= =E5=9C=A8=E8=BF=99=E4=B8=AA=E8=B0=83=E5=BA=A6=E5=9F=9F=E4=B8=AD=E8=A2=AB=E8= =B0=83=E7=94=A8=E4=BA=86#=E6=AC=A1 + 2) =E5=BD=93CPU=E7=A9=BA=E9=97=B2=E6=97=B6=EF=BC=8Csched_balance_rq()= =E5=9C=A8=E8=BF=99=E4=B8=AA=E8=B0=83=E5=BA=A6=E5=9F=9F=E4=B8=AD=E8=A2=AB=E8= =B0=83=E7=94=A8=EF=BC=8C=E4=BD=86=E6=98=AF=E5=8F=91=E7=8E=B0=E8=B4=9F=E8=BD= =BD=E6=97=A0=E9=9C=80 =E5=9D=87=E8=A1=A1#=E6=AC=A1 - 3) =E5=BD=93CPU=E7=A9=BA=E9=97=B2=E6=97=B6=EF=BC=8Cload_balance()=E5= =9C=A8=E8=BF=99=E4=B8=AA=E8=B0=83=E5=BA=A6=E5=9F=9F=E4=B8=AD=E8=A2=AB=E8=B0= =83=E7=94=A8=EF=BC=8C=E8=AF=95=E5=9B=BE=E8=BF=81=E7=A7=BB1=E4=B8=AA=E6=88= =96=E6=9B=B4=E5=A4=9A + 3) =E5=BD=93CPU=E7=A9=BA=E9=97=B2=E6=97=B6=EF=BC=8Csched_balance_rq()= =E5=9C=A8=E8=BF=99=E4=B8=AA=E8=B0=83=E5=BA=A6=E5=9F=9F=E4=B8=AD=E8=A2=AB=E8= =B0=83=E7=94=A8=EF=BC=8C=E8=AF=95=E5=9B=BE=E8=BF=81=E7=A7=BB1=E4=B8=AA=E6= =88=96=E6=9B=B4=E5=A4=9A =E4=BB=BB=E5=8A=A1=E4=B8=94=E5=A4=B1=E8=B4=A5=E4=BA=86#=E6=AC=A1 - 4) =E5=BD=93CPU=E7=A9=BA=E9=97=B2=E6=97=B6=EF=BC=8Cload_balance()=E5= =9C=A8=E8=BF=99=E4=B8=AA=E8=B0=83=E5=BA=A6=E5=9F=9F=E4=B8=AD=E8=A2=AB=E8=B0= =83=E7=94=A8=EF=BC=8C=E5=8F=91=E7=8E=B0=E4=B8=8D=E5=9D=87=E8=A1=A1=EF=BC=88= =E5=A6=82=E6=9E=9C=E6=9C=89=EF=BC=89 + 4) =E5=BD=93CPU=E7=A9=BA=E9=97=B2=E6=97=B6=EF=BC=8Csched_balance_rq()= =E5=9C=A8=E8=BF=99=E4=B8=AA=E8=B0=83=E5=BA=A6=E5=9F=9F=E4=B8=AD=E8=A2=AB=E8= =B0=83=E7=94=A8=EF=BC=8C=E5=8F=91=E7=8E=B0=E4=B8=8D=E5=9D=87=E8=A1=A1=EF=BC= =88=E5=A6=82=E6=9E=9C=E6=9C=89=EF=BC=89 #=E6=AC=A1 5) =E5=BD=93CPU=E7=A9=BA=E9=97=B2=E6=97=B6=EF=BC=8Cpull_task()=E5=9C= =A8=E8=BF=99=E4=B8=AA=E8=B0=83=E5=BA=A6=E5=9F=9F=E4=B8=AD=E8=A2=AB=E8=B0=83= =E7=94=A8#=E6=AC=A1 6) =E5=BD=93CPU=E7=A9=BA=E9=97=B2=E6=97=B6=EF=BC=8C=E5=B0=BD=E7=AE=A1= =E7=9B=AE=E6=A0=87=E4=BB=BB=E5=8A=A1=E6=98=AF=E7=83=AD=E7=BC=93=E5=AD=98=E7= =8A=B6=E6=80=81=EF=BC=8Cpull_task()=E4=BE=9D=E7=84=B6=E8=A2=AB=E8=B0=83=E7= =94=A8#=E6=AC=A1 - 7) =E5=BD=93CPU=E7=A9=BA=E9=97=B2=E6=97=B6=EF=BC=8Cload_balance()=E5= =9C=A8=E8=BF=99=E4=B8=AA=E8=B0=83=E5=BA=A6=E5=9F=9F=E4=B8=AD=E8=A2=AB=E8=B0= =83=E7=94=A8=EF=BC=8C=E6=9C=AA=E8=83=BD=E6=89=BE=E5=88=B0=E6=9B=B4=E7=B9=81= =E5=BF=99=E7=9A=84 + 7) =E5=BD=93CPU=E7=A9=BA=E9=97=B2=E6=97=B6=EF=BC=8Csched_balance_rq()= =E5=9C=A8=E8=BF=99=E4=B8=AA=E8=B0=83=E5=BA=A6=E5=9F=9F=E4=B8=AD=E8=A2=AB=E8= =B0=83=E7=94=A8=EF=BC=8C=E6=9C=AA=E8=83=BD=E6=89=BE=E5=88=B0=E6=9B=B4=E7=B9= =81=E5=BF=99=E7=9A=84 =E9=98=9F=E5=88=97#=E6=AC=A1 8) =E5=BD=93CPU=E7=A9=BA=E9=97=B2=E6=97=B6=EF=BC=8C=E5=9C=A8=E8=B0=83= =E5=BA=A6=E5=9F=9F=E4=B8=AD=E6=89=BE=E5=88=B0=E4=BA=86=E6=9B=B4=E7=B9=81=E5= =BF=99=E7=9A=84=E9=98=9F=E5=88=97=EF=BC=8C=E4=BD=86=E6=9C=AA=E6=89=BE=E5=88= =B0=E6=9B=B4=E7=B9=81=E5=BF=99=E7=9A=84=E8=B0=83=E5=BA=A6=E7=BB=84 #=E6=AC=A1 - 9) =E5=BD=93CPU=E7=B9=81=E5=BF=99=E6=97=B6=EF=BC=8Cload_balance()=E5= =9C=A8=E8=BF=99=E4=B8=AA=E8=B0=83=E5=BA=A6=E5=9F=9F=E4=B8=AD=E8=A2=AB=E8=B0= =83=E7=94=A8=E4=BA=86#=E6=AC=A1 - 10) =E5=BD=93CPU=E7=B9=81=E5=BF=99=E6=97=B6=EF=BC=8Cload_balance()=E5= =9C=A8=E8=BF=99=E4=B8=AA=E8=B0=83=E5=BA=A6=E5=9F=9F=E4=B8=AD=E8=A2=AB=E8=B0= =83=E7=94=A8=EF=BC=8C=E4=BD=86=E6=98=AF=E5=8F=91=E7=8E=B0=E8=B4=9F=E8=BD=BD= =E6=97=A0=E9=9C=80 + 9) =E5=BD=93CPU=E7=B9=81=E5=BF=99=E6=97=B6=EF=BC=8Csched_balance_rq()= =E5=9C=A8=E8=BF=99=E4=B8=AA=E8=B0=83=E5=BA=A6=E5=9F=9F=E4=B8=AD=E8=A2=AB=E8= =B0=83=E7=94=A8=E4=BA=86#=E6=AC=A1 + 10) =E5=BD=93CPU=E7=B9=81=E5=BF=99=E6=97=B6=EF=BC=8Csched_balance_rq()= =E5=9C=A8=E8=BF=99=E4=B8=AA=E8=B0=83=E5=BA=A6=E5=9F=9F=E4=B8=AD=E8=A2=AB=E8= =B0=83=E7=94=A8=EF=BC=8C=E4=BD=86=E6=98=AF=E5=8F=91=E7=8E=B0=E8=B4=9F=E8=BD= =BD=E6=97=A0=E9=9C=80 =E5=9D=87=E8=A1=A1#=E6=AC=A1 - 11) =E5=BD=93CPU=E7=B9=81=E5=BF=99=E6=97=B6=EF=BC=8Cload_balance()=E5= =9C=A8=E8=BF=99=E4=B8=AA=E8=B0=83=E5=BA=A6=E5=9F=9F=E4=B8=AD=E8=A2=AB=E8=B0= =83=E7=94=A8=EF=BC=8C=E8=AF=95=E5=9B=BE=E8=BF=81=E7=A7=BB1=E4=B8=AA=E6=88= =96=E6=9B=B4=E5=A4=9A + 11) =E5=BD=93CPU=E7=B9=81=E5=BF=99=E6=97=B6=EF=BC=8Csched_balance_rq()= =E5=9C=A8=E8=BF=99=E4=B8=AA=E8=B0=83=E5=BA=A6=E5=9F=9F=E4=B8=AD=E8=A2=AB=E8= =B0=83=E7=94=A8=EF=BC=8C=E8=AF=95=E5=9B=BE=E8=BF=81=E7=A7=BB1=E4=B8=AA=E6= =88=96=E6=9B=B4=E5=A4=9A =E4=BB=BB=E5=8A=A1=E4=B8=94=E5=A4=B1=E8=B4=A5=E4=BA=86#=E6=AC=A1 - 12) =E5=BD=93CPU=E7=B9=81=E5=BF=99=E6=97=B6=EF=BC=8Cload_balance()=E5= =9C=A8=E8=BF=99=E4=B8=AA=E8=B0=83=E5=BA=A6=E5=9F=9F=E4=B8=AD=E8=A2=AB=E8=B0= =83=E7=94=A8=EF=BC=8C=E5=8F=91=E7=8E=B0=E4=B8=8D=E5=9D=87=E8=A1=A1=EF=BC=88= =E5=A6=82=E6=9E=9C=E6=9C=89=EF=BC=89 + 12) =E5=BD=93CPU=E7=B9=81=E5=BF=99=E6=97=B6=EF=BC=8Csched_balance_rq()= =E5=9C=A8=E8=BF=99=E4=B8=AA=E8=B0=83=E5=BA=A6=E5=9F=9F=E4=B8=AD=E8=A2=AB=E8= =B0=83=E7=94=A8=EF=BC=8C=E5=8F=91=E7=8E=B0=E4=B8=8D=E5=9D=87=E8=A1=A1=EF=BC= =88=E5=A6=82=E6=9E=9C=E6=9C=89=EF=BC=89 #=E6=AC=A1 13) =E5=BD=93CPU=E7=B9=81=E5=BF=99=E6=97=B6=EF=BC=8Cpull_task()=E5=9C= =A8=E8=BF=99=E4=B8=AA=E8=B0=83=E5=BA=A6=E5=9F=9F=E4=B8=AD=E8=A2=AB=E8=B0=83= =E7=94=A8#=E6=AC=A1 14) =E5=BD=93CPU=E7=B9=81=E5=BF=99=E6=97=B6=EF=BC=8C=E5=B0=BD=E7=AE=A1= =E7=9B=AE=E6=A0=87=E4=BB=BB=E5=8A=A1=E6=98=AF=E7=83=AD=E7=BC=93=E5=AD=98=E7= =8A=B6=E6=80=81=EF=BC=8Cpull_task()=E4=BE=9D=E7=84=B6=E8=A2=AB=E8=B0=83=E7= =94=A8#=E6=AC=A1 - 15) =E5=BD=93CPU=E7=B9=81=E5=BF=99=E6=97=B6=EF=BC=8Cload_balance()=E5= =9C=A8=E8=BF=99=E4=B8=AA=E8=B0=83=E5=BA=A6=E5=9F=9F=E4=B8=AD=E8=A2=AB=E8=B0= =83=E7=94=A8=EF=BC=8C=E6=9C=AA=E8=83=BD=E6=89=BE=E5=88=B0=E6=9B=B4=E7=B9=81= =E5=BF=99=E7=9A=84 + 15) =E5=BD=93CPU=E7=B9=81=E5=BF=99=E6=97=B6=EF=BC=8Csched_balance_rq()= =E5=9C=A8=E8=BF=99=E4=B8=AA=E8=B0=83=E5=BA=A6=E5=9F=9F=E4=B8=AD=E8=A2=AB=E8= =B0=83=E7=94=A8=EF=BC=8C=E6=9C=AA=E8=83=BD=E6=89=BE=E5=88=B0=E6=9B=B4=E7=B9= =81=E5=BF=99=E7=9A=84 =E9=98=9F=E5=88=97#=E6=AC=A1 16) =E5=BD=93CPU=E7=B9=81=E5=BF=99=E6=97=B6=EF=BC=8C=E5=9C=A8=E8=B0=83= =E5=BA=A6=E5=9F=9F=E4=B8=AD=E6=89=BE=E5=88=B0=E4=BA=86=E6=9B=B4=E7=B9=81=E5= =BF=99=E7=9A=84=E9=98=9F=E5=88=97=EF=BC=8C=E4=BD=86=E6=9C=AA=E6=89=BE=E5=88= =B0=E6=9B=B4=E7=B9=81=E5=BF=99=E7=9A=84=E8=B0=83=E5=BA=A6=E7=BB=84 #=E6=AC=A1 - 17) =E5=BD=93CPU=E6=96=B0=E7=A9=BA=E9=97=B2=E6=97=B6=EF=BC=8Cload_bala= nce()=E5=9C=A8=E8=BF=99=E4=B8=AA=E8=B0=83=E5=BA=A6=E5=9F=9F=E4=B8=AD=E8=A2= =AB=E8=B0=83=E7=94=A8=E4=BA=86#=E6=AC=A1 - 18) =E5=BD=93CPU=E6=96=B0=E7=A9=BA=E9=97=B2=E6=97=B6=EF=BC=8Cload_bala= nce()=E5=9C=A8=E8=BF=99=E4=B8=AA=E8=B0=83=E5=BA=A6=E5=9F=9F=E4=B8=AD=E8=A2= =AB=E8=B0=83=E7=94=A8=EF=BC=8C=E4=BD=86=E6=98=AF=E5=8F=91=E7=8E=B0=E8=B4=9F= =E8=BD=BD=E6=97=A0=E9=9C=80 + 17) =E5=BD=93CPU=E6=96=B0=E7=A9=BA=E9=97=B2=E6=97=B6=EF=BC=8Csched_bal= ance_rq()=E5=9C=A8=E8=BF=99=E4=B8=AA=E8=B0=83=E5=BA=A6=E5=9F=9F=E4=B8=AD=E8= =A2=AB=E8=B0=83=E7=94=A8=E4=BA=86#=E6=AC=A1 + 18) =E5=BD=93CPU=E6=96=B0=E7=A9=BA=E9=97=B2=E6=97=B6=EF=BC=8Csched_bal= ance_rq()=E5=9C=A8=E8=BF=99=E4=B8=AA=E8=B0=83=E5=BA=A6=E5=9F=9F=E4=B8=AD=E8= =A2=AB=E8=B0=83=E7=94=A8=EF=BC=8C=E4=BD=86=E6=98=AF=E5=8F=91=E7=8E=B0=E8=B4= =9F=E8=BD=BD=E6=97=A0=E9=9C=80 =E5=9D=87=E8=A1=A1#=E6=AC=A1 - 19) =E5=BD=93CPU=E6=96=B0=E7=A9=BA=E9=97=B2=E6=97=B6=EF=BC=8Cload_bala= nce()=E5=9C=A8=E8=BF=99=E4=B8=AA=E8=B0=83=E5=BA=A6=E5=9F=9F=E4=B8=AD=E8=A2= =AB=E8=B0=83=E7=94=A8=EF=BC=8C=E8=AF=95=E5=9B=BE=E8=BF=81=E7=A7=BB1=E4=B8= =AA=E6=88=96=E6=9B=B4=E5=A4=9A + 19) =E5=BD=93CPU=E6=96=B0=E7=A9=BA=E9=97=B2=E6=97=B6=EF=BC=8Csched_bal= ance_rq()=E5=9C=A8=E8=BF=99=E4=B8=AA=E8=B0=83=E5=BA=A6=E5=9F=9F=E4=B8=AD=E8= =A2=AB=E8=B0=83=E7=94=A8=EF=BC=8C=E8=AF=95=E5=9B=BE=E8=BF=81=E7=A7=BB1=E4= =B8=AA=E6=88=96=E6=9B=B4=E5=A4=9A =E4=BB=BB=E5=8A=A1=E4=B8=94=E5=A4=B1=E8=B4=A5=E4=BA=86#=E6=AC=A1 - 20) =E5=BD=93CPU=E6=96=B0=E7=A9=BA=E9=97=B2=E6=97=B6=EF=BC=8Cload_bala= nce()=E5=9C=A8=E8=BF=99=E4=B8=AA=E8=B0=83=E5=BA=A6=E5=9F=9F=E4=B8=AD=E8=A2= =AB=E8=B0=83=E7=94=A8=EF=BC=8C=E5=8F=91=E7=8E=B0=E4=B8=8D=E5=9D=87=E8=A1=A1= =EF=BC=88=E5=A6=82=E6=9E=9C=E6=9C=89=EF=BC=89 + 20) =E5=BD=93CPU=E6=96=B0=E7=A9=BA=E9=97=B2=E6=97=B6=EF=BC=8Csched_bal= ance_rq()=E5=9C=A8=E8=BF=99=E4=B8=AA=E8=B0=83=E5=BA=A6=E5=9F=9F=E4=B8=AD=E8= =A2=AB=E8=B0=83=E7=94=A8=EF=BC=8C=E5=8F=91=E7=8E=B0=E4=B8=8D=E5=9D=87=E8=A1= =A1=EF=BC=88=E5=A6=82=E6=9E=9C=E6=9C=89=EF=BC=89 #=E6=AC=A1 21) =E5=BD=93CPU=E6=96=B0=E7=A9=BA=E9=97=B2=E6=97=B6=EF=BC=8Cpull_task= ()=E5=9C=A8=E8=BF=99=E4=B8=AA=E8=B0=83=E5=BA=A6=E5=9F=9F=E4=B8=AD=E8=A2=AB= =E8=B0=83=E7=94=A8#=E6=AC=A1 22) =E5=BD=93CPU=E6=96=B0=E7=A9=BA=E9=97=B2=E6=97=B6=EF=BC=8C=E5=B0=BD= =E7=AE=A1=E7=9B=AE=E6=A0=87=E4=BB=BB=E5=8A=A1=E6=98=AF=E7=83=AD=E7=BC=93=E5= =AD=98=E7=8A=B6=E6=80=81=EF=BC=8Cpull_task()=E4=BE=9D=E7=84=B6=E8=A2=AB=E8= =B0=83=E7=94=A8#=E6=AC=A1 - 23) =E5=BD=93CPU=E6=96=B0=E7=A9=BA=E9=97=B2=E6=97=B6=EF=BC=8Cload_bala= nce()=E5=9C=A8=E8=BF=99=E4=B8=AA=E8=B0=83=E5=BA=A6=E5=9F=9F=E4=B8=AD=E8=A2= =AB=E8=B0=83=E7=94=A8=EF=BC=8C=E6=9C=AA=E8=83=BD=E6=89=BE=E5=88=B0=E6=9B=B4= =E7=B9=81=E5=BF=99=E7=9A=84 + 23) =E5=BD=93CPU=E6=96=B0=E7=A9=BA=E9=97=B2=E6=97=B6=EF=BC=8Csched_bal= ance_rq()=E5=9C=A8=E8=BF=99=E4=B8=AA=E8=B0=83=E5=BA=A6=E5=9F=9F=E4=B8=AD=E8= =A2=AB=E8=B0=83=E7=94=A8=EF=BC=8C=E6=9C=AA=E8=83=BD=E6=89=BE=E5=88=B0=E6=9B= =B4=E7=B9=81=E5=BF=99=E7=9A=84 =E9=98=9F=E5=88=97#=E6=AC=A1 24) =E5=BD=93CPU=E6=96=B0=E7=A9=BA=E9=97=B2=E6=97=B6=EF=BC=8C=E5=9C=A8= =E8=B0=83=E5=BA=A6=E5=9F=9F=E4=B8=AD=E6=89=BE=E5=88=B0=E4=BA=86=E6=9B=B4=E7= =B9=81=E5=BF=99=E7=9A=84=E9=98=9F=E5=88=97=EF=BC=8C=E4=BD=86=E6=9C=AA=E6=89= =BE=E5=88=B0=E6=9B=B4=E7=B9=81=E5=BF=99=E7=9A=84=E8=B0=83=E5=BA=A6=E7=BB=84 #=E6=AC=A1 diff --git a/include/linux/sched/topology.h b/include/linux/sched/topology.h index 191b122158fb..f0b721b5d42d 100644 --- a/include/linux/sched/topology.h +++ b/include/linux/sched/topology.h @@ -110,7 +110,7 @@ struct sched_domain { unsigned long last_decay_max_lb_cost; =20 #ifdef CONFIG_SCHEDSTATS - /* load_balance() stats */ + /* sched_balance_rq() stats */ unsigned int lb_count[CPU_MAX_IDLE_TYPES]; unsigned int lb_failed[CPU_MAX_IDLE_TYPES]; unsigned int lb_balanced[CPU_MAX_IDLE_TYPES]; diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 330788b0c617..0d2753c50be9 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -6866,7 +6866,7 @@ static void dequeue_task_fair(struct rq *rq, struct t= ask_struct *p, int flags) =20 #ifdef CONFIG_SMP =20 -/* Working cpumask for: load_balance, load_balance_newidle. */ +/* Working cpumask for: sched_balance_rq, load_balance_newidle. */ static DEFINE_PER_CPU(cpumask_var_t, load_balance_mask); static DEFINE_PER_CPU(cpumask_var_t, select_rq_mask); static DEFINE_PER_CPU(cpumask_var_t, should_we_balance_tmpmask); @@ -11242,7 +11242,7 @@ static int should_we_balance(struct lb_env *env) * Check this_cpu to ensure it is balanced within domain. Attempt to move * tasks if there is an imbalance. */ -static int load_balance(int this_cpu, struct rq *this_rq, +static int sched_balance_rq(int this_cpu, struct rq *this_rq, struct sched_domain *sd, enum cpu_idle_type idle, int *continue_balancing) { @@ -11647,7 +11647,7 @@ static int active_load_balance_cpu_stop(void *data) static atomic_t sched_balance_running =3D ATOMIC_INIT(0); =20 /* - * Scale the max load_balance interval with the number of CPUs in the syst= em. + * Scale the max sched_balance_rq interval with the number of CPUs in the = system. * This trades load-balance latency on larger machines for less cross talk. */ void update_max_interval(void) @@ -11727,7 +11727,7 @@ static void sched_balance_domains(struct rq *rq, en= um cpu_idle_type idle) } =20 if (time_after_eq(jiffies, sd->last_balance + interval)) { - if (load_balance(cpu, rq, sd, idle, &continue_balancing)) { + if (sched_balance_rq(cpu, rq, sd, idle, &continue_balancing)) { /* * The LBF_DST_PINNED logic could have changed * env->dst_cpu, so we can't know our idle @@ -12353,7 +12353,7 @@ static int newidle_balance(struct rq *this_rq, stru= ct rq_flags *rf) =20 if (sd->flags & SD_BALANCE_NEWIDLE) { =20 - pulled_task =3D load_balance(this_cpu, this_rq, + pulled_task =3D sched_balance_rq(this_cpu, this_rq, sd, CPU_NEWLY_IDLE, &continue_balancing); =20 --=20 2.40.1