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

[PATCH v1 00/10] Define _GNU_SOURCE for sources using

by Edward Liaw

809216233555 ("selftests/harness: remove use of LINE_MAX") introduced asprintf into kselftest_harness.h, which is a GNU extension and needs _GNU_SOURCE to either be defined prior to including headers or with the -D_GNU_SOURCE flag passed to the compiler. Edward Liaw (10): selftests/sgx: Compile with -D_GNU_SOURCE selftests/alsa: Compile with -D_GNU_SOURCE selftests/hid: Compile with -D_GNU_SOURCE selftests/kvm: Define _GNU_SOURCE selftests/nci: Compile with -D_GNU_SOURCE selftests/net: Define _GNU_SOURCE selftests/prctl: Compile with -D_GNU_SOURCE selftests/rtc: Compile with -D_GNU_SOURCE selftests/tdx: Compile with -D_GNU_SOURCE selftests/user_events: Compiled with -D_GNU_SOURCE tools/testing/selftests/alsa/Makefile | 1 + tools/testing/selftests/hid/Makefile | 2 +- tools/testing/selftests/kvm/x86_64/fix_hypercall_test.c | 2 ++ tools/testing/selftests/nci/Makefile | 2 +- tools/testing/selftests/net/bind_wildcard.c | 1 + tools/testing/selftests/net/ip_local_port_range.c | 1 + tools/testing/selftests/net/reuseaddr_ports_exhausted.c | 2 ++ tools/testing/selftests/prctl/Makefile | 1 + tools/testing/selftests/rtc/Makefile | 2 +- tools/testing/selftests/sgx/Makefile | 2 +- tools/testing/selftests/sgx/sigstruct.c | 2 -- tools/testing/selftests/tdx/Makefile | 2 +- tools/testing/selftests/user_events/Makefile | 2 +- tools/testing/selftests/user_events/abi_test.c | 1 - 14 files changed, 14 insertions(+), 9 deletions(-) -- 2.45.0.rc0.197.gbae5840b3b-goog

1 year, 6 months

6
17
0 0

Re: [PATCH 2/2] selftests/netfilter: return a value for several "int" functions

by John Hubbard

On 5/7/24 1:36 AM, Felix Huettner wrote: > > > > As long as we are looking at this, what do you think about > > this: > > > > diff --git a/tools/testing/selftests/netfilter/conntrack_dump_flush.c > > b/tools/testing/selftests/netfilter/conntrack_dump_flush.c > > index e9df4ae14e16..4a73afad4de4 100644 > > --- a/tools/testing/selftests/netfilter/conntrack_dump_flush.c > > +++ b/tools/testing/selftests/netfilter/conntrack_dump_flush.c > > @@ -317,12 +317,12 @@ FIXTURE_SETUP(conntrack_dump_flush) > > self->sock = mnl_socket_open(NETLINK_NETFILTER); > > if (!self->sock) { > > perror("mnl_socket_open"); > > - exit(EXIT_FAILURE); > > + SKIP(exit(EXIT_FAILURE), "mnl_socket_open() failed"); > > } > > > > if (mnl_socket_bind(self->sock, 0, MNL_SOCKET_AUTOPID) < 0) { > > perror("mnl_socket_bind"); > > - exit(EXIT_FAILURE); > > + SKIP(exit(EXIT_FAILURE), "mnl_socket_bind() failed"); > > } > > > > ret = conntracK_count_zone(self->sock, TEST_ZONE_ID); > > > > ...which changes the above output, to: > > > > $ ./conntrack_dump_flush > > TAP version 13 > > 1..3 > > # Starting 3 tests from 1 test cases. > > # RUN conntrack_dump_flush.test_dump_by_zone ... > > mnl_socket_open: Protocol not supported > > # SKIP mnl_socket_open() failed > > # OK conntrack_dump_flush.test_dump_by_zone > > ok 1 conntrack_dump_flush.test_dump_by_zone # SKIP mnl_socket_open() > failed > > # RUN conntrack_dump_flush.test_flush_by_zone ... > > mnl_socket_open: Protocol not supported > > # SKIP mnl_socket_open() failed > > # OK conntrack_dump_flush.test_flush_by_zone > > ok 2 conntrack_dump_flush.test_flush_by_zone # SKIP mnl_socket_open() > failed > > # RUN conntrack_dump_flush.test_flush_by_zone_default ... > > mnl_socket_open: Protocol not supported > > # SKIP mnl_socket_open() failed > > # OK conntrack_dump_flush.test_flush_by_zone_default > > ok 3 conntrack_dump_flush.test_flush_by_zone_default # SKIP > > mnl_socket_open() failed > > # PASSED: 3 / 3 tests passed. > > # Totals: pass:0 fail:0 xfail:0 xpass:0 skip:3 error:0 > > > > ? > > lgtm > OK, I'll send that out, appreciate your looking at it. thanks, -- John Hubbard NVIDIA

