- Linux-kselftest-mirror - lists.linaro.org

[PATCH] selftests: add eventfd selftests

by wenyang.linux＠foxmail.com

From: Wen Yang <wenyang.linux(a)foxmail.com> This adds the promised selftest for eventfd. It will verify the flags of eventfd2, including EFD_CLOEXEC, EFD_NONBLOCK and EFD_SEMAPHORE. Signed-off-by: Wen Yang <wenyang.linux(a)foxmail.com> Cc: Shuah Khan <shuah(a)kernel.org> Cc: Javier Martinez Canillas <javierm(a)redhat.com> Cc: Andrew Morton <akpm(a)linux-foundation.org> Cc: Christian Brauner <brauner(a)kernel.org> Cc: Pengfei Xu <pengfei.xu(a)intel.com> Cc: Miklos Szeredi <mszeredi(a)redhat.com> Cc: Andrei Vagin <avagin(a)google.com> Cc: Mathieu Desnoyers <mathieu.desnoyers(a)efficios.com> Cc: linux-kselftest(a)vger.kernel.org Cc: linux-kernel(a)vger.kernel.org --- .../selftests/filesystems/eventfd/.gitignore | 2 + .../selftests/filesystems/eventfd/Makefile | 7 + .../filesystems/eventfd/eventfd_test.c | 186 ++++++++++++++++++ 3 files changed, 195 insertions(+) create mode 100644 tools/testing/selftests/filesystems/eventfd/.gitignore create mode 100644 tools/testing/selftests/filesystems/eventfd/Makefile create mode 100644 tools/testing/selftests/filesystems/eventfd/eventfd_test.c diff --git a/tools/testing/selftests/filesystems/eventfd/.gitignore b/tools/testing/selftests/filesystems/eventfd/.gitignore new file mode 100644 index 000000000000..483faf59fe4a --- /dev/null +++ b/tools/testing/selftests/filesystems/eventfd/.gitignore @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0-only +eventfd_test diff --git a/tools/testing/selftests/filesystems/eventfd/Makefile b/tools/testing/selftests/filesystems/eventfd/Makefile new file mode 100644 index 000000000000..0a8e3910df15 --- /dev/null +++ b/tools/testing/selftests/filesystems/eventfd/Makefile @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0 + +CFLAGS += $(KHDR_INCLUDES) +LDLIBS += -lpthread +TEST_GEN_PROGS := eventfd_test + +include ../../lib.mk diff --git a/tools/testing/selftests/filesystems/eventfd/eventfd_test.c b/tools/testing/selftests/filesystems/eventfd/eventfd_test.c new file mode 100644 index 000000000000..f142a137526c --- /dev/null +++ b/tools/testing/selftests/filesystems/eventfd/eventfd_test.c @@ -0,0 +1,186 @@ +// SPDX-License-Identifier: GPL-2.0 + +#define _GNU_SOURCE +#include <errno.h> +#include <fcntl.h> +#include <asm/unistd.h> +#include <linux/time_types.h> +#include <unistd.h> +#include <assert.h> +#include <signal.h> +#include <pthread.h> +#include <sys/epoll.h> +#include <sys/eventfd.h> +#include "../../kselftest_harness.h" + +struct error { + int code; + char msg[512]; +}; + +static int error_set(struct error *err, int code, const char *fmt, ...) +{ + va_list args; + int r; + + if (code == 0 || !err || err->code != 0) + return code; + + err->code = code; + va_start(args, fmt); + r = vsnprintf(err->msg, sizeof(err->msg), fmt, args); + assert((size_t)r < sizeof(err->msg)); + va_end(args); + + return code; +} + +static inline int sys_eventfd2(unsigned int count, int flags) +{ + return syscall(__NR_eventfd2, count, flags); +} + +TEST(eventfd01) +{ + int fd, flags; + + fd = sys_eventfd2(0, 0); + ASSERT_GE(fd, 0); + + flags = fcntl(fd, F_GETFL); + // since the kernel automatically added O_RDWR. + EXPECT_EQ(flags, O_RDWR); + + close(fd); +} + +TEST(eventfd02) +{ + int fd, flags; + + fd = sys_eventfd2(0, EFD_CLOEXEC); + ASSERT_GE(fd, 0); + + flags = fcntl(fd, F_GETFD); + ASSERT_GT(flags, -1); + EXPECT_EQ(flags, FD_CLOEXEC); + + close(fd); +} + +TEST(eventfd03) +{ + int fd, flags; + + fd = sys_eventfd2(0, EFD_NONBLOCK); + ASSERT_GE(fd, 0); + + flags = fcntl(fd, F_GETFL); + ASSERT_GT(flags, -1); + EXPECT_EQ(flags & EFD_NONBLOCK, EFD_NONBLOCK); + EXPECT_EQ(flags & O_RDWR, O_RDWR); + + close(fd); +} + +TEST(eventfd04) +{ + int fd, flags; + + fd = sys_eventfd2(0, EFD_CLOEXEC|EFD_NONBLOCK); + ASSERT_GE(fd, 0); + + flags = fcntl(fd, F_GETFL); + ASSERT_GT(flags, -1); + EXPECT_EQ(flags & EFD_NONBLOCK, EFD_NONBLOCK); + EXPECT_EQ(flags & O_RDWR, O_RDWR); + + flags = fcntl(fd, F_GETFD); + ASSERT_GT(flags, -1); + EXPECT_EQ(flags, FD_CLOEXEC); + + close(fd); +} + +static inline void trim_newline(char *str) +{ + char *pos = strrchr(str, '\n'); + + if (pos) + *pos = '\0'; +} + +static int verify_fdinfo(int fd, struct error *err, const char *prefix, + size_t prefix_len, const char *expect, ...) +{ + char buffer[512] = {0, }; + char path[512] = {0, }; + va_list args; + FILE *f; + char *line = NULL; + size_t n = 0; + int found = 0; + int r; + + va_start(args, expect); + r = vsnprintf(buffer, sizeof(buffer), expect, args); + assert((size_t)r < sizeof(buffer)); + va_end(args); + + snprintf(path, sizeof(path), "/proc/self/fdinfo/%d", fd); + f = fopen(path, "re"); + if (!f) + return error_set(err, -1, "fdinfo open failed for %d", fd); + + while (getline(&line, &n, f) != -1) { + char *val; + + if (strncmp(line, prefix, prefix_len)) + continue; + + found = 1; + + val = line + prefix_len; + r = strcmp(val, buffer); + if (r != 0) { + trim_newline(line); + trim_newline(buffer); + error_set(err, -1, "%s '%s' != '%s'", + prefix, val, buffer); + } + break; + } + + free(line); + fclose(f); + + if (found == 0) + return error_set(err, -1, "%s not found for fd %d", + prefix, fd); + + return 0; +} + +TEST(eventfd05) +{ + struct error err = {0}; + int fd, ret; + + fd = sys_eventfd2(0, EFD_SEMAPHORE); + ASSERT_GE(fd, 0); + + ret = fcntl(fd, F_GETFL); + ASSERT_GT(ret, -1); + EXPECT_EQ(ret & O_RDWR, O_RDWR); + + // The semaphore could only be obtained from fdinfo. + ret = verify_fdinfo(fd, &err, "eventfd-semaphore: ", 19, "1\n"); + if (ret != 0) + ksft_print_msg("eventfd-semaphore check failed, msg: %s\n", + err.msg); + EXPECT_EQ(ret, 0); + + close(fd); +} + +TEST_HARNESS_MAIN -- 2.25.1

