All of lore.kernel.org
 help / color / mirror / Atom feed
From: Will Deacon <will@kernel.org>
To: linux-arm-kernel@lists.infradead.org
Cc: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org,
	Will Deacon <will@kernel.org>,
	Catalin Marinas <catalin.marinas@arm.com>,
	Marc Zyngier <maz@kernel.org>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Peter Zijlstra <peterz@infradead.org>,
	Morten Rasmussen <morten.rasmussen@arm.com>,
	Qais Yousef <qais.yousef@arm.com>,
	Suren Baghdasaryan <surenb@google.com>,
	Quentin Perret <qperret@google.com>, Tejun Heo <tj@kernel.org>,
	Li Zefan <lizefan@huawei.com>,
	Johannes Weiner <hannes@cmpxchg.org>,
	Ingo Molnar <mingo@redhat.com>,
	Juri Lelli <juri.lelli@redhat.com>,
	Vincent Guittot <vincent.guittot@linaro.org>,
	kernel-team@android.com
Subject: [PATCH v4 09/14] cpuset: Don't use the cpu_possible_mask as a last resort for cgroup v1
Date: Tue, 24 Nov 2020 15:50:34 +0000	[thread overview]
Message-ID: <20201124155039.13804-10-will@kernel.org> (raw)
In-Reply-To: <20201124155039.13804-1-will@kernel.org>

If the scheduler cannot find an allowed CPU for a task,
cpuset_cpus_allowed_fallback() will widen the affinity to cpu_possible_mask
if cgroup v1 is in use.

In preparation for allowing architectures to provide their own fallback
mask, just return early if we're not using cgroup v2 and allow
select_fallback_rq() to figure out the mask by itself.

Cc: Li Zefan <lizefan@huawei.com>
Cc: Tejun Heo <tj@kernel.org>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Reviewed-by: Quentin Perret <qperret@google.com>
Signed-off-by: Will Deacon <will@kernel.org>
---
 kernel/cgroup/cpuset.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/kernel/cgroup/cpuset.c b/kernel/cgroup/cpuset.c