1 year, 6 months

1
0
0 0

[PATCH net-next v8 0/3] net: gro: remove network_header use, move p->{flush/flush_id} calculations to L4

by Richard Gobert

The cb fields network_offset and inner_network_offset are used instead of skb->network_header throughout GRO. These fields are then leveraged in the next commit to remove flush_id state from napi_gro_cb, and stateful code in {ipv6,inet}_gro_receive which may be unnecessarily complicated due to encapsulation support in GRO. These fields are checked in L4 instead. 3rd patch adds tests for different flush_id flows in GRO. v7 -> v8: - Remove network_header use in gro - Re-send commits after the dependent patch to net was applied - v7: https://lore.kernel.org/all/20240412155533.115507-1-richardbgobert@gmail.co… v6 -> v7: - Moved bug fixes to a separate submission in net - Added UDP fwd benchmark - v6: https://lore.kernel.org/all/20240410153423.107381-1-richardbgobert@gmail.co… v5 -> v6: - Write inner_network_offset in vxlan and geneve - Ignore is_atomic when DF=0 - v5: https://lore.kernel.org/all/20240408141720.98832-1-richardbgobert@gmail.com/ v4 -> v5: - Add 1st commit - flush id checks in udp_gro_receive segment which can be backported by itself - Add TCP measurements for the 5th commit - Add flush id tests to ensure flush id logic is preserved in GRO - Simplify gro_inet_flush by removing a branch - v4: https://lore.kernel.org/all/202420325182543.87683-1-richardbgobert@gmail.co… v3 -> v4: - Fix code comment and commit message typos - v3: https://lore.kernel.org/all/f939c84a-2322-4393-a5b0-9b1e0be8ed8e@gmail.com/ v2 -> v3: - Use napi_gro_cb instead of skb->{offset} - v2: https://lore.kernel.org/all/2ce1600b-e733-448b-91ac-9d0ae2b866a4@gmail.com/ v1 -> v2: - Pass p_off in *_gro_complete to fix UDP bug - Remove more conditionals and memory fetches from inet_gro_flush - v1: https://lore.kernel.org/netdev/e1d22505-c5f8-4c02-a997-64248480338b@gmail.c… Richard Gobert (3): net: gro: use cb instead of skb->network_header net: gro: move L3 flush checks to tcp_gro_receive and udp_gro_receive_segment selftests/net: add flush id selftests include/net/gro.h | 75 +++++++++++++-- net/core/gro.c | 3 - net/ipv4/af_inet.c | 45 +-------- net/ipv4/tcp_offload.c | 18 +--- net/ipv4/udp_offload.c | 10 +- net/ipv6/ip6_offload.c | 16 +--- net/ipv6/tcpv6_offload.c | 3 +- tools/testing/selftests/net/gro.c | 147 ++++++++++++++++++++++++++++++ 8 files changed, 225 insertions(+), 92 deletions(-) -- 2.36.1

1 year, 6 months

2
9
0 0

[PATCH v6 00/10] Fix Kselftest's vfork() side effects

by Mickaël Salaün

