diff options
author | Felix Fietkau <nbd@openwrt.org> | 2015-07-19 00:38:41 +0200 |
---|---|---|
committer | Luis Henriques <luis.henriques@canonical.com> | 2015-08-27 12:08:09 +0100 |
commit | 7b89a55a31088c561126124cb741a826aa318315 (patch) | |
tree | f73caf0b478b7ae117599b501b326c3eb21f7e70 /arch | |
parent | 2ab739524925f37eb8f108833ed38f837c1ea743 (diff) | |
download | linux-stable-7b89a55a31088c561126124cb741a826aa318315.tar.gz linux-stable-7b89a55a31088c561126124cb741a826aa318315.tar.bz2 linux-stable-7b89a55a31088c561126124cb741a826aa318315.zip |
MIPS: Fix sched_getaffinity with MT FPAFF enabled
commit 1d62d737555e1378eb62a8bba26644f7d97139d2 upstream.
p->thread.user_cpus_allowed is zero-initialized and is only filled on
the first sched_setaffinity call.
To avoid adding overhead in the task initialization codepath, simply OR
the returned mask in sched_getaffinity with p->cpus_allowed.
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/10740/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/mips/kernel/mips-mt-fpaff.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/mips/kernel/mips-mt-fpaff.c b/arch/mips/kernel/mips-mt-fpaff.c index 362bb3707e62..116c67a5320a 100644 --- a/arch/mips/kernel/mips-mt-fpaff.c +++ b/arch/mips/kernel/mips-mt-fpaff.c @@ -154,7 +154,7 @@ asmlinkage long mipsmt_sys_sched_getaffinity(pid_t pid, unsigned int len, unsigned long __user *user_mask_ptr) { unsigned int real_len; - cpumask_t mask; + cpumask_t allowed, mask; int retval; struct task_struct *p; @@ -173,7 +173,8 @@ asmlinkage long mipsmt_sys_sched_getaffinity(pid_t pid, unsigned int len, if (retval) goto out_unlock; - cpumask_and(&mask, &p->thread.user_cpus_allowed, cpu_possible_mask); + cpumask_or(&allowed, &p->thread.user_cpus_allowed, &p->cpus_allowed); + cpumask_and(&mask, &allowed, cpu_active_mask); out_unlock: read_unlock(&tasklist_lock); |