From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Oleg Nesterov <oleg@redhat.com>,
Dylan Hatch <dylanbhatch@google.com>,
"Eric W . Biederman" <ebiederm@xmission.com>,
Andrew Morton <akpm@linux-foundation.org>,
Sasha Levin <sashal@kernel.org>
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 [thread overview]
Message-ID: <20240313170212.616443-43-sashal@kernel.org> (raw)
In-Reply-To: <20240313170212.616443-1-sashal@kernel.org>
From: Oleg Nesterov <oleg@redhat.com>
[ 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 <oleg@redhat.com>
Reported-by: Dylan Hatch <dylanbhatch@google.com>
Tested-by: Dylan Hatch <dylanbhatch@google.com>
Cc: Eric W. Biederman <ebiederm@xmission.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
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
next prev parent reply other threads:[~2024-03-13 17:03 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-13 17:01 [PATCH 5.4 00/51] 5.4.272-rc1 review Sasha Levin
2024-03-13 17:01 ` [PATCH 5.4 01/51] lan78xx: Fix white space and style issues Sasha Levin
2024-03-13 17:01 ` [PATCH 5.4 02/51] lan78xx: Add missing return code checks Sasha Levin
2024-03-13 17:01 ` [PATCH 5.4 03/51] lan78xx: Fix partial packet errors on suspend/resume Sasha Levin
2024-03-13 17:01 ` [PATCH 5.4 04/51] lan78xx: Fix race conditions in suspend/resume handling Sasha Levin
2024-03-13 17:01 ` [PATCH 5.4 05/51] net: lan78xx: fix runtime PM count underflow on link stop Sasha Levin
2024-03-13 17:01 ` [PATCH 5.4 06/51] ixgbe: {dis, en}able irqs in ixgbe_txrx_ring_{dis, en}able Sasha Levin
2024-03-13 17:01 ` [PATCH 5.4 07/51] geneve: make sure to pull inner header in geneve_rx() Sasha Levin
2024-03-13 17:01 ` [PATCH 5.4 08/51] net: ice: Fix potential NULL pointer dereference in ice_bridge_setlink() Sasha Levin
2024-03-13 17:01 ` [PATCH 5.4 09/51] net/ipv6: avoid possible UAF in ip6_route_mpath_notify() Sasha Levin
2024-03-13 17:01 ` [PATCH 5.4 10/51] net/rds: fix WARNING in rds_conn_connect_if_down Sasha Levin
2024-03-13 17:01 ` [PATCH 5.4 11/51] netfilter: nft_ct: fix l3num expectations with inet pseudo family Sasha Levin
2024-03-13 17:01 ` [PATCH 5.4 12/51] netfilter: nf_conntrack_h323: Add protection for bmp length out of range Sasha Levin
2024-03-13 17:01 ` [PATCH 5.4 13/51] netrom: Fix a data-race around sysctl_netrom_default_path_quality Sasha Levin
2024-03-13 17:01 ` [PATCH 5.4 14/51] netrom: Fix a data-race around sysctl_netrom_obsolescence_count_initialiser Sasha Levin
2024-03-13 17:01 ` [PATCH 5.4 15/51] netrom: Fix data-races around sysctl_netrom_network_ttl_initialiser Sasha Levin
2024-03-13 17:01 ` [PATCH 5.4 16/51] netrom: Fix a data-race around sysctl_netrom_transport_timeout Sasha Levin
2024-03-13 17:01 ` [PATCH 5.4 17/51] netrom: Fix a data-race around sysctl_netrom_transport_maximum_tries Sasha Levin
2024-03-13 17:01 ` [PATCH 5.4 18/51] netrom: Fix a data-race around sysctl_netrom_transport_acknowledge_delay Sasha Levin
2024-03-13 17:01 ` [PATCH 5.4 19/51] netrom: Fix a data-race around sysctl_netrom_transport_busy_delay Sasha Levin
2024-03-13 17:01 ` [PATCH 5.4 20/51] netrom: Fix a data-race around sysctl_netrom_transport_requested_window_size Sasha Levin
2024-03-13 17:01 ` [PATCH 5.4 21/51] netrom: Fix a data-race around sysctl_netrom_transport_no_activity_timeout Sasha Levin
2024-03-13 17:01 ` [PATCH 5.4 22/51] netrom: Fix a data-race around sysctl_netrom_routing_control Sasha Levin
2024-03-13 17:01 ` [PATCH 5.4 23/51] netrom: Fix a data-race around sysctl_netrom_link_fails_count Sasha Levin
2024-03-13 17:01 ` [PATCH 5.4 24/51] netrom: Fix data-races around sysctl_net_busy_read Sasha Levin
2024-03-13 17:01 ` [PATCH 5.4 25/51] selftests: mm: fix map_hugetlb failure on 64K page size systems Sasha Levin
2024-03-13 17:01 ` [PATCH 5.4 26/51] um: allow not setting extra rpaths in the linux binary Sasha Levin
2024-03-13 17:01 ` [PATCH 5.4 27/51] serial: max310x: Use devm_clk_get_optional() to get the input clock Sasha Levin
2024-03-13 17:01 ` [PATCH 5.4 28/51] serial: max310x: Try to get crystal clock rate from property Sasha Levin
2024-03-13 17:01 ` [PATCH 5.4 29/51] serial: max310x: fail probe if clock crystal is unstable Sasha Levin
2024-03-13 17:01 ` [PATCH 5.4 30/51] serial: max310x: Make use of device properties Sasha Levin
2024-03-13 17:01 ` [PATCH 5.4 31/51] serial: max310x: use regmap methods for SPI batch operations Sasha Levin
2024-03-13 17:01 ` [PATCH 5.4 32/51] serial: max310x: use a separate regmap for each port Sasha Levin
2024-03-13 17:01 ` [PATCH 5.4 33/51] serial: max310x: prevent infinite while() loop in port startup Sasha Levin
2024-03-13 17:01 ` [PATCH 5.4 34/51] Input: i8042 - fix strange behavior of touchpad on Clevo NS70PU Sasha Levin
2024-03-13 17:01 ` [PATCH 5.4 35/51] hv_netvsc: Make netvsc/VF binding check both MAC and serial number Sasha Levin
2024-03-13 17:01 ` [PATCH 5.4 36/51] hv_netvsc: use netif_is_bond_master() instead of open code Sasha Levin
2024-03-13 17:01 ` [PATCH 5.4 37/51] hv_netvsc: Register VF in netvsc_probe if NET_DEVICE_REGISTER missed Sasha Levin
2024-03-13 17:01 ` [PATCH 5.4 38/51] y2038: rusage: use __kernel_old_timeval Sasha Levin
2024-03-13 17:02 ` [PATCH 5.4 39/51] getrusage: add the "signal_struct *sig" local variable Sasha Levin
2024-03-13 17:02 ` [PATCH 5.4 40/51] getrusage: move thread_group_cputime_adjusted() outside of lock_task_sighand() Sasha Levin
2024-03-13 17:02 ` [PATCH 5.4 41/51] getrusage: use __for_each_thread() Sasha Levin
2024-03-13 17:02 ` Sasha Levin [this message]
2024-03-13 17:02 ` [PATCH 5.4 43/51] exit: Fix typo in comment: s/sub-theads/sub-threads Sasha Levin
2024-03-13 17:02 ` [PATCH 5.4 44/51] exit: wait_task_zombie: kill the no longer necessary spin_lock_irq(siglock) Sasha Levin
2024-03-13 17:02 ` [PATCH 5.4 45/51] serial: max310x: Unprepare and disable clock in error path Sasha Levin
2024-03-13 17:02 ` [PATCH 5.4 46/51] regmap: allow to define reg_update_bits for no bus configuration Sasha Levin
2024-03-13 17:08 ` Mark Brown
2024-03-13 17:02 ` [PATCH 5.4 47/51] regmap: Add bulk read/write callbacks into regmap_config Sasha Levin
2024-03-13 17:09 ` Mark Brown
2024-03-13 17:02 ` [PATCH 5.4 48/51] serial: max310x: make accessing revision id interface-agnostic Sasha Levin
2024-03-13 17:02 ` [PATCH 5.4 49/51] serial: max310x: implement I2C support Sasha Levin
2024-03-13 17:02 ` [PATCH 5.4 50/51] serial: max310x: fix IO data corruption in batched operations Sasha Levin
2024-03-13 17:02 ` [PATCH 5.4 51/51] Linux 5.4.272-rc1 Sasha Levin
2024-03-14 14:59 ` [PATCH 5.4 00/51] 5.4.272-rc1 review Harshit Mogalapalli
2024-03-14 18:29 ` Naresh Kamboju
2024-03-14 19:38 ` Florian Fainelli
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240313170212.616443-43-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=dylanbhatch@google.com \
--cc=ebiederm@xmission.com \
--cc=linux-kernel@vger.kernel.org \
--cc=oleg@redhat.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox