Commit 018a8e75 authored by Maciej Fijalkowski's avatar Maciej Fijalkowski Committed by Daniel Borkmann

selftests, xsk: Rename AF_XDP testing app

Recently, xsk part of libbpf was moved to selftests/bpf directory and
lives on its own because there is an AF_XDP testing application that
needs it called xdpxceiver. That name makes it a bit hard to indicate
who maintains it as there are other XDP samples in there, whereas this
one is strictly about AF_XDP.

Do s/xdpxceiver/xskxceiver so that it will be easier to figure out who
maintains it. A follow-up patch will correct MAINTAINERS file.
Signed-off-by: default avatarMaciej Fijalkowski <maciej.fijalkowski@intel.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Link: https://lore.kernel.org/bpf/20220707111613.49031-2-maciej.fijalkowski@intel.com
parent fb8ddf24
...@@ -41,6 +41,6 @@ test_cpp ...@@ -41,6 +41,6 @@ test_cpp
/bench /bench
*.ko *.ko
*.tmp *.tmp
xdpxceiver xskxceiver
xdp_redirect_multi xdp_redirect_multi
xdp_synproxy xdp_synproxy
...@@ -82,7 +82,7 @@ TEST_PROGS_EXTENDED := with_addr.sh \ ...@@ -82,7 +82,7 @@ TEST_PROGS_EXTENDED := with_addr.sh \
TEST_GEN_PROGS_EXTENDED = test_sock_addr test_skb_cgroup_id_user \ TEST_GEN_PROGS_EXTENDED = test_sock_addr test_skb_cgroup_id_user \
flow_dissector_load test_flow_dissector test_tcp_check_syncookie_user \ flow_dissector_load test_flow_dissector test_tcp_check_syncookie_user \
test_lirc_mode2_user xdping test_cpp runqslower bench bpf_testmod.ko \ test_lirc_mode2_user xdping test_cpp runqslower bench bpf_testmod.ko \
xdpxceiver xdp_redirect_multi xdp_synproxy xskxceiver xdp_redirect_multi xdp_synproxy
TEST_CUSTOM_PROGS = $(OUTPUT)/urandom_read TEST_CUSTOM_PROGS = $(OUTPUT)/urandom_read
...@@ -231,7 +231,7 @@ $(OUTPUT)/flow_dissector_load: $(TESTING_HELPERS) ...@@ -231,7 +231,7 @@ $(OUTPUT)/flow_dissector_load: $(TESTING_HELPERS)
$(OUTPUT)/test_maps: $(TESTING_HELPERS) $(OUTPUT)/test_maps: $(TESTING_HELPERS)
$(OUTPUT)/test_verifier: $(TESTING_HELPERS) $(CAP_HELPERS) $(OUTPUT)/test_verifier: $(TESTING_HELPERS) $(CAP_HELPERS)
$(OUTPUT)/xsk.o: $(BPFOBJ) $(OUTPUT)/xsk.o: $(BPFOBJ)
$(OUTPUT)/xdpxceiver: $(OUTPUT)/xsk.o $(OUTPUT)/xskxceiver: $(OUTPUT)/xsk.o
BPFTOOL ?= $(DEFAULT_BPFTOOL) BPFTOOL ?= $(DEFAULT_BPFTOOL)
$(DEFAULT_BPFTOOL): $(wildcard $(BPFTOOLDIR)/*.[ch] $(BPFTOOLDIR)/Makefile) \ $(DEFAULT_BPFTOOL): $(wildcard $(BPFTOOLDIR)/*.[ch] $(BPFTOOLDIR)/Makefile) \
......
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
# conflict with any existing interface # conflict with any existing interface
# * tests the veth and xsk layers of the topology # * tests the veth and xsk layers of the topology
# #
# See the source xdpxceiver.c for information on each test # See the source xskxceiver.c for information on each test
# #
# Kernel configuration: # Kernel configuration:
# --------------------- # ---------------------
...@@ -160,14 +160,14 @@ statusList=() ...@@ -160,14 +160,14 @@ statusList=()
TEST_NAME="XSK_SELFTESTS_SOFTIRQ" TEST_NAME="XSK_SELFTESTS_SOFTIRQ"
execxdpxceiver exec_xskxceiver
cleanup_exit ${VETH0} ${VETH1} ${NS1} cleanup_exit ${VETH0} ${VETH1} ${NS1}
TEST_NAME="XSK_SELFTESTS_BUSY_POLL" TEST_NAME="XSK_SELFTESTS_BUSY_POLL"
busy_poll=1 busy_poll=1
setup_vethPairs setup_vethPairs
execxdpxceiver exec_xskxceiver
## END TESTS ## END TESTS
......
...@@ -8,7 +8,7 @@ ksft_xfail=2 ...@@ -8,7 +8,7 @@ ksft_xfail=2
ksft_xpass=3 ksft_xpass=3
ksft_skip=4 ksft_skip=4
XSKOBJ=xdpxceiver XSKOBJ=xskxceiver
validate_root_exec() validate_root_exec()
{ {
...@@ -77,7 +77,7 @@ validate_ip_utility() ...@@ -77,7 +77,7 @@ validate_ip_utility()
[ ! $(type -P ip) ] && { echo "'ip' not found. Skipping tests."; test_exit $ksft_skip; } [ ! $(type -P ip) ] && { echo "'ip' not found. Skipping tests."; test_exit $ksft_skip; }
} }
execxdpxceiver() exec_xskxceiver()
{ {
if [[ $busy_poll -eq 1 ]]; then if [[ $busy_poll -eq 1 ]]; then
ARGS+="-b " ARGS+="-b "
......
...@@ -98,11 +98,11 @@ ...@@ -98,11 +98,11 @@
#include <unistd.h> #include <unistd.h>
#include <stdatomic.h> #include <stdatomic.h>
#include "xsk.h" #include "xsk.h"
#include "xdpxceiver.h" #include "xskxceiver.h"
#include "../kselftest.h" #include "../kselftest.h"
/* AF_XDP APIs were moved into libxdp and marked as deprecated in libbpf. /* AF_XDP APIs were moved into libxdp and marked as deprecated in libbpf.
* Until xdpxceiver is either moved or re-writed into libxdp, suppress * Until xskxceiver is either moved or re-writed into libxdp, suppress
* deprecation warnings in this file * deprecation warnings in this file
*/ */
#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
* Copyright(c) 2020 Intel Corporation. * Copyright(c) 2020 Intel Corporation.
*/ */
#ifndef XDPXCEIVER_H_ #ifndef XSKXCEIVER_H_
#define XDPXCEIVER_H_ #define XSKXCEIVER_H_
#ifndef SOL_XDP #ifndef SOL_XDP
#define SOL_XDP 283 #define SOL_XDP 283
...@@ -169,4 +169,4 @@ pthread_cond_t pacing_cond = PTHREAD_COND_INITIALIZER; ...@@ -169,4 +169,4 @@ pthread_cond_t pacing_cond = PTHREAD_COND_INITIALIZER;
int pkts_in_flight; int pkts_in_flight;
#endif /* XDPXCEIVER_H */ #endif /* XSKXCEIVER_H_ */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment