UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Wanpeng Li 2015-03-17 19:15:31 +08:00 committed by Ingo Molnar
parent bd4bde14b9
commit a1963b81de
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kernel/sched/core.c
View File

@ -7804,7 +7804,7 @@ static int sched_rt_global_constraints(void)
} }
#endif /* CONFIG_RT_GROUP_SCHED */ #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 runtime = global_rt_runtime();
u64 period = global_rt_period(); u64 period = global_rt_period();
@ -7905,11 +7905,11 @@ int sched_rt_handler(struct ctl_table *table, int write,
if (ret) if (ret)
goto undo; goto undo;
ret = sched_rt_global_constraints(); ret = sched_dl_global_validate();
if (ret) if (ret)
goto undo; goto undo;
ret = sched_dl_global_constraints(); ret = sched_rt_global_constraints();
if (ret) if (ret)
goto undo; goto undo;