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

[PATCH v21 4/4] selftests/vDSO: add tests for vgetrandom

by Jason A. Donenfeld

This adds two tests for vgetrandom. The first one, vdso_test_chacha, simply checks that the assembly implementation of chacha20 matches that of libsodium, a basic sanity check that should catch most errors. The second, vdso_test_getrandom, is a full "libc-like" implementation of the userspace side of vgetrandom() support. It's meant to be used also as example code for libcs that might be integrating this. Cc: linux-kselftest(a)vger.kernel.org Signed-off-by: Jason A. Donenfeld <Jason(a)zx2c4.com> --- tools/include/asm/rwonce.h | 0 tools/testing/selftests/vDSO/.gitignore | 2 + tools/testing/selftests/vDSO/Makefile | 15 + .../testing/selftests/vDSO/vdso_test_chacha.c | 43 +++ .../selftests/vDSO/vdso_test_getrandom.c | 288 ++++++++++++++++++ 5 files changed, 348 insertions(+) create mode 100644 tools/include/asm/rwonce.h create mode 100644 tools/testing/selftests/vDSO/vdso_test_chacha.c create mode 100644 tools/testing/selftests/vDSO/vdso_test_getrandom.c diff --git a/tools/include/asm/rwonce.h b/tools/include/asm/rwonce.h new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/tools/testing/selftests/vDSO/.gitignore b/tools/testing/selftests/vDSO/.gitignore index a8dc51af5a9c..30d5c8f0e5c7 100644 --- a/tools/testing/selftests/vDSO/.gitignore +++ b/tools/testing/selftests/vDSO/.gitignore @@ -6,3 +6,5 @@ vdso_test_correctness vdso_test_gettimeofday vdso_test_getcpu vdso_standalone_test_x86 +vdso_test_getrandom +vdso_test_chacha diff --git a/tools/testing/selftests/vDSO/Makefile b/tools/testing/selftests/vDSO/Makefile index d53a4d8008f9..12fdae3b3201 100644 --- a/tools/testing/selftests/vDSO/Makefile +++ b/tools/testing/selftests/vDSO/Makefile @@ -3,6 +3,7 @@ include ../lib.mk uname_M := $(shell uname -m 2>/dev/null || echo not) ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/x86/ -e s/x86_64/x86/) +SODIUM := $(shell pkg-config --libs libsodium 2>/dev/null) TEST_GEN_PROGS := $(OUTPUT)/vdso_test_gettimeofday $(OUTPUT)/vdso_test_getcpu TEST_GEN_PROGS += $(OUTPUT)/vdso_test_abi @@ -11,9 +12,19 @@ ifeq ($(ARCH),$(filter $(ARCH),x86 x86_64)) TEST_GEN_PROGS += $(OUTPUT)/vdso_standalone_test_x86 endif TEST_GEN_PROGS += $(OUTPUT)/vdso_test_correctness +ifeq ($(uname_M),x86_64) +TEST_GEN_PROGS += $(OUTPUT)/vdso_test_getrandom +ifneq ($(SODIUM),) +TEST_GEN_PROGS += $(OUTPUT)/vdso_test_chacha +endif +endif CFLAGS := -std=gnu99 CFLAGS_vdso_standalone_test_x86 := -nostdlib -fno-asynchronous-unwind-tables -fno-stack-protector +CFLAGS_vdso_test_getrandom := -isystem $(top_srcdir)/tools/include -isystem $(top_srcdir)/include/uapi +CFLAGS_vdso_test_chacha := $(SODIUM) -idirafter $(top_srcdir)/tools/include -isystem $(top_srcdir)/include \ + -isystem $(top_srcdir)/arch/$(ARCH)/include \ + -D__ASSEMBLY__ -DBULID_VDSO -DCONFIG_FUNCTION_ALIGNMENT=0 -Wa,--noexecstack LDFLAGS_vdso_test_correctness := -ldl ifeq ($(CONFIG_X86_32),y) LDLIBS += -lgcc_s @@ -33,3 +44,7 @@ $(OUTPUT)/vdso_test_correctness: vdso_test_correctness.c vdso_test_correctness.c \ -o $@ \ $(LDFLAGS_vdso_test_correctness) +$(OUTPUT)/vdso_test_getrandom: CFLAGS += $(CFLAGS_vdso_test_getrandom) +$(OUTPUT)/vdso_test_getrandom: parse_vdso.c +$(OUTPUT)/vdso_test_chacha: CFLAGS += $(CFLAGS_vdso_test_chacha) +$(OUTPUT)/vdso_test_chacha: $(top_srcdir)/arch/$(ARCH)/entry/vdso/vgetrandom-chacha.S diff --git a/tools/testing/selftests/vDSO/vdso_test_chacha.c b/tools/testing/selftests/vDSO/vdso_test_chacha.c new file mode 100644 index 000000000000..e38f44e5f803 --- /dev/null +++ b/tools/testing/selftests/vDSO/vdso_test_chacha.c @@ -0,0 +1,43 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2022-2024 Jason A. Donenfeld <Jason(a)zx2c4.com>. All Rights Reserved. + */ + +#include <sodium/crypto_stream_chacha20.h> +#include <sys/random.h> +#include <string.h> +#include <stdint.h> +#include "../kselftest.h" + +extern void __arch_chacha20_blocks_nostack(uint8_t *dst_bytes, const uint8_t *key, uint32_t *counter, size_t nblocks); + +int main(int argc, char *argv[]) +{ + enum { TRIALS = 1000, BLOCKS = 128, BLOCK_SIZE = 64 }; + static const uint8_t nonce[8] = { 0 }; + uint32_t counter[2]; + uint8_t key[32]; + uint8_t output1[BLOCK_SIZE * BLOCKS], output2[BLOCK_SIZE * BLOCKS]; + + ksft_print_header(); + ksft_set_plan(1); + + for (unsigned int trial = 0; trial < TRIALS; ++trial) { + if (getrandom(key, sizeof(key), 0) != sizeof(key)) { + printf("getrandom() failed!\n"); + return KSFT_SKIP; + } + crypto_stream_chacha20(output1, sizeof(output1), nonce, key); + for (unsigned int split = 0; split < BLOCKS; ++split) { + memset(output2, 'X', sizeof(output2)); + memset(counter, 0, sizeof(counter)); + if (split) + __arch_chacha20_blocks_nostack(output2, key, counter, split); + __arch_chacha20_blocks_nostack(output2 + split * BLOCK_SIZE, key, counter, BLOCKS - split); + if (memcmp(output1, output2, sizeof(output1))) + return KSFT_FAIL; + } + } + ksft_test_result_pass("chacha: PASS\n"); + return KSFT_PASS; +} diff --git a/tools/testing/selftests/vDSO/vdso_test_getrandom.c b/tools/testing/selftests/vDSO/vdso_test_getrandom.c new file mode 100644 index 000000000000..69f5833590d2 --- /dev/null +++ b/tools/testing/selftests/vDSO/vdso_test_getrandom.c @@ -0,0 +1,288 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2022-2024 Jason A. Donenfeld <Jason(a)zx2c4.com>. All Rights Reserved. + */ + +#include <assert.h> +#include <pthread.h> +#include <stdint.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <time.h> +#include <unistd.h> +#include <signal.h> +#include <sys/auxv.h> +#include <sys/mman.h> +#include <sys/random.h> +#include <sys/syscall.h> +#include <sys/types.h> +#include <linux/random.h> + +#include "../kselftest.h" +#include "parse_vdso.h" + +#ifndef timespecsub +#define timespecsub(tsp, usp, vsp) \ + do { \ + (vsp)->tv_sec = (tsp)->tv_sec - (usp)->tv_sec; \ + (vsp)->tv_nsec = (tsp)->tv_nsec - (usp)->tv_nsec; \ + if ((vsp)->tv_nsec < 0) { \ + (vsp)->tv_sec--; \ + (vsp)->tv_nsec += 1000000000L; \ + } \ + } while (0) +#endif + +static struct { + pthread_mutex_t lock; + void **states; + size_t len, cap; +} grnd_allocator = { + .lock = PTHREAD_MUTEX_INITIALIZER +}; + +static struct { + ssize_t(*fn)(void *, size_t, unsigned long, void *, size_t); + pthread_key_t key; + pthread_once_t initialized; + struct vgetrandom_opaque_params params; +} grnd_ctx = { + .initialized = PTHREAD_ONCE_INIT +}; + +static void *vgetrandom_get_state(void) +{ + void *state = NULL; + + pthread_mutex_lock(&grnd_allocator.lock); + if (!grnd_allocator.len) { + size_t page_size = getpagesize(); + size_t new_cap; + size_t alloc_size, num = sysconf(_SC_NPROCESSORS_ONLN); /* Just a decent heuristic. */ + void *new_block, *new_states; + + alloc_size = (num * grnd_ctx.params.size_of_opaque_state + page_size - 1) & (~(page_size - 1)); + num = (page_size / grnd_ctx.params.size_of_opaque_state) * (alloc_size / page_size); + new_block = mmap(0, alloc_size, grnd_ctx.params.mmap_prot, grnd_ctx.params.mmap_flags, -1, 0); + if (new_block == MAP_FAILED) + return NULL; + + new_cap = grnd_allocator.cap + num; + new_states = reallocarray(grnd_allocator.states, new_cap, sizeof(*grnd_allocator.states)); + if (!new_states) + goto unmap; + grnd_allocator.cap = new_cap; + grnd_allocator.states = new_states; + + for (size_t i = 0; i < num; ++i) { + if (((uintptr_t)new_block & (page_size - 1)) + grnd_ctx.params.size_of_opaque_state > page_size) + new_block = (void *)(((uintptr_t)new_block + page_size - 1) & (~(page_size - 1))); + grnd_allocator.states[i] = new_block; + new_block += grnd_ctx.params.size_of_opaque_state; + } + grnd_allocator.len = num; + goto success; + + unmap: + munmap(new_block, alloc_size); + goto out; + } +success: + state = grnd_allocator.states[--grnd_allocator.len]; + +out: + pthread_mutex_unlock(&grnd_allocator.lock); + return state; +} + +static void vgetrandom_put_state(void *state) +{ + if (!state) + return; + pthread_mutex_lock(&grnd_allocator.lock); + grnd_allocator.states[grnd_allocator.len++] = state; + pthread_mutex_unlock(&grnd_allocator.lock); +} + +static void vgetrandom_init(void) +{ + if (pthread_key_create(&grnd_ctx.key, vgetrandom_put_state) != 0) + return; + unsigned long sysinfo_ehdr = getauxval(AT_SYSINFO_EHDR); + if (!sysinfo_ehdr) { + printf("AT_SYSINFO_EHDR is not present!\n"); + exit(KSFT_SKIP); + } + vdso_init_from_sysinfo_ehdr(sysinfo_ehdr); + grnd_ctx.fn = (__typeof__(grnd_ctx.fn))vdso_sym("LINUX_2.6", "__vdso_getrandom"); + if (!grnd_ctx.fn) { + printf("__vdso_getrandom is missing!\n"); + exit(KSFT_FAIL); + } + if (grnd_ctx.fn(NULL, 0, 0, &grnd_ctx.params, ~0UL) != 0) { + printf("failed to fetch vgetrandom params!\n"); + exit(KSFT_FAIL); + } +} + +static ssize_t vgetrandom(void *buf, size_t len, unsigned long flags) +{ + void *state; + + pthread_once(&grnd_ctx.initialized, vgetrandom_init); + state = pthread_getspecific(grnd_ctx.key); + if (!state) { + state = vgetrandom_get_state(); + if (pthread_setspecific(grnd_ctx.key, state) != 0) { + vgetrandom_put_state(state); + state = NULL; + } + if (!state) { + printf("vgetrandom_get_state failed!\n"); + exit(KSFT_FAIL); + } + } + return grnd_ctx.fn(buf, len, flags, state, grnd_ctx.params.size_of_opaque_state); +} + +enum { TRIALS = 25000000, THREADS = 256 }; + +static void *test_vdso_getrandom(void *) +{ + for (size_t i = 0; i < TRIALS; ++i) { + unsigned int val; + ssize_t ret = vgetrandom(&val, sizeof(val), 0); + assert(ret == sizeof(val)); + } + return NULL; +} + +static void *test_libc_getrandom(void *) +{ + for (size_t i = 0; i < TRIALS; ++i) { + unsigned int val; + ssize_t ret = getrandom(&val, sizeof(val), 0); + assert(ret == sizeof(val)); + } + return NULL; +} + +static void *test_syscall_getrandom(void *) +{ + for (size_t i = 0; i < TRIALS; ++i) { + unsigned int val; + ssize_t ret = syscall(__NR_getrandom, &val, sizeof(val), 0); + assert(ret == sizeof(val)); + } + return NULL; +} + +static void bench_single(void) +{ + struct timespec start, end, diff; + + clock_gettime(CLOCK_MONOTONIC, &start); + test_vdso_getrandom(NULL); + clock_gettime(CLOCK_MONOTONIC, &end); + timespecsub(&end, &start, &diff); + printf(" vdso: %u times in %lu.%09lu seconds\n", TRIALS, diff.tv_sec, diff.tv_nsec); + + clock_gettime(CLOCK_MONOTONIC, &start); + test_libc_getrandom(NULL); + clock_gettime(CLOCK_MONOTONIC, &end); + timespecsub(&end, &start, &diff); + printf(" libc: %u times in %lu.%09lu seconds\n", TRIALS, diff.tv_sec, diff.tv_nsec); + + clock_gettime(CLOCK_MONOTONIC, &start); + test_syscall_getrandom(NULL); + clock_gettime(CLOCK_MONOTONIC, &end); + timespecsub(&end, &start, &diff); + printf("syscall: %u times in %lu.%09lu seconds\n", TRIALS, diff.tv_sec, diff.tv_nsec); +} + +static void bench_multi(void) +{ + struct timespec start, end, diff; + pthread_t threads[THREADS]; + + clock_gettime(CLOCK_MONOTONIC, &start); + for (size_t i = 0; i < THREADS; ++i) + assert(pthread_create(&threads[i], NULL, test_vdso_getrandom, NULL) == 0); + for (size_t i = 0; i < THREADS; ++i) + pthread_join(threads[i], NULL); + clock_gettime(CLOCK_MONOTONIC, &end); + timespecsub(&end, &start, &diff); + printf(" vdso: %u x %u times in %lu.%09lu seconds\n", TRIALS, THREADS, diff.tv_sec, diff.tv_nsec); + + clock_gettime(CLOCK_MONOTONIC, &start); + for (size_t i = 0; i < THREADS; ++i) + assert(pthread_create(&threads[i], NULL, test_libc_getrandom, NULL) == 0); + for (size_t i = 0; i < THREADS; ++i) + pthread_join(threads[i], NULL); + clock_gettime(CLOCK_MONOTONIC, &end); + timespecsub(&end, &start, &diff); + printf(" libc: %u x %u times in %lu.%09lu seconds\n", TRIALS, THREADS, diff.tv_sec, diff.tv_nsec); + + clock_gettime(CLOCK_MONOTONIC, &start); + for (size_t i = 0; i < THREADS; ++i) + assert(pthread_create(&threads[i], NULL, test_syscall_getrandom, NULL) == 0); + for (size_t i = 0; i < THREADS; ++i) + pthread_join(threads[i], NULL); + clock_gettime(CLOCK_MONOTONIC, &end); + timespecsub(&end, &start, &diff); + printf(" syscall: %u x %u times in %lu.%09lu seconds\n", TRIALS, THREADS, diff.tv_sec, diff.tv_nsec); +} + +static void fill(void) +{ + uint8_t weird_size[323929]; + for (;;) + vgetrandom(weird_size, sizeof(weird_size), 0); +} + +static void kselftest(void) +{ + uint8_t weird_size[1263]; + + ksft_print_header(); + ksft_set_plan(1); + + for (size_t i = 0; i < 1000; ++i) { + ssize_t ret = vgetrandom(weird_size, sizeof(weird_size), 0); + if (ret != sizeof(weird_size)) + exit(KSFT_FAIL); + } + + ksft_test_result_pass("getrandom: PASS\n"); + exit(KSFT_PASS); +} + +static void usage(const char *argv0) +{ + fprintf(stderr, "Usage: %s [bench-single|bench-multi|fill]\n", argv0); +} + +int main(int argc, char *argv[]) +{ + if (argc == 1) { + kselftest(); + return 0; + } + + if (argc != 2) { + usage(argv[0]); + return 1; + } + if (!strcmp(argv[1], "bench-single")) + bench_single(); + else if (!strcmp(argv[1], "bench-multi")) + bench_multi(); + else if (!strcmp(argv[1], "fill")) + fill(); + else { + usage(argv[0]); + return 1; + } + return 0; +} -- 2.45.2

