Received-SPF: pass (google.com: domain of linux-kernel+bounces-150556-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Precedence: bulk
MIME-Version: 1.0
References: <20240226211237.48415-1-ppbuk5246@gmail.com> <Ze_x3kovSFe4z9SO@Levi-MacBook-Pro.local>
 <CAJuCfpFdbh37qWFS8eCXk0CCQD9bA2wtpOj5BMYPNTcz-0Oxnw@mail.gmail.com>
In-Reply-To: <CAJuCfpFdbh37qWFS8eCXk0CCQD9bA2wtpOj5BMYPNTcz-0Oxnw@mail.gmail.com>
From: Suren Baghdasaryan <surenb@google.com>
Date: Thu, 18 Apr 2024 10:15:21 -0700
Message-ID: <CAJuCfpHpYGMT9Gpf4BxGBB3OLM6QgvifMyPADmzKakPn1-hV2A@mail.gmail.com>
Subject: Re: [PATCH v2] psi: Fix avg trigger being fired unexpectedly.
To: Ingo Molnar <mingo@kernel.org>
Cc: "levi.yun" <ppbuk5246@gmail.com>, hannes@cmpxchg.org, peterz@infradead.org, 
	mingo@redhat.com, juri.lelli@redhat.com, vincent.guittot@linaro.org, 
	dietmar.eggemann@arm.com, rostedt@goodmis.org, bsegall@google.com, 
	mgorman@suse.de, bristot@redhat.com, vschneid@redhat.com, 
	linux-kernel@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On Tue, Mar 26, 2024 at 10:49=E2=80=AFAM Suren Baghdasaryan <surenb@google.=
com> wrote:
>
> On Tue, Mar 12, 2024 at 6:10=E2=80=AFAM levi.yun <ppbuk5246@gmail.com> wr=
ote:
> >
> > Gentle ping..
> >
> > On Mon, Feb 26, 2024 at 09:12:37PM +0000, Levi Yun wrote:
> > > commit 915a087e4c473("psi: Fix trigger being fired unexpectedly at in=
itial")
> > > fixes unexpected event fired when group->total accumulated for PSI_PO=
LL.
> > > But, for PSI_AVGS, win->value should be initialized with group->total=
[PSI_AVGS].
> > > Moreover, to get exact initial value for win->value, it should be set
> > > under each trigger lock to avoid concurrent changes to group->total[]=
.
> > >
> > > Signed-off-by: Levi Yun <ppbuk5246@gmail.com>
> > > Acked-by: Suren Baghdasaryan <surenb@google.com>
>
> Hi Peter,
> Could you please pull this patch into your tree? I don't see it in any
> tree, so I think you missed it.

I heard Peter is currently unavailable. Ingo, would you please take
this patch into the scheduler tree?
Thanks,
Suren.

> Thanks,
> Suren.
>
> > > ---
> > > v2: Fix commit message.
> > > ---
> > >  kernel/sched/psi.c | 8 +++++---
> > >  1 file changed, 5 insertions(+), 3 deletions(-)
> > >
> > > diff --git a/kernel/sched/psi.c b/kernel/sched/psi.c
> > > index 7b4aa5809c0f..e7f66ab2ad3e 100644
> > > --- a/kernel/sched/psi.c
> > > +++ b/kernel/sched/psi.c
> > > @@ -1323,9 +1323,6 @@ struct psi_trigger *psi_trigger_create(struct p=
si_group *group, char *buf,
> > >       t->state =3D state;
> > >       t->threshold =3D threshold_us * NSEC_PER_USEC;
> > >       t->win.size =3D window_us * NSEC_PER_USEC;
> > > -     window_reset(&t->win, sched_clock(),
> > > -                     group->total[PSI_POLL][t->state], 0);
> > > -
> > >       t->event =3D 0;
> > >       t->last_event_time =3D 0;
> > >       t->of =3D of;
> > > @@ -1336,6 +1333,8 @@ struct psi_trigger *psi_trigger_create(struct p=
si_group *group, char *buf,
> > >
> > >       if (privileged) {
> > >               mutex_lock(&group->rtpoll_trigger_lock);
> > > +             window_reset(&t->win, sched_clock(),
> > > +                             group->total[PSI_POLL][t->state], 0);
> > >
> > >               if (!rcu_access_pointer(group->rtpoll_task)) {
> > >                       struct task_struct *task;
> > > @@ -1361,6 +1360,9 @@ struct psi_trigger *psi_trigger_create(struct p=
si_group *group, char *buf,
> > >       } else {
> > >               mutex_lock(&group->avgs_lock);
> > >
> > > +             window_reset(&t->win, sched_clock(),
> > > +                             group->total[PSI_AVGS][t->state], 0);
> > > +
> > >               list_add(&t->node, &group->avg_triggers);
> > >               group->avg_nr_triggers[t->state]++;
> > >
> > > --
> > > 2.39.2