From nobody Sun Feb 8 23:25:26 2026 Received: from mail-ej1-f44.google.com (mail-ej1-f44.google.com [209.85.218.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EFA371C5D7D for ; Sat, 1 Feb 2025 16:31:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738427486; cv=none; b=PAOJC+oRqsyDZMu21ef/ZfEeC/yOvsJrz6Uz7W4ihfbIDHeEhUofLDXjGdjMM3OZimemG4VzQEhsTvdaIjPpfHfuqxm8NzV5Dzox98jmeOEcCBJkgDVF4Q2ifzKaAY+wPMD5oLA7YThFBlCOz6KyZsLqKyfW7niGms5mjCY4F+k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738427486; c=relaxed/simple; bh=29eRj3EFsZ4yZGV4Y5RF6hOfC7a7Sir0lKqdY6Rk6wM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Itiyncy1PabBVmTJON5NQJu0xNoMbAmYXszF1G2BZvv4CN7AtqHGcYN4/Sn4YLbUOepcCers9F9oyqpxEBMitNi6V5q3XL22qgnnwxYucmC3cJmlhRfJS2BQ3dXsxCRBcC+1hDx96pEl5GG5IVTslHqG4/LX7VfPtMzeORlDIXs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=kfLmPD33; arc=none smtp.client-ip=209.85.218.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="kfLmPD33" Received: by mail-ej1-f44.google.com with SMTP id a640c23a62f3a-ab69bba49e2so445898166b.2 for ; Sat, 01 Feb 2025 08:31:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738427483; x=1739032283; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=q9VwguEfdw2O0mEEKHo5I+DTD1LWzDzpt7iDjHggfOc=; b=kfLmPD33E0pjDWU1wvVcQRYTdnDzte2Uuek5unsqxyBLcO7koi0wjZt0Ee6ECwXWuS BHBG7EuOnkXpOS67LDMUKHvHV93Xu+Oh5Tnch5LEtotoUbk48r+h2WNGI2qHTnmS272g FNany51AVHwVmHjXt1dlEL000GVoHISJWKg2Yxb4UIYgO9WRVgCUgm5IR9fBBxWoOn74 jyOBX0T2m6fmnYcl7Sb6MH25MrPoKGEQ8W+rgv3bQIYces+JpyS/8KrgHyHvfBbK8vls W/XxktPU3I4c2VH76oFtr8Jp8e9+1wm6NrtO2wq5JOY+azAc1Xw8Imr/RuxnRuCZlFFh QBYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738427483; x=1739032283; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=q9VwguEfdw2O0mEEKHo5I+DTD1LWzDzpt7iDjHggfOc=; b=UvPESB/2dTZDab3cM9o9nhtG1hvDNRsUyz9+k/ricx6aLxpqiRPoHp/rJyh6nyhX6U ArLNxuyw0mXEbDrsQeVMtuiKO+OP/o4TRAkLEKsetHjr0fXyvnwIV15l4KBhDjv3ojLo oZSMzk3bTcalO2fxPy8eeGbGD5f9LNw1vzE7zN2XxiXFt1CCBmVQVeG3MmfyQ3pmsdCL nh4AaYOKWegAlcJLPUApR2/BQ00jntj4kqhH4cKrmp6+OM+NO498YGvuvdeWlZMEWn0l c/QZnxJsiNpl3f4Z5q6dMWGed1rLCAiS/Ue4bo8fG09kyDZ9pFPbDf7VkbkfoA1GbMb1 ZE+w== X-Forwarded-Encrypted: i=1; AJvYcCW9vK/jEknqqbDfy330JMcOKDpOWYER+ohqsXu3NZTpfsNXuI9oWhZMtv/v173SO4povzLqkIac4JC/VYU=@vger.kernel.org X-Gm-Message-State: AOJu0YzCe8byksna/Iwb/HuXtxgQHYm+MR6J+CLirXSbJk3z1ht93ktK 9fb0sCj9Qb1VtQBKunxsVkOREp5kBhN0CKEGdr8p1hB5b6Avl28V X-Gm-Gg: ASbGncvyVcv6MjG7fPQjlma0nnh3A8byjGQeY5ck/ZZEjI/s7Mjczx3BW+3PV/gfFhR uvDqwJ1yDw7ff/rNqcKT+RULLsZDIpO8eDCBXZmgJDjc7H8KvzNgbFjn4IYg1IdbeklGQ+F/Ate tHlsK/QWqZBZLJTE046++SnNVB6LXVSx1ZSh2bdfzUwYoRJSQquMSZQKY05Pbjh51G/tcH/Opib 44k4xeM1TI3q3Jrx8ELVcUb6zkS7q2azN9LFmxWhW6khO35p8R9di4gGNGhXLmJNbU+/MA3u+U7 kFXYX6uAPvwSU5HmePgTaFE4E2ZjpHyhDQ== X-Google-Smtp-Source: AGHT+IHvc7aK8w+Hd89W24dqneZqKXcLr+wAyc1msRlyW5N6rBFhpTa7M7G/9pyZypuHCoX+4ZopoA== X-Received: by 2002:a05:6402:3511:b0:5d0:81f5:a398 with SMTP id 4fb4d7f45d1cf-5dc5efa8b65mr37039629a12.1.1738427483014; Sat, 01 Feb 2025 08:31:23 -0800 (PST) Received: from f.. (cst-prg-25-223.cust.vodafone.cz. [46.135.25.223]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5dc723cff72sm4636959a12.15.2025.02.01.08.31.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Feb 2025 08:31:22 -0800 (PST) From: Mateusz Guzik To: ebiederm@xmission.com, oleg@redhat.com Cc: brauner@kernel.org, akpm@linux-foundation.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Mateusz Guzik Subject: [PATCH v3 1/6] exit: perform add_device_randomness() without tasklist_lock Date: Sat, 1 Feb 2025 17:31:01 +0100 Message-ID: <20250201163106.28912-2-mjguzik@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250201163106.28912-1-mjguzik@gmail.com> References: <20250201163106.28912-1-mjguzik@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Parallel calls to add_device_randomness() contend on their own. The clone side aleady runs outside of tasklist_lock, which in turn means any caller on the exit side extends the tasklist_lock hold time while contending on the random-private lock. Signed-off-by: Mateusz Guzik Reviewed-by: Oleg Nesterov --- kernel/exit.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/kernel/exit.c b/kernel/exit.c index 3485e5fc499e..1eb2e7d36ce4 100644 --- a/kernel/exit.c +++ b/kernel/exit.c @@ -174,9 +174,6 @@ static void __exit_signal(struct task_struct *tsk) sig->curr_target =3D next_thread(tsk); } =20 - add_device_randomness((const void*) &tsk->se.sum_exec_runtime, - sizeof(unsigned long long)); - /* * Accumulate here the counters for all threads as they die. We could * skip the group leader because it is the last user of signal_struct, @@ -278,6 +275,8 @@ void release_task(struct task_struct *p) write_unlock_irq(&tasklist_lock); proc_flush_pid(thread_pid); put_pid(thread_pid); + add_device_randomness((const void*) &p->se.sum_exec_runtime, + sizeof(unsigned long long)); release_thread(p); put_task_struct_rcu_user(p); =20 --=20 2.43.0 From nobody Sun Feb 8 23:25:26 2026 Received: from mail-ed1-f43.google.com (mail-ed1-f43.google.com [209.85.208.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7E49A1BEF81 for ; Sat, 1 Feb 2025 16:31:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738427488; cv=none; b=KjnAMu0XOg2G/oIr8VZyz/JHZXJoF5mhk9/1LWqez3OH7sCVcTo9vn7p+r/prNWct8jh6nv/orv2Wyd7WzHBGi6GLe9TzN4fyO6RSONCYR/mp85TqoCA8NoMXus9L51rrDjvOscF+6KFfrysltG918PdwtxKnXIcOCkGlyhVMnU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738427488; c=relaxed/simple; bh=9rF9XjhVIZ4MR6YyA9uIkpV/wPrZKAXNg/MzplEdjh4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZqriNl+oAuJlKyvqHcneUtUXP/JRbWWTjZovuyTN10wcM1vhZhuGRfh0FxdLVQE2Q57yO5DmmqBqCe7g5IEX9o7/5bLXVslc7aNJrR5O84q/qWhBfS/S7F96Pms1uUxW1Y7M7CfDy9mZ/o5NG5fccfmOmUgQlDq7wVYe2+hMaXQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=kECMI/6r; arc=none smtp.client-ip=209.85.208.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="kECMI/6r" Received: by mail-ed1-f43.google.com with SMTP id 4fb4d7f45d1cf-5d3f65844deso5354664a12.0 for ; Sat, 01 Feb 2025 08:31:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738427485; x=1739032285; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=CXVQSHG/dhd9jfamFZQ5v0xVVMd1VSHlCVKm8ZZoizM=; b=kECMI/6ryPdRwtPKRQcv7diHxsYy/fUYYK7YCz4g1+UhW6+w1klS7UzHH3U9z/rUvt yobj/2NojFO0S29lAO19p2Kywn8/lbiWl1ABIiUYPwkSUlh+B99Rjb8r7yYFKJL4j4m6 Ivjp7ThmBEYzICgk6Bcyv4fA9zc5mwmPkvd1kK+qrD9E8rtW1J+LLLSt51Ll16HS+bZ+ m7lxcQylEimJVQF+2SycQ381FK9hDrSMiG8p4VUF7Xlq3VZ/QEJpDVB5eNVzv8Cu2ynm ARY5Y67tfzPxyrywSkaRIo4xjWxFu8pjFoH92GMioqY+Xu10JTamWnJhiTKZ+xVt8phM 3Fug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738427485; x=1739032285; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=CXVQSHG/dhd9jfamFZQ5v0xVVMd1VSHlCVKm8ZZoizM=; b=sK0wMCcVxRKN4q7/BljeKA27/9/SVkSZjkFPDQK89bIOVgLAcPytarG+vbrqxc0Gca KaP/NPmblBqUlXkvo/lbtdW8MqTRZAhZB+G5OcWO88nNeN9ShcAl6wEbJ71CiIex6HqT 3eyjYh+4jU9LNrD/l3gfgjgFr4ca80deoZpe/pz3snT5t+AFiF7jkoYmxneTEwu9FAKe OsR1yfSaysIRSibjXNWq24Cjs8GLgprP3+GqQKoIJ9FadSWHuFeypOrPQymScrKoEKYN 6lS8QltTqkP6ygVDtAiZgSuOlEWmffmaCCV+o/YBk151+5bBAnzWBYq1o/58fDV6SLcy +Udg== X-Forwarded-Encrypted: i=1; AJvYcCXHktf+jX8+xd7E+I9lIizI7NxpagpNyNcHXYQviRG9yIcTqz8Z5MoCfjRbvx/i+mFvYeh1UOSHqGgh3JI=@vger.kernel.org X-Gm-Message-State: AOJu0YzMrx7WNOWl1DQnItD7G4qnpCppMsIIHNAWyZr+Jl3+Use+7RrX /6yQhNHLQXi9ghXVWQK1xaJ7BjU/73ioIJIZztj6i5VlLBXWB+Go X-Gm-Gg: ASbGncurwVigEyqJYYg00A+UMdHp+eqlPf5lKYcog+YGU0I1V+fbnhhlEV3Mc8T3pi6 M2sI4bpXGKwjMEwiVr6AMbGX6Z8miijz+t0ROKVRQPSYsXzlvvIQUtoTJBcgRccA3j4/+0a+ze/ bjCKSw8XFA8vncnkRSZQzSaEBJh+Lvvg7GfcG4wNITIgCAtQuI56ece0Q0DDCaY0c4Z5DYa4/Sk aF2v0Tx3zWaw+iGiQpcTs9/gNsT2WDS19pFPrRxIW+oVppDwMoGb9aUDTNr00c9K63Yll/HUJ0C maUHKPSVaEcuWPQSLJ240szn6d7+sFpx4g== X-Google-Smtp-Source: AGHT+IEBBONxnoUTzVDmSOq6OZmD+SIybzgSduX77ZYr+Wy+gfjJKcZ3ihdCR4osScCUIMVOsqIhYQ== X-Received: by 2002:a05:6402:51d4:b0:5dc:100c:157f with SMTP id 4fb4d7f45d1cf-5dc5efbf5afmr19313220a12.11.1738427484556; Sat, 01 Feb 2025 08:31:24 -0800 (PST) Received: from f.. (cst-prg-25-223.cust.vodafone.cz. [46.135.25.223]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5dc723cff72sm4636959a12.15.2025.02.01.08.31.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Feb 2025 08:31:23 -0800 (PST) From: Mateusz Guzik To: ebiederm@xmission.com, oleg@redhat.com Cc: brauner@kernel.org, akpm@linux-foundation.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Mateusz Guzik Subject: [PATCH v3 2/6] exit: hoist get_pid() in release_task() outside of tasklist_lock Date: Sat, 1 Feb 2025 17:31:02 +0100 Message-ID: <20250201163106.28912-3-mjguzik@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250201163106.28912-1-mjguzik@gmail.com> References: <20250201163106.28912-1-mjguzik@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Signed-off-by: Mateusz Guzik Reviewed-by: Oleg Nesterov --- kernel/exit.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kernel/exit.c b/kernel/exit.c index 1eb2e7d36ce4..257dd8ed45ea 100644 --- a/kernel/exit.c +++ b/kernel/exit.c @@ -248,9 +248,10 @@ void release_task(struct task_struct *p) =20 cgroup_release(p); =20 + thread_pid =3D get_pid(p->thread_pid); + write_lock_irq(&tasklist_lock); ptrace_release_task(p); - thread_pid =3D get_pid(p->thread_pid); __exit_signal(p); =20 /* --=20 2.43.0 From nobody Sun Feb 8 23:25:26 2026 Received: from mail-ed1-f44.google.com (mail-ed1-f44.google.com [209.85.208.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 363BB1C5D78 for ; Sat, 1 Feb 2025 16:31:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738427493; cv=none; b=UGxJJ3d+isb7X8e2HsOQ71YODBdW0+PsB0Bv0ckyUxE705KpxTqd6qfG9byq534u/L+JjKg3UFxqF4FW0JkkcEXHGMggM/hdxDnpCRDVl9+Yu299reZ0E3Tv2ZvbVpIbZFlp9r7PqUHlDnY6+BpTFH3aoEnjZY22HJRp48ufmkM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738427493; c=relaxed/simple; bh=HzNBnUBkt9bW/QkVS5iMhHOaiUUrO6ZWY/9e1VL/jG0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ClDRfZkAC4JVMSIfkp2mzProRXGxFScaTHdGpsZUF0OL8QDiOPMS7bb1rUcnVeVxolNqWvpF7r/Wy3jZhmiHA4y9V1XwkKEmhtbsUkYvg/acAdbDetnL5fgLbpj3UsRr+jTYPMgkncHKWMKSzZ/HFn+pK1g1dHmcwIP6Zl5VJ4I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=fNQxHCFb; arc=none smtp.client-ip=209.85.208.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="fNQxHCFb" Received: by mail-ed1-f44.google.com with SMTP id 4fb4d7f45d1cf-5d3dce16a3dso5561660a12.1 for ; Sat, 01 Feb 2025 08:31:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738427490; x=1739032290; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=dahzR0UxsGypw5SX9Oc+7ltkwZX50Rxb2ddXibPMRZo=; b=fNQxHCFbyaogkLAPkCnFMRCdh92O4YcGzEp19QOyfxC9Y40hxPpSh+YkYkC7/rmyl9 WJxOjazOQOeMP+CszW2TZAHW84toH5Ytw0GsTO3G177CunV0EDRIRzGKp1neq6HBzYlc 3GOGvQaw9n7I4ICLYtC7JZF04Gr6uhaJh8ELVytCUcU+TEJUVv0PRbP13oJQSZ5saRBt gXfmwStG3pEAPnQc1ed5UwhMz74uVfDmf6hwnoZXQQAmktHPqDP1XsN+63ZWiwrdseeo Lf0qflVeNSVc3csHnosqq/7nxKuk2C75eVz6s5NpQYdsDc3NSbflksref/hlSV+/jiLt a19g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738427490; x=1739032290; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dahzR0UxsGypw5SX9Oc+7ltkwZX50Rxb2ddXibPMRZo=; b=FFvhVbAA2hl1wdAYapTPYPSHXLo+bu0fDCV0JvqTPIXKIb10a8HWCpDKDtKmldz6JQ EVEHFOuD4IoPMJy+2qE0XnxX2/PRjZfoD1OEimv4Qt0ovKbzZBhzzhm8adR2S0NF8HGE tH846w9Jicq67aqDrXT8i0rPD4Yr77oWImkkW/wN7ypG2n+JUDQmH9yOgkF+S6GptfU6 itJLlubgWbayHoxCJ+uIHjcBUJxoaMDjhj8T1sS0vfSuQKdvDP5HkPP2jvpNkv/MAyJM Hl6ZwfUT9zsCTFbgrFMMfb05fMxPPZWo8KNMUPnKcUV0jqt9FDeYCg4fclbwmKGrVoaI Tbog== X-Forwarded-Encrypted: i=1; AJvYcCVVOhgrtps48QOIRoOW30XFrh+rEKvK9eRAqAm2KQJf1kdpCzn48O7uBudIQby+gQGv00+ST4KrymQs7xk=@vger.kernel.org X-Gm-Message-State: AOJu0Yz7hnKnSB2CYwfR7iKfF04UKRo+AtU8u0pa9xGRufzp/Tyzpwaz PKcq1Cc7JWlGNIhJ17oxdiH7FaQmnJTGeSGJ4PWjU3JNwCtjXsRH X-Gm-Gg: ASbGncsacAy8gjv40/EXZbky0eNHFF5GyKn29TK25dk9EEHZQwM4OPuxUVX8uKZJgdj LZu1xJAbMcIHFADmY5/8Tp4VgeZ4pulsLo/iNaTCw7MnveFZCeaSAIvrh0VAgRkvhFi20AEl/9w jkHNNpv0Vo7R77R2euR/7OHGT3KVRy8haUe1fzVg7x/7mfGWsz5T4CvfNiMqOhdsYtgqct8nWLd Ne8FfQOuXuP+5KfdEh0FOvHxq10u0oa9pg+gpBX7YN6ZM68NKmtwcSf+BvjhbYVnKqCsYLuy7xi 38hbbJ3JPV5LkC1TkOqDXOtgUH/aCdXCIQ== X-Google-Smtp-Source: AGHT+IFZHEIO8U5RqJXJbo7DHyIgBpdE5v9HITImIJ/GuVeKkP/Vgt/hmam0AcjLWutOLfeAg8IQfg== X-Received: by 2002:a05:6402:1d55:b0:5dc:92a9:8a5 with SMTP id 4fb4d7f45d1cf-5dc92a90b78mr2511527a12.6.1738427489352; Sat, 01 Feb 2025 08:31:29 -0800 (PST) Received: from f.. (cst-prg-25-223.cust.vodafone.cz. [46.135.25.223]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5dc723cff72sm4636959a12.15.2025.02.01.08.31.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Feb 2025 08:31:28 -0800 (PST) From: Mateusz Guzik To: ebiederm@xmission.com, oleg@redhat.com Cc: brauner@kernel.org, akpm@linux-foundation.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Mateusz Guzik Subject: [PATCH v3 3/6] exit: postpone tty_kref_put() until after tasklist_lock is dropped Date: Sat, 1 Feb 2025 17:31:03 +0100 Message-ID: <20250201163106.28912-4-mjguzik@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250201163106.28912-1-mjguzik@gmail.com> References: <20250201163106.28912-1-mjguzik@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Instead of smuggling the tty pointer directly, use a struct so that more things can be added later. Signed-off-by: Mateusz Guzik Reviewed-by: Oleg Nesterov --- kernel/exit.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/kernel/exit.c b/kernel/exit.c index 257dd8ed45ea..d2c74f93f7d2 100644 --- a/kernel/exit.c +++ b/kernel/exit.c @@ -122,6 +122,13 @@ static __init int kernel_exit_sysfs_init(void) late_initcall(kernel_exit_sysfs_init); #endif =20 +/* + * For things release_task() would like to do *after* tasklist_lock is rel= eased. + */ +struct release_task_post { + struct tty_struct *tty; +}; + static void __unhash_process(struct task_struct *p, bool group_dead) { nr_threads--; @@ -141,12 +148,11 @@ static void __unhash_process(struct task_struct *p, b= ool group_dead) /* * This function expects the tasklist_lock write-locked. */ -static void __exit_signal(struct task_struct *tsk) +static void __exit_signal(struct release_task_post *post, struct task_stru= ct *tsk) { struct signal_struct *sig =3D tsk->signal; bool group_dead =3D thread_group_leader(tsk); struct sighand_struct *sighand; - struct tty_struct *tty; u64 utime, stime; =20 sighand =3D rcu_dereference_check(tsk->sighand, @@ -160,7 +166,7 @@ static void __exit_signal(struct task_struct *tsk) #endif =20 if (group_dead) { - tty =3D sig->tty; + post->tty =3D sig->tty; sig->tty =3D NULL; } else { /* @@ -207,10 +213,8 @@ static void __exit_signal(struct task_struct *tsk) =20 __cleanup_sighand(sighand); clear_tsk_thread_flag(tsk, TIF_SIGPENDING); - if (group_dead) { + if (group_dead) flush_sigqueue(&sig->shared_pending); - tty_kref_put(tty); - } } =20 static void delayed_put_task_struct(struct rcu_head *rhp) @@ -236,10 +240,13 @@ void __weak release_thread(struct task_struct *dead_t= ask) =20 void release_task(struct task_struct *p) { + struct release_task_post post; struct task_struct *leader; struct pid *thread_pid; int zap_leader; repeat: + memset(&post, 0, sizeof(post)); + /* don't need to get the RCU readlock here - the process is dead and * can't be modifying its own credentials. But shut RCU-lockdep up */ rcu_read_lock(); @@ -252,7 +259,7 @@ void release_task(struct task_struct *p) =20 write_lock_irq(&tasklist_lock); ptrace_release_task(p); - __exit_signal(p); + __exit_signal(&post, p); =20 /* * If we are the last non-leader member of the thread @@ -280,6 +287,7 @@ void release_task(struct task_struct *p) sizeof(unsigned long long)); release_thread(p); put_task_struct_rcu_user(p); + tty_kref_put(post.tty); =20 p =3D leader; if (unlikely(zap_leader)) --=20 2.43.0 From nobody Sun Feb 8 23:25:26 2026 Received: from mail-ej1-f46.google.com (mail-ej1-f46.google.com [209.85.218.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 93F161CAA6E for ; Sat, 1 Feb 2025 16:31:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738427497; cv=none; b=OLdT5Z2kV254/IzZr3oo6+Noe78uyIkzsGY/u9Uz6auAmZYZxcwlFI5e+Mz/e0oEE1f76fqQyxwqqTtEo6km4qQkbSB/5O166sjCUt8MgV8Tr4aktiASo/xDldPHld9esOk6H+FP+1YdG0pYJGMuedgd0AC2PWalTbZwhEmJ7eg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738427497; c=relaxed/simple; bh=gewaK31HOiPxynrIPU4I77vQgKv9uOaKp+Qsck5H9mg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Z1Y7VV4+8qSdEIBjqYtqpzrTOmewSrtycz9FWUzhu7Zycq0aIpXrRlq5rmADo47GagA8ELUrFam196ve1wRFNPP5nnGci2tYpL/4He6U1ZNlZyuN5Sl9Quy3trpGudpdTijy1Z7YvtYbwHDPjzGvFJ3yjEzLSXL5hKp5hYKaO24= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=QZu9P2VP; arc=none smtp.client-ip=209.85.218.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="QZu9P2VP" Received: by mail-ej1-f46.google.com with SMTP id a640c23a62f3a-ab633d9582aso626427666b.1 for ; Sat, 01 Feb 2025 08:31:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738427494; x=1739032294; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=dyyFSflvKZq+gCyw4L+aRmZfdJK9jjjI1PXfRtKE+Wg=; b=QZu9P2VPmJyuc0uSW9OeG8NfhI42BoZ3kCodkwrU8y5RKYtrmD7awUgPQJPBumJNf2 SV6UtfMfA9vsTEJ/XJNVmomWEtI69vX4eF8baOy2c6idJFLBukAwHoahA3qQLTlSZ3h+ VK2j+QfWOwJWtGVMYj3QlPGhmvji2MwQm/Y7Wv8KtXQqGeej5s5BwY6ACF9kgC9cLs3H +ZPWPwpSSs1q9NLjw3eY3ohMuPx8+bpOM88mmlm6OgnZxoRv0N7VEQOSwyA2vdltB/s9 W/tQF3SZOtKL7hxkt7i9PraEidiJ/jqjNYnZpWK0SFbYPEuovY27koptjokDvkXTP/xF CKYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738427494; x=1739032294; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dyyFSflvKZq+gCyw4L+aRmZfdJK9jjjI1PXfRtKE+Wg=; b=xRAbkRTK3GbEP54Ng4LKYH7eqnubUjCfczLG2Kflra3pAjl6sCgfii2szUFu1gTywR e58tfFZVVCH0cz60iQZj8spFx/wc/lIfznsxYE81mPCHGBiH/zJW24avzs8m5/9keO06 8Y8UBTqrdOlRFaGmGoQ3ZMK8O2B1JNY3t9SYbUZitpqkBUZ+ARG8kyYwATuComMiDJYh LP0qrukmq+DUbs8Eg/8C+4bttE5lVwCcE164o0tk3g8M8qSvT5YlI4uK4pBkpmYwjkdJ GSLcs0KbafKikm9fTGe/Eu43JNC8sEvlEo63Eg61OQsPL63ny0/iKeg9n/NqpiswimbS 3zxA== X-Forwarded-Encrypted: i=1; AJvYcCVIhYMwTbxdHBRd1Xf4a2L12RCdxWN7gL01xGEbmy/MwOsnxOp/2Hx+G/iD6D5qV4XqCe7KLSZMHC2h1ig=@vger.kernel.org X-Gm-Message-State: AOJu0YwUnM9P4Nru8LAYQzRNlvr92RyHzObsQUFPlOcU4ZnPWWAgop1v sCRvN/0VSJ5Jl8DhwmS5UOqmOXxwQUW7o0kVb+MDAUgtSngJ0W68 X-Gm-Gg: ASbGnctlJwPSRcFRP0hWle0GdGT309+B++/DEfrr3EJvcw7QRh5jRMZCMPGAyzIyrkH 8ifCRhsqPPT9+u5bijnMEh9HL8tatO5Y9soCOzjemeHQrFcNUtNaEgSD42MQFkt5ELWLU47IZK9 m4vs/sI0COHKefdgMVy3Hi9oz5R5SWeR9s4D2qpjhk6OGQJCAKKKQAPTXRxxuLDcfNelNKhe9it YTDd1egFeWM6A7sdDEWruWudJg7FSg/jt2cMxhIQRhlJqhCa0kjt2Xz9SyUifXFYqRKC0spKs4q xnXTIWWUZyKL41qX4H7E8KYPEA8kV7IjLA== X-Google-Smtp-Source: AGHT+IFqaFYGHdlE7Mgj/EaOXQAoxs/uxy0rQwtHMZ/EngGz610MENXkBznnc7SJaPbJh49JC1NgBQ== X-Received: by 2002:a17:907:7fa2:b0:aa6:6e10:61f6 with SMTP id a640c23a62f3a-ab6cfdc6724mr1500512566b.52.1738427493533; Sat, 01 Feb 2025 08:31:33 -0800 (PST) Received: from f.. (cst-prg-25-223.cust.vodafone.cz. [46.135.25.223]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5dc723cff72sm4636959a12.15.2025.02.01.08.31.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Feb 2025 08:31:32 -0800 (PST) From: Mateusz Guzik To: ebiederm@xmission.com, oleg@redhat.com Cc: brauner@kernel.org, akpm@linux-foundation.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Mateusz Guzik Subject: [PATCH v3 4/6] pid: sprinkle tasklist_lock asserts Date: Sat, 1 Feb 2025 17:31:04 +0100 Message-ID: <20250201163106.28912-5-mjguzik@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250201163106.28912-1-mjguzik@gmail.com> References: <20250201163106.28912-1-mjguzik@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Signed-off-by: Mateusz Guzik Reviewed-by: Oleg Nesterov --- kernel/pid.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/kernel/pid.c b/kernel/pid.c index 924084713be8..2ae872f689a7 100644 --- a/kernel/pid.c +++ b/kernel/pid.c @@ -339,17 +339,23 @@ static struct pid **task_pid_ptr(struct task_struct *= task, enum pid_type type) */ void attach_pid(struct task_struct *task, enum pid_type type) { - struct pid *pid =3D *task_pid_ptr(task, type); + struct pid *pid; + + lockdep_assert_held_write(&tasklist_lock); + + pid =3D *task_pid_ptr(task, type); hlist_add_head_rcu(&task->pid_links[type], &pid->tasks[type]); } =20 static void __change_pid(struct task_struct *task, enum pid_type type, struct pid *new) { - struct pid **pid_ptr =3D task_pid_ptr(task, type); - struct pid *pid; + struct pid **pid_ptr, *pid; int tmp; =20 + lockdep_assert_held_write(&tasklist_lock); + + pid_ptr =3D task_pid_ptr(task, type); pid =3D *pid_ptr; =20 hlist_del_rcu(&task->pid_links[type]); @@ -386,6 +392,8 @@ void exchange_tids(struct task_struct *left, struct tas= k_struct *right) struct hlist_head *head1 =3D &pid1->tasks[PIDTYPE_PID]; struct hlist_head *head2 =3D &pid2->tasks[PIDTYPE_PID]; =20 + lockdep_assert_held_write(&tasklist_lock); + /* Swap the single entry tid lists */ hlists_swap_heads_rcu(head1, head2); =20 @@ -403,6 +411,7 @@ void transfer_pid(struct task_struct *old, struct task_= struct *new, enum pid_type type) { WARN_ON_ONCE(type =3D=3D PIDTYPE_PID); + lockdep_assert_held_write(&tasklist_lock); hlist_replace_rcu(&old->pid_links[type], &new->pid_links[type]); } =20 --=20 2.43.0 From nobody Sun Feb 8 23:25:26 2026 Received: from mail-ed1-f49.google.com (mail-ed1-f49.google.com [209.85.208.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F37951CAA9D for ; Sat, 1 Feb 2025 16:31:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738427500; cv=none; b=VR678YGb6gsaoPqvpdD9R/fpqI5q70GtgtTJi9N4JoCZb22mpemqMGAbqeSK6v7JR21KwOB634bYfC3s2ebvySTIOYM5HXGC6BVf+fFLKNBNzueGqeHfQ3Ijrg3KFAqWZIm3XVoe8I5ChOPdg4su0H5fYaf3B0VMKGGGq3wHeOA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738427500; c=relaxed/simple; bh=C8s0Xb9NhS5ua26k3JymOms2OQn46XAZzDAtSAivs6A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MO0yWQXzC9vtQ2XQmVE9To4G2dCVlLOxVet6kLp+cKNb+CDI7ODl47TsOQlyaPes6+jBTuK/jlUs7ezApNwOwx2gvvS1C+r1yMyTurI0gr3t/Mb7dv3/4DL9Gm/RFzCwl7WXsLkDMLaHm7d1M5gwlWWBGenQhKn/4ld7k1eT4vk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=AUoVLGwE; arc=none smtp.client-ip=209.85.208.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="AUoVLGwE" Received: by mail-ed1-f49.google.com with SMTP id 4fb4d7f45d1cf-5d41848901bso5765788a12.0 for ; Sat, 01 Feb 2025 08:31:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738427497; x=1739032297; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=9gAV0esEOMPqj1wMAKXBZQiiLf9TUFsrr9mzaYygi1E=; b=AUoVLGwEPVHkcNI8UvVz2ksv1crdS/lsrF8Pr0kEZr4jgGCp1O/DYkKNps8nbYn3CH YYWX/GHGlmK6DSklrp0hc2Woh1NjIURrAUxG43aBnKWI9QhLAbCNhzo6NA9y2AS/dxyM Mq750JKICs5BrRWNnMZrqf3D5q+cV31Inyl7TPDm5nMbJamxYJDQsGjn0/KH9dpK2hNB Hq64SJ0WQOKiPxq8Ao2sprR5QYYXVkgrVpI+2yrJYXxWcxUg8jphHfqJvhnQEiSNSmic 5c+BDfm+6Gz+7eCjEMH+l0as1N6ZP0MOVcdGeBrEog8p8ehP7Zo6Kd3L+mMR0OcsaCam Z7Iw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738427497; x=1739032297; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9gAV0esEOMPqj1wMAKXBZQiiLf9TUFsrr9mzaYygi1E=; b=SkNMb69NzgA3AZkwQLOp+Qq6samSEW2AZv+RIsTLuQjSONeQtKQ5Kjn+h7jV15vrhh my/SNuM83RWdQg5Vq/6K2hhTvpFlM9qIvaduHLAqWkXFMCzcAchj7Xm+EqqhLhxYLSkE q92bUbTPGyLCK6g5UHjlQ6zeQ8TCTu82H/uJwQgoxmo3q99UyQy5xdBDkJYRhUvC+bHQ LT3BCnLOSt3Gk/6+9cJk9NSPETK9dQAfGPHqECGQeWuPuLBmBGj26iYrmjbqGJ5zPNDS lq7KHwfH8TjDJJjoZ+HaqFX1SSHw8Aj3LnNkGcuwc1M5aiu1n4FqK8mbxIUBmULVuoA0 EWrg== X-Forwarded-Encrypted: i=1; AJvYcCUXMXLoWcAQC/YQoy04557a+XLqTwe9jjnZwsTkwYM7wMTkDufMKesqS34ak00aXOJbt51wWAV9/m2QEKQ=@vger.kernel.org X-Gm-Message-State: AOJu0Yxd6nV+murYiv1oyy/t0O0gTY8v5ghGyD/vBmzVo5K/GXm5KBR8 8JEXWWbiRN7mLDYPIdykF+yqTThVRfxyshZebbM4YnbCNDmNBqJ7 X-Gm-Gg: ASbGncuvWf0GSitYjnI7swPGRNy494W26WjuoFuOk6WKcG6HTLEzdKZrda8Zdk3QegT oxaYS2pAB8Y5TL8uuFqJrgvhySvf4HGt48zsssDMYeQB7SX4j/VoDQRwg02LLsQ+eOT13KDJR+z oQYwX0Xnsdd5TY0U7RGJqRGOye5egIRDomAexEfyA0Gb4OhKlmUhKAElfj+VAYaUmq6ax8cD3Y9 zzHz/EbSFLEaq29HF9wTU6/91iQL8rsA3BG6hY1d5JNNNVJrr5dkwVIAT2lpwqChBOYK/XI9IRD 4Rz7me8Lgr5ps0AI22wylpJdEW1EMqrvNw== X-Google-Smtp-Source: AGHT+IF4wAmURNewahoQOVfYM6M5jXjyc6eKsbposvu/SCSkZtrKzenFnpL1jbA6kPR8ePzJ8PJdEw== X-Received: by 2002:a05:6402:847:b0:5dc:783e:3efe with SMTP id 4fb4d7f45d1cf-5dc7fbb58ebmr8188423a12.6.1738427496993; Sat, 01 Feb 2025 08:31:36 -0800 (PST) Received: from f.. (cst-prg-25-223.cust.vodafone.cz. [46.135.25.223]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5dc723cff72sm4636959a12.15.2025.02.01.08.31.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Feb 2025 08:31:36 -0800 (PST) From: Mateusz Guzik To: ebiederm@xmission.com, oleg@redhat.com Cc: brauner@kernel.org, akpm@linux-foundation.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Mateusz Guzik Subject: [PATCH v3 5/6] pid: perform free_pid() calls outside of tasklist_lock Date: Sat, 1 Feb 2025 17:31:05 +0100 Message-ID: <20250201163106.28912-6-mjguzik@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250201163106.28912-1-mjguzik@gmail.com> References: <20250201163106.28912-1-mjguzik@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" As the clone side already executes pid allocation with only pidmap_lock held, issuing free_pid() while still holding tasklist_lock exacerbates total hold time of the latter. Signed-off-by: Mateusz Guzik Reviewed-by: Oleg Nesterov --- include/linux/pid.h | 7 ++++--- kernel/exit.c | 15 +++++++++------ kernel/pid.c | 44 ++++++++++++++++++++++---------------------- kernel/sys.c | 14 +++++++++----- 4 files changed, 44 insertions(+), 36 deletions(-) diff --git a/include/linux/pid.h b/include/linux/pid.h index 98837a1ff0f3..311ecebd7d56 100644 --- a/include/linux/pid.h +++ b/include/linux/pid.h @@ -101,9 +101,9 @@ extern struct pid *get_task_pid(struct task_struct *tas= k, enum pid_type type); * these helpers must be called with the tasklist_lock write-held. */ extern void attach_pid(struct task_struct *task, enum pid_type); -extern void detach_pid(struct task_struct *task, enum pid_type); -extern void change_pid(struct task_struct *task, enum pid_type, - struct pid *pid); +void detach_pid(struct pid **pids, struct task_struct *task, enum pid_type= ); +void change_pid(struct pid **pids, struct task_struct *task, enum pid_type, + struct pid *pid); extern void exchange_tids(struct task_struct *task, struct task_struct *ol= d); extern void transfer_pid(struct task_struct *old, struct task_struct *new, enum pid_type); @@ -129,6 +129,7 @@ extern struct pid *find_ge_pid(int nr, struct pid_names= pace *); extern struct pid *alloc_pid(struct pid_namespace *ns, pid_t *set_tid, size_t set_tid_size); extern void free_pid(struct pid *pid); +void free_pids(struct pid **pids); extern void disable_pid_allocation(struct pid_namespace *ns); =20 /* diff --git a/kernel/exit.c b/kernel/exit.c index d2c74f93f7d2..a90a0d159570 100644 --- a/kernel/exit.c +++ b/kernel/exit.c @@ -127,16 +127,18 @@ late_initcall(kernel_exit_sysfs_init); */ struct release_task_post { struct tty_struct *tty; + struct pid *pids[PIDTYPE_MAX]; }; =20 -static void __unhash_process(struct task_struct *p, bool group_dead) +static void __unhash_process(struct release_task_post *post, struct task_s= truct *p, + bool group_dead) { nr_threads--; - detach_pid(p, PIDTYPE_PID); + detach_pid(post->pids, p, PIDTYPE_PID); if (group_dead) { - detach_pid(p, PIDTYPE_TGID); - detach_pid(p, PIDTYPE_PGID); - detach_pid(p, PIDTYPE_SID); + detach_pid(post->pids, p, PIDTYPE_TGID); + detach_pid(post->pids, p, PIDTYPE_PGID); + detach_pid(post->pids, p, PIDTYPE_SID); =20 list_del_rcu(&p->tasks); list_del_init(&p->sibling); @@ -200,7 +202,7 @@ static void __exit_signal(struct release_task_post *pos= t, struct task_struct *ts task_io_accounting_add(&sig->ioac, &tsk->ioac); sig->sum_sched_runtime +=3D tsk->se.sum_exec_runtime; sig->nr_threads--; - __unhash_process(tsk, group_dead); + __unhash_process(post, tsk, group_dead); write_sequnlock(&sig->stats_lock); =20 /* @@ -285,6 +287,7 @@ void release_task(struct task_struct *p) put_pid(thread_pid); add_device_randomness((const void*) &p->se.sum_exec_runtime, sizeof(unsigned long long)); + free_pids(post.pids); release_thread(p); put_task_struct_rcu_user(p); tty_kref_put(post.tty); diff --git a/kernel/pid.c b/kernel/pid.c index 2ae872f689a7..73625f28c166 100644 --- a/kernel/pid.c +++ b/kernel/pid.c @@ -88,20 +88,6 @@ struct pid_namespace init_pid_ns =3D { }; EXPORT_SYMBOL_GPL(init_pid_ns); =20 -/* - * Note: disable interrupts while the pidmap_lock is held as an - * interrupt might come in and do read_lock(&tasklist_lock). - * - * If we don't disable interrupts there is a nasty deadlock between - * detach_pid()->free_pid() and another cpu that does - * spin_lock(&pidmap_lock) followed by an interrupt routine that does - * read_lock(&tasklist_lock); - * - * After we clean up the tasklist_lock and know there are no - * irq handlers that take it we can leave the interrupts enabled. - * For now it is easier to be safe than to prove it can't happen. - */ - static __cacheline_aligned_in_smp DEFINE_SPINLOCK(pidmap_lock); seqcount_spinlock_t pidmap_lock_seq =3D SEQCNT_SPINLOCK_ZERO(pidmap_lock_s= eq, &pidmap_lock); =20 @@ -128,10 +114,11 @@ static void delayed_put_pid(struct rcu_head *rhp) =20 void free_pid(struct pid *pid) { - /* We can be called with write_lock_irq(&tasklist_lock) held */ int i; unsigned long flags; =20 + lockdep_assert_not_held(&tasklist_lock); + spin_lock_irqsave(&pidmap_lock, flags); for (i =3D 0; i <=3D pid->level; i++) { struct upid *upid =3D pid->numbers + i; @@ -160,6 +147,18 @@ void free_pid(struct pid *pid) call_rcu(&pid->rcu, delayed_put_pid); } =20 +void free_pids(struct pid **pids) +{ + int tmp; + + /* + * This can batch pidmap_lock. + */ + for (tmp =3D PIDTYPE_MAX; --tmp >=3D 0; ) + if (pids[tmp]) + free_pid(pids[tmp]); +} + struct pid *alloc_pid(struct pid_namespace *ns, pid_t *set_tid, size_t set_tid_size) { @@ -347,8 +346,8 @@ void attach_pid(struct task_struct *task, enum pid_type= type) hlist_add_head_rcu(&task->pid_links[type], &pid->tasks[type]); } =20 -static void __change_pid(struct task_struct *task, enum pid_type type, - struct pid *new) +static void __change_pid(struct pid **pids, struct task_struct *task, + enum pid_type type, struct pid *new) { struct pid **pid_ptr, *pid; int tmp; @@ -370,18 +369,19 @@ static void __change_pid(struct task_struct *task, en= um pid_type type, if (pid_has_task(pid, tmp)) return; =20 - free_pid(pid); + WARN_ON(pids[type]); + pids[type] =3D pid; } =20 -void detach_pid(struct task_struct *task, enum pid_type type) +void detach_pid(struct pid **pids, struct task_struct *task, enum pid_type= type) { - __change_pid(task, type, NULL); + __change_pid(pids, task, type, NULL); } =20 -void change_pid(struct task_struct *task, enum pid_type type, +void change_pid(struct pid **pids, struct task_struct *task, enum pid_type= type, struct pid *pid) { - __change_pid(task, type, pid); + __change_pid(pids, task, type, pid); attach_pid(task, type); } =20 diff --git a/kernel/sys.c b/kernel/sys.c index cb366ff8703a..4efca8a97d62 100644 --- a/kernel/sys.c +++ b/kernel/sys.c @@ -1085,6 +1085,7 @@ SYSCALL_DEFINE2(setpgid, pid_t, pid, pid_t, pgid) { struct task_struct *p; struct task_struct *group_leader =3D current->group_leader; + struct pid *pids[PIDTYPE_MAX] =3D { 0 }; struct pid *pgrp; int err; =20 @@ -1142,13 +1143,14 @@ SYSCALL_DEFINE2(setpgid, pid_t, pid, pid_t, pgid) goto out; =20 if (task_pgrp(p) !=3D pgrp) - change_pid(p, PIDTYPE_PGID, pgrp); + change_pid(pids, p, PIDTYPE_PGID, pgrp); =20 err =3D 0; out: /* All paths lead to here, thus we are safe. -DaveM */ write_unlock_irq(&tasklist_lock); rcu_read_unlock(); + free_pids(pids); return err; } =20 @@ -1222,21 +1224,22 @@ SYSCALL_DEFINE1(getsid, pid_t, pid) return retval; } =20 -static void set_special_pids(struct pid *pid) +static void set_special_pids(struct pid **pids, struct pid *pid) { struct task_struct *curr =3D current->group_leader; =20 if (task_session(curr) !=3D pid) - change_pid(curr, PIDTYPE_SID, pid); + change_pid(pids, curr, PIDTYPE_SID, pid); =20 if (task_pgrp(curr) !=3D pid) - change_pid(curr, PIDTYPE_PGID, pid); + change_pid(pids, curr, PIDTYPE_PGID, pid); } =20 int ksys_setsid(void) { struct task_struct *group_leader =3D current->group_leader; struct pid *sid =3D task_pid(group_leader); + struct pid *pids[PIDTYPE_MAX] =3D { 0 }; pid_t session =3D pid_vnr(sid); int err =3D -EPERM; =20 @@ -1252,13 +1255,14 @@ int ksys_setsid(void) goto out; =20 group_leader->signal->leader =3D 1; - set_special_pids(sid); + set_special_pids(pids, sid); =20 proc_clear_tty(group_leader); =20 err =3D session; out: write_unlock_irq(&tasklist_lock); + free_pids(pids); if (err > 0) { proc_sid_connector(group_leader); sched_autogroup_create_attach(group_leader); --=20 2.43.0 From nobody Sun Feb 8 23:25:26 2026 Received: from mail-ed1-f49.google.com (mail-ed1-f49.google.com [209.85.208.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4BD371C5F28 for ; Sat, 1 Feb 2025 16:31:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738427502; cv=none; b=q83ACmrmzay2mzKIQesSclBfOxVhoYaoQuGrTiOqTjv+IZ/b9APvS6yQgeBoE9x/ixFJAn8I7vOZjx2EeO8JOxcTiPaPZs25/DGsfmOF2QbqTXDYviH/6l/MtCokoeFWaUGVkyN4WgrUqDt+XQ33vUlcRMeTD+6FYRv9+1TLmLw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738427502; c=relaxed/simple; bh=GbMEVsA74CTWVArAw5XlDKDbJHLapYEAHSmRoMhecN4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rHBZKe+8mKVfCTGGFb/AEhnRsS9H2KrC6CBdNko+ZSuQaFTcnJRLRDcj5jH1BDuwwIss8VQtUjT1rw2UguddkvaFtsM4FuosK7+tISTE9uL7rmzni+lIald2o/rRrBjzEBk6TayYe1DZH26/f0RtTeB5XnGHPQWBZq5+DQ/pzHk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=lOz4z8I3; arc=none smtp.client-ip=209.85.208.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="lOz4z8I3" Received: by mail-ed1-f49.google.com with SMTP id 4fb4d7f45d1cf-5d3f28a4fccso4476710a12.2 for ; Sat, 01 Feb 2025 08:31:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738427498; x=1739032298; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=KxrKCmOPbL9lf6kX3GnLZapq/62phjaxdfTVTGbwAvo=; b=lOz4z8I3n0CRvyETWIqIrwixl5eF6nJIqzmMHG3p0UQFC6gJi1mn1k7ewL0NY3C2Fe CvXCuflv65tcx/HTdEoGEGQDO6OcHA83ghkX59JzbgTVi24xzvt+KnpOadYUjOUfTzou lfzNo3TvuJJ5+mGqcNB+bLiHhJmHHLoRadyl5IEfC0av2Kf0sCYKzko4/qiIk2uVtu/U wJYgqL5QF8J/DUFRlixfUAb0uiBFExA5Za8LEp0pmh6Xn9RSEBbH/z7IkJeviMogN8x6 K3SoTwyIJKtpsQtmuEUIVlWAtjHSEs98H1bzzusjf1Ptxg2HWzPsSOaRxi2A7vVMqkCI +YWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738427498; x=1739032298; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=KxrKCmOPbL9lf6kX3GnLZapq/62phjaxdfTVTGbwAvo=; b=XLoRwsptfkU6ThLQ3N80xXc/ujQGWizyySpYp+BqB9UvDSadvR5nvylMGcazf6EvBQ UXLrgNIOAWEmerMQG+3kimsRSlrFb8t9Geq9puB6XHgTsLXiD2NCSaOW245tnjeexF09 20t4X5RrZEc5vWSq6TJ0TpkO5C0BZgp2DoL69H/1k66Hh1mrJwDh4q999qRUBKXH7v3O VjPgsQAj/n0+30mj+coE0l/Mv/lR0R5L3/xyZl0LP0hmpcVjtRZbRIXqOBCARgDqsKHb PmkOG7zIzE+54g4nSmNLzpsMXafEgUbwNhq9WNlEvb3vTPXNVgJIV4N7EOTOd4TxgXMv G7Dw== X-Forwarded-Encrypted: i=1; AJvYcCUR/ZXYKoYuMbbg7uqAn6s+gN4MFFJ/PajHu1OSDKJWnLKBFLbHNQ14iU2pKWOGHI2FyQAKKJliI9SVPnI=@vger.kernel.org X-Gm-Message-State: AOJu0YwnC+gRW7lsANWoly0T+zZtWMDD+kpfJZdpAzdd0JZNqIjaEE0R TwnJpi873jmbNfJ5IXZd4HekxnVeQGJe9hAPW3y4Iu2J7PaZvKUQ X-Gm-Gg: ASbGncuifl3czez1n+j3wTcrkxgSYR/0V7m2DvybAqaMwQSRJDzMqvnaI1GnGHKfwzx AAqSrEVJ6DAXGpivYWDucur0ZDelEET3GrfhS236CZxqVM0h91UJGEeRNcHnjhtNgHzTLtFY/Y8 +OTWNeBnUeOZj1pqFkTUPPJB5yQQBKoGvKnYN5G2tPUHAblG0ily3HtkOm8bPu9M6UpV5p9FzOB c1WX7uVFTc1NmChjopW3AWdbgaHzQM7g9iTNMBNrKZQxOpbm/unqSaDqzzRP+jq1W15X+9NfKZM l5l1iOR8HnRiJ3M+yE3lAVg5WwNr/hZqjA== X-Google-Smtp-Source: AGHT+IGwN8EDOCEWYQ+wXNUeHKgeJQKZbne3lalB1Xi6RAalLKFML7voSYY/GTyC8a3v+rsL/rd8PQ== X-Received: by 2002:a05:6402:42ce:b0:5d0:b925:a8a with SMTP id 4fb4d7f45d1cf-5dc5efc7231mr18239742a12.16.1738427498295; Sat, 01 Feb 2025 08:31:38 -0800 (PST) Received: from f.. (cst-prg-25-223.cust.vodafone.cz. [46.135.25.223]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5dc723cff72sm4636959a12.15.2025.02.01.08.31.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Feb 2025 08:31:37 -0800 (PST) From: Mateusz Guzik To: ebiederm@xmission.com, oleg@redhat.com Cc: brauner@kernel.org, akpm@linux-foundation.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Mateusz Guzik Subject: [PATCH v3 6/6] pid: drop irq disablement around pidmap_lock Date: Sat, 1 Feb 2025 17:31:06 +0100 Message-ID: <20250201163106.28912-7-mjguzik@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250201163106.28912-1-mjguzik@gmail.com> References: <20250201163106.28912-1-mjguzik@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" It no longer serves any purpose now that the tasklist_lock -> pidmap_lock ordering got eliminated. Signed-off-by: Mateusz Guzik Reviewed-by: Oleg Nesterov --- kernel/pid.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/kernel/pid.c b/kernel/pid.c index 73625f28c166..900193de4232 100644 --- a/kernel/pid.c +++ b/kernel/pid.c @@ -115,11 +115,10 @@ static void delayed_put_pid(struct rcu_head *rhp) void free_pid(struct pid *pid) { int i; - unsigned long flags; =20 lockdep_assert_not_held(&tasklist_lock); =20 - spin_lock_irqsave(&pidmap_lock, flags); + spin_lock(&pidmap_lock); for (i =3D 0; i <=3D pid->level; i++) { struct upid *upid =3D pid->numbers + i; struct pid_namespace *ns =3D upid->ns; @@ -142,7 +141,7 @@ void free_pid(struct pid *pid) idr_remove(&ns->idr, upid->nr); } pidfs_remove_pid(pid); - spin_unlock_irqrestore(&pidmap_lock, flags); + spin_unlock(&pidmap_lock); =20 call_rcu(&pid->rcu, delayed_put_pid); } @@ -210,7 +209,7 @@ struct pid *alloc_pid(struct pid_namespace *ns, pid_t *= set_tid, } =20 idr_preload(GFP_KERNEL); - spin_lock_irq(&pidmap_lock); + spin_lock(&pidmap_lock); =20 if (tid) { nr =3D idr_alloc(&tmp->idr, NULL, tid, @@ -237,7 +236,7 @@ struct pid *alloc_pid(struct pid_namespace *ns, pid_t *= set_tid, nr =3D idr_alloc_cyclic(&tmp->idr, NULL, pid_min, pid_max, GFP_ATOMIC); } - spin_unlock_irq(&pidmap_lock); + spin_unlock(&pidmap_lock); idr_preload_end(); =20 if (nr < 0) { @@ -271,7 +270,7 @@ struct pid *alloc_pid(struct pid_namespace *ns, pid_t *= set_tid, =20 upid =3D pid->numbers + ns->level; idr_preload(GFP_KERNEL); - spin_lock_irq(&pidmap_lock); + spin_lock(&pidmap_lock); if (!(ns->pid_allocated & PIDNS_ADDING)) goto out_unlock; pidfs_add_pid(pid); @@ -280,18 +279,18 @@ struct pid *alloc_pid(struct pid_namespace *ns, pid_t= *set_tid, idr_replace(&upid->ns->idr, pid, upid->nr); upid->ns->pid_allocated++; } - spin_unlock_irq(&pidmap_lock); + spin_unlock(&pidmap_lock); idr_preload_end(); =20 return pid; =20 out_unlock: - spin_unlock_irq(&pidmap_lock); + spin_unlock(&pidmap_lock); idr_preload_end(); put_pid_ns(ns); =20 out_free: - spin_lock_irq(&pidmap_lock); + spin_lock(&pidmap_lock); while (++i <=3D ns->level) { upid =3D pid->numbers + i; idr_remove(&upid->ns->idr, upid->nr); @@ -301,7 +300,7 @@ struct pid *alloc_pid(struct pid_namespace *ns, pid_t *= set_tid, if (ns->pid_allocated =3D=3D PIDNS_ADDING) idr_set_cursor(&ns->idr, 0); =20 - spin_unlock_irq(&pidmap_lock); + spin_unlock(&pidmap_lock); =20 kmem_cache_free(ns->pid_cachep, pid); return ERR_PTR(retval); @@ -309,9 +308,9 @@ struct pid *alloc_pid(struct pid_namespace *ns, pid_t *= set_tid, =20 void disable_pid_allocation(struct pid_namespace *ns) { - spin_lock_irq(&pidmap_lock); + spin_lock(&pidmap_lock); ns->pid_allocated &=3D ~PIDNS_ADDING; - spin_unlock_irq(&pidmap_lock); + spin_unlock(&pidmap_lock); } =20 struct pid *find_pid_ns(int nr, struct pid_namespace *ns) --=20 2.43.0