12 months

1
0
0 0

[PATCH net-next v9 00/10] net: openvswitch: Add sample multicasting.

by Adrian Moreno

** Background ** Currently, OVS supports several packet sampling mechanisms (sFlow, per-bridge IPFIX, per-flow IPFIX). These end up being translated into a userspace action that needs to be handled by ovs-vswitchd's handler threads only to be forwarded to some third party application that will somehow process the sample and provide observability on the datapath. A particularly interesting use-case is controller-driven per-flow IPFIX sampling where the OpenFlow controller can add metadata to samples (via two 32bit integers) and this metadata is then available to the sample-collecting system for correlation. ** Problem ** The fact that sampled traffic share netlink sockets and handler thread time with upcalls, apart from being a performance bottleneck in the sample extraction itself, can severely compromise the datapath, yielding this solution unfit for highly loaded production systems. Users are left with little options other than guessing what sampling rate will be OK for their traffic pattern and system load and dealing with the lost accuracy. Looking at available infrastructure, an obvious candidated would be to use psample. However, it's current state does not help with the use-case at stake because sampled packets do not contain user-defined metadata. ** Proposal ** This series is an attempt to fix this situation by extending the existing psample infrastructure to carry a variable length user-defined cookie. The main existing user of psample is tc's act_sample. It is also extended to forward the action's cookie to psample. Finally, a new OVS action (OVS_SAMPLE_ATTR_PSAMPLE) is created. It accepts a group and an optional cookie and uses psample to multicast the packet and the metadata. -- v8 -> v9: - Rebased. v7 -> v8: - Rebased - Redirect flow insertion to /dev/null to avoid spat in test. - Removed inline keyword in stub execute_psample_action function. v6 -> v7: - Rebased - Fixed typo in comment. v5 -> v6: - Renamed emit_sample -> psample - Addressed unused variable and conditionally compilation of function. v4 -> v5: - Rebased. - Removed lefover enum value and wrapped some long lines in selftests. v3 -> v4: - Rebased. - Addressed Jakub's comment on private and unused nla attributes. v2 -> v3: - Addressed comments from Simon, Aaron and Ilya. - Dropped probability propagation in nested sample actions. - Dropped patch v2's 7/9 in favor of a userspace implementation and consume skb if emit_sample is the last action, same as we do with userspace. - Split ovs-dpctl.py features in independent patches. v1 -> v2: - Create a new action ("emit_sample") rather than reuse existing "sample" one. - Add probability semantics to psample's sampling rate. - Store sampling probability in skb's cb area and use it in emit_sample. - Test combining "emit_sample" with "trunc" - Drop group_id filtering and tracepoint in psample. rfc_v2 -> v1: - Accommodate Ilya's comments. - Split OVS's attribute in two attributes and simplify internal handling of psample arguments. - Extend psample and tc with a user-defined cookie. - Add a tracepoint to psample to facilitate troubleshooting. rfc_v1 -> rfc_v2: - Use psample instead of a new OVS-only multicast group. - Extend psample and tc with a user-defined cookie. Adrian Moreno (10): net: psample: add user cookie net: sched: act_sample: add action cookie to sample net: psample: skip packet copy if no listeners net: psample: allow using rate as probability net: openvswitch: add psample action net: openvswitch: store sampling probability in cb. selftests: openvswitch: add psample action selftests: openvswitch: add userspace parsing selftests: openvswitch: parse trunc action selftests: openvswitch: add psample test Documentation/netlink/specs/ovs_flow.yaml | 17 ++ include/net/psample.h | 5 +- include/uapi/linux/openvswitch.h | 31 +- include/uapi/linux/psample.h | 11 +- net/openvswitch/Kconfig | 1 + net/openvswitch/actions.c | 66 ++++- net/openvswitch/datapath.h | 3 + net/openvswitch/flow_netlink.c | 32 ++- net/openvswitch/vport.c | 1 + net/psample/psample.c | 16 +- net/sched/act_sample.c | 12 + .../selftests/net/openvswitch/openvswitch.sh | 115 +++++++- .../selftests/net/openvswitch/ovs-dpctl.py | 272 +++++++++++++++++- 13 files changed, 566 insertions(+), 16 deletions(-) -- 2.45.2

