GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-26 00:21:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
Pull scheduler fixes from Ingo Molnar:
 "Misc fixes:

   - a deadline scheduler related bug fix which triggered a kernel
     warning

   - an RT_RUNTIME_SHARE fix

   - a stop_machine preemption fix

   - a potential NULL dereference fix in sched_domain_debug_one()"

* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  sched/rt: Restore rt_runtime after disabling RT_RUNTIME_SHARE
  sched/deadline: Update rq_clock of later_rq when pushing a task
  stop_machine: Disable preemption after queueing stopper threads
  sched/topology: Check variable group before dereferencing it
This commit is contained in:
Linus Torvalds 2018-07-30 12:13:56 -07:00
commit ae3e10aba5
4 changed files with 19 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
kernel/sched/deadline.c
View file

@ -2090,8 +2090,14 @@ retry:
sub_rq_bw(&next_task->dl, &rq->dl); sub_rq_bw(&next_task->dl, &rq->dl);
set_task_cpu(next_task, later_rq->cpu); set_task_cpu(next_task, later_rq->cpu);
add_rq_bw(&next_task->dl, &later_rq->dl); add_rq_bw(&next_task->dl, &later_rq->dl);
/*
* Update the later_rq clock here, because the clock is used
* by the cpufreq_update_util() inside __add_running_bw().
*/
update_rq_clock(later_rq);
add_running_bw(&next_task->dl, &later_rq->dl); add_running_bw(&next_task->dl, &later_rq->dl);
activate_task(later_rq, next_task, 0); activate_task(later_rq, next_task, ENQUEUE_NOCLOCK);
ret = 1; ret = 1;
resched_curr(later_rq); resched_curr(later_rq);

2
kernel/sched/rt.c
View file

@ -836,6 +836,8 @@ static int do_sched_rt_period_timer(struct rt_bandwidth *rt_b, int overrun)
* can be time-consuming. Try to avoid it when possible. * can be time-consuming. Try to avoid it when possible.
*/ */
raw_spin_lock(&rt_rq->rt_runtime_lock); raw_spin_lock(&rt_rq->rt_runtime_lock);
if (!sched_feat(RT_RUNTIME_SHARE) && rt_rq->rt_runtime != RUNTIME_INF)
rt_rq->rt_runtime = rt_b->rt_runtime;
skip = !rt_rq->rt_time && !rt_rq->rt_nr_running; skip = !rt_rq->rt_time && !rt_rq->rt_nr_running;
raw_spin_unlock(&rt_rq->rt_runtime_lock); raw_spin_unlock(&rt_rq->rt_runtime_lock);
if (skip) if (skip)

2
kernel/sched/topology.c
View file

@ -47,7 +47,7 @@ static int sched_domain_debug_one(struct sched_domain *sd, int cpu, int level,
if (!cpumask_test_cpu(cpu, sched_domain_span(sd))) { if (!cpumask_test_cpu(cpu, sched_domain_span(sd))) {
printk(KERN_ERR "ERROR: domain->span does not contain CPU%d\n", cpu); printk(KERN_ERR "ERROR: domain->span does not contain CPU%d\n", cpu);
} }
if (!cpumask_test_cpu(cpu, sched_group_span(group))) { if (group && !cpumask_test_cpu(cpu, sched_group_span(group))) {
printk(KERN_ERR "ERROR: domain->groups does not contain CPU%d\n", cpu); printk(KERN_ERR "ERROR: domain->groups does not contain CPU%d\n", cpu);
} }

10
kernel/stop_machine.c
View file

@ -260,6 +260,15 @@ retry:
err = 0; err = 0;
__cpu_stop_queue_work(stopper1, work1, &wakeq); __cpu_stop_queue_work(stopper1, work1, &wakeq);
__cpu_stop_queue_work(stopper2, work2, &wakeq); __cpu_stop_queue_work(stopper2, work2, &wakeq);
/*
* The waking up of stopper threads has to happen
* in the same scheduling context as the queueing.
* Otherwise, there is a possibility of one of the
* above stoppers being woken up by another CPU,
* and preempting us. This will cause us to n ot
* wake up the other stopper forever.
*/
preempt_disable();
unlock: unlock:
raw_spin_unlock(&stopper2->lock); raw_spin_unlock(&stopper2->lock);
raw_spin_unlock_irq(&stopper1->lock); raw_spin_unlock_irq(&stopper1->lock);
@ -271,7 +280,6 @@ unlock:
} }
if (!err) { if (!err) {
preempt_disable();
wake_up_q(&wakeq); wake_up_q(&wakeq);
preempt_enable(); preempt_enable();
} }