Commit a1963b81 authored Mar 17, 2015 by Wanpeng Li Committed by Ingo Molnar Mar 27, 2015

sched/deadline: Fix rt runtime corruption when dl fails its global constraints



One version of sched_rt_global_constaints() (the !rt-cgroup one)
changes state, therefore if we fail the later sched_dl_global_constraints()
call the state is left in an inconsistent state.

Fix this by changing the order of the calls.

Signed-off-by: Wanpeng Li <wanpeng.li@linux.intel.com>
[ Improved the changelog. ]
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: Juri Lelli <juri.lelli@arm.com>
Link: http://lkml.kernel.org/r/1426590931-4639-2-git-send-email-wanpeng.li@linux.intel.com


Signed-off-by: Ingo Molnar <mingo@kernel.org>

parent bd4bde14

kernel/sched/core.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -7804,7 +7804,7 @@ static int sched_rt_global_constraints(void)
		}
		#endif /* CONFIG_RT_GROUP_SCHED */

		static int sched_dl_global_constraints(void)
		static int sched_dl_global_validate(void)
		{
		u64 runtime = global_rt_runtime();
		u64 period = global_rt_period();
		@@ -7905,11 +7905,11 @@ int sched_rt_handler(struct ctl_table *table, int write,
		if (ret)
		goto undo;

		ret = sched_rt_global_constraints();
		ret = sched_dl_global_validate();
		if (ret)
		goto undo;

		ret = sched_dl_global_constraints();
		ret = sched_rt_global_constraints();
		if (ret)
		goto undo;