1 year

3
6
0 0

[PATCH bpf-next v8 0/9] use network helpers, part 8

by Geliang Tang

From: Geliang Tang <tanggeliang(a)kylinos.cn> v8: - only patch 8 updated, to fix errors reported by CI. v7: - address Martin's comments in v6. (thanks) - use MAX(opts->backlog, 0) instead of opts->backlog. - use connect_to_fd_opts instead connect_to_fd. - more ASSERT_* to check errors. v6: - update patch 6 as Daniel suggested. (thanks) v5: - keep make_server and make_client as Eduard suggested. v4: - a new patch to use make_sockaddr in sockmap_ktls. - a new patch to close fd in error path in drop_on_reuseport. - drop make_server() in patch 7. - drop make_client() too in patch 9. v3: - a new patch to add backlog for network_helper_opts. - use start_server_str in sockmap_ktls now, not start_server. v2: - address Eduard's comments in v1. (thanks) - fix errors reported by CI. This patch set uses network helpers in sockmap_ktls and sk_lookup, and drop three local helpers tcp_server(), inetaddr_len() and make_socket() in them. Geliang Tang (9): selftests/bpf: Add backlog for network_helper_opts selftests/bpf: Use start_server_str in sockmap_ktls selftests/bpf: Use connect_to_fd_opts in sockmap_ktls selftests/bpf: Use make_sockaddr in sockmap_ktls selftests/bpf: Close fd in error path in drop_on_reuseport selftests/bpf: Use start_server_str in sk_lookup selftests/bpf: Use connect_to_fd_opts in sk_lookup selftests/bpf: Use connect_to_addr in sk_lookup selftests/bpf: Drop make_socket in sk_lookup tools/testing/selftests/bpf/network_helpers.c | 2 +- tools/testing/selftests/bpf/network_helpers.h | 4 + .../selftests/bpf/prog_tests/sk_lookup.c | 152 +++++++----------- .../selftests/bpf/prog_tests/sockmap_ktls.c | 53 ++---- 4 files changed, 76 insertions(+), 135 deletions(-) -- 2.43.0