1 year, 8 months

1
0
0 0

[PATCH v6 0/6] iommufd: Add nesting infrastructure (part 2/2)

by Yi Liu

Nested translation is a hardware feature that is supported by many modern IOMMU hardwares. It has two stages (stage-1, stage-2) address translation to get access to the physical address. stage-1 translation table is owned by userspace (e.g. by a guest OS), while stage-2 is owned by kernel. Changes to stage-1 translation table should be followed by an IOTLB invalidation. Take Intel VT-d as an example, the stage-1 translation table is I/O page table. As the below diagram shows, guest I/O page table pointer in GPA (guest physical address) is passed to host and be used to perform the stage-1 address translation. Along with it, modifications to present mappings in the guest I/O page table should be followed with an IOTLB invalidation. .-------------. .---------------------------. | vIOMMU | | Guest I/O page table | | | '---------------------------' .----------------/ | PASID Entry |--- PASID cache flush --+ '-------------' | | | V | | I/O page table pointer in GPA '-------------' Guest ------| Shadow |---------------------------|-------- v v v Host .-------------. .------------------------. | pIOMMU | | FS for GIOVA->GPA | | | '------------------------' .----------------/ | | PASID Entry | V (Nested xlate) '----------------\.----------------------------------. | | | SS for GPA->HPA, unmanaged domain| | | '----------------------------------' '-------------' Where: - FS = First stage page tables - SS = Second stage page tables <Intel VT-d Nested translation> This series adds the cache invalidation path for the userspace to invalidate cache after modifying the stage-1 page table. This is based on the first part of nesting [1] Complete code can be found in [2], QEMU could can be found in [3]. At last, this is a team work together with Nicolin Chen, Lu Baolu. Thanks them for the help. ^_^. Look forward to your feedbacks. [1] https://lore.kernel.org/linux-iommu/20231026044216.64964-1-yi.l.liu@intel.c… - merged [2] https://github.com/yiliu1765/iommufd/tree/iommufd_nesting [3] https://github.com/yiliu1765/qemu/tree/zhenzhong/wip/iommufd_nesting_rfcv1 Change log: v6: - No much change, just rebase on top of 6.7-rc1 as part 1/2 is merged v5: https://lore.kernel.org/linux-iommu/20231020092426.13907-1-yi.l.liu@intel.c… - Split the iommufd nesting series into two parts of alloc_user and invalidation (Jason) - Split IOMMUFD_OBJ_HW_PAGETABLE to IOMMUFD_OBJ_HWPT_PAGING/_NESTED, and do the same with the structures/alloc()/abort()/destroy(). Reworked the selftest accordingly too. (Jason) - Move hwpt/data_type into struct iommu_user_data from standalone op arguments. (Jason) - Rename hwpt_type to be data_type, the HWPT_TYPE to be HWPT_ALLOC_DATA, _TYPE_DEFAULT to be _ALLOC_DATA_NONE (Jason, Kevin) - Rename iommu_copy_user_data() to iommu_copy_struct_from_user() (Kevin) - Add macro to the iommu_copy_struct_from_user() to calculate min_size (Jason) - Fix two bugs spotted by ZhaoYan v4: https://lore.kernel.org/linux-iommu/20230921075138.124099-1-yi.l.liu@intel.… - Separate HWPT alloc/destroy/abort functions between user-managed HWPTs and kernel-managed HWPTs - Rework invalidate uAPI to be a multi-request array-based design - Add a struct iommu_user_data_array and a helper for driver to sanitize and copy the entry data from user space invalidation array - Add a patch fixing TEST_LENGTH() in selftest program - Drop IOMMU_RESV_IOVA_RANGES patches - Update kdoc and inline comments - Drop the code to add IOMMU_RESV_SW_MSI to kernel-managed HWPT in nested translation, this does not change the rule that resv regions should only be added to the kernel-managed HWPT. The IOMMU_RESV_SW_MSI stuff will be added in later series as it is needed only by SMMU so far. v3: https://lore.kernel.org/linux-iommu/20230724110406.107212-1-yi.l.liu@intel.… - Add new uAPI things in alphabetical order - Pass in "enum iommu_hwpt_type hwpt_type" to op->domain_alloc_user for sanity, replacing the previous op->domain_alloc_user_data_len solution - Return ERR_PTR from domain_alloc_user instead of NULL - Only add IOMMU_RESV_SW_MSI to kernel-managed HWPT in nested translation (Kevin) - Add IOMMU_RESV_IOVA_RANGES to report resv iova ranges to userspace hence userspace is able to exclude the ranges in the stage-1 HWPT (e.g. guest I/O page table). (Kevin) - Add selftest coverage for the new IOMMU_RESV_IOVA_RANGES ioctl - Minor changes per Kevin's inputs v2: https://lore.kernel.org/linux-iommu/20230511143844.22693-1-yi.l.liu@intel.c… - Add union iommu_domain_user_data to include all user data structures to avoid passing void * in kernel APIs. - Add iommu op to return user data length for user domain allocation - Rename struct iommu_hwpt_alloc::data_type to be hwpt_type - Store the invalidation data length in iommu_domain_ops::cache_invalidate_user_data_len - Convert cache_invalidate_user op to be int instead of void - Remove @data_type in struct iommu_hwpt_invalidate - Remove out_hwpt_type_bitmap in struct iommu_hw_info hence drop patch 08 of v1 v1: https://lore.kernel.org/linux-iommu/20230309080910.607396-1-yi.l.liu@intel.… Thanks, Yi Liu Lu Baolu (1): iommu: Add cache_invalidate_user op Nicolin Chen (4): iommu: Add iommu_copy_struct_from_user_array helper iommufd/selftest: Add mock_domain_cache_invalidate_user support iommufd/selftest: Add IOMMU_TEST_OP_MD_CHECK_IOTLB test op iommufd/selftest: Add coverage for IOMMU_HWPT_INVALIDATE ioctl Yi Liu (1): iommufd: Add IOMMU_HWPT_INVALIDATE drivers/iommu/iommufd/hw_pagetable.c | 35 ++++++++ drivers/iommu/iommufd/iommufd_private.h | 9 ++ drivers/iommu/iommufd/iommufd_test.h | 22 +++++ drivers/iommu/iommufd/main.c | 3 + drivers/iommu/iommufd/selftest.c | 69 +++++++++++++++ include/linux/iommu.h | 84 +++++++++++++++++++ include/uapi/linux/iommufd.h | 35 ++++++++ tools/testing/selftests/iommu/iommufd.c | 75 +++++++++++++++++ tools/testing/selftests/iommu/iommufd_utils.h | 63 ++++++++++++++ 9 files changed, 395 insertions(+) -- 2.34.1

