May 2023 - Linux-kselftest-mirror

[PATCH AUTOSEL 6.2 08/30] selftests/bpf: check that modifier resolves after pointer

by Sasha Levin

From: Lorenz Bauer <lorenz.bauer(a)isovalent.com> [ Upstream commit dfdd608c3b365f0fd49d7e13911ebcde06b9865b ] Add a regression test that ensures that a VAR pointing at a modifier which follows a PTR (or STRUCT or ARRAY) is resolved correctly by the datasec validator. Signed-off-by: Lorenz Bauer <lmb(a)isovalent.com> Link: https://lore.kernel.org/r/20230306112138.155352-3-lmb@isovalent.com Signed-off-by: Martin KaFai Lau <martin.lau(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- tools/testing/selftests/bpf/prog_tests/btf.c | 28 ++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/tools/testing/selftests/bpf/prog_tests/btf.c b/tools/testing/selftests/bpf/prog_tests/btf.c index de1b5b9eb93a8..d8d1292e73b53 100644 --- a/tools/testing/selftests/bpf/prog_tests/btf.c +++ b/tools/testing/selftests/bpf/prog_tests/btf.c @@ -879,6 +879,34 @@ static struct btf_raw_test raw_tests[] = { .btf_load_err = true, .err_str = "Invalid elem", }, +{ + .descr = "var after datasec, ptr followed by modifier", + .raw_types = { + /* .bss section */ /* [1] */ + BTF_TYPE_ENC(NAME_TBD, BTF_INFO_ENC(BTF_KIND_DATASEC, 0, 2), + sizeof(void*)+4), + BTF_VAR_SECINFO_ENC(4, 0, sizeof(void*)), + BTF_VAR_SECINFO_ENC(6, sizeof(void*), 4), + /* int */ /* [2] */ + BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4), + /* int* */ /* [3] */ + BTF_TYPE_ENC(0, BTF_INFO_ENC(BTF_KIND_PTR, 0, 0), 2), + BTF_VAR_ENC(NAME_TBD, 3, 0), /* [4] */ + /* const int */ /* [5] */ + BTF_TYPE_ENC(0, BTF_INFO_ENC(BTF_KIND_CONST, 0, 0), 2), + BTF_VAR_ENC(NAME_TBD, 5, 0), /* [6] */ + BTF_END_RAW, + }, + .str_sec = "\0a\0b\0c\0", + .str_sec_size = sizeof("\0a\0b\0c\0"), + .map_type = BPF_MAP_TYPE_ARRAY, + .map_name = ".bss", + .key_size = sizeof(int), + .value_size = sizeof(void*)+4, + .key_type_id = 0, + .value_type_id = 1, + .max_entries = 1, +}, /* Test member exceeds the size of struct. * * struct A { -- 2.39.2

1 year, 7 months

3
10
0 0

Re: [PATCH] selftests/input: Introduce basic tests for evdev ioctls

by Enric Balletbo Serra