Hi, This sixth series just update the last patch description. Shuah, I think this should be in -next really soon to make sure everything works fine for the v6.9 release, which is not currently the case. I cannot test against all kselftests though. I would prefer to let you handle this, but I guess you're not able to do so and I'll push it on my branch without reply from you. Even if I push it on my branch, please push it on yours too as soon as you see this and I'll remove it from mine. Mark, Jakub, could you please test this series? As reported by Kernel Test Robot [1] and Sean Christopherson [2], some tests fail since v6.9-rc1 . This is due to the use of vfork() which introduced some side effects. Similarly, while making it more generic, a previous commit made some Landlock file system tests flaky, and subject to the host's file system mount configuration. This series fixes all these side effects by replacing vfork() with clone3() and CLONE_VFORK, which is cleaner (no arbitrary shared memory) and makes the Kselftest framework more robust. I tried different approaches and I found this one to be the cleaner and less invasive for current test cases. I successfully ran the following tests (using TEST_F and fork/clone/clone3, and KVM_ONE_VCPU_TEST) with this series: - kvm:fix_hypercall_test - kvm:sync_regs_test - kvm:userspace_msr_exit_test - kvm:vmx_pmu_caps_test - landlock:fs_test - landlock:net_test - landlock:ptrace_test - move_mount_set_group:move_mount_set_group_test - net/af_unix:scm_pidfd - perf_events:remove_on_exec - pidfd:pidfd_getfd_test - pidfd:pidfd_setns_test - seccomp:seccomp_bpf - user_events:abi_test [1] https://lore.kernel.org/oe-lkp/202403291015.1fcfa957-oliver.sang@intel.com [2] https://lore.kernel.org/r/ZjPelW6-AbtYvslu@google.com Previous versions: v1: https://lore.kernel.org/r/20240426172252.1862930-1-mic@digikod.net v2: https://lore.kernel.org/r/20240429130931.2394118-1-mic@digikod.net v3: https://lore.kernel.org/r/20240429191911.2552580-1-mic@digikod.net v4: https://lore.kernel.org/r/20240502210926.145539-1-mic@digikod.net v5: https://lore.kernel.org/r/20240503105820.300927-1-mic@digikod.net Regards, Mickaël Salaün (10): selftests/pidfd: Fix config for pidfd_setns_test selftests/landlock: Fix FS tests when run on a private mount point selftests/harness: Fix fixture teardown selftests/harness: Fix interleaved scheduling leading to race conditions selftests/landlock: Do not allocate memory in fixture data selftests/harness: Constify fixture variants selftests/pidfd: Fix wrong expectation selftests/harness: Share _metadata between forked processes selftests/harness: Fix vfork() side effects selftests/harness: Handle TEST_F()'s explicit exit codes tools/testing/selftests/kselftest_harness.h | 122 +++++++++++++----- tools/testing/selftests/landlock/fs_test.c | 83 +++++++----- tools/testing/selftests/pidfd/config | 2 + .../selftests/pidfd/pidfd_setns_test.c | 2 +- 4 files changed, 143 insertions(+), 66 deletions(-) base-commit: e67572cd2204894179d89bd7b984072f19313b03 -- 2.45.0

1 year, 6 months

3
13
0 0

[PATCH 00/18] HID: Include current HID-BPF fixes in tree

by Benjamin Tissoires