1 year, 8 months

9
92
0 0

[PATCH v1 0/4] kselftest: alsa: Fix a couple of format specifiers and function parameters

by Mirsad Todorovac

Minor fixes of compiler warnings and one bug in the number of parameters which would not crash the test but it is better fixed for correctness sake. As the general climate in the Linux kernel community is to fix all compiler warnings, this could be on the right track, even if only in the testing suite. Mirsad Todorovac (4): kselftest: alsa: fix the number of parameters to ksft_exit_fail_msg() kselftest: alsa: Fix the printf format specifier in call to ksft_print_msg() ksellftest: alsa: Fix the printf format specifier to unsigned int selftests: alsa: Fix the exit error message parameter in sysfs_get() tools/testing/selftests/alsa/conf.c | 2 +- tools/testing/selftests/alsa/mixer-test.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) -- 2.40.1

1 year, 8 months

3
12
0 0

[PATCH v1 1/1] selftests: net: increase timeout value for tests

by Mirsad Todorovac

In particular, fcnal-test.sh timed out on slower hardware after some new permutations of tests were added. This single test ran for almost an hour instead of the expected 25 min (1500s). 75 minutes should suffice for most systems. Cc: David Ahern <dsahern(a)kernel.org> Cc: "David S. Miller" <davem(a)davemloft.net> Cc: Eric Dumazet <edumazet(a)google.com> Cc: Jakub Kicinski <kuba(a)kernel.org> Cc: Paolo Abeni <pabeni(a)redhat.com> Cc: Shuah Khan <shuah(a)kernel.org> Cc: netdev(a)vger.kernel.org Cc: linux-kselftest(a)vger.kernel.org Signed-off-by: Mirsad Todorovac <mirsad.todorovac(a)alu.unizg.hr> --- tools/testing/selftests/net/settings | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/settings b/tools/testing/selftests/net/settings index dfc27cdc6c05..ed8418e8217a 100644 --- a/tools/testing/selftests/net/settings +++ b/tools/testing/selftests/net/settings @@ -1 +1 @@ -timeout=1500 +timeout=4500 -- 2.40.1

