On 17/04/2026 16:33, Alexis Lothoré (eBPF Foundation) wrote: > As part of a larger cleanup effort in the bpf selftests directory, > tests and scripts are either being converted to the test_progs framework > (so they are executed automatically in bpf CI), or removed if not > relevant for such integration. > > The test_xdping.sh script (with the associated xdping.c) acts as a RTT > measurement tool, by attaching two small xdp programs to two interfaces. > Converting this test to test_progs may not make much sense: > - RTT measurement does not really fit in the scope of a functional test, > this is rather about measuring some performance level. > - there are other existing tests in test_progs that actively validate > XDP features like program attachment, return value processing, packet > modification, etc > > Drop test_xdping.sh and the corresponding xdping.c userspace part. Keep > the ebpf part (xdping_kern.c), as it is used by another test integrated > in test_progs (btf_dump) > > Signed-off-by: Alexis Lothoré (eBPF Foundation) <[email protected]>
Reviewed-by: Alan Maguire <[email protected]> as discussed, switching to loading xdp_dummy.bpf.o in prog_tests/btf_dump.c would be good too (feel free to retain the Reviewed-by: with that v2 change). Thanks! > --- > tools/testing/selftests/bpf/.gitignore | 1 - > tools/testing/selftests/bpf/Makefile | 3 - > tools/testing/selftests/bpf/test_xdping.sh | 103 ------------ > tools/testing/selftests/bpf/xdping.c | 254 > ----------------------------- > 4 files changed, 361 deletions(-) > > diff --git a/tools/testing/selftests/bpf/.gitignore > b/tools/testing/selftests/bpf/.gitignore > index bfdc5518ecc8..986a6389186b 100644 > --- a/tools/testing/selftests/bpf/.gitignore > +++ b/tools/testing/selftests/bpf/.gitignore > @@ -21,7 +21,6 @@ test_lirc_mode2_user > flow_dissector_load > test_tcpnotify_user > test_libbpf > -xdping > test_cpp > *.d > *.subskel.h > diff --git a/tools/testing/selftests/bpf/Makefile > b/tools/testing/selftests/bpf/Makefile > index 78e60040811e..00a986a7d088 100644 > --- a/tools/testing/selftests/bpf/Makefile > +++ b/tools/testing/selftests/bpf/Makefile > @@ -111,7 +111,6 @@ TEST_FILES = xsk_prereqs.sh $(wildcard > progs/btf_dump_test_case_*.c) > # Order correspond to 'make run_tests' order > TEST_PROGS := test_kmod.sh \ > test_lirc_mode2.sh \ > - test_xdping.sh \ > test_bpftool_build.sh \ > test_doc_build.sh \ > test_xsk.sh \ > @@ -134,7 +133,6 @@ TEST_GEN_PROGS_EXTENDED = \ > xdp_features \ > xdp_hw_metadata \ > xdp_synproxy \ > - xdping \ > xskxceiver > > TEST_GEN_FILES += $(TEST_KMODS) liburandom_read.so urandom_read sign-file > uprobe_multi > @@ -320,7 +318,6 @@ $(OUTPUT)/test_tcpnotify_user: $(CGROUP_HELPERS) > $(TESTING_HELPERS) $(TRACE_HELP > $(OUTPUT)/test_sock_fields: $(CGROUP_HELPERS) $(TESTING_HELPERS) > $(OUTPUT)/test_tag: $(TESTING_HELPERS) > $(OUTPUT)/test_lirc_mode2_user: $(TESTING_HELPERS) > -$(OUTPUT)/xdping: $(TESTING_HELPERS) > $(OUTPUT)/flow_dissector_load: $(TESTING_HELPERS) > $(OUTPUT)/test_maps: $(TESTING_HELPERS) > $(OUTPUT)/test_verifier: $(TESTING_HELPERS) $(CAP_HELPERS) $(UNPRIV_HELPERS) > diff --git a/tools/testing/selftests/bpf/test_xdping.sh > b/tools/testing/selftests/bpf/test_xdping.sh > deleted file mode 100755 > index c3d82e0a7378..000000000000 > --- a/tools/testing/selftests/bpf/test_xdping.sh > +++ /dev/null > @@ -1,103 +0,0 @@ > -#!/bin/bash > -# SPDX-License-Identifier: GPL-2.0 > - > -# xdping tests > -# Here we setup and teardown configuration required to run > -# xdping, exercising its options. > -# > -# Setup is similar to test_tunnel tests but without the tunnel. > -# > -# Topology: > -# --------- > -# root namespace | tc_ns0 namespace > -# | > -# ---------- | ---------- > -# | veth1 | --------- | veth0 | > -# ---------- peer ---------- > -# > -# Device Configuration > -# -------------------- > -# Root namespace with BPF > -# Device names and addresses: > -# veth1 IP: 10.1.1.200 > -# xdp added to veth1, xdpings originate from here. > -# > -# Namespace tc_ns0 with BPF > -# Device names and addresses: > -# veth0 IPv4: 10.1.1.100 > -# For some tests xdping run in server mode here. > -# > - > -readonly TARGET_IP="10.1.1.100" > -readonly TARGET_NS="xdp_ns0" > - > -readonly LOCAL_IP="10.1.1.200" > - > -setup() > -{ > - ip netns add $TARGET_NS > - ip link add veth0 type veth peer name veth1 > - ip link set veth0 netns $TARGET_NS > - ip netns exec $TARGET_NS ip addr add ${TARGET_IP}/24 dev veth0 > - ip addr add ${LOCAL_IP}/24 dev veth1 > - ip netns exec $TARGET_NS ip link set veth0 up > - ip link set veth1 up > -} > - > -cleanup() > -{ > - set +e > - ip netns delete $TARGET_NS 2>/dev/null > - ip link del veth1 2>/dev/null > - if [[ $server_pid -ne 0 ]]; then > - kill -TERM $server_pid > - fi > -} > - > -test() > -{ > - client_args="$1" > - server_args="$2" > - > - echo "Test client args '$client_args'; server args '$server_args'" > - > - server_pid=0 > - if [[ -n "$server_args" ]]; then > - ip netns exec $TARGET_NS ./xdping $server_args & > - server_pid=$! > - sleep 10 > - fi > - ./xdping $client_args $TARGET_IP > - > - if [[ $server_pid -ne 0 ]]; then > - kill -TERM $server_pid > - server_pid=0 > - fi > - > - echo "Test client args '$client_args'; server args '$server_args': PASS" > -} > - > -set -e > - > -server_pid=0 > - > -trap cleanup EXIT > - > -setup > - > -for server_args in "" "-I veth0 -s -S" ; do > - # client in skb mode > - client_args="-I veth1 -S" > - test "$client_args" "$server_args" > - > - # client with count of 10 RTT measurements. > - client_args="-I veth1 -S -c 10" > - test "$client_args" "$server_args" > -done > - > -# Test drv mode > -test "-I veth1 -N" "-I veth0 -s -N" > -test "-I veth1 -N -c 10" "-I veth0 -s -N" > - > -echo "OK. All tests passed" > -exit 0 > diff --git a/tools/testing/selftests/bpf/xdping.c > b/tools/testing/selftests/bpf/xdping.c > deleted file mode 100644 > index 9ed8c796645d..000000000000 > --- a/tools/testing/selftests/bpf/xdping.c > +++ /dev/null > @@ -1,254 +0,0 @@ > -// SPDX-License-Identifier: GPL-2.0 > -/* Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. */ > - > -#include <linux/bpf.h> > -#include <linux/if_link.h> > -#include <arpa/inet.h> > -#include <assert.h> > -#include <errno.h> > -#include <signal.h> > -#include <stdio.h> > -#include <stdlib.h> > -#include <string.h> > -#include <unistd.h> > -#include <libgen.h> > -#include <net/if.h> > -#include <sys/types.h> > -#include <sys/socket.h> > -#include <netdb.h> > - > -#include "bpf/bpf.h" > -#include "bpf/libbpf.h" > - > -#include "xdping.h" > -#include "testing_helpers.h" > - > -static int ifindex; > -static __u32 xdp_flags = XDP_FLAGS_UPDATE_IF_NOEXIST; > - > -static void cleanup(int sig) > -{ > - bpf_xdp_detach(ifindex, xdp_flags, NULL); > - if (sig) > - exit(1); > -} > - > -static int get_stats(int fd, __u16 count, __u32 raddr) > -{ > - struct pinginfo pinginfo = { 0 }; > - char inaddrbuf[INET_ADDRSTRLEN]; > - struct in_addr inaddr; > - __u16 i; > - > - inaddr.s_addr = raddr; > - > - printf("\nXDP RTT data:\n"); > - > - if (bpf_map_lookup_elem(fd, &raddr, &pinginfo)) { > - perror("bpf_map_lookup elem"); > - return 1; > - } > - > - for (i = 0; i < count; i++) { > - if (pinginfo.times[i] == 0) > - break; > - > - printf("64 bytes from %s: icmp_seq=%d ttl=64 time=%#.5f ms\n", > - inet_ntop(AF_INET, &inaddr, inaddrbuf, > - sizeof(inaddrbuf)), > - count + i + 1, > - (double)pinginfo.times[i]/1000000); > - } > - > - if (i < count) { > - fprintf(stderr, "Expected %d samples, got %d.\n", count, i); > - return 1; > - } > - > - bpf_map_delete_elem(fd, &raddr); > - > - return 0; > -} > - > -static void show_usage(const char *prog) > -{ > - fprintf(stderr, > - "usage: %s [OPTS] -I interface destination\n\n" > - "OPTS:\n" > - " -c count Stop after sending count requests\n" > - " (default %d, max %d)\n" > - " -I interface interface name\n" > - " -N Run in driver mode\n" > - " -s Server mode\n" > - " -S Run in skb mode\n", > - prog, XDPING_DEFAULT_COUNT, XDPING_MAX_COUNT); > -} > - > -int main(int argc, char **argv) > -{ > - __u32 mode_flags = XDP_FLAGS_DRV_MODE | XDP_FLAGS_SKB_MODE; > - struct addrinfo *a, hints = { .ai_family = AF_INET }; > - __u16 count = XDPING_DEFAULT_COUNT; > - struct pinginfo pinginfo = { 0 }; > - const char *optstr = "c:I:NsS"; > - struct bpf_program *main_prog; > - int prog_fd = -1, map_fd = -1; > - struct sockaddr_in rin; > - struct bpf_object *obj; > - struct bpf_map *map; > - char *ifname = NULL; > - char filename[256]; > - int opt, ret = 1; > - __u32 raddr = 0; > - int server = 0; > - char cmd[256]; > - > - while ((opt = getopt(argc, argv, optstr)) != -1) { > - switch (opt) { > - case 'c': > - count = atoi(optarg); > - if (count < 1 || count > XDPING_MAX_COUNT) { > - fprintf(stderr, > - "min count is 1, max count is %d\n", > - XDPING_MAX_COUNT); > - return 1; > - } > - break; > - case 'I': > - ifname = optarg; > - ifindex = if_nametoindex(ifname); > - if (!ifindex) { > - fprintf(stderr, "Could not get interface %s\n", > - ifname); > - return 1; > - } > - break; > - case 'N': > - xdp_flags |= XDP_FLAGS_DRV_MODE; > - break; > - case 's': > - /* use server program */ > - server = 1; > - break; > - case 'S': > - xdp_flags |= XDP_FLAGS_SKB_MODE; > - break; > - default: > - show_usage(basename(argv[0])); > - return 1; > - } > - } > - > - if (!ifname) { > - show_usage(basename(argv[0])); > - return 1; > - } > - if (!server && optind == argc) { > - show_usage(basename(argv[0])); > - return 1; > - } > - > - if ((xdp_flags & mode_flags) == mode_flags) { > - fprintf(stderr, "-N or -S can be specified, not both.\n"); > - show_usage(basename(argv[0])); > - return 1; > - } > - > - if (!server) { > - /* Only supports IPv4; see hints initialization above. */ > - if (getaddrinfo(argv[optind], NULL, &hints, &a) || !a) { > - fprintf(stderr, "Could not resolve %s\n", argv[optind]); > - return 1; > - } > - memcpy(&rin, a->ai_addr, sizeof(rin)); > - raddr = rin.sin_addr.s_addr; > - freeaddrinfo(a); > - } > - > - /* Use libbpf 1.0 API mode */ > - libbpf_set_strict_mode(LIBBPF_STRICT_ALL); > - > - snprintf(filename, sizeof(filename), "%s_kern.bpf.o", argv[0]); > - > - if (bpf_prog_test_load(filename, BPF_PROG_TYPE_XDP, &obj, &prog_fd)) { > - fprintf(stderr, "load of %s failed\n", filename); > - return 1; > - } > - > - main_prog = bpf_object__find_program_by_name(obj, > - server ? "xdping_server" : > "xdping_client"); > - if (main_prog) > - prog_fd = bpf_program__fd(main_prog); > - if (!main_prog || prog_fd < 0) { > - fprintf(stderr, "could not find xdping program"); > - return 1; > - } > - > - map = bpf_object__next_map(obj, NULL); > - if (map) > - map_fd = bpf_map__fd(map); > - if (!map || map_fd < 0) { > - fprintf(stderr, "Could not find ping map"); > - goto done; > - } > - > - signal(SIGINT, cleanup); > - signal(SIGTERM, cleanup); > - > - printf("Setting up XDP for %s, please wait...\n", ifname); > - > - printf("XDP setup disrupts network connectivity, hit Ctrl+C to quit\n"); > - > - if (bpf_xdp_attach(ifindex, prog_fd, xdp_flags, NULL) < 0) { > - fprintf(stderr, "Link set xdp fd failed for %s\n", ifname); > - goto done; > - } > - > - if (server) { > - close(prog_fd); > - close(map_fd); > - printf("Running server on %s; press Ctrl+C to exit...\n", > - ifname); > - do { } while (1); > - } > - > - /* Start xdping-ing from last regular ping reply, e.g. for a count > - * of 10 ICMP requests, we start xdping-ing using reply with seq number > - * 10. The reason the last "real" ping RTT is much higher is that > - * the ping program sees the ICMP reply associated with the last > - * XDP-generated packet, so ping doesn't get a reply until XDP is done. > - */ > - pinginfo.seq = htons(count); > - pinginfo.count = count; > - > - if (bpf_map_update_elem(map_fd, &raddr, &pinginfo, BPF_ANY)) { > - fprintf(stderr, "could not communicate with BPF map: %s\n", > - strerror(errno)); > - cleanup(0); > - goto done; > - } > - > - /* We need to wait for XDP setup to complete. */ > - sleep(10); > - > - snprintf(cmd, sizeof(cmd), "ping -c %d -I %s %s", > - count, ifname, argv[optind]); > - > - printf("\nNormal ping RTT data\n"); > - printf("[Ignore final RTT; it is distorted by XDP using the reply]\n"); > - > - ret = system(cmd); > - > - if (!ret) > - ret = get_stats(map_fd, count, raddr); > - > - cleanup(0); > - > -done: > - if (prog_fd > 0) > - close(prog_fd); > - if (map_fd > 0) > - close(map_fd); > - > - return ret; > -} > > --- > base-commit: b7fb68124aa80db90394236a9a4a6add12f4425d > change-id: 20260417-xdping-5c2ef5a63899 > > Best regards, > -- > Alexis Lothoré (eBPF Foundation) <[email protected]> >
