[PATCH RESEND v2 45/51] selftests/proc: check a sysctl listing while entries come and go
sashiko-bot at kernel.org
sashiko-bot at kernel.org
Thu Nov 5 11:30:20 PST 2026
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
- [Low] selftests/proc: duplicate readdir churn test in proc-sysctl-readdir-churn.c
--
commit 89d111e3f559a343f6b04af3c2c0857d3d1f5a29
Author: Christian Brauner <brauner at kernel.org>
selftests/proc: check a sysctl listing while entries come and go
This commit adds a selftest in proc-sysctl-readdir-churn.c to verify that a
multi-call getdents64() listing of /proc/sys/net/ipv4/conf does not repeat or
skip entries when a network device is registered or unregistered in between
calls.
> diff --git a/tools/testing/selftests/proc/proc-sysctl-readdir-churn.c b/tools/testing/selftests/proc/proc-sysctl-readdir-churn.c
> new file mode 100644
> index 0000000000000..b2ad097b464aa
> --- /dev/null
> +++ b/tools/testing/selftests/proc/proc-sysctl-readdir-churn.c
> @@ -0,0 +1,152 @@
[ ... ]
> +#define CONF_DIR "/proc/sys/net/ipv4/conf"
> +#define TUN_NAME "a0" /* sorts before "all" */
> +#define TUN_PATH CONF_DIR "/" TUN_NAME
> +#define SMALL_BUF 80 /* ".", ".." and one short name */
> +#define NAMES 64
> +
> +static int tun_open(const char *name)
> +{
> + struct ifreq ifr = {};
> + int fd;
> +
> + fd = open("/dev/net/tun", O_RDWR | O_CLOEXEC);
> + if (fd < 0)
> + return -1;
> + strncpy(ifr.ifr_name, name, IFNAMSIZ - 1);
> + ifr.ifr_flags = IFF_TUN | IFF_NO_PI;
> + if (ioctl(fd, TUNSETIFF, &ifr)) {
> + close(fd);
> + return -1;
> + }
> + return fd;
> +}
> +
> +/* one getdents64() into @buf, the names appended to @names */
> +static int list(int fd, char *buf, size_t size, char names[][NAME_MAX + 1],
> + int *n)
> +{
> + long ret, off;
> + int got = 0;
> +
> + ret = syscall(__NR_getdents64, fd, buf, size);
> + if (ret < 0)
> + return -errno;
> + for (off = 0; off < ret;) {
> + struct dirent64 *d = (void *)(buf + off);
> +
> + if (*n < NAMES)
> + strcpy(names[(*n)++], d->d_name);
> + got++;
> + off += d->d_reclen;
> + }
> + return got;
> +}
> +
> +static int count(char names[][NAME_MAX + 1], int n, const char *name)
> +{
> + int i, c = 0;
> +
> + for (i = 0; i < n; i++)
> + if (!strcmp(names[i], name))
> + c++;
> + return c;
> +}
> +
> +FIXTURE(sysctl_readdir) {
> + int dir;
> + int n;
> + char names[NAMES][NAME_MAX + 1];
> + char buf[65536];
> +};
> +
> +FIXTURE_SETUP(sysctl_readdir)
> +{
> + int tun;
> +
> + if (unshare(CLONE_NEWNET))
> + SKIP(return, "unshare(CLONE_NEWNET): %s", strerror(errno));
> + tun = open("/dev/net/tun", O_RDWR | O_CLOEXEC);
> + if (tun < 0)
> + SKIP(return, "/dev/net/tun: %s", strerror(errno));
> + close(tun);
> + self->dir = open(CONF_DIR, O_RDONLY | O_DIRECTORY | O_CLOEXEC);
> + if (self->dir < 0)
> + SKIP(return, CONF_DIR ": %s", strerror(errno));
> + self->n = 0;
> +}
> +
> +FIXTURE_TEARDOWN(sysctl_readdir)
> +{
> + close(self->dir);
> +}
> +
> +/* a device registered in front of the position doesn't repeat an entry */
> +TEST_F(sysctl_readdir, register_in_front)
> +{
> + int tun;
> +
> + /* ".", ".." and "all", "default" doesn't fit */
> + ASSERT_EQ(list(self->dir, self->buf, SMALL_BUF, self->names, &self->n), 3);
> + ASSERT_EQ(count(self->names, self->n, "all"), 1);
> +
> + tun = tun_open(TUN_NAME);
> + ASSERT_GE(tun, 0);
> + ASSERT_EQ(access(TUN_PATH, F_OK), 0);
> +
> + while (list(self->dir, self->buf, sizeof(self->buf), self->names,
> + &self->n) > 0)
> + ;
> + EXPECT_EQ(count(self->names, self->n, "all"), 1);
> + EXPECT_EQ(count(self->names, self->n, "default"), 1);
> + EXPECT_EQ(count(self->names, self->n, "lo"), 1);
> + close(tun);
> +}
> +
> +/* a device unregistered in front of the position doesn't skip an entry */
> +TEST_F(sysctl_readdir, unregister_in_front)
> +{
> + int tun;
> +
> + tun = tun_open(TUN_NAME);
> + ASSERT_GE(tun, 0);
> + ASSERT_EQ(access(TUN_PATH, F_OK), 0);
> +
> + /* ".", ".." and the device, "all" doesn't fit */
> + ASSERT_EQ(list(self->dir, self->buf, SMALL_BUF, self->names, &self->n), 3);
> + ASSERT_EQ(count(self->names, self->n, TUN_NAME), 1);
> +
> + /* closing the device unregisters its sysctls under RTNL */
> + close(tun);
> + ASSERT_EQ(access(TUN_PATH, F_OK), -1);
> +
> + while (list(self->dir, self->buf, sizeof(self->buf), self->names,
> + &self->n) > 0)
> + ;
> + EXPECT_EQ(count(self->names, self->n, "all"), 1);
> + EXPECT_EQ(count(self->names, self->n, "default"), 1);
> + EXPECT_EQ(count(self->names, self->n, "lo"), 1);
> +}
[Severity: Low]
As reported by Sashiko on RFC [1], this isn't a bug, but tun_open(),
list(), count(), the fixture state in FIXTURE(sysctl_readdir),
FIXTURE_SETUP(sysctl_readdir), FIXTURE_TEARDOWN(sysctl_readdir), and the
register_in_front and unregister_in_front test cases in
tools/testing/selftests/proc/proc-sysctl-readdir-churn.c duplicate the
helpers, FIXTURE(proc_readdir), and the add_in_front and remove_in_front
test cases in tools/testing/selftests/proc/proc-readdir-churn.c, differing
only in the target directory (/proc/sys/net/ipv4/conf vs
/proc/net/dev_snmp6) and expected entries.
Should these sysctl cases be added to
tools/testing/selftests/proc/proc-readdir-churn.c (for example using
FIXTURE_VARIANT() and FIXTURE_VARIANT_ADD()) rather than introducing a
separate standalone test file?
[1] https://lore.kernel.org/r/sashiko-outbox-195504@kernel.org
--
Sashiko AI review · https://sashiko.dev/#/patchset/20261104-work-procfs-bugfixes-v2-0-021c84d852e0@kernel.org?part=45
More information about the kexec
mailing list