1 year, 8 months

2
2
0 0

[BUG] selftests: memfd: run_hugetlbfs_test.sh: Hang in fuse_mnt?

by Mirsad Todorovac

Hi all, I'm running the 6.7.0-rc8-00174-g95c8a35f1c01 kernel from torvalds tree on a Ubuntu 23.10 Mantic Minotaur system. What I get are these errors. memfd selftests are actually counted as "ok", but they give errors and/or hang. Please find the strace output attached, and the config used. Hope this helps. Best regards, Mirsad TAP version 13 1..3 # timeout set to 45 # selftests: memfd: memfd_test # memfd: CREATE # memfd: BASIC # memfd: SEAL-EXEC # memfd: Apply SEAL_EXEC # memfd: Apply ALL_SEALS # memfd: EXEC_NO_SEAL # memfd: NOEXEC_SEAL # memfd: SEAL-WRITE # memfd: SEAL-FUTURE-WRITE # memfd: SEAL-SHRINK # memfd: SEAL-GROW # memfd: SEAL-RESIZE # memfd: sysctl 0 # memfd: sysctl 1 # memfd: sysctl 0 # memfd: sysctl 2 # memfd: sysctl 1 # memfd: sysctl 0 # memfd: nested sysctl 0 # memfd: sysctl 0 # memfd: sysctl 1 # memfd: sysctl 0 # memfd: sysctl 2 # memfd: sysctl 1 # memfd: sysctl 0 # memfd: nested sysctl 1 # memfd: nested sysctl 2 # memfd: nested sysctl 0 -> 1 after fork # memfd: nested sysctl 0 -> 2 after fork # memfd: nested sysctl 2 -> 1 after fork # memfd: nested sysctl 2 -> 0 after fork # memfd: nested sysctl 1 -> 0 after fork # memfd: SHARE-DUP # memfd: SHARE-MMAP # memfd: SHARE-OPEN # memfd: SHARE-FORK # memfd: SHARE-DUP (shared file-table) # memfd: SHARE-MMAP (shared file-table) # memfd: SHARE-OPEN (shared file-table) # memfd: SHARE-FORK (shared file-table) # memfd: DONE ok 1 selftests: memfd: memfd_test # timeout set to 45 # selftests: memfd: run_fuse_test.sh # fusermount: failed to unmount /home/marvin/linux/kernel/linux_torvalds/tools/testing/selftests/memfd/mnt: Invalid argument # opening: ./mnt/memfd # fuse: DONE ok 2 selftests: memfd: run_fuse_test.sh # timeout set to 45 # selftests: memfd: run_hugetlbfs_test.sh # memfd-hugetlb: CREATE # memfd-hugetlb: BASIC # memfd-hugetlb: SEAL-EXEC # memfd-hugetlb: Apply SEAL_EXEC # fchmod(/memfd:kern_memfd_seal_exec (deleted), 00777) didn't fail as expected # ./run_hugetlbfs_test.sh: line 60: 97095 Aborted (core dumped) ./memfd_test hugetlbfs # opening: ./mnt/memfd # ADD_SEALS(6, 0 -> 8) failed: Device or resource busy # 8 != 0 = GET_SEALS(6) # Aborted (core dumped) ok 3 selftests: memfd: run_hugetlbfs_test.sh make[3]: Leaving directory '/home/marvin/linux/kernel/linux_torvalds/tools/testing/selftests/memfd' -- Mirsad Goran Todorovac Sistem inženjer Grafički fakultet | Akademija likovnih umjetnosti Sveučilište u Zagrebu System engineer Faculty of Graphic Arts | Academy of Fine Arts University of Zagreb, Republic of Croatia The European Union "I see something approaching fast ... Will it be friends with me?"

