Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
MIME-Version: 1.0
References: <20210701171837.32156-1-vincent.guittot@linaro.org> <DAABF914-F5D0-4C92-BFE0-341D83B9F3D0@linux.vnet.ibm.com>
In-Reply-To: <DAABF914-F5D0-4C92-BFE0-341D83B9F3D0@linux.vnet.ibm.com>
From:   Vincent Guittot <vincent.guittot@linaro.org>
Date:   Fri, 2 Jul 2021 10:08:09 +0200
Message-ID: <CAKfTPtCuV6iCRfb53Avu7=+rV6G=AYYRyutqm0_LJU6mVV1kKg@mail.gmail.com>
Subject: Re: [PATCH] sched/fair: Sync load_sum with load_avg after dequeue
To:     Sachin Sant <sachinp@linux.vnet.ibm.com>
Cc:     Ingo Molnar <mingo@redhat.com>,
        Peter Zijlstra <peterz@infradead.org>,
        Juri Lelli <juri.lelli@redhat.com>,
        Dietmar Eggemann <dietmar.eggemann@arm.com>,
        Steven Rostedt <rostedt@goodmis.org>,
        Ben Segall <bsegall@google.com>, Mel Gorman <mgorman@suse.de>,
        Daniel Bristot de Oliveira <bristot@redhat.com>,
        linux-kernel <linux-kernel@vger.kernel.org>,
        Odin Ugedal <odin@uged.al>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Fri, 2 Jul 2021 at 08:16, Sachin Sant <sachinp@linux.vnet.ibm.com> wrote=
:
>
>
>
> > On 01-Jul-2021, at 10:48 PM, Vincent Guittot <vincent.guittot@linaro.or=
g> wrote:
> >
> > commit 9e077b52d86a ("sched/pelt: Check that *_avg are null when *_sum =
are")
> > reported some inconsitencies between *_avg and *_sum.
> >
> > commit 1c35b07e6d39 ("sched/fair: Ensure _sum and _avg values stay cons=
istent")
> > fixed some but one remains when dequeuing load.
> >
> > sync the cfs's load_sum with its load_avg after dequeuing the load of a
> > sched_entity.
> >
> > Fixes: 9e077b52d86a ("sched/pelt: Check that *_avg are null when *_sum =
are")
> > Reported-by: Sachin Sant <sachinp@linux.vnet.ibm.com>
> > Signed-off-by: Vincent Guittot <vincent.guittot@linaro.org>
> > ---
> >
> > I have been able to trigger a WARN on my system even with the patch
> > listed above. This patch fixes it.
> > Sachin could you test that it also fixes yours ?
> >
>
> I ran various LTP stress tests, scheduler tests and kernel compile operat=
ion for about 5 hours.
> Haven=E2=80=99t seen the warning during the testing.
>
> Tested-by: Sachin Sant <sachinp@linux.vnet.ibm.com>

Thanks

>
> I have left the tests running, will let it run for few more hours.
>
> Thanks
> -Sachin
>
> > kernel/sched/fair.c | 3 ++-
> > 1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
> > index 11d22943753f..48fc7dfc2f66 100644
> > --- a/kernel/sched/fair.c
> > +++ b/kernel/sched/fair.c
> > @@ -3037,8 +3037,9 @@ enqueue_load_avg(struct cfs_rq *cfs_rq, struct sc=
hed_entity *se)
> > static inline void
> > dequeue_load_avg(struct cfs_rq *cfs_rq, struct sched_entity *se)
> > {
> > +     u32 divider =3D get_pelt_divider(&se->avg);
> >       sub_positive(&cfs_rq->avg.load_avg, se->avg.load_avg);
> > -     sub_positive(&cfs_rq->avg.load_sum, se_weight(se) * se->avg.load_=
sum);
> > +     cfs_rq->avg.load_sum =3D cfs_rq->avg.load_avg * divider;
> > }
> > #else
> > static inline void
> > --
> > 2.17.1
> >
>