From patchwork Thu Mar 20 09:29:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Brauner X-Patchwork-Id: 14023596 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 298191C1F2F for ; Thu, 20 Mar 2025 09:29:22 +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=1742462963; cv=none; b=lYs3BjBl6vMUIOpspB7BDc7f0U3LrVyzG+SeCh+8iHriBmp80BaFzNkVly0qbPnFxkUApBclJGEQFr2QlIu9STzMaFIAfCwJHwrk7AQ+rYECFbLuItEjnCPCRjD0ZuMZf49F+47KY1pCSuU9NPsTUS6/bW+0/5/qrYszJV57Kek= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742462963; c=relaxed/simple; bh=nbqWaPaXqyDnB0HDQ1wL/80R9Ma05kzOsoIHnfmrKKY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=L2Dl5pxHm0ANqvawAajSGENogjbgFUW30h0LT3c9S3lsAE58Zop2fePsUJDclBgu7J1trBuTVF1GI+pn6MBMx0pwb1p70QWun1Zzy3Tb41IsfPrqX/1hbM1VW+IT937ONvv497QE6j1e+0PHVW/qlKnF4WqkrTADRNmjnhPR3zA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Y7+ZARnr; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Y7+ZARnr" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 616D8C4CEEA; Thu, 20 Mar 2025 09:29:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1742462962; bh=nbqWaPaXqyDnB0HDQ1wL/80R9Ma05kzOsoIHnfmrKKY=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=Y7+ZARnrM7ijCRnyB7NuKu8lCsqkGzSjfqOiSckKXJreYD2OdDy5fH2M31aIBnbBj 0qxzqwOmRjCATiJfjaE5CXsqIHi3Irf6JiqSgmk3T94N9fNop00WcgwzGzzqYwyM7T kbgcBYe7u+fQI1Opmb0nxyAXZ9G7GeWTYr7ptDuZX8SseWDh885qAC3dh8CsGRiAJr WcZWEha2bcN4h0Ybi+snHTnctXFz27DXiLal/InbRVLx6LauFHlrlC2LJv27x5BovS JypcJvLBdVvsusPjpZZBEAuKq8IDmqKOyDt6pFasOJhyK6AH5twNIaNufuZKvXUMUc Evvz5FVBFVTEQ== From: Christian Brauner Date: Thu, 20 Mar 2025 10:29:07 +0100 Subject: [PATCH v3 2/4] selftests/pidfd: first test for multi-threaded exec polling Precedence: bulk X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250320-work-pidfs-thread_group-v3-2-b7e5f7e2c3b1@kernel.org> References: <20250320-work-pidfs-thread_group-v3-0-b7e5f7e2c3b1@kernel.org> In-Reply-To: <20250320-work-pidfs-thread_group-v3-0-b7e5f7e2c3b1@kernel.org> To: Oleg Nesterov Cc: linux-fsdevel@vger.kernel.org, Jeff Layton , Lennart Poettering , Daan De Meyer , Mike Yuan , Christian Brauner X-Mailer: b4 0.15-dev-42535 X-Developer-Signature: v=1; a=openpgp-sha256; l=2472; i=brauner@kernel.org; h=from:subject:message-id; bh=nbqWaPaXqyDnB0HDQ1wL/80R9Ma05kzOsoIHnfmrKKY=; b=owGbwMvMwCU28Zj0gdSKO4sYT6slMaTfvv9S8detLamdDpFTzn3ayq13/G/wkfsLDrZzs9cU+ Me3Me+t7ShlYRDjYpAVU2RxaDcJl1vOU7HZKFMDZg4rE8gQBi5OAZjI6ssM/90k1180SF/36GLk edUVQodCPtfVHXL2iOLL1C5V/LbiWCrD/7T1B/w+PDz/wPBW+DvfzLxHiRu6lh291haVME9g1qV HizkA X-Developer-Key: i=brauner@kernel.org; a=openpgp; fpr=4880B8C9BD0E5106FC070F4F7B3C391EFEA93624 Add first test for premature thread-group leader exit. Signed-off-by: Christian Brauner --- tools/testing/selftests/pidfd/pidfd_info_test.c | 38 ++++++++++++++++++++----- 1 file changed, 31 insertions(+), 7 deletions(-) diff --git a/tools/testing/selftests/pidfd/pidfd_info_test.c b/tools/testing/selftests/pidfd/pidfd_info_test.c index 09bc4ae7aed5..28a28ae4686a 100644 --- a/tools/testing/selftests/pidfd/pidfd_info_test.c +++ b/tools/testing/selftests/pidfd/pidfd_info_test.c @@ -236,7 +236,7 @@ static void *pidfd_info_pause_thread(void *arg) TEST_F(pidfd_info, thread_group) { - pid_t pid_leader, pid_thread; + pid_t pid_leader, pid_poller, pid_thread; pthread_t thread; int nevents, pidfd_leader, pidfd_thread, pidfd_leader_thread, ret; int ipc_sockets[2]; @@ -262,6 +262,35 @@ TEST_F(pidfd_info, thread_group) syscall(__NR_exit, EXIT_SUCCESS); } + /* + * Opening a PIDFD_THREAD aka thread-specific pidfd based on a + * thread-group leader must succeed. + */ + pidfd_leader_thread = sys_pidfd_open(pid_leader, PIDFD_THREAD); + ASSERT_GE(pidfd_leader_thread, 0); + + pid_poller = fork(); + ASSERT_GE(pid_poller, 0); + if (pid_poller == 0) { + /* + * We can't poll and wait for the old thread-group + * leader to exit using a thread-specific pidfd. The + * thread-group leader exited prematurely and + * notification is delayed until all subthreads have + * exited. + */ + fds.events = POLLIN; + fds.fd = pidfd_leader_thread; + nevents = poll(&fds, 1, 10000 /* wait 5 seconds */); + if (nevents != 0) + _exit(EXIT_FAILURE); + if (fds.revents & POLLIN) + _exit(EXIT_FAILURE); + if (fds.revents & POLLHUP) + _exit(EXIT_FAILURE); + _exit(EXIT_SUCCESS); + } + /* Retrieve the tid of the thread. */ EXPECT_EQ(close(ipc_sockets[1]), 0); ASSERT_EQ(read_nointr(ipc_sockets[0], &pid_thread, sizeof(pid_thread)), sizeof(pid_thread)); @@ -275,12 +304,7 @@ TEST_F(pidfd_info, thread_group) pidfd_thread = sys_pidfd_open(pid_thread, PIDFD_THREAD); ASSERT_GE(pidfd_thread, 0); - /* - * Opening a PIDFD_THREAD aka thread-specific pidfd based on a - * thread-group leader must succeed. - */ - pidfd_leader_thread = sys_pidfd_open(pid_leader, PIDFD_THREAD); - ASSERT_GE(pidfd_leader_thread, 0); + ASSERT_EQ(wait_for_pid(pid_poller), 0); /* * Note that pidfd_leader is a thread-group pidfd, so polling on it