1 year

2
10
0 0

[PATCH v5 0/3] selftests/vDSO: fix clang build errors, and Makefile cleanup

by John Hubbard

Hi Shuah, These are for 6.10, as we just discussed. Changes since v4: 1) Subject line on patch #2/3: s/mm/vDSO/ 2) Added Muhammad's review tag. Changes since v3: 1. Rebased onto Linux 6.10-rc6+. Cover letter for v3: Jason A. Donenfeld, I've added you because I ended up looking through your latest "implement getrandom() in vDSO" series [1], which also touches this Makefile, so just a heads up about upcoming (minor) merge conflicts. Changes since v2: 1. Added two patches, both of which apply solely to the Makefile. These provide a smaller, cleaner, and more accurate Makefile. 2. Added Reviewed-by and Tested-by tags for the original patch, which fixes all of the clang errors and warnings for this selftest. 3. Removed an obsolete blurb from the commit description of the original patch, now that Valentin Obst LLVM build fix has been merged. thanks, John Hubbard NVIDIA John Hubbard (3): selftests/vDSO: fix clang build errors and warnings selftests/vDSO: remove partially duplicated "all:" target in Makefile selftests/vDSO: remove duplicate compiler invocations from Makefile tools/testing/selftests/vDSO/Makefile | 29 ++++++++----------- tools/testing/selftests/vDSO/parse_vdso.c | 16 ++++++---- .../selftests/vDSO/vdso_standalone_test_x86.c | 18 ++++++++++-- 3 files changed, 39 insertions(+), 24 deletions(-) base-commit: d270dd21bee023ab627f34cfb77a9b89a688492a -- 2.40.1

