Commit fe841226 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

sched: Convert cpupri lock to raw_spinlock 



Convert locks which cannot be sleeping locks in preempt-rt to
raw_spinlocks.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarPeter Zijlstra <peterz@infradead.org>
Acked-by: default avatarIngo Molnar <mingo@elte.hu>
parent 0986b11b

kernel/sched_cpupri.c

+5 −5
Original line number Diff line number Diff line
@@ -135,26 +135,26 @@ void cpupri_set(struct cpupri *cp, int cpu, int newpri) 
	if (likely(newpri != CPUPRI_INVALID)) {

		struct cpupri_vec *vec = &cp->pri_to_cpu[newpri];



		spin_lock_irqsave(&vec->lock, flags);

		raw_spin_lock_irqsave(&vec->lock, flags);



		cpumask_set_cpu(cpu, vec->mask);

		vec->count++;

		if (vec->count == 1)

			set_bit(newpri, cp->pri_active);



		spin_unlock_irqrestore(&vec->lock, flags);

		raw_spin_unlock_irqrestore(&vec->lock, flags);

	}

	if (likely(oldpri != CPUPRI_INVALID)) {

		struct cpupri_vec *vec  = &cp->pri_to_cpu[oldpri];



		spin_lock_irqsave(&vec->lock, flags);

		raw_spin_lock_irqsave(&vec->lock, flags);



		vec->count--;

		if (!vec->count)

			clear_bit(oldpri, cp->pri_active);

		cpumask_clear_cpu(cpu, vec->mask);



		spin_unlock_irqrestore(&vec->lock, flags);

		raw_spin_unlock_irqrestore(&vec->lock, flags);

	}



	*currpri = newpri;
@@ -180,7 +180,7 @@ int cpupri_init(struct cpupri *cp, bool bootmem) 
	for (i = 0; i < CPUPRI_NR_PRIORITIES; i++) {

		struct cpupri_vec *vec = &cp->pri_to_cpu[i];



		spin_lock_init(&vec->lock);

		raw_spin_lock_init(&vec->lock);

		vec->count = 0;

		if (!zalloc_cpumask_var(&vec->mask, gfp))

			goto cleanup;

kernel/sched_cpupri.h

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
/* values 2-101 are RT priorities 0-99 */



struct cpupri_vec {

	spinlock_t lock;

	raw_spinlock_t lock;

	int        count;

	cpumask_var_t mask;

};