Re: [PATCH] sched: avoid scale real weight down to zero

[çè]

On 2020/3/6 äå11:06, Vincent Guittot wrote:
[snip]
>>
>> Thus when scale_load_down() scale real weight down to 0, it's no
>> longer telling the real story, the caller will have the wrong
>> information and the calculation will be buggy.
>>
>> This patch add check in scale_load_down(), so the real weight will
>> be >= MIN_SHARES after scale, after applied the group C wins as
>> expected.
>>
>> Cc: Ben Segall <bsegall@xxxxxxxxxx>
>> Cc: Vincent Guittot <vincent.guittot@xxxxxxxxxx>
>> Suggested-by: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
>> Signed-off-by: Michael Wang <yun.wang@xxxxxxxxxxxxxxxxx>
> 
> Reviewed-by: Vincent Guittot <vincent.guittot@xxxxxxxxxx>

Thanks for the review :-)

Hi Peter, should we apply this one?

Regards,
Michael Wang


>> ---
>>  kernel/sched/sched.h | 8 +++++++-
>>  1 file changed, 7 insertions(+), 1 deletion(-)
>>
>> diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
>> index 2a0caf394dd4..75c283f22256 100644
>> --- a/kernel/sched/sched.h
>> +++ b/kernel/sched/sched.h
>> @@ -118,7 +118,13 @@ extern long calc_load_fold_active(struct rq *this_rq, long adjust);
>>  #ifdef CONFIG_64BIT
>>  # define NICE_0_LOAD_SHIFT     (SCHED_FIXEDPOINT_SHIFT + SCHED_FIXEDPOINT_SHIFT)
>>  # define scale_load(w)         ((w) << SCHED_FIXEDPOINT_SHIFT)
>> -# define scale_load_down(w)    ((w) >> SCHED_FIXEDPOINT_SHIFT)
>> +# define scale_load_down(w) \
>> +({ \
>> +       unsigned long __w = (w); \
>> +       if (__w) \
>> +               __w = max(MIN_SHARES, __w >> SCHED_FIXEDPOINT_SHIFT); \
>> +       __w; \
>> +})
>>  #else
>>  # define NICE_0_LOAD_SHIFT     (SCHED_FIXEDPOINT_SHIFT)
>>  # define scale_load(w)         (w)
>> --
>> 2.14.4.44.g2045bb6
>>