1 year

2
4
0 0

[PATCH v4 0/3] selftests/vDSO: fix clang build errors, and Makefile cleanup

by John Hubbard

Hi, This is basically a resend, with a rebase onto today's latest Linux main, in order to show that the patches are still relevant and correct. Changes since v3: 1. Rebased onto Linux 6.10-rc6+. Cover letter for v3: Jason A. Donenfeld, I've added you because I ended up looking through your latest "implement getrandom() in vDSO" series [1], which also touches this Makefile, so just a heads up about upcoming (minor) merge conflicts. Changes since v2: 1. Added two patches, both of which apply solely to the Makefile. These provide a smaller, cleaner, and more accurate Makefile. 2. Added Reviewed-by and Tested-by tags for the original patch, which fixes all of the clang errors and warnings for this selftest. 3. Removed an obsolete blurb from the commit description of the original patch, now that Valentin Obst LLVM build fix has been merged. John Hubbard (3): selftests/vDSO: fix clang build errors and warnings selftests/mm: remove partially duplicated "all:" target in Makefile selftests/vDSO: remove duplicate compiler invocations from Makefile tools/testing/selftests/vDSO/Makefile | 29 ++++++++----------- tools/testing/selftests/vDSO/parse_vdso.c | 16 ++++++---- .../selftests/vDSO/vdso_standalone_test_x86.c | 18 ++++++++++-- 3 files changed, 39 insertions(+), 24 deletions(-) base-commit: 8a9c6c40432e265600232b864f97d7c675e8be52 -- 2.45.2