index 57b5b5d0a5fd..e970737c3ed2 100644
--- a/kernel/cgroup/cpuset.c
+++ b/kernel/cgroup/cpuset.c
@@ -3299,9 +3299,11 @@ void cpuset_cpus_allowed(struct task_struct *tsk, struct cpumask *pmask)
 
 void cpuset_cpus_allowed_fallback(struct task_struct *tsk)
 {
+	if (!is_in_v2_mode())
+		return; /* select_fallback_rq will try harder */
+
 	rcu_read_lock();
-	do_set_cpus_allowed(tsk, is_in_v2_mode() ?
-		task_cs(tsk)->cpus_allowed : cpu_possible_mask);
+	do_set_cpus_allowed(tsk, task_cs(tsk)->cpus_allowed);
 	rcu_read_unlock();
 
 	/*
-- 
2.29.2.454.gaff20da3a2-goog


WARNING: multiple messages have this Message-ID (diff)
From: Will Deacon <will@kernel.org>
To: linux-arm-kernel@lists.infradead.org
Cc: linux-arch@vger.kernel.org, Marc Zyngier <maz@kernel.org>,
	kernel-team@android.com,
	Vincent Guittot <vincent.guittot@linaro.org>,
	Juri Lelli <juri.lelli@redhat.com>,
	Quentin Perret <qperret@google.com>,
	Peter Zijlstra <peterz@infradead.org>,
	Catalin Marinas <catalin.marinas@arm.com>,
	Johannes Weiner <hannes@cmpxchg.org>,
	linux-kernel@vger.kernel.org, Qais Yousef <qais.yousef@arm.com>,
	Suren Baghdasaryan <surenb@google.com>,
	Ingo Molnar <mingo@redhat.com>, Li Zefan <lizefan@huawei.com>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Tejun Heo <tj@kernel.org>, Will Deacon <will@kernel.org>,
	Morten Rasmussen <morten.rasmussen@arm.com>
Subject: [PATCH v4 09/14] cpuset: Don't use the cpu_possible_mask as a last resort for cgroup v1
Date: Tue, 24 Nov 2020 15:50:34 +0000	[thread overview]
Message-ID: <20201124155039.13804-10-will@kernel.org> (raw)
In-Reply-To: <20201124155039.13804-1-will@kernel.org>

If the scheduler cannot find an allowed CPU for a task,
cpuset_cpus_allowed_fallback() will widen the affinity to cpu_possible_mask
if cgroup v1 is in use.

In preparation for allowing architectures to provide their own fallback
mask, just return early if we're not using cgroup v2 and allow
select_fallback_rq() to figure out the mask by itself.

Cc: Li Zefan <lizefan@huawei.com>
Cc: Tejun Heo <tj@kernel.org>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Reviewed-by: Quentin Perret <qperret@google.com>
Signed-off-by: Will Deacon <will@kernel.org>
---
 kernel/cgroup/cpuset.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/kernel/cgroup/cpuset.c b/kernel/cgroup/cpuset.c
index 57b5b5d0a5fd..e970737c3ed2 100644
--- a/kernel/cgroup/cpuset.c
+++ b/kernel/cgroup/cpuset.c
@@ -3299,9 +3299,11 @@ void cpuset_cpus_allowed(struct task_struct *tsk, struct cpumask *pmask)
 
 void cpuset_cpus_allowed_fallback(struct task_struct *tsk)
 {
+	if (!is_in_v2_mode())
+		return; /* select_fallback_rq will try harder */
+
 	rcu_read_lock();
-	do_set_cpus_allowed(tsk, is_in_v2_mode() ?
-		task_cs(tsk)->cpus_allowed : cpu_possible_mask);
+	do_set_cpus_allowed(tsk, task_cs(tsk)->cpus_allowed);
 	rcu_read_unlock();
 
 	/*
-- 
2.29.2.454.gaff20da3a2-goog


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  parent reply	other threads:[~2020-11-24 15:51 UTC|newest]

Thread overview: 122+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-24 15:50 [PATCH v4 00/14] An alternative series for asymmetric AArch32 systems Will Deacon
2020-11-24 15:50 ` Will Deacon
2020-11-24 15:50 ` [PATCH v4 01/14] arm64: cpuinfo: Split AArch32 registers out into a separate struct Will Deacon
2020-11-24 15:50   ` Will Deacon
2020-11-24 15:50 ` [PATCH v4 02/14] arm64: Allow mismatched 32-bit EL0 support Will Deacon
2020-11-24 15:50   ` Will Deacon
2020-11-27 10:25   ` Marc Zyngier
2020-11-27 10:25     ` Marc Zyngier
2020-11-27 11:50     ` Will Deacon
2020-11-27 11:50       ` Will Deacon
2020-11-27 13:09   ` Qais Yousef
2020-11-27 13:09     ` Qais Yousef
2020-12-01 16:56     ` Will Deacon
2020-12-01 16:56       ` Will Deacon
2020-12-02 13:16       ` Qais Yousef
2020-12-02 13:16         ` Qais Yousef
2020-11-24 15:50 ` [PATCH v4 03/14] KVM: arm64: Kill 32-bit vCPUs on systems with mismatched " Will Deacon
2020-11-24 15:50   ` Will Deacon
2020-11-27 10:26   ` Marc Zyngier
2020-11-27 10:26     ` Marc Zyngier
2020-11-27 11:53     ` Will Deacon
2020-11-27 11:53       ` Will Deacon
2020-11-27 17:14       ` Marc Zyngier
2020-11-27 17:14         ` Marc Zyngier
2020-11-27 17:24         ` Quentin Perret
2020-11-27 17:24           ` Quentin Perret
2020-11-27 18:16           ` Marc Zyngier
2020-11-27 18:16             ` Marc Zyngier
2020-12-01 16:57             ` Will Deacon
2020-12-01 16:57               ` Will Deacon
2020-12-02  8:18               ` Marc Zyngier
2020-12-02  8:18                 ` Marc Zyngier
2020-12-02 17:27                 ` Will Deacon
2020-12-02 17:27                   ` Will Deacon
2020-11-24 15:50 ` [PATCH v4 04/14] arm64: Kill 32-bit applications scheduled on 64-bit-only CPUs Will Deacon
2020-11-24 15:50   ` Will Deacon
2020-11-27 13:12   ` Qais Yousef
2020-11-27 13:12     ` Qais Yousef
2020-12-01 16:56     ` Will Deacon
2020-12-01 16:56       ` Will Deacon
2020-12-02 13:52       ` Qais Yousef
2020-12-02 13:52         ` Qais Yousef
2020-12-02 17:42         ` Will Deacon
2020-12-02 17:42           ` Will Deacon
2020-11-24 15:50 ` [PATCH v4 05/14] arm64: Advertise CPUs capable of running 32-bit applications in sysfs Will Deacon
2020-11-24 15:50   ` Will Deacon
2020-11-24 15:50 ` [PATCH v4 06/14] arm64: Hook up cmdline parameter to allow mismatched 32-bit EL0 Will Deacon
2020-11-24 15:50   ` Will Deacon
2020-11-27 13:17   ` Qais Yousef
2020-11-27 13:17     ` Qais Yousef
2020-12-01 16:56     ` Will Deacon
2020-12-01 16:56       ` Will Deacon
2020-11-24 15:50 ` [PATCH v4 07/14] sched: Introduce restrict_cpus_allowed_ptr() to limit task CPU affinity Will Deacon
2020-11-24 15:50   ` Will Deacon
2020-11-27  9:49   ` Quentin Perret
2020-11-27  9:49     ` Quentin Perret
2020-11-27 13:19   ` Qais Yousef
2020-11-27 13:19     ` Qais Yousef
2020-12-01 16:56     ` Will Deacon
2020-12-01 16:56       ` Will Deacon
2020-12-02 13:06       ` Qais Yousef
2020-12-02 13:06         ` Qais Yousef
2020-11-24 15:50 ` [PATCH v4 08/14] arm64: exec: Adjust affinity for compat tasks with mismatched 32-bit EL0 Will Deacon
2020-11-24 15:50   ` Will Deacon
2020-11-27 10:01   ` Quentin Perret
2020-11-27 10:01     ` Quentin Perret
2020-11-27 13:23   ` Qais Yousef
2020-11-27 13:23     ` Qais Yousef
2020-12-01 16:55     ` Will Deacon
2020-12-01 16:55       ` Will Deacon
2020-12-02 14:07       ` Qais Yousef
2020-12-02 14:07         ` Qais Yousef
2020-11-24 15:50 ` Will Deacon [this message]
2020-11-24 15:50   ` [PATCH v4 09/14] cpuset: Don't use the cpu_possible_mask as a last resort for cgroup v1 Will Deacon
2020-11-27 13:32   ` Qais Yousef
2020-11-27 13:32     ` Qais Yousef
2020-11-30 17:05     ` Qais Yousef
2020-11-30 17:05       ` Qais Yousef
2020-11-30 17:36       ` Quentin Perret
2020-11-30 17:36         ` Quentin Perret
2020-12-01 11:58         ` Qais Yousef
2020-12-01 11:58           ` Qais Yousef
2020-12-01 12:37           ` Quentin Perret
2020-12-01 12:37             ` Quentin Perret
2020-12-01 14:11             ` Qais Yousef
2020-12-01 14:11               ` Qais Yousef
2020-12-01 15:56               ` Quentin Perret
2020-12-01 15:56                 ` Quentin Perret
2020-12-01 22:30                 ` Will Deacon
2020-12-01 22:30                   ` Will Deacon
2020-12-02 11:34                   ` Qais Yousef
2020-12-02 11:34                     ` Qais Yousef
2020-12-02 11:33                 ` Qais Yousef
2020-12-02 11:33                   ` Qais Yousef
2020-11-24 15:50 ` [PATCH v4 10/14] sched: Introduce arch_task_cpu_possible_mask() to limit fallback rq selection Will Deacon
2020-11-24 15:50   ` Will Deacon
2020-11-24 15:50 ` [PATCH v4 11/14] sched: Reject CPU affinity changes based on arch_task_cpu_possible_mask() Will Deacon
2020-11-24 15:50   ` Will Deacon
2020-11-27  9:54   ` Quentin Perret
2020-11-27  9:54     ` Quentin Perret
2020-11-24 15:50 ` [PATCH v4 12/14] arm64: Prevent offlining first CPU with 32-bit EL0 on mismatched system Will Deacon
2020-11-24 15:50   ` Will Deacon
2020-11-27 13:41   ` Qais Yousef
2020-11-27 13:41     ` Qais Yousef
2020-12-01 22:13     ` Will Deacon
2020-12-01 22:13       ` Will Deacon
2020-12-02 12:59       ` Qais Yousef
2020-12-02 12:59         ` Qais Yousef
2020-12-02 17:42         ` Will Deacon
2020-12-02 17:42           ` Will Deacon
2020-12-02 18:08           ` Qais Yousef
2020-12-02 18:08             ` Qais Yousef
2020-11-24 15:50 ` [PATCH v4 13/14] arm64: Implement arch_task_cpu_possible_mask() Will Deacon
2020-11-24 15:50   ` Will Deacon
2020-11-27 13:41   ` Qais Yousef
2020-11-27 13:41     ` Qais Yousef
2020-11-24 15:50 ` [PATCH v4 14/14] arm64: Remove logic to kill 32-bit tasks on 64-bit-only cores Will Deacon
2020-11-24 15:50   ` Will Deacon
2020-11-27 13:58 ` [PATCH v4 00/14] An alternative series for asymmetric AArch32 systems Qais Yousef
2020-11-27 13:58   ` Qais Yousef
2020-12-05 20:43 ` Pavel Machek
2020-12-05 20:43   ` Pavel Machek

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201124155039.13804-10-will@kernel.org \
    --to=will@kernel.org \
    --cc=catalin.marinas@arm.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=hannes@cmpxchg.org \
    --cc=juri.lelli@redhat.com \
    --cc=kernel-team@android.com \
    --cc=linux-arch@vger.kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lizefan@huawei.com \
    --cc=maz@kernel.org \
    --cc=mingo@redhat.com \
    --cc=morten.rasmussen@arm.com \
    --cc=peterz@infradead.org \
    --cc=qais.yousef@arm.com \
    --cc=qperret@google.com \
    --cc=surenb@google.com \
    --cc=tj@kernel.org \
    --cc=vincent.guittot@linaro.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.