1 year, 8 months

1
0
0 0

selftest: net: fcnal-test.sh TIMEOUT

by Mirsad Todorovac

Hi, all, The default timeout for tools/testing/selftest/net groups of tests is 1500s (25m). This is less than half of what is required to run the full fcnal-test.sh on my hardware (53m48s). With the timeout adjusted, tests passed 914 of 914 OK. Best regards, Mirsad Todorovac diff --git a/tools/testing/selftests/net/settings b/tools/testing/selftests/net/settings index dfc27cdc6c05..ed8418e8217a 100644 --- a/tools/testing/selftests/net/settings +++ b/tools/testing/selftests/net/settings @@ -1 +1 @@ -timeout=1500 +timeout=3600 ----------------------------------------------------------------- [snip] ################################################################# Ping LLA with multiple interfaces TEST: Pre cycle, ping out ns-B - multicast IP [ OK ] TEST: Pre cycle, ping out ns-C - multicast IP [ OK ] TEST: Post cycle ns-A eth1, ping out ns-B - multicast IP [ OK ] TEST: Post cycle ns-A eth1, ping out ns-C - multicast IP [ OK ] TEST: Post cycle ns-A eth2, ping out ns-B - multicast IP [ OK ] TEST: Post cycle ns-A eth2, ping out ns-C - multicast IP [ OK ] ################################################################# SNAT on VRF TEST: IPv4 TCP connection over VRF with SNAT [ OK ] TEST: IPv6 TCP connection over VRF with SNAT [ OK ] Tests passed: 914 Tests failed: 0 real 53m48.460s user 0m32.885s sys 2m41.509s root@hostname:/ -- Mirsad Goran Todorovac Sistem inženjer Grafički fakultet | Akademija likovnih umjetnosti Sveučilište u Zagrebu System engineer Faculty of Graphic Arts | Academy of Fine Arts University of Zagreb, Republic of Croatia The European Union "I see something approaching fast ... Will it be friends with me?"

1 year, 8 months

2
3
0 0

[BUG] selftests: alsa: conf.c: wrong parm passed to printf [FIXED]

by Mirsad Todorovac