1 year

3
8
0 0

[PATCH v2] selftest: acct: Add selftest for the acct() syscall

by Abdulrasaq Lawani

Noticed that there was no selftest for the acct() syscall which enables the kernel to record terminated processes into a specified file. The acct() system call enables or disables process accounting. If accounting is turned on, records for each terminating process are appended to a specified filename as it terminates. An argument of NULL causes accounting to be turned off. This patch provides a test for the acct() syscall. References: https://man7.org/linux/man-pages/man2/acct.2.html Signed-off-by: Abdulrasaq Lawani <abdulrasaqolawani(a)gmail.com> --- Changes in v2: Add testcases to test error conditions. Add kselftest function for reporting results. - Link to v1: https://lore.kernel.org/r/20240622-kselftest-acct-syscall-v1-1-d270b5be8d37… --- tools/testing/selftests/Makefile | 1 + tools/testing/selftests/acct/.gitignore | 2 + tools/testing/selftests/acct/Makefile | 4 ++ tools/testing/selftests/acct/acct_syscall.c | 89 +++++++++++++++++++++++++++++ 4 files changed, 96 insertions(+) diff --git a/tools/testing/selftests/Makefile b/tools/testing/selftests/Makefile index 9039f3709aff..45a58ef5ad92 100644 --- a/tools/testing/selftests/Makefile +++ b/tools/testing/selftests/Makefile @@ -1,4 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 +TARGETS += acct TARGETS += alsa TARGETS += amd-pstate TARGETS += arm64 diff --git a/tools/testing/selftests/acct/.gitignore b/tools/testing/selftests/acct/.gitignore new file mode 100644 index 000000000000..8ab358d81bd2 --- /dev/null +++ b/tools/testing/selftests/acct/.gitignore @@ -0,0 +1,2 @@ +acct_syscall +config \ No newline at end of file diff --git a/tools/testing/selftests/acct/Makefile b/tools/testing/selftests/acct/Makefile new file mode 100644 index 000000000000..ff3e238c5634 --- /dev/null +++ b/tools/testing/selftests/acct/Makefile @@ -0,0 +1,4 @@ +TEST_GEN_PROGS := acct_syscall +CFLAGS += -Wall + +include ../lib.mk \ No newline at end of file diff --git a/tools/testing/selftests/acct/acct_syscall.c b/tools/testing/selftests/acct/acct_syscall.c new file mode 100644 index 000000000000..4fa00a88a1bd --- /dev/null +++ b/tools/testing/selftests/acct/acct_syscall.c @@ -0,0 +1,89 @@ +// SPDX-License-Identifier: GPL-2.0 + +/* kselftest for acct() system call + * The acct() system call enables or disables process accounting. + */ + +#include <stdio.h> +#include <errno.h> +#include <string.h> +#include <sys/wait.h> + +#include "../kselftest.h" + +int main(void) +{ + // Setting up kselftest framework + ksft_print_header(); + ksft_set_plan(1); + + // Create file to log closed processes + char filename[] = "process_log"; + FILE *fp; + + fp = fopen(filename, "w"); + + int i = acct(filename); + + // Handle error conditions + if (i) { + switch (errno) { + case EPERM: + ksft_test_result_error("%s. Please run the test as root.\n", + strerror(errno)); + break; + + case EACCES: + ksft_test_result_error("Insufficient privilege.\n"); + break; + + case EIO: + ksft_test_result_error("Error writing to the file: %s.\n", filename); + break; + + default: + ksft_test_result_error("%s.\n", strerror(errno)); + break; + } + + remove(filename); + fclose(fp); + ksft_finished(); + return 1; + } + + // Create child process and wait for it to terminate. + pid_t child_pid; + + child_pid = fork(); + + if (child_pid < 0) { + ksft_test_result_error("Process failed\n"); + ksft_finished(); + return 1; + } else if (child_pid == 0) { + ksft_print_msg("Child process successfully created!\n"); + } else { + wait(NULL); + fseek(fp, 0L, SEEK_END); + int sz = ftell(fp); + + ksft_print_msg("Parent process successfully created!\n"); + + i = acct(NULL); + + if (sz <= 0) { + ksft_test_result_fail("Terminated child process not logged"); + ksft_exit_fail(); + return 1; + } + + ksft_test_result_pass("Successfully logged terminated process.\n"); + remove(filename); + fclose(fp); + ksft_exit_pass(); + return 0; + } + + return 1; +} --- base-commit: 50736169ecc8387247fe6a00932852ce7b057083 change-id: 20240622-kselftest-acct-syscall-2d90f7666b1e Best regards, -- Abdulrasaq Lawani <abdulrasaqolawani(a)gmail.com>