Again, without html format. Sorry for the noise. Hi Peter, Many thanks for taking a look at this and for the review comments. > Missatge de Peter Hutterer <peter.hutterer(a)redhat.com> del dia dt., 30 de maig 2023 a les 7:56: > > > > Hi Enric, > > > > On 26/5/23 18:22, eballetbo(a)kernel.org wrote: > > > From: Enric Balletbo i Serra <eballetbo(a)kernel.org> > > > > > > This provides a basic infrastructure for the creation of tests for the evdev > > > interface. Most of this is code is adapted from the libevdev wrapper > > > library. While most of evdev ioctls are covered and tested using > > > libevdev tests there are some evdev ioctls that aren't because are not > > > supported (and will not be supported) by libevdev. So, adding, at least > > > those tests, would make sense. > > > > for the archives: libevdev doesn't support setting EV_REP because it's > > inherently racy - one libevdev context to set those values via the ioctl > > would cause all other libevdev contexts on the same device to be out of > > sync. Since we do not get notifications when the values changed, > > libevdev's buffered values for EV_REP will remain whatever they were > > initially. > > > > The only way around that would be setting it via udev on plug, but that > > udev doesnt need/want the libevdev dependency. > > > > plus, afaik most or all libevdev's users ignore kernel key repeats anyway :) > > > > > > > > The test creates an uinput device (and an evdev device) so you can > > > call the wanted ioctl from userspace. So, to run those tests you need > > > to have support for uinput and evdev as well. > > > > > > Signed-off-by: Enric Balletbo i Serra <eballetbo(a)kernel.org> > > > --- > > > tools/testing/selftests/Makefile | 1 + > > > tools/testing/selftests/input/.gitignore | 2 + > > > tools/testing/selftests/input/Makefile | 5 + > > > tools/testing/selftests/input/config | 3 + > > > tools/testing/selftests/input/evioc-test.c | 282 +++++++++++++++++++++ > > > 5 files changed, 293 insertions(+) > > > create mode 100644 tools/testing/selftests/input/.gitignore > > > create mode 100644 tools/testing/selftests/input/Makefile > > > create mode 100644 tools/testing/selftests/input/config > > > create mode 100644 tools/testing/selftests/input/evioc-test.c > > > > > > diff --git a/tools/testing/selftests/Makefile b/tools/testing/selftests/Makefile > > > index 90a62cf75008..29fc77168aa7 100644 > > > --- a/tools/testing/selftests/Makefile > > > +++ b/tools/testing/selftests/Makefile > > > @@ -28,6 +28,7 @@ TARGETS += futex > > > TARGETS += gpio > > > TARGETS += hid > > > TARGETS += intel_pstate > > > +TARGETS += input > > > TARGETS += iommu > > > TARGETS += ipc > > > TARGETS += ir > > > diff --git a/tools/testing/selftests/input/.gitignore b/tools/testing/selftests/input/.gitignore > > > new file mode 100644 > > > index 000000000000..37f5dff3255b > > > --- /dev/null > > > +++ b/tools/testing/selftests/input/.gitignore > > > @@ -0,0 +1,2 @@ > > > +# SPDX-License-Identifier: GPL-2.0 > > > +evioc-test > > > diff --git a/tools/testing/selftests/input/Makefile b/tools/testing/selftests/input/Makefile > > > new file mode 100644 > > > index 000000000000..031729be0628 > > > --- /dev/null > > > +++ b/tools/testing/selftests/input/Makefile > > > @@ -0,0 +1,5 @@ > > > +# SPDX-License-Identifier: GPL-2.0 > > > +CFLAGS += -D_GNU_SOURCE -std=gnu99 -Wl,-no-as-needed -Wall $(KHDR_INCLUDES) > > > + > > > +TEST_GEN_PROGS := evioc-test > > > +include ../lib.mk > > > diff --git a/tools/testing/selftests/input/config b/tools/testing/selftests/input/config > > > new file mode 100644 > > > index 000000000000..b7512f3e6d8d > > > --- /dev/null > > > +++ b/tools/testing/selftests/input/config > > > @@ -0,0 +1,3 @@ > > > +CONFIG_INPUT=y > > > +CONFIG_INPUT_EVDEV=y > > > +CONFIG_INPUT_UINPUT=m > > > diff --git a/tools/testing/selftests/input/evioc-test.c b/tools/testing/selftests/input/evioc-test.c > > > new file mode 100644 > > > index 000000000000..4c0c8ebed378 > > > --- /dev/null > > > +++ b/tools/testing/selftests/input/evioc-test.c > > > @@ -0,0 +1,282 @@ > > > +// SPDX-License-Identifier: MIT > > > +/* > > > + * Copyright © 2023 Red Hat, Inc. > > > + * > > > + * Part of the code in this file is inspired and copied from the libevdev wrapper library > > > + * for evdev devices written by Peter Hutterer. > > > + */ > > > + > > > +#include <dirent.h> > > > +#include <errno.h> > > > +#include <fcntl.h> > > > +#include <linux/uinput.h> > > > +#include <poll.h> > > > +#include <stdio.h> > > > +#include <stdlib.h> > > > +#include <string.h> > > > +#include <sys/stat.h> > > > +#include <time.h> > > > +#include <unistd.h> > > > + > > > +#include "../kselftest_harness.h" > > > + > > > +#define TEST_DEVICE_NAME "selftest input device" > > > + > > > +struct selftest_uinput { > > > + int uinput_fd; /** file descriptor to uinput */ > > > + int evdev_fd; /** file descriptor to evdev */ > > > + char *name; /** device name */ > > > + char *syspath; /** /sys path */ > > > + char *devnode; /** device node */ > > > +}; > > > + > > > +static int is_event_device(const struct dirent *dent) > > > +{ > > > + return strncmp("event", dent->d_name, 5) == 0; > > > +} > > > + > > > +static char *fetch_device_node(const char *path) > > > +{ > > > + struct dirent **namelist; > > > + char *devnode = NULL; > > > + int ndev, i; > > > + > > > + ndev = scandir(path, &namelist, is_event_device, alphasort); > > > + if (ndev <= 0) > > > + return NULL; > > > + > > > + /* ndev should only ever be 1 */ > > > + > > > + for (i = 0; i < ndev; i++) { > > > + if (!devnode && asprintf(&devnode, "/dev/input/%s", > > > + namelist[i]->d_name) == -1) > > > + devnode = NULL; > > > + free(namelist[i]); > > > + } > > > + > > > + free(namelist); > > > + > > > + return devnode; > > > +} > > > + > > > +static int is_input_device(const struct dirent *dent) > > > +{ > > > + return strncmp("input", dent->d_name, 5) == 0; > > > +} > > > + > > > +/* > > > + * Device node is guessed based on the sysfs path, the sysfs path contains a > > > + * eventN file, that corresponds to our /dev/input/eventN number. > > > + */ > > > +static int fetch_syspath_and_devnode(struct selftest_uinput *uidev) > > > +{ > > > +#define SYS_INPUT_DIR "/sys/devices/virtual/input/" > > > + struct dirent **namelist; > > > + int ndev, i; > > > + int rc; > > > + char buf[sizeof(SYS_INPUT_DIR) + 64] = SYS_INPUT_DIR; > > > + > > > + rc = ioctl(uidev->uinput_fd, > > > + UI_GET_SYSNAME(sizeof(buf) - strlen(SYS_INPUT_DIR)), > > > + &buf[strlen(SYS_INPUT_DIR)]); > > > + if (rc != -1) { > > > + uidev->syspath = strdup(buf); > > > + uidev->devnode = fetch_device_node(buf); > > > + return 0; > > > + } > > > > It's not obvious in the the code, but the above is pretty much all you > > need. UI_GET_SYSNAME has been around 3.15 and if that fails you might as > > well bail out in this case. All the code below is the fallback that > > pre-dates that ioctl. > > I see now, thanks. So I think we can simplify all this and make the assumption that a recent kernel version will be used, so we can remove the fallback code. > > > + > > > + ndev = scandir(SYS_INPUT_DIR, &namelist, is_input_device, alphasort); > > > + if (ndev <= 0) > > > + return -1; > > > + > > > + for (i = 0; i < ndev; i++) { > > > + int fd, len; > > > + > > > + rc = snprintf(buf, sizeof(buf), "%s%s/name", SYS_INPUT_DIR, > > > + namelist[i]->d_name); > > > + if (rc < 0 || (size_t)rc >= sizeof(buf)) > > > + continue; > > > + > > > + /* created within time frame */ > > > + fd = open(buf, O_RDONLY); > > > + if (fd < 0) > > > + continue; > > > + > > > + len = read(fd, buf, sizeof(buf)); > > > + close(fd); > > > + if (len <= 0) > > > + continue; > > > + > > > + buf[len - 1] = '\0'; /* file contains \n */ > > > + if (strcmp(buf, uidev->name) == 0) { > > > + if (uidev->syspath) { > > > + fprintf(stderr, > > > + "multiple identical devices found. syspath is unreliable\n"); > > > + break; > > > + } > > > + > > > + rc = snprintf(buf, sizeof(buf), "%s%s", SYS_INPUT_DIR, > > > + namelist[i]->d_name); > > > + > > > + if (rc < 0 || (size_t)rc >= sizeof(buf)) { > > > + fprintf(stderr, > > > + "Invalid syspath, syspath is unreliable\n"); > > > + break; > > > + } > > > + > > > + uidev->syspath = strdup(buf); > > > + uidev->devnode = fetch_device_node(buf); > > > + } > > > + } > > > + > > > + for (i = 0; i < ndev; i++) > > > + free(namelist[i]); > > > + free(namelist); > > > + > > > + return uidev->devnode ? 0 : -1; > > > +#undef SYS_INPUT_DIR > > > +} > > > + > > > +void selftest_uinput_destroy(struct selftest_uinput *uidev) > > > +{ > > > + if (!uidev) > > > + return; > > > + > > > + if (uidev->uinput_fd >= 0) > > > + ioctl(uidev->uinput_fd, UI_DEV_DESTROY, NULL); > > > + > > > + close(uidev->evdev_fd); > > > + close(uidev->uinput_fd); > > > + > > > + free(uidev->syspath); > > > + free(uidev->devnode); > > > + free(uidev->name); > > > + free(uidev); > > > +} > > > + > > > +int selftest_uinput_create_device(struct selftest_uinput **uidev, ...) > > > +{ > > > + struct selftest_uinput *new_device; > > > + struct uinput_setup setup; > > > + va_list args; > > > + int rc, fd; > > > + int type; > > > + > > > + new_device = calloc(1, sizeof(struct selftest_uinput)); > > > + if (!new_device) > > > + return -ENOMEM; > > > + > > > + memset(&setup, 0, sizeof(setup)); > > > + strncpy(setup.name, TEST_DEVICE_NAME, UINPUT_MAX_NAME_SIZE - 1); > > > + setup.id.vendor = 0x1234; /* sample vendor */ > > > + setup.id.product = 0x5678; /* sample product */ > > > + setup.id.bustype = BUS_USB; > > > + > > > + fd = open("/dev/uinput", O_WRONLY | O_NONBLOCK); > > > + if (fd < 0) { > > > + fprintf(stderr, "cannot open uinput (%d): %m\n", errno); > > > + goto error; > > > + } > > > + > > > + va_start(args, uidev); > > > + rc = 0; > > > + do { > > > + type = va_arg(args, int); > > > + if (type == -1) > > > + break; > > > + rc = ioctl(fd, UI_SET_EVBIT, type); > > > + } while (rc == 0); > > > + va_end(args); > > > + > > > + rc = ioctl(fd, UI_DEV_SETUP, &setup); > > > + if (rc == -1) > > > + goto error; > > > + > > > + rc = ioctl(fd, UI_DEV_CREATE, NULL); > > > + if (rc == -1) > > > + goto error; > > > + > > > + new_device->name = strdup(TEST_DEVICE_NAME); > > > + new_device->uinput_fd = fd; > > > + > > > + if (fetch_syspath_and_devnode(new_device) == -1) { > > > + fprintf(stderr, "unable to fetch syspath or device node.\n"); > > > + errno = ENODEV; > > > + goto error; > > > + } > > > + > > > + fd = open(new_device->devnode, O_RDONLY); > > > + if (fd < 0) { > > > + fprintf(stderr, "cannot open uinput (%d): %m\n", errno); > > > + goto error; > > > + } > > > + new_device->evdev_fd = fd; > > > + > > > + *uidev = new_device; > > > + > > > + return 0; > > > + > > > +error: > > > + rc = -errno; > > > + selftest_uinput_destroy(new_device); > > > + return rc; > > > +} > > > + > > > +const char *selftest_uinput_get_devnode(struct selftest_uinput *uidev) > > > +{ > > > + return uidev->devnode; > > > +} > > > + > > > +TEST(eviocgname_get_device_name) > > > +{ > > > + struct selftest_uinput *uidev; > > > + char buf[256]; > > > + int rc; > > > + > > > + rc = selftest_uinput_create_device(&uidev); > > > + ASSERT_EQ(0, rc); > > > + ASSERT_NE(NULL, uidev); > > > + > > > + memset(buf, 0, sizeof(buf)); > > > + /* ioctl to get the name */ > > > + rc = ioctl(uidev->evdev_fd, EVIOCGNAME(sizeof(buf) - 1), buf); > > > + ASSERT_GE(rc, 0); > > > + ASSERT_STREQ(TEST_DEVICE_NAME, buf); > > > + > > > + selftest_uinput_destroy(uidev); > > > +} > > > + > > > +TEST(eviocgrep_get_repeat_settings) > > > +{ > > > + struct selftest_uinput *uidev; > > > + int rep_values[2]; > > > + int rc; > > > + > > > + memset(rep_values, 0, sizeof(rep_values)); > > > + > > > + rc = selftest_uinput_create_device(&uidev); > > > + ASSERT_EQ(0, rc); > > > + ASSERT_NE(NULL, uidev); > > > + > > > + /* ioctl to get the repeat rates values */ > > > + rc = ioctl(uidev->evdev_fd, EVIOCSREP, rep_values); > > > > EVIOCSREP *sets* the repeat values My intention was to use EVIOCGREP here instead of 'S', so instead of fixing the comment I'd fix the ioctl. Thanks. > > > > > > > + /* should fail because EV_REP is not set */ > > > + ASSERT_EQ(-1, rc); > > > + > > > + selftest_uinput_destroy(uidev); > > > + > > > + rc = selftest_uinput_create_device(&uidev, EV_REP); > > This needs a -1 terminator, otherwise you're va-argsing into oblivion. > > Right, I'd add in the next version. > > > > > + ASSERT_EQ(0, rc); > > > + ASSERT_NE(NULL, uidev); > > > + > > > + /* ioctl to get the repeat rates values */ > > > + rc = ioctl(uidev->evdev_fd, EVIOCGREP, rep_values); > > > + ASSERT_EQ(0, rc); > > > + /* should get the default delay an period values set by the kernel */ > > > > typo -> "and" > > Fixed in the next version. > > > + ASSERT_EQ(rep_values[0], 250); > > > + ASSERT_EQ(rep_values[1], 33); > > > > So, interestingly enough you don't actually test setting the value here. > > The EV_REP bit is set during device creation and you check the default > > values but you don't call EVIOCSREP to change the values - which AFAIU > > was the initial intention of these tests? > > > Yes, one of the main purposes is to test EVIOC**S**REP, but I skipped and sent a first version only testing the EVIOC**G**REP test to catch feedback from the mailing list. In the next version I'll include both tests, for getting and setting the repeat values (I think it makes sense). Cheers, Enric > > > Cheers, > > PEter > > > > > + > > > + selftest_uinput_destroy(uidev); > > > +} > > > + > > > +TEST_HARNESS_MAIN