When I introduced HID-BPF, I mentioned that we should ship the HID-BPF programs in the kernel when they are fixes so that everybody can benefit from them. I tried multiple times to do so but I was confronted to a tough problem: how can I make the kernel load them automatically? I went over a few solutions, but it always came down to something either ugly, or either not satisfying (like forcing `bpftool` to be compiled first, or not being able to insert them as a module). OTOH, I was working with Peter on `udev-hid-bpf`[0] as a proof of concept on how a minimal loader should look like. This allowed me to experiment on the BPF files and how they should look like. And after further thoughts, I realized that `udev-hid-bpf` could very well be the `kmod load` that we currently have: - the kernel handles the device normally - a udev event is emitted - a udev rule fires `udev-hid-bpf` and load the appropriate HID-BPF file(s) based on the modalias Given that most HID devices are supposed to work to a minimal level when connected without any driver, this makes the whole HID-BPF programs nice to have but not critical. We can then postpone the HID-BPF loading when userspace is ready. Working with HID-BPF is also a much better user experience for end users (as I predicted). All they have to do is to go to the `udev-hid-bpf` project, fetch an artifact from the MR that concerns them, run `install.sh` (no compilation required), and their devices are fixed (minus some back and forth when the HID-BPF program needs some changes). So I already have that loader available, and it works well enough for our users. But the missing point was still how to "upstream" those BPF fixes? That's where this patch series comes in: we simply store the fixes in the kernel under `drivers/hid/bpf/progs`, provide a way to compile them, but also add tests for them in the selftests dir. Once a program is accepted here, for convenience, the same program will move from a "testing" directory to a "stable" directory on `udev-hid-bpf`. This way, distributions don't need to follow when there is a new program added here, they can just ship the "stable" ones from `udev-hid-bpf`. Signed-off-by: Benjamin Tissoires <bentiss(a)kernel.org> [0] https://gitlab.freedesktop.org/libevdev/udev-hid-bpf/ --- Benjamin Tissoires (18): HID: do not assume HAT Switch logical max < 8 HID: bpf: add first in-tree HID-BPF fix for the XPPen Artist 24 HID: bpf: add in-tree HID-BPF fix for the XPPen Artist 16 HID: bpf: add in-tree HID-BPF fix for the HP Elite Presenter Mouse HID: bpf: add in-tree HID-BPF fix for the IOGear Kaliber Gaming MMOmentum mouse HID: bpf: add in-tree HID-BPF fix for the Wacom ArtPen HID: bpf: add in-tree HID-BPF fix for the XBox Elite 2 over Bluetooth HID: bpf: add in-tree HID-BPF fix for the Huion Kamvas Pro 19 HID: bpf: add in-tree HID-BPF fix for the Raptor Mach 2 selftests/hid: import base_device.py from hid-tools selftests/hid: add support for HID-BPF pre-loading before starting a test selftests/hid: tablets: reduce the number of pen state selftests/hid: tablets: add a couple of XP-PEN tablets selftests/hid: tablets: also check for XP-Pen offset correction selftests/hid: add Huion Kamvas Pro 19 tests selftests/hid: import base_gamepad.py from hid-tools selftests/hid: move the gamepads definitions in the test file selftests/hid: add tests for the Raptor Mach 2 joystick drivers/hid/bpf/progs/FR-TEC__Raptor-Mach-2.bpf.c | 185 ++++++ drivers/hid/bpf/progs/HP__Elite-Presenter.bpf.c | 58 ++ drivers/hid/bpf/progs/Huion__Kamvas-Pro-19.bpf.c | 290 +++++++++ .../hid/bpf/progs/IOGEAR__Kaliber-MMOmentum.bpf.c | 59 ++ drivers/hid/bpf/progs/Makefile | 91 +++ .../hid/bpf/progs/Microsoft__XBox-Elite-2.bpf.c | 133 ++++ drivers/hid/bpf/progs/README | 102 +++ drivers/hid/bpf/progs/Wacom__ArtPen.bpf.c | 173 +++++ drivers/hid/bpf/progs/XPPen__Artist24.bpf.c | 229 +++++++ drivers/hid/bpf/progs/XPPen__ArtistPro16Gen2.bpf.c | 274 ++++++++ drivers/hid/bpf/progs/hid_bpf.h | 15 + drivers/hid/bpf/progs/hid_bpf_helpers.h | 170 +++++ include/linux/hid.h | 6 +- tools/testing/selftests/hid/tests/base.py | 87 ++- tools/testing/selftests/hid/tests/base_device.py | 421 ++++++++++++ tools/testing/selftests/hid/tests/base_gamepad.py | 238 +++++++ tools/testing/selftests/hid/tests/test_gamepad.py | 457 ++++++++++++- tools/testing/selftests/hid/tests/test_tablet.py | 723 +++++++++++++++------ 18 files changed, 3507 insertions(+), 204 deletions(-) --- base-commit: 3e78a6c0d3e02e4cf881dc84c5127e9990f939d6 change-id: 20240328-bpf_sources-be1f3c617c5e Best regards, -- Benjamin Tissoires <bentiss(a)kernel.org>

1 year, 6 months

3
22
0 0

[PATCH] selftests: introduce additional eventfd test coverage

by Wen Yang

