[PATCH RESEND v2] sched/deadline: fix rt runtime corrupt when dl refuse a smaller bandwidth

From: Wanpeng Li
Date: Fri Mar 13 2015 - 03:46:16 EST

Dl class will refuse the bandwidth being set to some value smaller
than the currently allocated bandwidth in any of the root_domains
through sched_rt_runtime_us and sched_rt_period_us. RT runtime will
be set according to sched_rt_runtime_us before dl class verify if
the new bandwidth is suitable in the case of !CONFIG_RT_GROUP_SCHED.

However, rt runtime will be corrupt if dl refuse the new bandwidth
since there is no undo to reset the rt runtime to the old value.

This patch fix it by verifying new bandwidth for deadline in advance.

Acked-by: Juri Lelli <juri.lelli@xxxxxxx>
Signed-off-by: Wanpeng Li <wanpeng.li@xxxxxxxxxxxxxxx>
kernel/sched/core.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 97fe79c..e884909 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -7815,7 +7815,7 @@ static int sched_rt_global_constraints(void)

-static int sched_dl_global_constraints(void)
+static int sched_dl_global_validate(void)
u64 runtime = global_rt_runtime();
u64 period = global_rt_period();
@@ -7916,11 +7916,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;


To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/