diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2015-07-18 22:49:39 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2015-07-18 22:49:39 +0000 |
| commit | 473ddd592c55c4fcafc27b61ee17905377d336b1 (patch) | |
| tree | 2418a6b0de6aa1a7945a5e69575d3d9e4f2cad0f /target/linux/generic | |
| parent | c89f360059f87df379c4a3092aa19f8732e3e661 (diff) | |
| download | upstream-473ddd592c55c4fcafc27b61ee17905377d336b1.tar.gz upstream-473ddd592c55c4fcafc27b61ee17905377d336b1.tar.bz2 upstream-473ddd592c55c4fcafc27b61ee17905377d336b1.zip | |
kernel: fix sched_getaffinity on MIPS SMP systems (fixes enabling RPS/XPS in netifd with musl)
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 46420
Diffstat (limited to 'target/linux/generic')
3 files changed, 105 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.18/130-MIPS-kernel-fix-sched_getaffinity-with-MT-FPAFF-enab.patch b/target/linux/generic/patches-3.18/130-MIPS-kernel-fix-sched_getaffinity-with-MT-FPAFF-enab.patch new file mode 100644 index 0000000000..a7bfef347c --- /dev/null +++ b/target/linux/generic/patches-3.18/130-MIPS-kernel-fix-sched_getaffinity-with-MT-FPAFF-enab.patch @@ -0,0 +1,35 @@ +From: Felix Fietkau <nbd@openwrt.org> +Date: Sun, 19 Jul 2015 00:21:57 +0200 +Subject: [PATCH] MIPS: kernel: fix sched_getaffinity with MT FPAFF enabled + +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. + +Cc: stable@vger.kernel.org +Signed-off-by: Felix Fietkau <nbd@openwrt.org> +--- + +--- 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_getaffi + 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_getaffi + 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); diff --git a/target/linux/generic/patches-4.0/130-MIPS-kernel-fix-sched_getaffinity-with-MT-FPAFF-enab.patch b/target/linux/generic/patches-4.0/130-MIPS-kernel-fix-sched_getaffinity-with-MT-FPAFF-enab.patch new file mode 100644 index 0000000000..a7bfef347c --- /dev/null +++ b/target/linux/generic/patches-4.0/130-MIPS-kernel-fix-sched_getaffinity-with-MT-FPAFF-enab.patch @@ -0,0 +1,35 @@ +From: Felix Fietkau <nbd@openwrt.org> +Date: Sun, 19 Jul 2015 00:21:57 +0200 +Subject: [PATCH] MIPS: kernel: fix sched_getaffinity with MT FPAFF enabled + +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. + +Cc: stable@vger.kernel.org +Signed-off-by: Felix Fietkau <nbd@openwrt.org> +--- + +--- 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_getaffi + 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_getaffi + 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); diff --git a/target/linux/generic/patches-4.1/130-MIPS-kernel-fix-sched_getaffinity-with-MT-FPAFF-enab.patch b/target/linux/generic/patches-4.1/130-MIPS-kernel-fix-sched_getaffinity-with-MT-FPAFF-enab.patch new file mode 100644 index 0000000000..a7bfef347c --- /dev/null +++ b/target/linux/generic/patches-4.1/130-MIPS-kernel-fix-sched_getaffinity-with-MT-FPAFF-enab.patch @@ -0,0 +1,35 @@ +From: Felix Fietkau <nbd@openwrt.org> +Date: Sun, 19 Jul 2015 00:21:57 +0200 +Subject: [PATCH] MIPS: kernel: fix sched_getaffinity with MT FPAFF enabled + +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. + +Cc: stable@vger.kernel.org +Signed-off-by: Felix Fietkau <nbd@openwrt.org> +--- + +--- 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_getaffi + 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_getaffi + 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); |