scheduler fixes
Subsystems (2)
Linus,
Please pull the latest sched-urgent-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git sched-urgent-for-linus
# HEAD: 6acbfb96976fc3350e30d964acb1dbbdf876d55e sched: Fix hotplug vs. set_cpus_allowed_ptr()
Various fixlets, mostly related to the (root-only) SCHED_DEADLINE policy, but also a hotplug bug fix and a fix for a NR_CPUS related overallocation bug causing a suspend/resume regression.
Thanks,
Ingo
------------------>
Juri Lelli (1):
sched/deadline: Restrict user params max value to 2^63 ns
Lai Jiangshan (1):
sched: Fix hotplug vs. set_cpus_allowed_ptr()
Michael Kerrisk (1):
sched: Make sched_setattr() correctly return -EFBIG
Peter Zijlstra (4):
sched: Disallow sched_attr::sched_policy < 0 sched/deadline: Change sched_getparam() behaviour vs SCHED_DEADLINE sched/deadline: Replace NR_CPUS arrays
sched/cpupri: Replace NR_CPUS arrays
kernel/cpu.c | 6 +++-- kernel/sched/core.c | 55 ++++++++++++++++++++++++++++++++-------------- kernel/sched/cpudeadline.c | 33 ++++++++++++++++++++-------- kernel/sched/cpudeadline.h | 6 ++--- kernel/sched/cpupri.c | 7 ++++++ kernel/sched/cpupri.h | 2 +- 6 files changed, 78 insertions(+), 31 deletions(-)
kernel/cpu.c +4 -2
@@ -726,10 +726,12 @@ void set_cpu_present(unsigned int cpu, bool present)void set_cpu_online (unsigned int cpu,bool online) { -if (online) +if (online) {cpumask_set_cpu (cpu,to_cpumask (cpu_online_bits)); -else +cpumask_set_cpu (cpu,to_cpumask (cpu_active_bits)); + }else {cpumask_clear_cpu (cpu,to_cpumask (cpu_online_bits)); + } }void set_cpu_active (unsigned int cpu,bool active)
kernel/sched/core.c +39 -16
89 lines not on this page · raw message
kernel/sched/cpudeadline.c +24 -9
@@ -13,6 +13,7 @@#include <linux/gfp.h> #include <linux/kernel.h> +#include <linux/slab.h> #include "cpudeadline.h" static inline int parent (int i)
@@ -39,8 +40,10 @@ static void cpudl_exchange(struct cpudl *cp, int a, int b) {int cpu_a = cp->elements[a].cpu, cpu_b = cp->elements[b].cpu; -swap (cp->elements[a], cp->elements[b]); -swap (cp->cpu_to_idx[cpu_a], cp->cpu_to_idx[cpu_b]); +swap (cp->elements[a].cpu, cp->elements[b].cpu); +swap (cp->elements[a].dl , cp->elements[b].dl ); + +swap (cp->elements[cpu_a].idx, cp->elements[cpu_b].idx); }static void cpudl_heapify (struct cpudl *cp,int idx)
@@ -140,7 +143,7 @@ void cpudl_set(struct cpudl *cp, int cpu, u64 dl, int is_valid)WARN_ON (!cpu_present (cpu));raw_spin_lock_irqsave (&cp->lock, flags); - old_idx = cp->cpu_to_idx[cpu]; + old_idx = cp->elements[cpu].idx;if (!is_valid) {/* remove item */ if (old_idx ==IDX_INVALID ) {
@@ -155,8 +158,8 @@ void cpudl_set(struct cpudl *cp, int cpu, u64 dl, int is_valid) cp->elements[old_idx].dl = cp->elements[cp->size -1 ].dl; cp->elements[old_idx].cpu = new_cpu; cp->size--; - cp->cpu_to_idx[new_cpu] = old_idx; - cp->cpu_to_idx[cpu] =IDX_INVALID ; + cp->elements[new_cpu].idx = old_idx; + cp->elements[cpu].idx =IDX_INVALID ;while (old_idx >0 &&dl_time_before ( cp->elements[parent (old_idx)].dl, cp->elements[old_idx].dl)) {
@@ -173,7 +176,7 @@ void cpudl_set(struct cpudl *cp, int cpu, u64 dl, int is_valid) cp->size++; cp->elements[cp->size -1 ].dl =0 ; cp->elements[cp->size -1 ].cpu = cpu; - cp->cpu_to_idx[cpu] = cp->size -1 ; + cp->elements[cpu].idx = cp->size -1 ;cpudl_change_key (cp, cp->size -1 , dl);cpumask_clear_cpu (cpu, cp->free_cpus); }else {
@@ -195,10 +198,21 @@ int cpudl_init(struct cpudl *cp)memset (cp,0 ,sizeof (*cp));raw_spin_lock_init (&cp->lock); cp->size =0 ; -for (i =0 ; i <NR_CPUS ; i++) - cp->cpu_to_idx[i] =IDX_INVALID ; -if (!alloc_cpumask_var (&cp->free_cpus,GFP_KERNEL )) + + cp->elements =kcalloc (nr_cpu_ids, +sizeof (struct cpudl_item ), +GFP_KERNEL ); +if (!cp->elements) +return -ENOMEM ; + +if (!alloc_cpumask_var (&cp->free_cpus,GFP_KERNEL )) { +kfree (cp->elements);return -ENOMEM ; + } + +for_each_possible_cpu (i) + cp->elements[i].idx =IDX_INVALID ; +cpumask_setall (cp->free_cpus);return 0 ;
@@ -211,4 +225,5 @@ int cpudl_init(struct cpudl *cp)void cpudl_cleanup (struct cpudl *cp) {free_cpumask_var (cp->free_cpus); +kfree (cp->elements); }
kernel/sched/cpudeadline.h +3 -3
@@ -5,17 +5,17 @@#define IDX_INVALID -1 -struct array_item { +struct cpudl_item {u64 dl;int cpu; +int idx; };struct cpudl {raw_spinlock_t lock;int size; -int cpu_to_idx[NR_CPUS ]; -struct array_item elements[NR_CPUS ];cpumask_var_t free_cpus; +struct cpudl_item *elements; };
kernel/sched/cpupri.c +7 -0
@@ -30,6 +30,7 @@#include <linux/gfp.h> #include <linux/sched.h> #include <linux/sched/rt.h> +#include <linux/slab.h> #include "cpupri.h" /* Convert between a 140 based task->prio, and our 102 based cpupri */
@@ -218,8 +219,13 @@ int cpupri_init(struct cpupri *cp) goto cleanup; } + cp->cpu_to_pri =kcalloc (nr_cpu_ids,sizeof (int ),GFP_KERNEL ); +if (!cp->cpu_to_pri) + goto cleanup; +for_each_possible_cpu (i) cp->cpu_to_pri[i] =CPUPRI_INVALID ; +return 0 ; cleanup:
@@ -236,6 +242,7 @@ void cpupri_cleanup(struct cpupri *cp) {int i; +kfree (cp->cpu_to_pri);for (i =0 ; i <CPUPRI_NR_PRIORITIES ; i++)free_cpumask_var (cp->pri_to_cpu[i].mask); }
kernel/sched/cpupri.h +1 -1
@@ -17,7 +17,7 @@ struct cpupri_vec {struct cpupri {struct cpupri_vec pri_to_cpu[CPUPRI_NR_PRIORITIES ]; -int cpu_to_pri[NR_CPUS ]; +int *cpu_to_pri; };#ifdef CONFIG_SMP