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 v3 11/14] sched: Reject CPU affinity changes based on arch_cpu_allowed_mask()
Date: Fri, 13 Nov 2020 09:37:16 +0000 [thread overview]
Message-ID: <20201113093720.21106-12-will@kernel.org> (raw)
In-Reply-To: <20201113093720.21106-1-will@kernel.org>
Reject explicit requests to change the affinity mask of a task via
set_cpus_allowed_ptr() if the requested mask is not a subset of the
mask returned by arch_cpu_allowed_mask(). This ensures that the
'cpus_mask' for a given task cannot contain CPUs which are incapable of
executing it, except in cases where the affinity is forced.
Signed-off-by: Will Deacon <will@kernel.org>
---
kernel/sched/core.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 8df38ebfe769..13bdb2ae4d3f 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -1877,6 +1877,7 @@ static int __set_cpus_allowed_ptr_locked(struct task_struct *p,
struct rq_flags *rf)
{
const struct cpumask *cpu_valid_mask = cpu_active_mask;
+ const struct cpumask *cpu_allowed_mask = arch_cpu_allowed_mask(p);
unsigned int dest_cpu;
int ret = 0;
@@ -1887,6 +1888,9 @@ static int __set_cpus_allowed_ptr_locked(struct task_struct *p,
* Kernel threads are allowed on online && !active CPUs
*/
cpu_valid_mask = cpu_online_mask;
+ } else if (!cpumask_subset(new_mask, cpu_allowed_mask)) {
+ ret = -EINVAL;
+ goto out;
}
/*
--
2.29.2.299.gdc1121823c-goog
next prev parent reply other threads:[~2020-11-13 9:38 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-13 9:37 [PATCH v3 00/14] An alternative series for asymmetric AArch32 systems Will Deacon
2020-11-13 9:37 ` [PATCH v3 01/14] arm64: cpuinfo: Split AArch32 registers out into a separate struct Will Deacon
2020-11-13 9:37 ` [PATCH v3 02/14] arm64: Allow mismatched 32-bit EL0 support Will Deacon
2020-11-19 11:27 ` Valentin Schneider
2020-11-19 13:12 ` Will Deacon
2020-11-13 9:37 ` [PATCH v3 03/14] KVM: arm64: Kill 32-bit vCPUs on systems with mismatched " Will Deacon
2020-11-13 9:37 ` [PATCH v3 04/14] arm64: Kill 32-bit applications scheduled on 64-bit-only CPUs Will Deacon
2020-11-13 9:37 ` [PATCH v3 05/14] arm64: Advertise CPUs capable of running 32-bit applications in sysfs Will Deacon
2020-11-13 9:37 ` [PATCH v3 06/14] arm64: Hook up cmdline parameter to allow mismatched 32-bit EL0 Will Deacon
2020-11-13 9:37 ` [PATCH v3 07/14] sched: Introduce restrict_cpus_allowed_ptr() to limit task CPU affinity Will Deacon
2020-11-19 9:18 ` Quentin Perret
2020-11-19 11:03 ` Quentin Perret
2020-11-19 11:05 ` Will Deacon
2020-11-19 11:27 ` Valentin Schneider
2020-11-19 13:13 ` Will Deacon
2020-11-19 14:54 ` Valentin Schneider
2020-11-19 16:41 ` Will Deacon
2020-11-19 12:47 ` Valentin Schneider
2020-11-19 13:13 ` Will Deacon
2020-11-19 14:54 ` Valentin Schneider
2020-11-19 16:09 ` Peter Zijlstra
2020-11-19 16:57 ` Valentin Schneider
2020-11-19 19:25 ` Will Deacon
2020-11-13 9:37 ` [PATCH v3 08/14] arm64: exec: Adjust affinity for compat tasks with mismatched 32-bit EL0 Will Deacon
2020-11-19 9:24 ` Quentin Perret
2020-11-19 11:06 ` Will Deacon
2020-11-19 16:19 ` Peter Zijlstra
2020-11-19 16:30 ` Will Deacon
2020-11-19 16:44 ` Peter Zijlstra
2020-11-19 16:51 ` Will Deacon
2020-11-19 16:14 ` Peter Zijlstra
2020-11-19 16:28 ` Will Deacon
2020-11-19 16:42 ` Peter Zijlstra
2020-11-19 16:48 ` Will Deacon
2020-11-13 9:37 ` [PATCH v3 09/14] cpuset: Don't use the cpu_possible_mask as a last resort for cgroup v1 Will Deacon
2020-11-19 9:29 ` Quentin Perret
2020-11-19 11:06 ` Will Deacon
2020-11-13 9:37 ` [PATCH v3 10/14] sched: Introduce arch_cpu_allowed_mask() to limit fallback rq selection Will Deacon
2020-11-19 9:38 ` Quentin Perret
2020-11-19 11:07 ` Will Deacon
2020-11-19 20:39 ` Will Deacon
2020-11-23 14:48 ` Quentin Perret
2020-11-13 9:37 ` Will Deacon [this message]
2020-11-19 9:47 ` [PATCH v3 11/14] sched: Reject CPU affinity changes based on arch_cpu_allowed_mask() Quentin Perret
2020-11-19 11:07 ` Will Deacon
2020-11-19 14:30 ` Quentin Perret
2020-11-19 16:44 ` Will Deacon
2020-11-13 9:37 ` [PATCH v3 12/14] arm64: Prevent offlining first CPU with 32-bit EL0 on mismatched system Will Deacon
2020-11-13 9:37 ` [PATCH v3 13/14] arm64: Implement arch_cpu_allowed_mask() Will Deacon
2020-11-13 9:37 ` [PATCH v3 14/14] arm64: Remove logic to kill 32-bit tasks on 64-bit-only cores Will Deacon
2020-11-19 16:11 ` [PATCH v3 00/14] An alternative series for asymmetric AArch32 systems Peter Zijlstra
2020-11-19 16:39 ` Will Deacon
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=20201113093720.21106-12-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).