Hi, all, There is a minor omission in selftests/alsa/conf.c, returning errno where there is strerror(errno) passed in the sibling calls to printf(). The bug was apparently introduced with the commit aba51cd0949ae ("selftests: alsa - add PCM test"). As a diff speaks like a thousand words, the fix is simple: Regards, Mirsad ----- cut ----- diff --git a/tools/testing/selftests/alsa/conf.c b/tools/testing/selftests/alsa/conf.c index 00925eb8d9f4..89e3656a042d 100644 --- a/tools/testing/selftests/alsa/conf.c +++ b/tools/testing/selftests/alsa/conf.c @@ -179,7 +179,7 @@ static char *sysfs_get(const char *sysfs_root, const char *id) close(fd); if (len < 0) ksft_exit_fail_msg("sysfs: unable to read value '%s': %s\n", - path, errno); + path, strerror(errno)); while (len > 0 && path[len-1] == '\n') len--; path[len] = '\0'; -- Mirsad Goran Todorovac Sistem inženjer Grafički fakultet | Akademija likovnih umjetnosti Sveučilište u Zagrebu System engineer Faculty of Graphic Arts | Academy of Fine Arts University of Zagreb, Republic of Croatia The European Union "I see something approaching fast ... Will it be friends with me?"

1 year, 8 months

1
0
0 0

[PATCH bpf-next v2 0/3] Annotate kfuncs in .BTF_ids section

by Daniel Xu

=== Description === This is a bpf-treewide change that annotates all kfuncs as such inside .BTF_ids. This annotation eventually allows us to automatically generate kfunc prototypes from bpftool. We store this metadata inside a yet-unused flags field inside struct btf_id_set8 (thanks Kumar!). pahole will be taught where to look. More details about the full chain of events are available in commit 3's description. The accompanying pahole changes (still needs some cleanup) can be viewed here on this "frozen" branch [0]. [0]: https://github.com/danobi/pahole/tree/kfunc_btf-mailed === Changelog === Changes from v1: * Move WARN_ON() up a call level * Also return error when kfunc set is not properly tagged * Use BTF_KFUNCS_START/END instead of flags * Rename BTF_SET8_KFUNC to BTF_SET8_KFUNCS Daniel Xu (3): bpf: btf: Support flags for BTF_SET8 sets bpf: btf: Add BTF_KFUNCS_START/END macro pair bpf: treewide: Annotate BPF kfuncs in BTF drivers/hid/bpf/hid_bpf_dispatch.c | 8 +++---- fs/verity/measure.c | 4 ++-- include/linux/btf_ids.h | 21 +++++++++++++++---- kernel/bpf/btf.c | 4 ++++ kernel/bpf/cpumask.c | 4 ++-- kernel/bpf/helpers.c | 8 +++---- kernel/bpf/map_iter.c | 4 ++-- kernel/cgroup/rstat.c | 4 ++-- kernel/trace/bpf_trace.c | 8 +++---- net/bpf/test_run.c | 8 +++---- net/core/filter.c | 16 +++++++------- net/core/xdp.c | 4 ++-- net/ipv4/bpf_tcp_ca.c | 4 ++-- net/ipv4/fou_bpf.c | 4 ++-- net/ipv4/tcp_bbr.c | 4 ++-- net/ipv4/tcp_cubic.c | 4 ++-- net/ipv4/tcp_dctcp.c | 4 ++-- net/netfilter/nf_conntrack_bpf.c | 4 ++-- net/netfilter/nf_nat_bpf.c | 4 ++-- net/xfrm/xfrm_interface_bpf.c | 4 ++-- net/xfrm/xfrm_state_bpf.c | 4 ++-- .../selftests/bpf/bpf_testmod/bpf_testmod.c | 8 +++---- 22 files changed, 77 insertions(+), 60 deletions(-) -- 2.42.1

1 year, 8 months

2
5
0 0

[PATCH net-next] selftests: forwarding: Avoid failures to source net/lib.sh

by Benjamin Poirier

