Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f7556698 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull scheduler fixes from Ingo Molnar:
 "An RT group-scheduling fix and the sched-domains topology setup fix
  from Mel"

* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  sched/rt: Fix rq's cpupri leak while enqueue/dequeue child RT entities
  sched: Assign correct scheduling domain to 'sd_llc'
parents 58cac3fa 757dfcaa

kernel/sched/core.c

+3 −2
Original line number Diff line number Diff line
@@ -4902,6 +4902,7 @@ DEFINE_PER_CPU(struct sched_domain *, sd_asym); 
static void update_top_cache_domain(int cpu)

{

	struct sched_domain *sd;

	struct sched_domain *busy_sd = NULL;

	int id = cpu;

	int size = 1;
@@ -4909,9 +4910,9 @@ static void update_top_cache_domain(int cpu) 
	if (sd) {

		id = cpumask_first(sched_domain_span(sd));

		size = cpumask_weight(sched_domain_span(sd));

		sd = sd->parent; /* sd_busy */

		busy_sd = sd->parent; /* sd_busy */

	}

	rcu_assign_pointer(per_cpu(sd_busy, cpu), sd);

	rcu_assign_pointer(per_cpu(sd_busy, cpu), busy_sd);



	rcu_assign_pointer(per_cpu(sd_llc, cpu), sd);

	per_cpu(sd_llc_size, cpu) = size;

kernel/sched/rt.c

+14 −0
Original line number Diff line number Diff line
@@ -901,6 +901,13 @@ inc_rt_prio_smp(struct rt_rq *rt_rq, int prio, int prev_prio) 
{

	struct rq *rq = rq_of_rt_rq(rt_rq);



#ifdef CONFIG_RT_GROUP_SCHED

	/*

	 * Change rq's cpupri only if rt_rq is the top queue.

	 */

	if (&rq->rt != rt_rq)

		return;

#endif

	if (rq->online && prio < prev_prio)

		cpupri_set(&rq->rd->cpupri, rq->cpu, prio);

}
@@ -910,6 +917,13 @@ dec_rt_prio_smp(struct rt_rq *rt_rq, int prio, int prev_prio) 
{

	struct rq *rq = rq_of_rt_rq(rt_rq);



#ifdef CONFIG_RT_GROUP_SCHED

	/*

	 * Change rq's cpupri only if rt_rq is the top queue.

	 */

	if (&rq->rt != rt_rq)

		return;

#endif

	if (rq->online && rt_rq->highest_prio.curr != prev_prio)

		cpupri_set(&rq->rd->cpupri, rq->cpu, rt_rq->highest_prio.curr);

}