2015-02-25 04:37:49

by Wanpeng Li

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

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.

Cc: Juri Lelli <[email protected]>
Signed-off-by: Wanpeng Li <[email protected]>
---
v1 -> v2:
* move sched_dl_global_constraints before sched_rt_global_constraints,
and change the name of the former to sched_dl_global_validate().

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)
}
#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();
@@ -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;

--
1.9.1

2015-02-26 09:55:21

by Juri Lelli

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

Hi,

On 25/02/2015 04:37, Wanpeng Li wrote:
> 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.
>

Looks good, thanks!

Acked-by: Juri Lelli <[email protected]>

> Cc: Juri Lelli <[email protected]>
> Signed-off-by: Wanpeng Li <[email protected]>
> ---
> v1 -> v2:
> * move sched_dl_global_constraints before sched_rt_global_constraints,
> and change the name of the former to sched_dl_global_validate().
>
> 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)
> }
> #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();
> @@ -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;
>
>