1 year, 7 months

1
0
0 0

[PATCH 00/13] tools/nolibc: riscv: Add full rv32 support

by Zhangjin Wu

Hi, Willy Thanks very mush for your kindly review, discuss and suggestion, now we get full rv32 support ;-) In the first series [1], we have fixed up the compile errors about _start and __NR_llseek for rv32, but left compile errors about tons of time32 syscalls (removed after kernel commit d4c08b9776b3 ("riscv: Use latest system call ABI")) and the missing fstat in nolibc-test.c [2], now we have fixed up all of them. Introduction ============ This series is based on the 20230524-nolibc-rv32+stkp4 branch of [3], it includes 3 parts, they work together to add full rv32 support: * Reverts two old out-of-day patches * Revert "tools/nolibc: riscv: Support __NR_llseek for rv32" * Revert "selftests/nolibc: Fix up compile error for rv32" (these two and the reverted ones: * commit 606343b7478c ("selftests/nolibc: Fix up compile error for rv32") * commit d2c3acba6d66 ("tools/nolibc: riscv: Support __NR_llseek for rv32") can be removed from the git repo completely, there are two new ones to replace them) * Compile and test support patches * selftests/nolibc: print name instead of number for EOVERFLOW * selftests/nolibc: syscall_args: use __NR_statx for rv32 * --> replace the old one 606343b7478, use statx instead of read * selftests/nolibc: riscv: customize makefile for rv32 * selftests/nolibc: allow specify a bios for qemu * selftests/nolibc: remove the duplicated gettimeofday_bad2 * Fix up some missing syscalls, mainly time32 syscalls * tools/nolibc: sys_lseek: riscv: use __NR_llseek for rv32 * --> replace the old one d2c3acba6d66, cleaned up * tools/nolibc: sys_poll: riscv: use __NR_ppoll_time64 for rv32 * tools/nolibc: ppoll/ppoll_time64: Add a missing argument * tools/nolibc: sys_select: riscv: use __NR_pselect6_time64 for rv32 * tools/nolibc: sys_wait4: riscv: use __NR_waitid for rv32 * tools/nolibc: sys_gettimeofday: riscv: use __NR_clock_gettime64 for rv32 Compile ======= For rv64: $ make ARCH=riscv CROSS_COMPILE=riscv64-linux-gnu- nolibc-test $ file nolibc-test nolibc-test: ELF 64-bit LSB executable, UCB RISC-V ... $ make ARCH=riscv64 CROSS_COMPILE=riscv64-linux-gnu- nolibc-test $ file nolibc-test nolibc-test: ELF 64-bit LSB executable, UCB RISC-V ... For rv32: $ make ARCH=riscv CONFIG_32BIT=1 CROSS_COMPILE=riscv64-linux-gnu- nolibc-test $ file nolibc-test nolibc-test: ELF 32-bit LSB executable, UCB RISC-V ... $ make ARCH=riscv32 CROSS_COMPILE=riscv64-linux-gnu- nolibc-test $ file nolibc-test nolibc-test: ELF 32-bit LSB executable, UCB RISC-V ... Testing ======= Environment: // gcc toolchain $ riscv64-linux-gnu-gcc --version riscv64-linux-gnu-gcc (Ubuntu 9.3.0-17ubuntu1~20.04) 9.3.0 Copyright (C) 2019 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. // glibc >= 2.33 required, for older glibc, must upgrade include/bits/wordsize.h $ dpkg -l | grep libc6-dev | grep riscv ii libc6-dev-riscv64-cross 2.31-0ubuntu7cross1 // glibc include/bits/wordsize.h: manually upgraded to >= 2.33 // without this, can not build tools/testing/selftests/nolibc/nolibc-test.c $ cat /usr/riscv64-linux-gnu/include/bits/wordsize.h #if __riscv_xlen == (__SIZEOF_POINTER__ * 8) # define __WORDSIZE __riscv_xlen #else # error unsupported ABI #endif # define __WORDSIZE_TIME64_COMPAT32 1 #if __WORDSIZE == 32 # define __WORDSIZE32_SIZE_ULONG 0 # define __WORDSIZE32_PTRDIFF_LONG 0 #endif // higher qemu version is better, latest version is v8.0.0+ $ qemu-system-riscv64 --version QEMU emulator version 4.2.1 (Debian 1:4.2-3ubuntu6.18) Copyright (c) 2003-2019 Fabrice Bellard and the QEMU Project developers // opensbi version, higher is better, must match kernel version and qemu version // rv64: used version is 1.2, latest is 1.2 $ head -2 /labs/linux-lab/src/linux-stable/tools/testing/selftests/nolibc/run.out | tail -1 OpenSBI v1.2-116-g7919530 // rv32: used version is v0.9, latest is 1.2 $ head -2 /labs/linux-lab/src/linux-stable/tools/testing/selftests/nolibc/run.out | tail -1 OpenSBI v0.9-152-g754d511 For rv64: $ pwd /labs/linux-lab/src/linux-stable/tools/testing/selftests/nolibc $ make ARCH=riscv64 CROSS_COMPILE=riscv64-linux-gnu- defconfig $ make ARCH=riscv64 CROSS_COMPILE=riscv64-linux-gnu- BIOS=/labs/linux-lab/boards/riscv64/virt/bsp/bios/opensbi/generic/fw_jump.elf run MKDIR sysroot/riscv/include make[1]: Entering directory '/labs/linux-lab/src/linux-stable/tools/include/nolibc' make[2]: Entering directory '/labs/linux-lab/src/linux-stable' make[2]: Leaving directory '/labs/linux-lab/src/linux-stable' make[2]: Entering directory '/labs/linux-lab/src/linux-stable' INSTALL /labs/linux-lab/src/linux-stable/tools/testing/selftests/nolibc/sysroot/sysroot/include make[2]: Leaving directory '/labs/linux-lab/src/linux-stable' make[1]: Leaving directory '/labs/linux-lab/src/linux-stable/tools/include/nolibc' CC nolibc-test MKDIR initramfs INSTALL initramfs/init make[1]: Entering directory '/labs/linux-lab/src/linux-stable' ... LD vmlinux NM System.map SORTTAB vmlinux OBJCOPY arch/riscv/boot/Image Kernel: arch/riscv/boot/Image is ready make[1]: Leaving directory '/labs/linux-lab/src/linux-stable' 135 test(s) passed. $ file ../../../../vmlinux ../../../../vmlinux: ELF 64-bit LSB executable, UCB RISC-V, version 1 (SYSV), statically linked, BuildID[sha1]=b8e1cea5122b04bce540b4022f0d6f171ffe615a, not stripped For rv32: $ pwd /labs/linux-lab/src/linux-stable/tools/testing/selftests/nolibc $ make ARCH=riscv32 CROSS_COMPILE=riscv64-linux-gnu- defconfig $ make ARCH=riscv32 CROSS_COMPILE=riscv64-linux-gnu- BIOS=/labs/linux-lab/boards/riscv32/virt/bsp/bios/opensbi/generic/fw_jump.elf run MKDIR sysroot/riscv/include make[1]: Entering directory '/labs/linux-lab/src/linux-stable/tools/include/nolibc' make[2]: Entering directory '/labs/linux-lab/src/linux-stable' make[2]: Leaving directory '/labs/linux-lab/src/linux-stable' make[2]: Entering directory '/labs/linux-lab/src/linux-stable' INSTALL /labs/linux-lab/src/linux-stable/tools/testing/selftests/nolibc/sysroot/sysroot/include make[2]: Leaving directory '/labs/linux-lab/src/linux-stable' make[1]: Leaving directory '/labs/linux-lab/src/linux-stable/tools/include/nolibc' CC nolibc-test MKDIR initramfs INSTALL initramfs/init make[1]: Entering directory '/labs/linux-lab/src/linux-stable' CALL scripts/checksyscalls.sh GEN usr/initramfs_data.cpio COPY usr/initramfs_inc_data AS usr/initramfs_data.o AR usr/built-in.a GEN security/selinux/flask.h security/selinux/av_permissions.h CC security/selinux/avc.o CC security/selinux/hooks.o CC security/selinux/selinuxfs.o CC security/selinux/nlmsgtab.o CC security/selinux/netif.o CC security/selinux/netnode.o CC security/selinux/netport.o CC security/selinux/status.o CC security/selinux/ss/services.o AR security/selinux/built-in.a AR security/built-in.a AR built-in.a AR vmlinux.a LD vmlinux.o OBJCOPY modules.builtin.modinfo GEN modules.builtin MODPOST vmlinux.symvers UPD include/generated/utsversion.h CC init/version-timestamp.o LD .tmp_vmlinux.kallsyms1 NM .tmp_vmlinux.kallsyms1.syms KSYMS .tmp_vmlinux.kallsyms1.S AS .tmp_vmlinux.kallsyms1.S LD .tmp_vmlinux.kallsyms2 NM .tmp_vmlinux.kallsyms2.syms KSYMS .tmp_vmlinux.kallsyms2.S AS .tmp_vmlinux.kallsyms2.S LD vmlinux NM System.map SORTTAB vmlinux OBJCOPY arch/riscv/boot/Image Kernel: arch/riscv/boot/Image is ready make[1]: Leaving directory '/labs/linux-lab/src/linux-stable' 135 test(s) passed. $ file ../../../../vmlinux ../../../../vmlinux: ELF 32-bit LSB executable, UCB RISC-V, version 1 (SYSV), statically linked, BuildID[sha1]=bad4c1f3899f47355d2a2010bade56972fd94b9d, not stripped The full rv64 testing result (run.out) is uploaded at [4]. The full rv32 testing result (run.out) is uploaded at [5]. That's all, thanks! Best regards, Zhangjin Wu --- [1]: https://lore.kernel.org/linux-riscv/20230520143154.68663-1-falcon@tinylab.o… [2]: https://lore.kernel.org/linux-riscv/20230520135235.68155-1-falcon@tinylab.o… [3]: https://git.kernel.org/pub/scm/linux/kernel/git/wtarreau/nolibc.git [4]: https://pastebin.com/3L0nV78u [5]: https://pastebin.com/RadrXdta Zhangjin Wu (13): Revert "tools/nolibc: riscv: Support __NR_llseek for rv32" Revert "selftests/nolibc: Fix up compile error for rv32" selftests/nolibc: print name instead of number for EOVERFLOW selftests/nolibc: syscall_args: use __NR_statx for rv32 selftests/nolibc: riscv: customize makefile for rv32 selftests/nolibc: allow specify a bios for qemu selftests/nolibc: remove the duplicated gettimeofday_bad2 tools/nolibc: sys_lseek: riscv: use __NR_llseek for rv32 tools/nolibc: sys_poll: riscv: use __NR_ppoll_time64 for rv32 tools/nolibc: ppoll/ppoll_time64: Add a missing argument tools/nolibc: sys_select: riscv: use __NR_pselect6_time64 for rv32 tools/nolibc: sys_wait4: riscv: use __NR_waitid for rv32 tools/nolibc: sys_gettimeofday: riscv: use __NR_clock_gettime64 for rv32 tools/include/nolibc/std.h | 1 + tools/include/nolibc/sys.h | 135 +++++++++++++++++-- tools/include/nolibc/types.h | 21 ++- tools/testing/selftests/nolibc/Makefile | 14 +- tools/testing/selftests/nolibc/nolibc-test.c | 15 ++- 5 files changed, 167 insertions(+), 19 deletions(-) -- 2.25.1