1 year

2
1
0 0

[PATCH v3] selftests/timers: remove unused irqcount variable

by John Hubbard

When building with clang, via: make LLVM=1 -C tools/testing/selftest ...clang warns about an unused irqcount variable. clang is correct: the variable is incremented and then ignored. Fix this by deleting the irqcount variable. Signed-off-by: John Hubbard <jhubbard(a)nvidia.com> --- Changes since v2: 1) Rebased onto Linux 6.10-rc6+ Changes since the first version: 1) Rebased onto Linux 6.10-rc1 thanks, John Hubbard tools/testing/selftests/timers/rtcpie.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/testing/selftests/timers/rtcpie.c b/tools/testing/selftests/timers/rtcpie.c index 4ef2184f1558..7c07edd0d450 100644 --- a/tools/testing/selftests/timers/rtcpie.c +++ b/tools/testing/selftests/timers/rtcpie.c @@ -29,7 +29,7 @@ static const char default_rtc[] = "/dev/rtc0"; int main(int argc, char **argv) { - int i, fd, retval, irqcount = 0; + int i, fd, retval; unsigned long tmp, data, old_pie_rate; const char *rtc = default_rtc; struct timeval start, end, diff; @@ -120,7 +120,6 @@ int main(int argc, char **argv) fprintf(stderr, " %d",i); fflush(stderr); - irqcount++; } /* Disable periodic interrupts */ base-commit: 8a9c6c40432e265600232b864f97d7c675e8be52 -- 2.45.2

1 year

4
3
0 0

[PATCH net-next 0/3] selftests: openvswitch: Address some flakes in the CI environment

by Aaron Conole

These patches aim to make using the openvswitch testsuite more reliable. These should address the major sources of flakiness in the openvswitch test suite allowing the CI infrastructure to exercise the openvswitch module for patch series. There should be no change for users who simply run the tests (except that patch 3/3 does make some of the debugging a bit easier by making some output more verbose). Aaron Conole (3): selftests: openvswitch: Bump timeout to 15 minutes. selftests: openvswitch: Attempt to autoload module. selftests: openvswitch: Be more verbose with selftest debugging. .../selftests/net/openvswitch/openvswitch.sh | 23 ++++++++++++------- .../selftests/net/openvswitch/settings | 1 + 2 files changed, 16 insertions(+), 8 deletions(-) create mode 100644 tools/testing/selftests/net/openvswitch/settings -- 2.45.1

1 year

5
11
0 0

Re: [PATCH net-next v9 00/10] net: openvswitch: Add sample multicasting.

by Adrián Moreno

