Received: by 2002:ab2:710b:0:b0:1ef:a325:1205 with SMTP id z11csp1900951lql; Wed, 13 Mar 2024 11:15:30 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCWZ8OfBLeDwRR0Qe9zw74ckgPY1BydxKp8rF3uzZXvKJqpSK40qzrPhjekR4foVYIK1D42Vkg5CoBdHcY80Zrs3p9lY2o9ebgEgeA3qWA== X-Google-Smtp-Source: AGHT+IEFWKbW+vmJBcUQ8ouyEcer9afJeu58L4t/Pap/WJG+afJBjLiHoI3FFRy58IjGzTn7FQER X-Received: by 2002:a19:5f19:0:b0:513:cbaf:d149 with SMTP id t25-20020a195f19000000b00513cbafd149mr1053939lfb.64.1710353730475; Wed, 13 Mar 2024 11:15:30 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1710353730; cv=pass; d=google.com; s=arc-20160816; b=0RniGgMyvico8jCUX7a+Agphz/Eo8Cb2lNHxk+LwWd5LDcqunKvei94pVO/9IdBj6I /4ENC0iMl1B+mFk4iEOMSEvYhtmG+j8veZoHh2WdQbx/iJ41hkBKV8j/eVmqYxhknwuS DMSadauuIju3oLpZPJotAv/Nm+CNXDy2CgigVg9TKvgrICl6pigCmtyHxb3Gz9akib4Q KeGQnYO0YZNlNHVv+MhQ5VbmYs0i2Bwhv682k2V00Gm1Yhq//QIxC+pQr/d8xBoGWAgK wznMEp+EcPFNG0UgshYmMXEjbpvKoKFEN7CcG/9eW+UQ5jJf+7D5V+8TLs4O/2V9KdlS HtKg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=qnJER5y63TnLGY9O91npnxsjrrpy3DcnmDomb5C0ooo=; fh=QHYoePTVyKNoydmDXmfPR/lPlJYVhXqsBmqXV4JCFVY=; b=ax+E0401UE/v7gnScF2ze9eZG+/X3yk8chyDphjMb3GV/WV5EWFkvRG5RG3kJ6B0I/ 2l3HgOg3rUVhZ15Dwifmms7yC6SakbYlpTen0pNKi6vmbtuWw4jokYb56mK1hPfcNbcR heJxXmhqXTiGjADs+n0BQ35xyFCGNWsXnTxnZsLBhe3i8oc7NEkBA2Cv6ikUviQkzcFR ZazJsTk2BWurFvzIh0J7BghrExrVPyhb9Y86yd481lmJGzo/Cj3D283iLlwGTRGagPVp K2HYpSPQf+UM5P3hmTaZS7YBMTw30Humrpj1bIh6pBh0FdTGF2UkbYUWiStYAVKZUppC MjcQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=OieeqT1K; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-102163-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-102163-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id d23-20020a1709064c5700b00a466b3e9b8bsi76140ejw.945.2024.03.13.11.15.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Mar 2024 11:15:30 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-102163-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=OieeqT1K; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-102163-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-102163-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 4F81E1F2AA46 for ; Wed, 13 Mar 2024 18:13:44 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id EB09D150166; Wed, 13 Mar 2024 17:03:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="OieeqT1K" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 065BB1937F4; Wed, 13 Mar 2024 17:03:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710349381; cv=none; b=KUKxTBN4WHyLTq4vK/vwVT5bggsmbyHm95BwqUZ0K4Gneo9bVt4ocCMf2CTXcJETF/0MZh18inNp24VzQLA3ULSEXEEpzaegLLCZ0OkVarEaHe5HS0ma8Z6dK07jy1QOcLo/VuFSLv78uQxFDOAJxMfFGmLd77f4vUvefaJpDRU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710349381; c=relaxed/simple; bh=3m17ZI08i4+tU78rfRs4kIYsgR3Qf4E46O/a07wvH8U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Kii5hM9vPMisRwehVR8lBfes5csBZc+agIwTKsHqXgVunGusWxrUcoiQYe37WftHSdNkMcKvbAsC02lArp86iCkQv7lktcmT+lyPeEGTF6EVOlhCoF72U98eQZN9ByaGCpitmuj/S6hOXmIbvsqhFJfbGDKuQZCKz5iUjSgkyNA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=OieeqT1K; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id EB142C433C7; Wed, 13 Mar 2024 17:02:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1710349380; bh=3m17ZI08i4+tU78rfRs4kIYsgR3Qf4E46O/a07wvH8U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OieeqT1Kw7886zKrm4XDiYrz7j9YjS+ytPC6xvqlZjW6VN9SlpzMM2Mz8PcTTr7r3 GYCMeHzoglYZopVoqabayfnkmSzhixgTS/LrfZ6i67vKf5KAbsJ83QdcOWB0MtlaaC VJL7PZZXYLL9yMw2+FGaSncPxN68UpdWTeUYDNjv6mae2h2FwCPcashJSI03bVxlx2 uJCn11tHbN2ipRP4TRKF/TYYnapxm9uFWoCi2B90LcXR/Q9FLVkyhCTjmdgcRtzUBW OMMH7++tl+jL28mL0cm2dYT+mbhSVAmDIxXB9kIkHwvFjyz9mScmybDT15RSZp4TNK vh1Qt/vI/dFtw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Oleg Nesterov , Dylan Hatch , "Eric W . Biederman" , Andrew Morton , Sasha Levin Subject: [PATCH 5.4 42/51] getrusage: use sig->stats_lock rather than lock_task_sighand() Date: Wed, 13 Mar 2024 13:02:03 -0400 Message-ID: <20240313170212.616443-43-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240313170212.616443-1-sashal@kernel.org> References: <20240313170212.616443-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.4.272-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-5.4.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 5.4.272-rc1 X-KernelTest-Deadline: 2024-03-15T17:02+00:00 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit From: Oleg Nesterov [ Upstream commit f7ec1cd5cc7ef3ad964b677ba82b8b77f1c93009 ] lock_task_sighand() can trigger a hard lockup. If NR_CPUS threads call getrusage() at the same time and the process has NR_THREADS, spin_lock_irq will spin with irqs disabled O(NR_CPUS * NR_THREADS) time. Change getrusage() to use sig->stats_lock, it was specifically designed for this type of use. This way it 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. Link: https://lkml.kernel.org/r/20240122155053.GA26214@redhat.com Signed-off-by: Oleg Nesterov Reported-by: Dylan Hatch Tested-by: Dylan Hatch Cc: Eric W. Biederman Cc: Signed-off-by: Andrew Morton Signed-off-by: Sasha Levin --- kernel/sys.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/kernel/sys.c b/kernel/sys.c index 4a5b03ad6e9b4..23e88587df87d 100644 --- a/kernel/sys.c +++ b/kernel/sys.c @@ -1714,7 +1714,9 @@ void getrusage(struct task_struct *p, int who, struct rusage *r) unsigned long maxrss; struct mm_struct *mm; struct signal_struct *sig = p->signal; + unsigned int seq = 0; +retry: memset(r, 0, sizeof(*r)); utime = stime = 0; maxrss = 0; @@ -1726,8 +1728,7 @@ void getrusage(struct task_struct *p, int who, struct rusage *r) goto out_thread; } - if (!lock_task_sighand(p, &flags)) - return; + flags = read_seqbegin_or_lock_irqsave(&sig->stats_lock, &seq); switch (who) { case RUSAGE_BOTH: @@ -1755,14 +1756,23 @@ void getrusage(struct task_struct *p, int who, struct rusage *r) r->ru_oublock += sig->oublock; if (maxrss < sig->maxrss) maxrss = 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 = 1; + goto retry; + } + done_seqretry_irqrestore(&sig->stats_lock, seq, flags); if (who == RUSAGE_CHILDREN) goto out_children; -- 2.43.0