1 year, 7 months

6
58
0 0

[PATCH v1 0/6] Memory Mapping (VMA) protection using PKU - set 1

by jeffxu＠chromium.org

From: Jeff Xu <jeffxu(a)google.com> This is the first set of Memory mapping (VMA) protection patches using PKU. * * * Background: As discussed previously in the kernel mailing list [1], V8 CFI [2] uses PKU to protect memory, and Stephen Röttger proposes to extend the PKU to memory mapping [3]. We're using PKU for in-process isolation to enforce control-flow integrity for a JIT compiler. In our threat model, an attacker exploits a vulnerability and has arbitrary read/write access to the whole process space concurrently to other threads being executed. This attacker can manipulate some arguments to syscalls from some threads. Under such a powerful attack, we want to create a “safe/isolated” thread environment. We assign dedicated PKUs to this thread, and use those PKUs to protect the threads’ runtime environment. The thread has exclusive access to its run-time memory. This includes modifying the protection of the memory mapping, or munmap the memory mapping after use. And the other threads won’t be able to access the memory or modify the memory mapping (VMA) belonging to the thread. * * * Proposed changes: This patch introduces a new flag, PKEY_ENFORCE_API, to the pkey_alloc() function. When a PKEY is created with this flag, it is enforced that any thread that wants to make changes to the memory mapping (such as mprotect) of the memory must have write access to the PKEY. PKEYs created without this flag will continue to work as they do now, for backwards compatibility. Only PKEY created from user space can have the new flag set, the PKEY allocated by the kernel internally will not have it. In other words, ARCH_DEFAULT_PKEY(0) and execute_only_pkey won’t have this flag set, and continue work as today. This flag is checked only at syscall entry, such as mprotect/munmap in this set of patches. It will not apply to other call paths. In other words, if the kernel want to change attributes of VMA for some reasons, the kernel is free to do that and not affected by this new flag. This set of patch covers mprotect/munmap, I plan to work on other syscalls after this. * * * Testing: I have tested this patch on a Linux kernel 5.15, 6,1, and 6.4-rc1, new selftest is added in: pkey_enforce_api.c * * * Discussion: We believe that this patch provides a valuable security feature. It allows us to create “safe/isolated” thread environments that are protected from attackers with arbitrary read/write access to the process space. We believe that the interface change and the patch don't introduce backwards compatibility risk. We would like to disucss this patch in Linux kernel community for feedback and support. * * * Reference: [1]https://lore.kernel.org/all/202208221331.71C50A6F@keescook/ [2]https://docs.google.com/document/d/1O2jwK4dxI3nRcOJuPYkonhTkNQfbmwdvxQMyX… [3]https://docs.google.com/document/d/1qqVoVfRiF2nRylL3yjZyCQvzQaej1HRPh3f5w… * * * Current status: There are on-going discussion related to threat model, io_uring, we will continue discuss using v0 thread. * * * PATCH history: v1: update code related review comments: mprotect.c: remove syscall from do_mprotect_pkey() remove pr_warn_ratelimited munmap.c: change syscall to enum caller_origin remove pr_warn_ratelimited v0: https://lore.kernel.org/linux-mm/20230515130553.2311248-1-jeffxu@chromium.o… Best Regards, -Jeff Xu Jeff Xu (6): PKEY: Introduce PKEY_ENFORCE_API flag PKEY: Add arch_check_pkey_enforce_api() PKEY: Apply PKEY_ENFORCE_API to mprotect PKEY:selftest pkey_enforce_api for mprotect PKEY: Apply PKEY_ENFORCE_API to munmap PKEY:selftest pkey_enforce_api for munmap arch/powerpc/include/asm/pkeys.h | 19 +- arch/x86/include/asm/mmu.h | 7 + arch/x86/include/asm/pkeys.h | 92 +- arch/x86/mm/pkeys.c | 2 +- include/linux/mm.h | 8 +- include/linux/pkeys.h | 18 +- include/uapi/linux/mman.h | 5 + mm/mmap.c | 31 +- mm/mprotect.c | 17 +- mm/mremap.c | 6 +- tools/testing/selftests/mm/Makefile | 1 + tools/testing/selftests/mm/pkey_enforce_api.c | 1312 +++++++++++++++++ 12 files changed, 1499 insertions(+), 19 deletions(-) create mode 100644 tools/testing/selftests/mm/pkey_enforce_api.c base-commit: ba0ad6ed89fd5dada3b7b65ef2b08e95d449d4ab -- 2.40.1.606.ga4b1b128d6-goog