On Fri, Jul 05, 2024 at 11:49:28AM GMT, Adrián Moreno wrote: > On Thu, Jul 04, 2024 at 10:56:51AM GMT, Adrian Moreno wrote: > > ** Background ** > > Currently, OVS supports several packet sampling mechanisms (sFlow, > > per-bridge IPFIX, per-flow IPFIX). These end up being translated into a > > userspace action that needs to be handled by ovs-vswitchd's handler > > threads only to be forwarded to some third party application that > > will somehow process the sample and provide observability on the > > datapath. > > > > A particularly interesting use-case is controller-driven > > per-flow IPFIX sampling where the OpenFlow controller can add metadata > > to samples (via two 32bit integers) and this metadata is then available > > to the sample-collecting system for correlation. > > > > ** Problem ** > > The fact that sampled traffic share netlink sockets and handler thread > > time with upcalls, apart from being a performance bottleneck in the > > sample extraction itself, can severely compromise the datapath, > > yielding this solution unfit for highly loaded production systems. > > > > Users are left with little options other than guessing what sampling > > rate will be OK for their traffic pattern and system load and dealing > > with the lost accuracy. > > > > Looking at available infrastructure, an obvious candidated would be > > to use psample. However, it's current state does not help with the > > use-case at stake because sampled packets do not contain user-defined > > metadata. > > > > ** Proposal ** > > This series is an attempt to fix this situation by extending the > > existing psample infrastructure to carry a variable length > > user-defined cookie. > > > > The main existing user of psample is tc's act_sample. It is also > > extended to forward the action's cookie to psample. > > > > Finally, a new OVS action (OVS_SAMPLE_ATTR_PSAMPLE) is created. > > It accepts a group and an optional cookie and uses psample to > > multicast the packet and the metadata. > > > > -- > > v8 -> v9: > > - Rebased. > > > > v7 -> v8: > > - Rebased > > - Redirect flow insertion to /dev/null to avoid spat in test. > > - Removed inline keyword in stub execute_psample_action function. > > > > v6 -> v7: > > - Rebased > > - Fixed typo in comment. > > > > v5 -> v6: > > - Renamed emit_sample -> psample > > - Addressed unused variable and conditionally compilation of function. > > > > v4 -> v5: > > - Rebased. > > - Removed lefover enum value and wrapped some long lines in selftests. > > > > v3 -> v4: > > - Rebased. > > - Addressed Jakub's comment on private and unused nla attributes. > > > > v2 -> v3: > > - Addressed comments from Simon, Aaron and Ilya. > > - Dropped probability propagation in nested sample actions. > > - Dropped patch v2's 7/9 in favor of a userspace implementation and > > consume skb if emit_sample is the last action, same as we do with > > userspace. > > - Split ovs-dpctl.py features in independent patches. > > > > v1 -> v2: > > - Create a new action ("emit_sample") rather than reuse existing > > "sample" one. > > - Add probability semantics to psample's sampling rate. > > - Store sampling probability in skb's cb area and use it in emit_sample. > > - Test combining "emit_sample" with "trunc" > > - Drop group_id filtering and tracepoint in psample. > > > > rfc_v2 -> v1: > > - Accommodate Ilya's comments. > > - Split OVS's attribute in two attributes and simplify internal > > handling of psample arguments. > > - Extend psample and tc with a user-defined cookie. > > - Add a tracepoint to psample to facilitate troubleshooting. > > > > rfc_v1 -> rfc_v2: > > - Use psample instead of a new OVS-only multicast group. > > - Extend psample and tc with a user-defined cookie. > > > > Adrian Moreno (10): > > net: psample: add user cookie > > net: sched: act_sample: add action cookie to sample > > net: psample: skip packet copy if no listeners > > net: psample: allow using rate as probability > > net: openvswitch: add psample action > > net: openvswitch: store sampling probability in cb. > > selftests: openvswitch: add psample action > > selftests: openvswitch: add userspace parsing > > selftests: openvswitch: parse trunc action > > selftests: openvswitch: add psample test > > > > Documentation/netlink/specs/ovs_flow.yaml | 17 ++ > > include/net/psample.h | 5 +- > > include/uapi/linux/openvswitch.h | 31 +- > > include/uapi/linux/psample.h | 11 +- > > net/openvswitch/Kconfig | 1 + > > net/openvswitch/actions.c | 66 ++++- > > net/openvswitch/datapath.h | 3 + > > net/openvswitch/flow_netlink.c | 32 ++- > > net/openvswitch/vport.c | 1 + > > net/psample/psample.c | 16 +- > > net/sched/act_sample.c | 12 + > > .../selftests/net/openvswitch/openvswitch.sh | 115 +++++++- > > .../selftests/net/openvswitch/ovs-dpctl.py | 272 +++++++++++++++++- > > 13 files changed, 566 insertions(+), 16 deletions(-) > > > > -- > > 2.45.2 > > > > Hi, > > Simon Horman has spotted that openvswitch.sh tests are failing in the > debug executor: > > https://netdev.bots.linux.dev/contest.html?test=openvswitch-sh > > The failing tests are two: psample and upcall_interfaces. These two > tests have a known source of instability (they use "sleep") that make > them specially unreliable in slow systems. > > Aaron and I already discussed this and I'm working on a patch to make > both tests more robust by adding a wait-and-retry mechanism. > > I hope this series can be considered regardless of this flaky tests. > Adding more context to explain our situation. This series has a counterpart in OVS [1]. The state of this other series is still RFC just because the kernel bits have not yet been merged. OVS 3.4 "softfreeze" was declared last monday, which excludes from the release any series that is stil in RFC state. Given the kernel parts seemed very close to be merged, an exception was given to the series so we can consider it for inclusion [2]. I hate to put any pressure on already busy maintainers but I would also dislike missing this OVS release by just one or two days and having to wait 6 months (OVS release cadence) for it to be available. Again, I don't want to put pressure on maintainers. If it's not possible, that's it. I just wanted to voice our timeline constraints. Thanks for your understanding. Adrián [1] https://patchwork.ozlabs.org/project/openvswitch/cover/20240704085710.35384… [2] https://mail.openvswitch.org/pipermail/ovs-dev/2024-July/415261.html

1 year

1
0
0 0

[PATCH] selftests/net: do_setcpu function not need to have a return value

by Liu Jing

in the do_setcpu, this function does not need to have a return value, which is meaningless Signed-off-by: Liu Jing <liujing(a)cmss.chinamobile.com> --- tools/testing/selftests/net/msg_zerocopy.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/testing/selftests/net/msg_zerocopy.c b/tools/testing/selftests/net/msg_zerocopy.c index bdc03a2097e8..0b54f2011449 100644 --- a/tools/testing/selftests/net/msg_zerocopy.c +++ b/tools/testing/selftests/net/msg_zerocopy.c @@ -118,7 +118,7 @@ static uint16_t get_ip_csum(const uint16_t *start, int num_words) return ~sum; } -static int do_setcpu(int cpu) +static void do_setcpu(int cpu) { cpu_set_t mask; @@ -129,7 +129,6 @@ static int do_setcpu(int cpu) else if (cfg_verbose) fprintf(stderr, "cpu: %u\n", cpu); - return 0; } static void do_setsockopt(int fd, int level, int optname, int val) -- 2.33.0

1 year

1
0
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-kselftest-mirror