From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F00B4606C902 for ; Wed, 4 Nov 2026 19:57:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key, unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=kqE7S5Xb Received: from boromir.ozlabs.org (localhost [127.0.0.1]) by lists.ozlabs.org (Postfix) with ESMTP id 4jKbnW57QCz3cY7; Thu, 05 Nov 2026 06:57:19 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; arc=none smtp.remote-ip="2600:3c04:e001:324:0:1991:8:25" ARC-Seal: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1793822239; cv=none; b=KCVv5A920NYGi5Kan2hNvcBw/oQLbpIl89HakAMkVakxRlACpBpeT/Ze2W7XQhC2ArWkPrsYiYOSbuPM7so2ENo1kgBaESXn94LOF/6nlMw5NDSrlmmQFG3voDKXxQZvX16OJBJ2XqwPYQ3Uh66RdgbOsCBd7YyELTfVqYZ/cMqd1X5uWg5NC3Q5qFFkI/fvTNyzJWmhn692P+57QWRweHoqvUu5GHTMWQ26J89jmwU5XuNa3h+BsKTjECCj7RnUd3bmHhk9BrD+QVHuOjezLVl9O2r/qgdVfmH9nOOsM2izpW7FaPUF8AwBcvFqEsGB5iPgIeh8N4JOox6l6WWGGA== ARC-Message-Signature: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1793822239; c=relaxed/relaxed; bh=TlMRmMUMe8QjAR6CrqBxKOo0d6t3LuUXfgeBLoU2aVQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=bGaQICT+41qPmSR1EmvQJXUIzqb58Ox1xugbanbdoWZTLfjoeAZejvlFJaUFSjOs0LluKjv4yIgwUOCi6DuxC44ne0u2q4eVvIbh/+CvV/MhkKcKkomiwDKjOxOMgIxvnj/g1iT092dfiMs9USlT4GRq9syHVjteaWoKGlTAaFSuPV7AF7WJl4tQymK8qzkUntfY1juIF54XUA1MjmaJ8exX+s4Oeg9jtktfDJO7CoS9i/Jn3kvu8zxam5pBPePP7n9knHtbrbimOWhJx3JabktjqsLZKEMnDJEMKl5EWmmIQzw0Vx6elNd1b7wdJ0EhalpK2g8xdk3hQDuZWmapxg== ARC-Authentication-Results: i=1; lists.ozlabs.org; dmarc=pass (p=quarantine dis=none) header.from=kernel.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=kqE7S5Xb; dkim-atps=neutral; spf=pass (client-ip=2600:3c04:e001:324:0:1991:8:25; helo=tor.source.kernel.org; envelope-from=brauner@kernel.org; receiver=lists.ozlabs.org) smtp.mailfrom=kernel.org Authentication-Results: lists.ozlabs.org; dmarc=pass (p=quarantine dis=none) header.from=kernel.org Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=kqE7S5Xb; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=kernel.org (client-ip=2600:3c04:e001:324:0:1991:8:25; helo=tor.source.kernel.org; envelope-from=brauner@kernel.org; receiver=lists.ozlabs.org) Received: from tor.source.kernel.org (tor.source.kernel.org [IPv6:2600:3c04:e001:324:0:1991:8:25]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4jKbnV6mZkz2ygp for ; Thu, 05 Nov 2026 06:57:18 +1100 (AEDT) Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) by tor.source.kernel.org (Postfix) with ESMTP id 0611160F30; Wed, 4 Nov 2026 19:57:17 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 73B4E1F0093A; Wed, 4 Nov 2026 19:57:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1793822236; bh=TlMRmMUMe8QjAR6CrqBxKOo0d6t3LuUXfgeBLoU2aVQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=kqE7S5XbuPIKNWgp4NcZtfxZcKDOczdTyfF6Lb8nBkfcnxaRlqnGD+MaRgRQBXNdL cL1adcnEzbJdtGYfAsG5VHAqA4BETjnf58PLyPmqGWnQP0rpXnLeJ/+QmKPG7qeIKA hRq+/iIxd2JbJ+p/at2OkZrx4ySzYMev1Cd2Jsd7KGS4shN4u5UzGNl2aeD7+6rjz2 Jz//M8FN+MIGMB8INEniatc1xDsyIDdvQxrW6TC6MgJiqUpNa9XPgFBq7Foxi5L6ah DogTh1A4WvscXityp0tTb9b/tpjyhIQ5HDNDc9RYmgXzkAUT8tucExiczCpS3FKXuW ZizaXv/BEuT+g== From: Christian Brauner To: linux-fsdevel@vger.kernel.org Cc: Linus Torvalds , Jann Horn , Josef Bacik , Chris Mason , Jeff Layton , NeilBrown , Eric Dumazet , Thomas Gleixner , Al Viro , Jonathan Corbet , Christoph Hellwig , Greg Kroah-Hartman , Joel Granados , Kees Cook , Jan Kara , Jan Kara , linux-kernel@vger.kernel.org, linux-nfs@vger.kernel.org, linux-acpi@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-s390@vger.kernel.org, linux-scsi@vger.kernel.org, linux-um@lists.infradead.org, linux-wireless@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, netdev@vger.kernel.org, ntfs3@lists.linux.dev, platform-driver-x86@vger.kernel.org, coreteam@netfilter.org, kexec@lists.infradead.org, linux-pci@vger.kernel.org, linux-sound@vger.kernel.org, netfilter-devel@vger.kernel.org, dri-devel@lists.freedesktop.org, ibm-acpi-devel@lists.sourceforge.net, jfs-discussion@lists.sourceforge.net, linux-alpha@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-cifs@vger.kernel.org, linux-fbdev@vger.kernel.org, linux-hwmon@vger.kernel.org, linux-mm@kvack.org, linux-sh@vger.kernel.org, linux-usb@vger.kernel.org, samba-technical@lists.samba.org, sparclinux@vger.kernel.org, linux-m68k@lists.linux-m68k.org, linux-doc@vger.kernel.org, linux-serial@vger.kernel.org, linux-atm-general@lists.sourceforge.net, Takashi Iwai , linux-input@vger.kernel.org, linux-raid@vger.kernel.org, linux-ext4@vger.kernel.org, linux-modules@vger.kernel.org, linux-debuggers@vger.kernel.org, "Christian Brauner (Amutable)" , Chuck Lever Subject: [PATCH RESEND v2 30/30] selftests/proc: check that unloading configs doesn't wait for a reader Date: Wed, 4 Nov 2026 20:57:02 +0100 Message-ID: <20261104-work-procfs-fs-v2-30-319e0f9a8aae@kernel.org> In-Reply-To: <20261104-work-procfs-fs-v2-0-319e0f9a8aae@kernel.org> References: <20261104-work-procfs-fs-v2-0-319e0f9a8aae@kernel.org> X-Mailing-List: linuxppc-dev@lists.ozlabs.org List-Id: List-Help: List-Owner: List-Post: List-Archive: , List-Subscribe: , , Precedence: list X-Archived-By: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" X-Mailer: b4 0.17-dev X-Developer-Signature: v=1; a=openpgp-sha256; l=6975; i=brauner@kernel.org; h=from:subject:message-id; bh=Zaf7aQXhU8HLaVPdOPllMB8eHKp+Tuk66nG4inrKqtI=; b=owGbwMvMwCU28Zj0gdSKO4sYT6slMWS97vHv7BDe1a4XkZsjGzjxhP5d1TaR9DwbEbXP7r+UK lx1gtQ7SlkYxLgYZMUUWRzaTcLllvNUbDbK1ICZw8oEMoSBi1MAJhIhzsjQ+O/84rDM6r9Orw9O bhF9KqEldSQrX6wjhOPqjMMJV2IaGf7XCCjtOGddIBLj/P/jR3XTdf+Epk/fMvvJmQWuDy6+if/ ODwA= X-Developer-Key: i=brauner@kernel.org; a=openpgp; fpr=4880B8C9BD0E5106FC070F4F7B3C391EFEA93624 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_PASS, SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=4.0.1 X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on aws-us-west-2-korg-listserv-alma10-1 Read /proc/config.gz into a buffer whose first page is backed by userfaultfd and unload configs.ko while procfs copies what was read to userspace: - removing the entry doesn't wait for the reader - the reader still gets the page that was read before the removal, and nothing more - and the next read fails with -EIO The test loads configs.ko if it isn't there, skips if configs is built in or can't be unloaded, and loads it again afterwards. It needs CONFIG_IKCONFIG=m. kselftest-merge keeps the =y that other fragments ask for, so it skips there. Signed-off-by: Christian Brauner (Amutable) --- tools/testing/selftests/proc/.gitignore | 1 + tools/testing/selftests/proc/Makefile | 1 + tools/testing/selftests/proc/config | 2 + .../proc/proc-remove-slow-config-reader.c | 157 +++++++++++++++++++++ 4 files changed, 161 insertions(+) diff --git a/tools/testing/selftests/proc/.gitignore b/tools/testing/selftests/proc/.gitignore index a1994bda676c..ed863db1688f 100644 --- a/tools/testing/selftests/proc/.gitignore +++ b/tools/testing/selftests/proc/.gitignore @@ -21,6 +21,7 @@ /proc-uptime-001 /proc-uptime-002 /proc-pidns +/proc-remove-slow-config-reader /proc-remove-slow-sysctl /proc-remove-slow-reader /proc-remove-mapped diff --git a/tools/testing/selftests/proc/Makefile b/tools/testing/selftests/proc/Makefile index 8fcab5af502b..95c9212fb670 100644 --- a/tools/testing/selftests/proc/Makefile +++ b/tools/testing/selftests/proc/Makefile @@ -33,6 +33,7 @@ TEST_GEN_PROGS += proc-fsconfig-hidepid TEST_GEN_PROGS += proc-sysctl-readdir-churn TEST_GEN_PROGS += proc-pidns TEST_GEN_PROGS += proc-remove-slow-sysctl +TEST_GEN_PROGS += proc-remove-slow-config-reader TEST_GEN_PROGS += proc-remove-slow-reader TEST_GEN_PROGS += proc-remove-mapped TEST_GEN_PROGS += proc-remove-slow-readlink diff --git a/tools/testing/selftests/proc/config b/tools/testing/selftests/proc/config index 992577d15295..15b307189392 100644 --- a/tools/testing/selftests/proc/config +++ b/tools/testing/selftests/proc/config @@ -11,3 +11,5 @@ CONFIG_SND=y CONFIG_SND_DUMMY=m CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y +CONFIG_IKCONFIG=m +CONFIG_IKCONFIG_PROC=y diff --git a/tools/testing/selftests/proc/proc-remove-slow-config-reader.c b/tools/testing/selftests/proc/proc-remove-slow-config-reader.c new file mode 100644 index 000000000000..5f7bcb27b315 --- /dev/null +++ b/tools/testing/selftests/proc/proc-remove-slow-config-reader.c @@ -0,0 +1,157 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * A read that faults while procfs copies it to userspace must not hold up + * removal of the /proc entry. Unloading configs.ko removes /proc/config.gz, + * which isn't a seq_file. + */ +#define _GNU_SOURCE +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "../kselftest_harness.h" + +#define CONFIG_PATH "/proc/config.gz" +#define CONFIG_MODULE "/sys/module/configs" +#define READ_PAGES 2 +#define TIMEOUT_MS 5000 + +struct reader { + int fd; + char *buf; + size_t len; + ssize_t ret; +}; + +struct unloader { + int done; + int ret; +}; + +static void *read_thread(void *arg) +{ + struct reader *r = arg; + + r->ret = read(r->fd, r->buf, r->len); + return NULL; +} + +static void *unload_thread(void *arg) +{ + struct unloader *u = arg; + ssize_t ret; + + u->ret = syscall(__NR_delete_module, "configs", O_NONBLOCK) ? -errno : 0; + ret = write(u->done, "x", 1); + return (void *)ret; +} + +FIXTURE(configs) { + bool loaded; +}; + +FIXTURE_SETUP(configs) +{ + self->loaded = false; + if (access(CONFIG_PATH, R_OK) && system("modprobe -q configs")) + SKIP(return, "no " CONFIG_PATH); + if (access(CONFIG_PATH, R_OK)) + SKIP(return, CONFIG_PATH ": %s", strerror(errno)); + if (access(CONFIG_MODULE, F_OK)) + SKIP(return, "configs isn't a module"); + self->loaded = true; +} + +FIXTURE_TEARDOWN(configs) +{ + /* an ASSERT may have fired with the module unloaded */ + if (self->loaded && access(CONFIG_PATH, F_OK) && + system("modprobe -q configs")) + TH_LOG("couldn't load configs again"); +} + +TEST_F(configs, remove_while_reader_faults) +{ + struct uffdio_api api = { .api = UFFD_API }; + struct uffdio_register reg = {}; + struct uffdio_zeropage zero = {}; + long psz = sysconf(_SC_PAGESIZE); + struct unloader u = {}; + struct reader r = {}; + struct uffd_msg msg; + struct pollfd pfd; + pthread_t rt, ut; + int uffd, done[2]; + char *buf, *ref; + ssize_t ref_len; + + r.fd = open(CONFIG_PATH, O_RDONLY | O_CLOEXEC); + ASSERT_GE(r.fd, 0); + + /* what the first page of a read looks like */ + ref = malloc(psz); + ASSERT_NE(ref, NULL); + ref_len = pread(r.fd, ref, psz, 0); + ASSERT_GT(ref_len, 0); + + uffd = syscall(__NR_userfaultfd, O_CLOEXEC | O_NONBLOCK); + if (uffd < 0) + SKIP(return, "userfaultfd: %s", strerror(errno)); + ASSERT_EQ(ioctl(uffd, UFFDIO_API, &api), 0); + + /* Only the first page of the buffer goes through userfaultfd. */ + buf = mmap(NULL, READ_PAGES * psz, PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); + ASSERT_NE(buf, MAP_FAILED); + reg.range.start = (unsigned long)buf; + reg.range.len = psz; + reg.mode = UFFDIO_REGISTER_MODE_MISSING; + ASSERT_EQ(ioctl(uffd, UFFDIO_REGISTER, ®), 0); + + r.buf = buf; + r.len = READ_PAGES * psz; + ASSERT_EQ(pthread_create(&rt, NULL, read_thread, &r), 0); + + /* The reader now sleeps in the copy to userspace. */ + pfd = (struct pollfd){ .fd = uffd, .events = POLLIN }; + ASSERT_EQ(poll(&pfd, 1, TIMEOUT_MS), 1); + ASSERT_EQ(read(uffd, &msg, sizeof(msg)), sizeof(msg)); + ASSERT_EQ(msg.event, UFFD_EVENT_PAGEFAULT); + + /* Unloading configs.ko removes the file that is being read. */ + ASSERT_EQ(pipe2(done, O_CLOEXEC), 0); + u.done = done[1]; + ASSERT_EQ(pthread_create(&ut, NULL, unload_thread, &u), 0); + pfd = (struct pollfd){ .fd = done[0], .events = POLLIN }; + EXPECT_EQ(poll(&pfd, 1, TIMEOUT_MS), 1) { + TH_LOG("removing " CONFIG_PATH " waited for the reader"); + } + + zero.range.start = (unsigned long)buf; + zero.range.len = psz; + ASSERT_EQ(ioctl(uffd, UFFDIO_ZEROPAGE, &zero), 0); + ASSERT_EQ(pthread_join(rt, NULL), 0); + ASSERT_EQ(pthread_join(ut, NULL), 0); + if (u.ret) + SKIP(return, "unloading configs: %s", strerror(-u.ret)); + + /* + * The page that was read before the removal still arrives and the + * next piece isn't filled anymore, then nothing. + */ + EXPECT_EQ(r.ret, ref_len); + EXPECT_EQ(memcmp(buf, ref, ref_len), 0); + EXPECT_EQ(read(r.fd, buf, psz), -1); + EXPECT_EQ(errno, EIO); + free(ref); +} + +TEST_HARNESS_MAIN -- 2.53.0