Add several new test cases which assert corner cases on the eventfd mechanism, for example, the supplied buffer is less than 8 bytes, attempting to write a value that is too large, etc. ./eventfd_test # Starting 9 tests from 1 test cases. # RUN global.eventfd01 ... # OK global.eventfd01 ok 1 global.eventfd01 # RUN global.eventfd02 ... # OK global.eventfd02 ok 2 global.eventfd02 # RUN global.eventfd03 ... # OK global.eventfd03 ok 3 global.eventfd03 # RUN global.eventfd04 ... # OK global.eventfd04 ok 4 global.eventfd04 # RUN global.eventfd05 ... # OK global.eventfd05 ok 5 global.eventfd05 # RUN global.eventfd06 ... # OK global.eventfd06 ok 6 global.eventfd06 # RUN global.eventfd07 ... # OK global.eventfd07 ok 7 global.eventfd07 # RUN global.eventfd08 ... # OK global.eventfd08 ok 8 global.eventfd08 # RUN global.eventfd09 ... # OK global.eventfd09 ok 9 global.eventfd09 # PASSED: 9 / 9 tests passed. # Totals: pass:9 fail:0 xfail:0 xpass:0 skip:0 error:0 Signed-off-by: Wen Yang <wen.yang(a)linux.dev> Cc: SShuah Khan <shuah(a)kernel.org> Cc: Christian Brauner <brauner(a)kernel.org> Cc: Andrei Vagin <avagin(a)google.com> Cc: Mathieu Desnoyers <mathieu.desnoyers(a)efficios.com> Cc: Steven Rostedt <rostedt(a)goodmis.org> Cc: Andrew Morton <akpm(a)linux-foundation.org> Cc: Dave Young <dyoung(a)redhat.com> Cc: linux-kselftest(a)vger.kernel.org Cc: linux-kernel(a)vger.kernel.org --- .../filesystems/eventfd/eventfd_test.c | 116 ++++++++++++++++++ 1 file changed, 116 insertions(+) diff --git a/tools/testing/selftests/filesystems/eventfd/eventfd_test.c b/tools/testing/selftests/filesystems/eventfd/eventfd_test.c index f142a137526c..eeab8df5b1b5 100644 --- a/tools/testing/selftests/filesystems/eventfd/eventfd_test.c +++ b/tools/testing/selftests/filesystems/eventfd/eventfd_test.c @@ -183,4 +183,120 @@ TEST(eventfd05) close(fd); } +/* + * A write(2) fails with the error EINVAL if the size of the supplied buffer + * is less than 8 bytes, or if an attempt is made to write the value + * 0xffffffffffffffff. + */ +TEST(eventfd06) +{ + uint64_t value = 1; + ssize_t size; + int fd; + + fd = sys_eventfd2(0, 0); + ASSERT_GE(fd, 0); + + size = write(fd, &value, sizeof(int)); + EXPECT_EQ(size, -1); + EXPECT_EQ(errno, EINVAL); + + value = (uint64_t)-1; + size = write(fd, &value, sizeof(value)); + EXPECT_EQ(size, -1); + EXPECT_EQ(errno, EINVAL); + + close(fd); +} + +/* + * A read(2) fails with the error EINVAL if the size of the supplied buffer is + * less than 8 bytes. + */ +TEST(eventfd07) +{ + int value = 0; + ssize_t size; + int fd; + + fd = sys_eventfd2(0, 0); + ASSERT_GE(fd, 0); + + size = write(fd, &value, sizeof(value)); + EXPECT_EQ(size, -1); + EXPECT_EQ(errno, EINVAL); + + close(fd); +} + +/* + * If EFD_SEMAPHORE was not specified and the eventfd counter has a nonzero + * value, then a read(2) returns 8 bytes containing that value, and the + * counter's value is reset to zero. + * If the eventfd counter is zero at the time of the call to read(2), then the + * call fails with the error EAGAIN if the file descriptor has been made nonblocking. + */ +TEST(eventfd08) +{ + uint64_t value; + ssize_t size; + int fd; + int i; + + fd = sys_eventfd2(0, EFD_NONBLOCK); + ASSERT_GE(fd, 0); + + value = 1; + for (i = 0; i < 10000000; i++) { + size = write(fd, &value, sizeof(value)); + EXPECT_EQ(size, sizeof(value)); + } + + size = read(fd, &value, sizeof(value)); + EXPECT_EQ(size, sizeof(uint64_t)); + EXPECT_EQ(value, 10000000); + + size = read(fd, &value, sizeof(value)); + EXPECT_EQ(size, -1); + EXPECT_EQ(errno, EAGAIN); + + close(fd); +} + +/* + * If EFD_SEMAPHORE was specified and the eventfd counter has a nonzero value, + * then a read(2) returns 8 bytes containing the value 1, and the counter's + * value is decremented by 1. + * If the eventfd counter is zero at the time of the call to read(2), then the + * call fails with the error EAGAIN if the file descriptor has been made nonblocking. + */ +TEST(eventfd09) +{ + uint64_t value; + ssize_t size; + int fd; + int i; + + fd = sys_eventfd2(0, EFD_SEMAPHORE|EFD_NONBLOCK); + ASSERT_GE(fd, 0); + + value = 1; + for (i = 0; i < 10000000; i++) { + size = write(fd, &value, sizeof(value)); + EXPECT_EQ(size, sizeof(value)); + } + + for (i = 0; i < 10000000; i++) { + size = read(fd, &value, sizeof(value)); + EXPECT_EQ(size, sizeof(value)); + EXPECT_EQ(value, 1); + } + + size = read(fd, &value, sizeof(value)); + EXPECT_EQ(size, -1); + EXPECT_EQ(errno, EAGAIN); + + close(fd); +} + TEST_HARNESS_MAIN -- 2.25.1

