Received-SPF: pass (google.com: domain of linux-kernel+bounces-36195-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Precedence: bulk
MIME-Version: 1.0
References: <20240123153313.GA21832@redhat.com> <20240123153355.GA21854@redhat.com>
In-Reply-To: <20240123153355.GA21854@redhat.com>
From: Dylan Hatch <dylanbhatch@google.com>
Date: Tue, 23 Jan 2024 15:48:15 -0800
Message-ID: <CADBMgpxpn1otErZkhG3NxSMUWGPSFUG7HFmJG3po46k_D2PXnw@mail.gmail.com>
Subject: Re: [PATCH 1/3] fs/proc: do_task_stat: move thread_group_cputime_adjusted()
 outside of lock_task_sighand()
To: Oleg Nesterov <oleg@redhat.com>
Cc: Andrew Morton <akpm@linux-foundation.org>, "Eric W. Biederman" <ebiederm@xmission.com>, 
	linux-kernel@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On Tue, Jan 23, 2024 at 7:35=E2=80=AFAM Oleg Nesterov <oleg@redhat.com> wro=
te:
>
> thread_group_cputime() does its own locking, we can safely shift
> thread_group_cputime_adjusted() which does another for_each_thread loop
> outside of ->siglock protected section.
>
> Not only this removes for_each_thread() from the critical section with
> irqs disabled, this removes another case when stats_lock is taken with
> siglock held. We want to remove this dependency, then we can change the
> users of stats_lock to not disable irqs.
>
> Signed-off-by: Oleg Nesterov <oleg@redhat.com>
> ---
>  fs/proc/array.c | 10 ++++++----
>  1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/fs/proc/array.c b/fs/proc/array.c
> index ff08a8957552..45ba91863808 100644
> --- a/fs/proc/array.c
> +++ b/fs/proc/array.c
> @@ -511,7 +511,7 @@ static int do_task_stat(struct seq_file *m, struct pi=
d_namespace *ns,
>
>         sigemptyset(&sigign);
>         sigemptyset(&sigcatch);
> -       cutime =3D cstime =3D utime =3D stime =3D 0;
> +       cutime =3D cstime =3D 0;
>         cgtime =3D gtime =3D 0;
>
>         if (lock_task_sighand(task, &flags)) {
> @@ -546,7 +546,6 @@ static int do_task_stat(struct seq_file *m, struct pi=
d_namespace *ns,
>
>                         min_flt +=3D sig->min_flt;
>                         maj_flt +=3D sig->maj_flt;
> -                       thread_group_cputime_adjusted(task, &utime, &stim=
e);
>                         gtime +=3D sig->gtime;
>
>                         if (sig->flags & (SIGNAL_GROUP_EXIT | SIGNAL_STOP=
_STOPPED))
> @@ -562,10 +561,13 @@ static int do_task_stat(struct seq_file *m, struct =
pid_namespace *ns,
>
>         if (permitted && (!whole || num_threads < 2))
>                 wchan =3D !task_is_running(task);
> -       if (!whole) {
> +
> +       if (whole) {
> +               thread_group_cputime_adjusted(task, &utime, &stime);
> +       } else {
> +               task_cputime_adjusted(task, &utime, &stime);
>                 min_flt =3D task->min_flt;
>                 maj_flt =3D task->maj_flt;
> -               task_cputime_adjusted(task, &utime, &stime);
>                 gtime =3D task_gtime(task);
>         }
>
> --
> 2.25.1.362.g51ebf55
>

Signed-off-by: Dylan Hatch <dylanbhatch@google.com>