1 year, 7 months

3
8
0 0

[PATCH] selftests/input: Introduce basic tests for evdev ioctls

by eballetbo＠kernel.org

From: Enric Balletbo i Serra <eballetbo(a)kernel.org> This provides a basic infrastructure for the creation of tests for the evdev interface. Most of this is code is adapted from the libevdev wrapper library. While most of evdev ioctls are covered and tested using libevdev tests there are some evdev ioctls that aren't because are not supported (and will not be supported) by libevdev. So, adding, at least those tests, would make sense. The test creates an uinput device (and an evdev device) so you can call the wanted ioctl from userspace. So, to run those tests you need to have support for uinput and evdev as well. Signed-off-by: Enric Balletbo i Serra <eballetbo(a)kernel.org> --- tools/testing/selftests/Makefile | 1 + tools/testing/selftests/input/.gitignore | 2 + tools/testing/selftests/input/Makefile | 5 + tools/testing/selftests/input/config | 3 + tools/testing/selftests/input/evioc-test.c | 282 +++++++++++++++++++++ 5 files changed, 293 insertions(+) create mode 100644 tools/testing/selftests/input/.gitignore create mode 100644 tools/testing/selftests/input/Makefile create mode 100644 tools/testing/selftests/input/config create mode 100644 tools/testing/selftests/input/evioc-test.c diff --git a/tools/testing/selftests/Makefile b/tools/testing/selftests/Makefile index 90a62cf75008..29fc77168aa7 100644 --- a/tools/testing/selftests/Makefile +++ b/tools/testing/selftests/Makefile @@ -28,6 +28,7 @@ TARGETS += futex TARGETS += gpio TARGETS += hid TARGETS += intel_pstate +TARGETS += input TARGETS += iommu TARGETS += ipc TARGETS += ir diff --git a/tools/testing/selftests/input/.gitignore b/tools/testing/selftests/input/.gitignore new file mode 100644 index 000000000000..37f5dff3255b --- /dev/null +++ b/tools/testing/selftests/input/.gitignore @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0 +evioc-test diff --git a/tools/testing/selftests/input/Makefile b/tools/testing/selftests/input/Makefile new file mode 100644 index 000000000000..031729be0628 --- /dev/null +++ b/tools/testing/selftests/input/Makefile @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0 +CFLAGS += -D_GNU_SOURCE -std=gnu99 -Wl,-no-as-needed -Wall $(KHDR_INCLUDES) + +TEST_GEN_PROGS := evioc-test +include ../lib.mk diff --git a/tools/testing/selftests/input/config b/tools/testing/selftests/input/config new file mode 100644 index 000000000000..b7512f3e6d8d --- /dev/null +++ b/tools/testing/selftests/input/config @@ -0,0 +1,3 @@ +CONFIG_INPUT=y +CONFIG_INPUT_EVDEV=y +CONFIG_INPUT_UINPUT=m diff --git a/tools/testing/selftests/input/evioc-test.c b/tools/testing/selftests/input/evioc-test.c new file mode 100644 index 000000000000..4c0c8ebed378 --- /dev/null +++ b/tools/testing/selftests/input/evioc-test.c @@ -0,0 +1,282 @@ +// SPDX-License-Identifier: MIT +/* + * Copyright © 2023 Red Hat, Inc. + * + * Part of the code in this file is inspired and copied from the libevdev wrapper library + * for evdev devices written by Peter Hutterer. + */ + +#include <dirent.h> +#include <errno.h> +#include <fcntl.h> +#include <linux/uinput.h> +#include <poll.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <sys/stat.h> +#include <time.h> +#include <unistd.h> + +#include "../kselftest_harness.h" + +#define TEST_DEVICE_NAME "selftest input device" + +struct selftest_uinput { + int uinput_fd; /** file descriptor to uinput */ + int evdev_fd; /** file descriptor to evdev */ + char *name; /** device name */ + char *syspath; /** /sys path */ + char *devnode; /** device node */ +}; + +static int is_event_device(const struct dirent *dent) +{ + return strncmp("event", dent->d_name, 5) == 0; +} + +static char *fetch_device_node(const char *path) +{ + struct dirent **namelist; + char *devnode = NULL; + int ndev, i; + + ndev = scandir(path, &namelist, is_event_device, alphasort); + if (ndev <= 0) + return NULL; + + /* ndev should only ever be 1 */ + + for (i = 0; i < ndev; i++) { + if (!devnode && asprintf(&devnode, "/dev/input/%s", + namelist[i]->d_name) == -1) + devnode = NULL; + free(namelist[i]); + } + + free(namelist); + + return devnode; +} + +static int is_input_device(const struct dirent *dent) +{ + return strncmp("input", dent->d_name, 5) == 0; +} + +/* + * Device node is guessed based on the sysfs path, the sysfs path contains a + * eventN file, that corresponds to our /dev/input/eventN number. + */ +static int fetch_syspath_and_devnode(struct selftest_uinput *uidev) +{ +#define SYS_INPUT_DIR "/sys/devices/virtual/input/" + struct dirent **namelist; + int ndev, i; + int rc; + char buf[sizeof(SYS_INPUT_DIR) + 64] = SYS_INPUT_DIR; + + rc = ioctl(uidev->uinput_fd, + UI_GET_SYSNAME(sizeof(buf) - strlen(SYS_INPUT_DIR)), + &buf[strlen(SYS_INPUT_DIR)]); + if (rc != -1) { + uidev->syspath = strdup(buf); + uidev->devnode = fetch_device_node(buf); + return 0; + } + + ndev = scandir(SYS_INPUT_DIR, &namelist, is_input_device, alphasort); + if (ndev <= 0) + return -1; + + for (i = 0; i < ndev; i++) { + int fd, len; + + rc = snprintf(buf, sizeof(buf), "%s%s/name", SYS_INPUT_DIR, + namelist[i]->d_name); + if (rc < 0 || (size_t)rc >= sizeof(buf)) + continue; + + /* created within time frame */ + fd = open(buf, O_RDONLY); + if (fd < 0) + continue; + + len = read(fd, buf, sizeof(buf)); + close(fd); + if (len <= 0) + continue; + + buf[len - 1] = '\0'; /* file contains \n */ + if (strcmp(buf, uidev->name) == 0) { + if (uidev->syspath) { + fprintf(stderr, + "multiple identical devices found. syspath is unreliable\n"); + break; + } + + rc = snprintf(buf, sizeof(buf), "%s%s", SYS_INPUT_DIR, + namelist[i]->d_name); + + if (rc < 0 || (size_t)rc >= sizeof(buf)) { + fprintf(stderr, + "Invalid syspath, syspath is unreliable\n"); + break; + } + + uidev->syspath = strdup(buf); + uidev->devnode = fetch_device_node(buf); + } + } + + for (i = 0; i < ndev; i++) + free(namelist[i]); + free(namelist); + + return uidev->devnode ? 0 : -1; +#undef SYS_INPUT_DIR +} + +void selftest_uinput_destroy(struct selftest_uinput *uidev) +{ + if (!uidev) + return; + + if (uidev->uinput_fd >= 0) + ioctl(uidev->uinput_fd, UI_DEV_DESTROY, NULL); + + close(uidev->evdev_fd); + close(uidev->uinput_fd); + + free(uidev->syspath); + free(uidev->devnode); + free(uidev->name); + free(uidev); +} + +int selftest_uinput_create_device(struct selftest_uinput **uidev, ...) +{ + struct selftest_uinput *new_device; + struct uinput_setup setup; + va_list args; + int rc, fd; + int type; + + new_device = calloc(1, sizeof(struct selftest_uinput)); + if (!new_device) + return -ENOMEM; + + memset(&setup, 0, sizeof(setup)); + strncpy(setup.name, TEST_DEVICE_NAME, UINPUT_MAX_NAME_SIZE - 1); + setup.id.vendor = 0x1234; /* sample vendor */ + setup.id.product = 0x5678; /* sample product */ + setup.id.bustype = BUS_USB; + + fd = open("/dev/uinput", O_WRONLY | O_NONBLOCK); + if (fd < 0) { + fprintf(stderr, "cannot open uinput (%d): %m\n", errno); + goto error; + } + + va_start(args, uidev); + rc = 0; + do { + type = va_arg(args, int); + if (type == -1) + break; + rc = ioctl(fd, UI_SET_EVBIT, type); + } while (rc == 0); + va_end(args); + + rc = ioctl(fd, UI_DEV_SETUP, &setup); + if (rc == -1) + goto error; + + rc = ioctl(fd, UI_DEV_CREATE, NULL); + if (rc == -1) + goto error; + + new_device->name = strdup(TEST_DEVICE_NAME); + new_device->uinput_fd = fd; + + if (fetch_syspath_and_devnode(new_device) == -1) { + fprintf(stderr, "unable to fetch syspath or device node.\n"); + errno = ENODEV; + goto error; + } + + fd = open(new_device->devnode, O_RDONLY); + if (fd < 0) { + fprintf(stderr, "cannot open uinput (%d): %m\n", errno); + goto error; + } + new_device->evdev_fd = fd; + + *uidev = new_device; + + return 0; + +error: + rc = -errno; + selftest_uinput_destroy(new_device); + return rc; +} + +const char *selftest_uinput_get_devnode(struct selftest_uinput *uidev) +{ + return uidev->devnode; +} + +TEST(eviocgname_get_device_name) +{ + struct selftest_uinput *uidev; + char buf[256]; + int rc; + + rc = selftest_uinput_create_device(&uidev); + ASSERT_EQ(0, rc); + ASSERT_NE(NULL, uidev); + + memset(buf, 0, sizeof(buf)); + /* ioctl to get the name */ + rc = ioctl(uidev->evdev_fd, EVIOCGNAME(sizeof(buf) - 1), buf); + ASSERT_GE(rc, 0); + ASSERT_STREQ(TEST_DEVICE_NAME, buf); + + selftest_uinput_destroy(uidev); +} + +TEST(eviocgrep_get_repeat_settings) +{ + struct selftest_uinput *uidev; + int rep_values[2]; + int rc; + + memset(rep_values, 0, sizeof(rep_values)); + + rc = selftest_uinput_create_device(&uidev); + ASSERT_EQ(0, rc); + ASSERT_NE(NULL, uidev); + + /* ioctl to get the repeat rates values */ + rc = ioctl(uidev->evdev_fd, EVIOCSREP, rep_values); + /* should fail because EV_REP is not set */ + ASSERT_EQ(-1, rc); + + selftest_uinput_destroy(uidev); + + rc = selftest_uinput_create_device(&uidev, EV_REP); + ASSERT_EQ(0, rc); + ASSERT_NE(NULL, uidev); + + /* ioctl to get the repeat rates values */ + rc = ioctl(uidev->evdev_fd, EVIOCGREP, rep_values); + ASSERT_EQ(0, rc); + /* should get the default delay an period values set by the kernel */ + ASSERT_EQ(rep_values[0], 250); + ASSERT_EQ(rep_values[1], 33); + + selftest_uinput_destroy(uidev); +} + +TEST_HARNESS_MAIN -- 2.40.1