1 year, 6 months

2
2
0 0

[PATCH RFC bpf-next 0/8] Implement generic bpf_async cb

by Benjamin Tissoires

This is a RFC, following[0]. It works, still needs some care but this is mainly to see if this will have a chance to get upsrteamed or if I should rely on struct_ops instead. Cheers, Benjamin Signed-off-by: Benjamin Tissoires <bentiss(a)kernel.org> --- Benjamin Tissoires (8): bpf: ignore sleepable prog parameter for kfuncs bpf: add kfunc_meta parameter to push_callback_call() bpf: implement __async and __s_async kfunc suffixes bpf: typedef a type for the bpf_wq callbacks selftests/bpf: rely on wq_callback_fn_t bpf: remove one special case of is_bpf_wq_set_callback_impl_kfunc bpf: implement __aux kfunc argument suffix to fetch prog_aux bpf: rely on __aux suffix for bpf_wq_set_callback_impl kernel/bpf/helpers.c | 10 +- kernel/bpf/verifier.c | 333 +++++++++++++++++++----- tools/testing/selftests/bpf/bpf_experimental.h | 3 +- tools/testing/selftests/bpf/progs/wq.c | 10 +- tools/testing/selftests/bpf/progs/wq_failures.c | 4 +- 5 files changed, 280 insertions(+), 80 deletions(-) --- base-commit: 05cbc217aafbc631a6c2fab4accf95850cb48358 change-id: 20240507-bpf_async-bd2e65847525 Best regards, -- Benjamin Tissoires <bentiss(a)kernel.org>

1 year, 6 months

1
8
0 0

[PATCH net-next v3 0/2] fix icmp error source address over xfrm tunnel

by Antony Antony

Hi, This fix, originally intended for XFRM/IPsec, has been recommended by Steffen Klassert to submit to the net tree. The patch addresses a minor issue related to the IPv4 source address of ICMP error messages, which originated from an old 2011 commit: 415b3334a21a ("icmp: Fix regression in nexthop resolution during replies.") The omission of a "Fixes" tag in the following commit is deliberate to prevent potential test failures and subsequent regression issues that may arise from backporting this patch all stable kerenels. This is a minor fix, anot not security fix. With a seleftest I am submitting this to net-next tree. v2->v3 : fix testscript. The IFS, space, got mangled. v1->v2 : add kernel selftest script Antony Antony (2): xfrm: fix source address in icmp error generation from IPsec gateway selftests/net: add ICMP unreachable over IPsec tunnel net/ipv4/icmp.c | 1 - tools/testing/selftests/net/Makefile | 1 + tools/testing/selftests/net/xfrm_state.sh | 624 ++++++++++++++++++++++ 3 files changed, 625 insertions(+), 1 deletion(-) create mode 100755 tools/testing/selftests/net/xfrm_state.sh -- 2.30.2