The expression "source ../lib.sh" added to net/forwarding/lib.sh in commit 25ae948b4478 ("selftests/net: add lib.sh") does not work for tests outside net/forwarding which source net/forwarding/lib.sh (1). It also does not work in some cases where only a subset of tests are exported (2). Avoid the problems mentioned above by replacing the faulty expression with a copy of the content from net/lib.sh which is used by files under net/forwarding. A more thorough solution which avoids duplicating content between net/lib.sh and net/forwarding/lib.sh has been posted here: https://lore.kernel.org/netdev/20231222135836.992841-1-bpoirier@nvidia.com/ The approach in the current patch is a stopgap solution to avoid submitting large changes at the eleventh hour of this development cycle. Example of problem 1) tools/testing/selftests/drivers/net/bonding$ ./dev_addr_lists.sh ./net_forwarding_lib.sh: line 41: ../lib.sh: No such file or directory TEST: bonding cleanup mode active-backup [ OK ] TEST: bonding cleanup mode 802.3ad [ OK ] TEST: bonding LACPDU multicast address to slave (from bond down) [ OK ] TEST: bonding LACPDU multicast address to slave (from bond up) [ OK ] An error message is printed but since the test does not use functions from net/lib.sh, the test results are not affected. Example of problem 2) tools/testing/selftests$ make install TARGETS="net/forwarding" tools/testing/selftests$ cd kselftest_install/net/forwarding/ tools/testing/selftests/kselftest_install/net/forwarding$ ./pedit_ip.sh veth{0..3} lib.sh: line 41: ../lib.sh: No such file or directory TEST: ping [ OK ] TEST: ping6 [ OK ] ./pedit_ip.sh: line 135: busywait: command not found TEST: dev veth1 ingress pedit ip src set 198.51.100.1 [FAIL] Expected to get 10 packets, but got . ./pedit_ip.sh: line 135: busywait: command not found TEST: dev veth2 egress pedit ip src set 198.51.100.1 [FAIL] Expected to get 10 packets, but got . ./pedit_ip.sh: line 135: busywait: command not found TEST: dev veth1 ingress pedit ip dst set 198.51.100.1 [FAIL] Expected to get 10 packets, but got . ./pedit_ip.sh: line 135: busywait: command not found TEST: dev veth2 egress pedit ip dst set 198.51.100.1 [FAIL] Expected to get 10 packets, but got . ./pedit_ip.sh: line 135: busywait: command not found TEST: dev veth1 ingress pedit ip6 src set 2001:db8:2::1 [FAIL] Expected to get 10 packets, but got . ./pedit_ip.sh: line 135: busywait: command not found TEST: dev veth2 egress pedit ip6 src set 2001:db8:2::1 [FAIL] Expected to get 10 packets, but got . ./pedit_ip.sh: line 135: busywait: command not found TEST: dev veth1 ingress pedit ip6 dst set 2001:db8:2::1 [FAIL] Expected to get 10 packets, but got . ./pedit_ip.sh: line 135: busywait: command not found TEST: dev veth2 egress pedit ip6 dst set 2001:db8:2::1 [FAIL] Expected to get 10 packets, but got . In this case, the test results are affected. Fixes: 25ae948b4478 ("selftests/net: add lib.sh") Suggested-by: Ido Schimmel <idosch(a)nvidia.com> Suggested-by: Petr Machata <petrm(a)nvidia.com> Reviewed-by: Ido Schimmel <idosch(a)nvidia.com> Tested-by: Petr Machata <petrm(a)nvidia.com> Signed-off-by: Benjamin Poirier <bpoirier(a)nvidia.com> --- tools/testing/selftests/net/forwarding/lib.sh | 27 ++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/forwarding/lib.sh b/tools/testing/selftests/net/forwarding/lib.sh index 69ef2a40df21..8a61464ab6eb 100755 --- a/tools/testing/selftests/net/forwarding/lib.sh +++ b/tools/testing/selftests/net/forwarding/lib.sh @@ -38,7 +38,32 @@ if [[ -f $relative_path/forwarding.config ]]; then source "$relative_path/forwarding.config" fi -source ../lib.sh +# Kselftest framework requirement - SKIP code is 4. +ksft_skip=4 + +busywait() +{ + local timeout=$1; shift + + local start_time="$(date -u +%s%3N)" + while true + do + local out + out=$("$@") + local ret=$? + if ((!ret)); then + echo -n "$out" + return 0 + fi + + local current_time="$(date -u +%s%3N)" + if ((current_time - start_time > timeout)); then + echo -n "$out" + return 1 + fi + done +} + ############################################################################## # Sanity checks -- 2.43.0

1 year, 8 months

3
2
0 0

Re: [PATCH bpf-next 12/15] bpf: Preserve boundaries and track scalars on narrowing fill

by Maxim Mikityanskiy