1 year, 7 months

2
1
0 0

[PATCH v2 0/7] nolibc: add generic part1 of prepare for rv32

by Zhangjin Wu

Hi, All Thanks very much for your review suggestions of the v1 series [1], this is the generic part1 of the v2 revison. * selftests/nolibc: syscall_args: use generic __NR_statx A more generic statx is used instead of fstat (Review suggestions from Willy, Arnd) * selftests/nolibc: allow specify extra arguments for qemu Besides BIOS, QEMU_ARGS_EXTRA is better for more requirements (Review suggestions from Thomas, Willy) * selftests/nolibc: fix up compile warning with glibc on x86_64 Definition of uint64_t differs from glibc and nolibc, use the right print format here * selftests/nolibc: not include limits.h for nolibc Remove the requirement of limits.h for nolibc can let us use older glibc for rv32 (Review suggestions from thomas) * selftests/nolibc: use INT_MAX instead of __INT_MAX__ A trivial cleanup, based on the previous patch * tools/nolibc: arm: add missing my_syscall6 Required by future forced pselect6/pselect6_time64, tested on arm/vexpress-a9 (Review suggestions from Arnd) * tools/nolibc: open: fix up compile warning for arm A trivial fixup based on compiler's suggestion and glibc code Best regards, Zhangjin ---- [1]: https://lore.kernel.org/linux-riscv/20230529113143.GB2762@1wt.eu/T/#t Zhangjin Wu (7): selftests/nolibc: syscall_args: use __NR_statx for rv32 selftests/nolibc: allow specify extra arguments for qemu selftests/nolibc: fix up compile warning with glibc on x86_64 selftests/nolibc: not include limits.h for nolibc selftests/nolibc: use INT_MAX instead of __INT_MAX__ tools/nolibc: arm: add missing my_syscall6 tools/nolibc: open: fix up compile warning for arm tools/include/nolibc/arch-arm.h | 23 ++++++++++++++++++++ tools/include/nolibc/stdint.h | 14 ++++++++++++ tools/include/nolibc/sys.h | 2 +- tools/testing/selftests/nolibc/Makefile | 2 +- tools/testing/selftests/nolibc/nolibc-test.c | 14 +++++++----- 5 files changed, 47 insertions(+), 8 deletions(-) -- 2.25.1