1 year, 6 months

4
9
0 0

[PATCH net] selftests/bpf: fix pointer arithmetic in test_xdp_do_redirect

by Michal Schmidt

Cast operation has a higher precedence than addition. The code here wants to zero the 2nd half of the 64-bit metadata, but due to a pointer arithmetic mistake, it writes the zero at offset 16 instead. Just adding parentheses around "data + 4" would fix this, but I think this will be slightly better readable with array syntax. I was unable to test this with tools/testing/selftests/bpf/vmtest.sh, because my glibc is newer than glibc in the provided VM image. So I just checked the difference in the compiled code. objdump -S tools/testing/selftests/bpf/xdp_do_redirect.test.o: - *((__u32 *)data) = 0x42; /* metadata test value */ + ((__u32 *)data)[0] = 0x42; /* metadata test value */ be7: 48 8d 85 30 fc ff ff lea -0x3d0(%rbp),%rax bee: c7 00 42 00 00 00 movl $0x42,(%rax) - *((__u32 *)data + 4) = 0; + ((__u32 *)data)[1] = 0; bf4: 48 8d 85 30 fc ff ff lea -0x3d0(%rbp),%rax - bfb: 48 83 c0 10 add $0x10,%rax + bfb: 48 83 c0 04 add $0x4,%rax bff: c7 00 00 00 00 00 movl $0x0,(%rax) Fixes: 5640b6d89434 ("selftests/bpf: fix "metadata marker" getting overwritten by the netstack") Signed-off-by: Michal Schmidt <mschmidt(a)redhat.com> --- tools/testing/selftests/bpf/prog_tests/xdp_do_redirect.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/xdp_do_redirect.c b/tools/testing/selftests/bpf/prog_tests/xdp_do_redirect.c index 498d3bdaa4b0..bad0ea167be7 100644 --- a/tools/testing/selftests/bpf/prog_tests/xdp_do_redirect.c +++ b/tools/testing/selftests/bpf/prog_tests/xdp_do_redirect.c @@ -107,8 +107,8 @@ void test_xdp_do_redirect(void) .attach_point = BPF_TC_INGRESS); memcpy(&data[sizeof(__u64)], &pkt_udp, sizeof(pkt_udp)); - *((__u32 *)data) = 0x42; /* metadata test value */ - *((__u32 *)data + 4) = 0; + ((__u32 *)data)[0] = 0x42; /* metadata test value */ + ((__u32 *)data)[1] = 0; skel = test_xdp_do_redirect__open(); if (!ASSERT_OK_PTR(skel, "skel")) -- 2.44.0

1 year, 6 months

4
3
0 0

[PATCH bpf-next v4 0/3] export send_recv_data

by Geliang Tang

From: Geliang Tang <tanggeliang(a)kylinos.cn> v4: - fix a bug in v3, it should be 'if (err)', not 'if (!err)'. - move "selftests/bpf: Use log_err in network_helpers" out of this series. v3: - add two more patches. - use log_err instead of ASSERT in v3. - let send_recv_data return int as Martin suggested. v2: Address Martin's comments for v1 (thanks.) - drop patch 1, "export send_byte helper". - drop "WRITE_ONCE(arg.stop, 0)". - rebased. send_recv_data will be re-used in MPTCP bpf tests, but not included in this set because it depends on other patches that have not been in the bpf-next yet. It will be sent as another set soon. Geliang Tang (3): selftests/bpf: Add struct send_recv_arg selftests/bpf: Export send_recv_data helper selftests/bpf: Support nonblock for send_recv_data tools/testing/selftests/bpf/network_helpers.c | 103 ++++++++++++++++++ tools/testing/selftests/bpf/network_helpers.h | 1 + .../selftests/bpf/prog_tests/bpf_tcp_ca.c | 71 +----------- 3 files changed, 105 insertions(+), 70 deletions(-) -- 2.40.1

1 year, 6 months

2
6
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-kselftest-mirror