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 v5 09/15] sched: Reject CPU affinity changes based on task_cpu_possible_mask() Date: Tue, 8 Dec 2020 13:28:29 +0000 [thread overview] Message-ID: <20201208132835.6151-10-will@kernel.org> (raw) In-Reply-To: <20201208132835.6151-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 task_cpu_possible_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. Reviewed-by: Quentin Perret <qperret@google.com> 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 58474569a2ea..92ac3e53f50a 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -1875,6 +1875,7 @@ static int __set_cpus_allowed_ptr(struct task_struct *p, const struct cpumask *new_mask, bool check) { const struct cpumask *cpu_valid_mask = cpu_active_mask; + const struct cpumask *cpu_allowed_mask = task_cpu_possible_mask(p); unsigned int dest_cpu; struct rq_flags rf; struct rq *rq; @@ -1888,6 +1889,9 @@ static int __set_cpus_allowed_ptr(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.576.ga3fc446d84-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 v5 09/15] sched: Reject CPU affinity changes based on task_cpu_possible_mask() Date: Tue, 8 Dec 2020 13:28:29 +0000 [thread overview] Message-ID: <20201208132835.6151-10-will@kernel.org> (raw) In-Reply-To: <20201208132835.6151-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 task_cpu_possible_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. Reviewed-by: Quentin Perret <qperret@google.com> 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 58474569a2ea..92ac3e53f50a 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -1875,6 +1875,7 @@ static int __set_cpus_allowed_ptr(struct task_struct *p, const struct cpumask *new_mask, bool check) { const struct cpumask *cpu_valid_mask = cpu_active_mask; + const struct cpumask *cpu_allowed_mask = task_cpu_possible_mask(p); unsigned int dest_cpu; struct rq_flags rf; struct rq *rq; @@ -1888,6 +1889,9 @@ static int __set_cpus_allowed_ptr(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.576.ga3fc446d84-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-12-08 13:30 UTC|newest] Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-12-08 13:28 [PATCH v5 00/15] An alternative series for asymmetric AArch32 systems Will Deacon 2020-12-08 13:28 ` Will Deacon 2020-12-08 13:28 ` [PATCH v5 01/15] arm64: cpuinfo: Split AArch32 registers out into a separate struct Will Deacon 2020-12-08 13:28 ` Will Deacon 2020-12-08 13:28 ` [PATCH v5 02/15] arm64: Allow mismatched 32-bit EL0 support Will Deacon 2020-12-08 13:28 ` Will Deacon 2020-12-08 13:28 ` [PATCH v5 03/15] KVM: arm64: Kill 32-bit vCPUs on systems with mismatched " Will Deacon 2020-12-08 13:28 ` Will Deacon 2020-12-08 13:28 ` [PATCH v5 04/15] arm64: Kill 32-bit applications scheduled on 64-bit-only CPUs Will Deacon 2020-12-08 13:28 ` Will Deacon 2020-12-08 13:28 ` [PATCH v5 05/15] arm64: Advertise CPUs capable of running 32-bit applications in sysfs Will Deacon 2020-12-08 13:28 ` Will Deacon 2020-12-08 13:28 ` [PATCH v5 06/15] sched: Introduce task_cpu_possible_mask() to limit fallback rq selection Will Deacon 2020-12-08 13:28 ` Will Deacon 2020-12-08 13:28 ` [PATCH v5 07/15] cpuset: Don't use the cpu_possible_mask as a last resort for cgroup v1 Will Deacon 2020-12-08 13:28 ` Will Deacon 2020-12-17 12:15 ` Qais Yousef 2020-12-17 12:15 ` Qais Yousef 2020-12-17 13:44 ` Peter Zijlstra 2020-12-17 13:44 ` Peter Zijlstra 2020-12-17 14:59 ` Will Deacon 2020-12-17 14:59 ` Will Deacon 2020-12-17 15:00 ` Qais Yousef 2020-12-17 15:00 ` Qais Yousef 2020-12-08 13:28 ` [PATCH v5 08/15] cpuset: Honour task_cpu_possible_mask() in guarantee_online_cpus() Will Deacon 2020-12-08 13:28 ` Will Deacon 2020-12-28 3:54 ` Suren Baghdasaryan 2020-12-28 3:54 ` Suren Baghdasaryan 2020-12-08 13:28 ` Will Deacon [this message] 2020-12-08 13:28 ` [PATCH v5 09/15] sched: Reject CPU affinity changes based on task_cpu_possible_mask() Will Deacon 2020-12-08 13:28 ` [PATCH v5 10/15] sched: Introduce force_compatible_cpus_allowed_ptr() to limit CPU affinity Will Deacon 2020-12-08 13:28 ` Will Deacon 2020-12-28 4:29 ` Suren Baghdasaryan 2020-12-28 4:29 ` Suren Baghdasaryan 2020-12-08 13:28 ` [PATCH v5 11/15] arm64: Implement task_cpu_possible_mask() Will Deacon 2020-12-08 13:28 ` Will Deacon 2020-12-08 13:28 ` [PATCH v5 12/15] arm64: exec: Adjust affinity for compat tasks with mismatched 32-bit EL0 Will Deacon 2020-12-08 13:28 ` Will Deacon 2020-12-08 13:28 ` [PATCH v5 13/15] arm64: Prevent offlining first CPU with 32-bit EL0 on mismatched system Will Deacon 2020-12-08 13:28 ` Will Deacon 2020-12-08 13:28 ` [PATCH v5 14/15] arm64: Hook up cmdline parameter to allow mismatched 32-bit EL0 Will Deacon 2020-12-08 13:28 ` Will Deacon 2020-12-08 13:28 ` [PATCH v5 15/15] arm64: Remove logic to kill 32-bit tasks on 64-bit-only cores Will Deacon 2020-12-08 13:28 ` Will Deacon 2020-12-15 17:36 ` [PATCH v5 00/15] An alternative series for asymmetric AArch32 systems Peter Zijlstra 2020-12-15 17:36 ` Peter Zijlstra 2020-12-15 18:50 ` Will Deacon 2020-12-15 18:50 ` Will Deacon 2020-12-17 10:55 ` Peter Zijlstra 2020-12-17 10:55 ` Peter Zijlstra 2020-12-16 11:16 ` Qais Yousef 2020-12-16 11:16 ` Qais Yousef 2020-12-16 14:14 ` Will Deacon 2020-12-16 14:14 ` Will Deacon 2020-12-16 16:48 ` Qais Yousef 2020-12-16 16:48 ` Qais Yousef 2020-12-16 18:21 ` Suren Baghdasaryan 2020-12-16 18:21 ` Suren Baghdasaryan
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=20201208132835.6151-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: linkBe 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.