1 year, 7 months

2
9
0 0

[PATCH] tracing/user_events: Handle matching arguments that is null from dyn_events

by sunliming

When A registering user event from dyn_events has no argments, it will pass the matching check, regardless of whether there is a user event with the same name and arguments. Add the matching check when the arguments of registering user event is null. Signed-off-by: sunliming <sunliming(a)kylinos.cn> --- kernel/trace/trace_events_user.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kernel/trace/trace_events_user.c b/kernel/trace/trace_events_user.c index e90161294698..0d91dac206ff 100644 --- a/kernel/trace/trace_events_user.c +++ b/kernel/trace/trace_events_user.c @@ -1712,6 +1712,8 @@ static bool user_event_match(const char *system, const char *event, if (match && argc > 0) match = user_fields_match(user, argc, argv); + else if (match && argc == 0) + match = list_empty(&user->fields); return match; } -- 2.25.1

1 year, 7 months

2
1
0 0

[PATCH 6.1 5.15 5.10 5.4 4.19 4.14] selftests/memfd: Fix unknown type name build failure

by Hardik Garg

Partially backport v6.3 commit 11f75a01448f ("selftests/memfd: add tests for MFD_NOEXEC_SEAL MFD_EXEC") to fix an unknown type name build error. In some systems, the __u64 typedef is not present due to differences in system headers, causing compilation errors like this one: fuse_test.c:64:8: error: unknown type name '__u64' 64 | static __u64 mfd_assert_get_seals(int fd) This header includes the __u64 typedef which increases the likelihood of successful compilation on a wider variety of systems. Signed-off-by: Hardik Garg <hargar(a)linux.microsoft.com> --- tools/testing/selftests/memfd/fuse_test.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/testing/selftests/memfd/fuse_test.c b/tools/testing/selftests/memfd/fuse_test.c index be675002f918..93798c8c5d54 100644 --- a/tools/testing/selftests/memfd/fuse_test.c +++ b/tools/testing/selftests/memfd/fuse_test.c @@ -22,6 +22,7 @@ #include <linux/falloc.h> #include <fcntl.h> #include <linux/memfd.h> +#include <linux/types.h> #include <sched.h> #include <stdio.h> #include <stdlib.h> -- 2.25.1

