tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull scheduler fixes from Ingo Molnar:
"Four misc fixes: each was deemed serious enough to warrant v3.15
inclusion"

* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
sched/fair: Fix tg_set_cfs_bandwidth() deadlock on rq->lock
sched/dl: Fix race in dl_task_timer()
sched: Fix sched_policy < 0 comparison
sched/numa: Fix use of spin_{un}lock_irq() when interrupts are disabled

Linus Torvalds d54d14bf 624483f3

+20 -12
+2 -3
kernel/sched/core.c
··· 3685 3685 if (retval) 3686 3686 return retval; 3687 3687 3688 - if (attr.sched_policy < 0) 3688 + if ((int)attr.sched_policy < 0) 3689 3689 return -EINVAL; 3690 3690 3691 3691 rcu_read_lock(); ··· 7751 7751 /* restart the period timer (if active) to handle new period expiry */ 7752 7752 if (runtime_enabled && cfs_b->timer_active) { 7753 7753 /* force a reprogram */ 7754 - cfs_b->timer_active = 0; 7755 - __start_cfs_bandwidth(cfs_b); 7754 + __start_cfs_bandwidth(cfs_b, true); 7756 7755 } 7757 7756 raw_spin_unlock_irq(&cfs_b->lock); 7758 7757
+9 -1
kernel/sched/deadline.c
··· 513 513 struct sched_dl_entity, 514 514 dl_timer); 515 515 struct task_struct *p = dl_task_of(dl_se); 516 - struct rq *rq = task_rq(p); 516 + struct rq *rq; 517 + again: 518 + rq = task_rq(p); 517 519 raw_spin_lock(&rq->lock); 520 + 521 + if (rq != task_rq(p)) { 522 + /* Task was moved, retrying. */ 523 + raw_spin_unlock(&rq->lock); 524 + goto again; 525 + } 518 526 519 527 /* 520 528 * We need to take care of a possible races here. In fact, the
+8 -7
kernel/sched/fair.c
··· 1707 1707 void task_numa_free(struct task_struct *p) 1708 1708 { 1709 1709 struct numa_group *grp = p->numa_group; 1710 - int i; 1711 1710 void *numa_faults = p->numa_faults_memory; 1711 + unsigned long flags; 1712 + int i; 1712 1713 1713 1714 if (grp) { 1714 - spin_lock_irq(&grp->lock); 1715 + spin_lock_irqsave(&grp->lock, flags); 1715 1716 for (i = 0; i < NR_NUMA_HINT_FAULT_STATS * nr_node_ids; i++) 1716 1717 grp->faults[i] -= p->numa_faults_memory[i]; 1717 1718 grp->total_faults -= p->total_numa_faults; 1718 1719 1719 1720 list_del(&p->numa_entry); 1720 1721 grp->nr_tasks--; 1721 - spin_unlock_irq(&grp->lock); 1722 + spin_unlock_irqrestore(&grp->lock, flags); 1722 1723 rcu_assign_pointer(p->numa_group, NULL); 1723 1724 put_numa_group(grp); 1724 1725 } ··· 3130 3129 */ 3131 3130 if (!cfs_b->timer_active) { 3132 3131 __refill_cfs_bandwidth_runtime(cfs_b); 3133 - __start_cfs_bandwidth(cfs_b); 3132 + __start_cfs_bandwidth(cfs_b, false); 3134 3133 } 3135 3134 3136 3135 if (cfs_b->runtime > 0) { ··· 3309 3308 raw_spin_lock(&cfs_b->lock); 3310 3309 list_add_tail_rcu(&cfs_rq->throttled_list, &cfs_b->throttled_cfs_rq); 3311 3310 if (!cfs_b->timer_active) 3312 - __start_cfs_bandwidth(cfs_b); 3311 + __start_cfs_bandwidth(cfs_b, false); 3313 3312 raw_spin_unlock(&cfs_b->lock); 3314 3313 } 3315 3314 ··· 3691 3690 } 3692 3691 3693 3692 /* requires cfs_b->lock, may release to reprogram timer */ 3694 - void __start_cfs_bandwidth(struct cfs_bandwidth *cfs_b) 3693 + void __start_cfs_bandwidth(struct cfs_bandwidth *cfs_b, bool force) 3695 3694 { 3696 3695 /* 3697 3696 * The timer may be active because we're trying to set a new bandwidth ··· 3706 3705 cpu_relax(); 3707 3706 raw_spin_lock(&cfs_b->lock); 3708 3707 /* if someone else restarted the timer then we're done */ 3709 - if (cfs_b->timer_active) 3708 + if (!force && cfs_b->timer_active) 3710 3709 return; 3711 3710 } 3712 3711
+1 -1
kernel/sched/sched.h
··· 278 278 extern int sched_group_set_shares(struct task_group *tg, unsigned long shares); 279 279 280 280 extern void __refill_cfs_bandwidth_runtime(struct cfs_bandwidth *cfs_b); 281 - extern void __start_cfs_bandwidth(struct cfs_bandwidth *cfs_b); 281 + extern void __start_cfs_bandwidth(struct cfs_bandwidth *cfs_b, bool force); 282 282 extern void unthrottle_cfs_rq(struct cfs_rq *cfs_rq); 283 283 284 284 extern void free_rt_sched_group(struct task_group *tg);