Commit 111cd11b authored by Juri Lelli's avatar Juri Lelli Committed by Tejun Heo
Browse files

sched/cpuset: Bring back cpuset_mutex 



Turns out percpu_cpuset_rwsem - commit 1243dc51 ("cgroup/cpuset:
Convert cpuset_mutex to percpu_rwsem") - wasn't such a brilliant idea,
as it has been reported to cause slowdowns in workloads that need to
change cpuset configuration frequently and it is also not implementing
priority inheritance (which causes troubles with realtime workloads).

Convert percpu_cpuset_rwsem back to regular cpuset_mutex. Also grab it
only for SCHED_DEADLINE tasks (other policies don't care about stable
cpusets anyway).

Signed-off-by: default avatarJuri Lelli <juri.lelli@redhat.com>
Reviewed-by: default avatarWaiman Long <longman@redhat.com>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent ad3a557d

include/linux/cpuset.h

+4 −4
Original line number Diff line number Diff line
@@ -71,8 +71,8 @@ extern void cpuset_init_smp(void); 
extern void cpuset_force_rebuild(void);

extern void cpuset_update_active_cpus(void);

extern void cpuset_wait_for_hotplug(void);

extern void cpuset_read_lock(void);

extern void cpuset_read_unlock(void);

extern void cpuset_lock(void);

extern void cpuset_unlock(void);

extern void cpuset_cpus_allowed(struct task_struct *p, struct cpumask *mask);

extern bool cpuset_cpus_allowed_fallback(struct task_struct *p);

extern nodemask_t cpuset_mems_allowed(struct task_struct *p);
@@ -189,8 +189,8 @@ static inline void cpuset_update_active_cpus(void) 


static inline void cpuset_wait_for_hotplug(void) { }



static inline void cpuset_read_lock(void) { }

static inline void cpuset_read_unlock(void) { }

static inline void cpuset_lock(void) { }

static inline void cpuset_unlock(void) { }



static inline void cpuset_cpus_allowed(struct task_struct *p,

				       struct cpumask *mask)

kernel/cgroup/cpuset.c

+80 −79

File changed.

Preview size limit exceeded, changes collapsed.

kernel/sched/core.c

+15 −7
Original line number Diff line number Diff line
@@ -7590,6 +7590,7 @@ static int __sched_setscheduler(struct task_struct *p, 
	int reset_on_fork;

	int queue_flags = DEQUEUE_SAVE | DEQUEUE_MOVE | DEQUEUE_NOCLOCK;

	struct rq *rq;

	bool cpuset_locked = false;



	/* The pi code expects interrupts enabled */

	BUG_ON(pi && in_interrupt());
@@ -7639,8 +7640,14 @@ static int __sched_setscheduler(struct task_struct *p, 
			return retval;

	}



	if (pi)

		cpuset_read_lock();

	/*

	 * SCHED_DEADLINE bandwidth accounting relies on stable cpusets

	 * information.

	 */

	if (dl_policy(policy) || dl_policy(p->policy)) {

		cpuset_locked = true;

		cpuset_lock();

	}



	/*

	 * Make sure no PI-waiters arrive (or leave) while we are
@@ -7716,8 +7723,8 @@ static int __sched_setscheduler(struct task_struct *p, 
	if (unlikely(oldpolicy != -1 && oldpolicy != p->policy)) {

		policy = oldpolicy = -1;

		task_rq_unlock(rq, p, &rf);

		if (pi)

			cpuset_read_unlock();

		if (cpuset_locked)

			cpuset_unlock();

		goto recheck;

	}
@@ -7784,7 +7791,8 @@ static int __sched_setscheduler(struct task_struct *p, 
	task_rq_unlock(rq, p, &rf);



	if (pi) {

		cpuset_read_unlock();

		if (cpuset_locked)

			cpuset_unlock();

		rt_mutex_adjust_pi(p);

	}
@@ -7796,8 +7804,8 @@ static int __sched_setscheduler(struct task_struct *p, 


unlock:

	task_rq_unlock(rq, p, &rf);

	if (pi)

		cpuset_read_unlock();

	if (cpuset_locked)

		cpuset_unlock();

	return retval;

}