1 year, 7 months

3
2
0 0

[PATCH v2 0/2] tools/nolibc: avoid coredumps and speed up tests

by Thomas Weißschuh

Small optimization to avoid coredump writing during the stack protector tests. Adds prctl() as prerequisite. This series is based on nolibc/20230524-nolibc-rv32+stkp4 Signed-off-by: Thomas Weißschuh <linux(a)weissschuh.net> --- Changes in v2: - Fix compilation warning in prctl() testcase - Link to v1: https://lore.kernel.org/r/20230526-nolibc-test-no-dump-v1-0-62e724a96db2@we… --- Thomas Weißschuh (2): tools/nolibc: add support for prctl() selftests/nolibc: prevent coredumps during test execution tools/include/nolibc/sys.h | 27 +++++++++++++++++++++++++++ tools/testing/selftests/nolibc/nolibc-test.c | 3 +++ 2 files changed, 30 insertions(+) --- base-commit: 1974a2b5fd434812b32952b09df7b79fdee8104d change-id: 20230526-nolibc-test-no-dump-a1b1d9557df8 Best regards, -- Thomas Weißschuh <linux(a)weissschuh.net>

1 year, 7 months

2
3
0 0

[PATCH] tools/nolibc: support nanoseconds in stat()

by Thomas Weißschuh

Keep backwards compatibility through unions. The compatibility macros like #define st_atime st_atim.tv_sec as documented in stat(3type) don't work for nolibc because it would break with other stat-like structures that contain the field st_atime. Signed-off-by: Thomas Weißschuh <linux(a)weissschuh.net> --- tools/include/nolibc/sys.h | 29 +++++++++++++++------------- tools/include/nolibc/types.h | 6 +++--- tools/testing/selftests/nolibc/nolibc-test.c | 23 ++++++++++++++++++++++ 3 files changed, 42 insertions(+), 16 deletions(-) diff --git a/tools/include/nolibc/sys.h b/tools/include/nolibc/sys.h index 7874062bea95..11b354e26861 100644 --- a/tools/include/nolibc/sys.h +++ b/tools/include/nolibc/sys.h @@ -1187,19 +1187,22 @@ int sys_stat(const char *path, struct stat *buf) #else #error Neither __NR_newfstatat nor __NR_stat defined, cannot implement sys_stat() #endif - buf->st_dev = stat.st_dev; - buf->st_ino = stat.st_ino; - buf->st_mode = stat.st_mode; - buf->st_nlink = stat.st_nlink; - buf->st_uid = stat.st_uid; - buf->st_gid = stat.st_gid; - buf->st_rdev = stat.st_rdev; - buf->st_size = stat.st_size; - buf->st_blksize = stat.st_blksize; - buf->st_blocks = stat.st_blocks; - buf->st_atime = stat.st_atime; - buf->st_mtime = stat.st_mtime; - buf->st_ctime = stat.st_ctime; + buf->st_dev = stat.st_dev; + buf->st_ino = stat.st_ino; + buf->st_mode = stat.st_mode; + buf->st_nlink = stat.st_nlink; + buf->st_uid = stat.st_uid; + buf->st_gid = stat.st_gid; + buf->st_rdev = stat.st_rdev; + buf->st_size = stat.st_size; + buf->st_blksize = stat.st_blksize; + buf->st_blocks = stat.st_blocks; + buf->st_atim.tv_sec = stat.st_atime; + buf->st_atim.tv_nsec = stat.st_atime_nsec; + buf->st_mtim.tv_sec = stat.st_mtime; + buf->st_mtim.tv_nsec = stat.st_mtime_nsec; + buf->st_ctim.tv_sec = stat.st_ctime; + buf->st_ctim.tv_nsec = stat.st_ctime_nsec; return ret; } #endif diff --git a/tools/include/nolibc/types.h b/tools/include/nolibc/types.h index 15b0baffd336..f96e28bff4ba 100644 --- a/tools/include/nolibc/types.h +++ b/tools/include/nolibc/types.h @@ -198,9 +198,9 @@ struct stat { off_t st_size; /* total size, in bytes */ blksize_t st_blksize; /* blocksize for file system I/O */ blkcnt_t st_blocks; /* number of 512B blocks allocated */ - time_t st_atime; /* time of last access */ - time_t st_mtime; /* time of last modification */ - time_t st_ctime; /* time of last status change */ + union { time_t st_atime; struct timespec st_atim; }; /* time of last access */ + union { time_t st_mtime; struct timespec st_mtim; }; /* time of last modification */ + union { time_t st_ctime; struct timespec st_ctim; }; /* time of last status change */ }; /* WARNING, it only deals with the 4096 first majors and 256 first minors */ diff --git a/tools/testing/selftests/nolibc/nolibc-test.c b/tools/testing/selftests/nolibc/nolibc-test.c index 6e0a4dbe321e..8de72c87b7b7 100644 --- a/tools/testing/selftests/nolibc/nolibc-test.c +++ b/tools/testing/selftests/nolibc/nolibc-test.c @@ -500,6 +500,28 @@ static int test_fork(void) } } +static int test_stat_timestamps(void) +{ + struct stat st; + + if (sizeof(st.st_atim.tv_sec) != sizeof(st.st_atime)) + return 1; + + if (stat("/proc/self/", &st)) + return 1; + + if (st.st_atim.tv_sec != st.st_atime || st.st_atim.tv_nsec > 1000000000) + return 1; + + if (st.st_mtim.tv_sec != st.st_mtime || st.st_mtim.tv_nsec > 1000000000) + return 1; + + if (st.st_ctim.tv_sec != st.st_ctime || st.st_ctim.tv_nsec > 1000000000) + return 1; + + return 0; +} + /* Run syscall tests between IDs <min> and <max>. * Return 0 on success, non-zero on failure. */ @@ -587,6 +609,7 @@ int run_syscall(int min, int max) CASE_TEST(select_fault); EXPECT_SYSER(1, select(1, (void *)1, NULL, NULL, 0), -1, EFAULT); break; CASE_TEST(stat_blah); EXPECT_SYSER(1, stat("/proc/self/blah", &stat_buf), -1, ENOENT); break; CASE_TEST(stat_fault); EXPECT_SYSER(1, stat(NULL, &stat_buf), -1, EFAULT); break; + CASE_TEST(stat_timestamps); EXPECT_SYSZR(1, test_stat_timestamps()); break; CASE_TEST(symlink_root); EXPECT_SYSER(1, symlink("/", "/"), -1, EEXIST); break; CASE_TEST(unlink_root); EXPECT_SYSER(1, unlink("/"), -1, EISDIR); break; CASE_TEST(unlink_blah); EXPECT_SYSER(1, unlink("/proc/self/blah"), -1, ENOENT); break; --- base-commit: 1974a2b5fd434812b32952b09df7b79fdee8104d change-id: 20230527-nolibc-stat-nanoseconds-35de1467a430 Best regards, -- Thomas Weißschuh <linux(a)weissschuh.net>

1 year, 7 months

2
1
0 0

2024

2023

2022

2021

2020

2019

2018

2017

Linux-kselftest-mirror May 2023