Received-SPF: pass (google.com: domain of linux-kernel+bounces-31695-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Precedence: bulk
MIME-Version: 1.0
References: <20240117192534.1327608-1-dylanbhatch@google.com>
 <20240119141501.GA23739@redhat.com> <20240119141529.GB23739@redhat.com>
In-Reply-To: <20240119141529.GB23739@redhat.com>
From: Dylan Hatch <dylanbhatch@google.com>
Date: Fri, 19 Jan 2024 19:27:49 -0800
Message-ID: <CADBMgpxC+BP-wfrM-wP1nbZOcRb0LbsmMDQ3LQ8hUKYsF3QECw@mail.gmail.com>
Subject: Re: [PATCH 2/2] getrusage: use sig->stats_lock
To: Oleg Nesterov <oleg@redhat.com>
Cc: Andrew Morton <akpm@linux-foundation.org>, Kees Cook <keescook@chromium.org>, 
	Frederic Weisbecker <frederic@kernel.org>, "Joel Fernandes (Google)" <joel@joelfernandes.org>, 
	Ard Biesheuvel <ardb@kernel.org>, "Matthew Wilcox (Oracle)" <willy@infradead.org>, 
	Thomas Gleixner <tglx@linutronix.de>, Sebastian Andrzej Siewior <bigeasy@linutronix.de>, 
	"Eric W. Biederman" <ebiederm@xmission.com>, Vincent Whitchurch <vincent.whitchurch@axis.com>, 
	Dmitry Vyukov <dvyukov@google.com>, Luis Chamberlain <mcgrof@kernel.org>, 
	Mike Christie <michael.christie@oracle.com>, David Hildenbrand <david@redhat.com>, 
	Catalin Marinas <catalin.marinas@arm.com>, Stefan Roesch <shr@devkernel.io>, 
	Joey Gouly <joey.gouly@arm.com>, Josh Triplett <josh@joshtriplett.org>, Helge Deller <deller@gmx.de>, 
	Ondrej Mosnacek <omosnace@redhat.com>, Florent Revest <revest@chromium.org>, 
	Miguel Ojeda <ojeda@kernel.org>, linux-kernel@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On Fri, Jan 19, 2024 at 6:16=E2=80=AFAM Oleg Nesterov <oleg@redhat.com> wro=
te:
>
> Rather than lock_task_sighand(), sig->stats_lock was specifically designe=
d
> for this type of use. This way getrusage runs lockless in the likely case=
.
>
> TODO:
>         - Change do_task_stat() to use sig->stats_lock too, then we can
>           remove spin_lock_irq(siglock) in wait_task_zombie().
>
>         - Turn sig->stats_lock into seqcount_rwlock_t, this way the
>           readers in the slow mode won't exclude each other. See
>           https://lore.kernel.org/all/20230913154907.GA26210@redhat.com/
>
>         - stats_lock has to disable irqs because ->siglock can be taken
>           in irq context, it would be very nice to change __exit_signal()
>           to avoid the siglock->stats_lock dependency.
>
> Signed-off-by: Oleg Nesterov <oleg@redhat.com>
> ---
>  kernel/sys.c | 16 +++++++++++++---
>  1 file changed, 13 insertions(+), 3 deletions(-)
>
> diff --git a/kernel/sys.c b/kernel/sys.c
> index 70ad06ad852e..f8e543f1e38a 100644
> --- a/kernel/sys.c
> +++ b/kernel/sys.c
> @@ -1788,7 +1788,9 @@ void getrusage(struct task_struct *p, int who, stru=
ct rusage *r)
>         unsigned long maxrss;
>         struct mm_struct *mm;
>         struct signal_struct *sig =3D p->signal;
> +       unsigned int seq =3D 0;
>
> +retry:
>         memset(r, 0, sizeof(*r));
>         utime =3D stime =3D 0;
>         maxrss =3D 0;
> @@ -1800,8 +1802,7 @@ void getrusage(struct task_struct *p, int who, stru=
ct rusage *r)
>                 goto out_thread;
>         }
>
> -       if (!lock_task_sighand(p, &flags))
> -               return;
> +       flags =3D read_seqbegin_or_lock_irqsave(&sig->stats_lock, &seq);
>
>         switch (who) {
>         case RUSAGE_BOTH:
> @@ -1829,14 +1830,23 @@ void getrusage(struct task_struct *p, int who, st=
ruct rusage *r)
>                 r->ru_oublock +=3D sig->oublock;
>                 if (maxrss < sig->maxrss)
>                         maxrss =3D sig->maxrss;
> +
> +               rcu_read_lock();
>                 __for_each_thread(sig, t)
>                         accumulate_thread_rusage(t, r);
> +               rcu_read_unlock();
> +
>                 break;
>
>         default:
>                 BUG();
>         }
> -       unlock_task_sighand(p, &flags);
> +
> +       if (need_seqretry(&sig->stats_lock, seq)) {
> +               seq =3D 1;
> +               goto retry;
> +       }
> +       done_seqretry_irqrestore(&sig->stats_lock, seq, flags);
>
>         if (who =3D=3D RUSAGE_CHILDREN)
>                 goto out_children;
> --
> 2.25.1.362.g51ebf55
>
>

I applied these to a 5.10 kernel, and my repro (calling getrusage(RUSAGE_SE=
LF)
from 200K threads) is no longer triggering a hard lockup.

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