On Thu, 04 Jan 2024 at 04:27:00 +0200, Eduard Zingerman wrote: > On Wed, 2023-12-20 at 23:40 +0200, Maxim Mikityanskiy wrote: > > [...] > > The two tests below were added by the following commit: > ef979017b837 ("bpf: selftest: Add verifier tests for <8-byte scalar spill and refill") > > As far as I understand, the original intent was to check the behavior > for stack read/write with non-matching size. > I think these tests are redundant after patch #13. Wdyt? _6_offset_to_skb_data is for sure not redundant. I don't test a partial fill from the most significant bits in my patch 13. u16_offset_to_skb_data is somewhat similar to fill_32bit_after_spill_64bit, but they aren't exactly the same: the former spills (u32)20 and fills (u16)20 (the same value), while my test spills (u64)0xXXXXXXXX00000000 and fills (u32)0 (the most significant bits are stripped). Maybe u16_offset_to_skb_data is redundant, but more coverage is better than less coverage, isn't it? > > diff --git a/tools/testing/selftests/bpf/progs/verifier_spill_fill.c b/tools/testing/selftests/bpf/progs/verifier_spill_fill.c > > index 809a09732168..de03e72e07a9 100644 > > --- a/tools/testing/selftests/bpf/progs/verifier_spill_fill.c > > +++ b/tools/testing/selftests/bpf/progs/verifier_spill_fill.c > > @@ -217,7 +217,7 @@ __naked void uninit_u32_from_the_stack(void) > > > > SEC("tc") > > __description("Spill a u32 const scalar. Refill as u16. Offset to skb->data") > > -__failure __msg("invalid access to packet") > > +__success __retval(0) > > __naked void u16_offset_to_skb_data(void) > > { > > asm volatile (" \ > > @@ -225,19 +225,24 @@ __naked void u16_offset_to_skb_data(void) > > r3 = *(u32*)(r1 + %[__sk_buff_data_end]); \ > > w4 = 20; \ > > *(u32*)(r10 - 8) = r4; \ > > - r4 = *(u16*)(r10 - 8); \ > > + r4 = *(u16*)(r10 - %[offset]); \ > > r0 = r2; \ > > - /* r0 += r4 R0=pkt R2=pkt R3=pkt_end R4=umax=65535 */\ > > + /* r0 += r4 R0=pkt R2=pkt R3=pkt_end R4=20 */\ > > r0 += r4; \ > > - /* if (r0 > r3) R0=pkt,umax=65535 R2=pkt R3=pkt_end R4=umax=65535 */\ > > + /* if (r0 > r3) R0=pkt,off=20 R2=pkt R3=pkt_end R4=20 */\ > > if r0 > r3 goto l0_%=; \ > > - /* r0 = *(u32 *)r2 R0=pkt,umax=65535 R2=pkt R3=pkt_end R4=20 */\ > > + /* r0 = *(u32 *)r2 R0=pkt,off=20 R2=pkt R3=pkt_end R4=20 */\ > > r0 = *(u32*)(r2 + 0); \ > > l0_%=: r0 = 0; \ > > exit; \ > > " : > > : __imm_const(__sk_buff_data, offsetof(struct __sk_buff, data)), > > - __imm_const(__sk_buff_data_end, offsetof(struct __sk_buff, data_end)) > > + __imm_const(__sk_buff_data_end, offsetof(struct __sk_buff, data_end)), > > +#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ > > + __imm_const(offset, 8) > > +#else > > + __imm_const(offset, 6) > > +#endif > > : __clobber_all); > > } > > > > @@ -270,7 +275,7 @@ l0_%=: r0 = 0; \ > > } > > > > SEC("tc") > > -__description("Spill a u32 const scalar. Refill as u16 from fp-6. Offset to skb->data") > > +__description("Spill a u32 const scalar. Refill as u16 from MSB. Offset to skb->data") > > __failure __msg("invalid access to packet") > > __naked void _6_offset_to_skb_data(void) > > { > > @@ -279,7 +284,7 @@ __naked void _6_offset_to_skb_data(void) > > r3 = *(u32*)(r1 + %[__sk_buff_data_end]); \ > > w4 = 20; \ > > *(u32*)(r10 - 8) = r4; \ > > - r4 = *(u16*)(r10 - 6); \ > > + r4 = *(u16*)(r10 - %[offset]); \ > > r0 = r2; \ > > /* r0 += r4 R0=pkt R2=pkt R3=pkt_end R4=umax=65535 */\ > > r0 += r4; \ > > @@ -291,7 +296,12 @@ l0_%=: r0 = 0; \ > > exit; \ > > " : > > : __imm_const(__sk_buff_data, offsetof(struct __sk_buff, data)), > > - __imm_const(__sk_buff_data_end, offsetof(struct __sk_buff, data_end)) > > + __imm_const(__sk_buff_data_end, offsetof(struct __sk_buff, data_end)), > > +#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ > > + __imm_const(offset, 6) > > +#else > > + __imm_const(offset, 8) > > +#endif > > : __clobber_all); > > } > > > > >

1 year, 8 months

1
0
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-kselftest-mirror