This series adds support for transmitting packets using XDP in
bpf_prog_run(), by enabling a new mode "live packet" mode which will handle
the XDP program return codes and redirect the packets to the stack or other
devices.
The primary use case for this is testing the redirect map types and the
ndo_xdp_xmit driver operation without an external traffic generator. But it
turns out to also be useful for creating a programmable traffic generator
in XDP, as well as injecting frames into the stack. A sample traffic
generator, which was included in previous versions of the series, but now
moved to xdp-tools, transmits up to 9 Mpps/core on my test machine.
To transmit the frames, the new mode instantiates a page_pool structure in
bpf_prog_run() and initialises the pages to contain XDP frames with the
data passed in by userspace. These frames can then be handled as though
they came from the hardware XDP path, and the existing page_pool code takes
care of returning and recycling them. The setup is optimised for high
performance with a high number of repetitions to support stress testing and
the traffic generator use case; see patch 1 for details.
v8:
- Make the batch size configurable from userspace
- Don't interrupt the packet loop on errors in do_redirect (this can be
caught from the tracepoint)
- Add documentation of the feature
- Add reserved flag userspace can use to probe for support (kernel didn't
check flags previously)
- Rebase to newest bpf-next, disallow live mode for jumbo frames
v7:
- Extend the local_bh_disable() to cover the full test run loop, to prevent
running concurrently with the softirq. Fixes a deadlock with veth xmit.
- Reinstate the forwarding sysctl setting in the selftest, and bump up the
number of packets being transmitted to trigger the above bug.
- Update commit message to make it clear that user space can select the
ingress interface.
v6:
- Fix meta vs data pointer setting and add a selftest for it
- Add local_bh_disable() around code passing packets up the stack
- Create a new netns for the selftest and use a TC program instead of the
forwarding hack to count packets being XDP_PASS'ed from the test prog.
- Check for the correct ingress ifindex in the selftest
- Rebase and drop patches 1-5 that were already merged
v5:
- Rebase to current bpf-next
v4:
- Fix a few code style issues (Alexei)
- Also handle the other return codes: XDP_PASS builds skbs and injects them
into the stack, and XDP_TX is turned into a redirect out the same
interface (Alexei).
- Drop the last patch adding an xdp_trafficgen program to samples/bpf; this
will live in xdp-tools instead (Alexei).
- Add a separate bpf_test_run_xdp_live() function to test_run.c instead of
entangling the new mode in the existing bpf_test_run().
v3:
- Reorder patches to make sure they all build individually (Patchwork)
- Remove a couple of unused variables (Patchwork)
- Remove unlikely() annotation in slow path and add back John's ACK that I
accidentally dropped for v2 (John)
v2:
- Split up up __xdp_do_redirect to avoid passing two pointers to it (John)
- Always reset context pointers before each test run (John)
- Use get_mac_addr() from xdp_sample_user.h instead of rolling our own (Kumar)
- Fix wrong offset for metadata pointer
Toke Høiland-Jørgensen (5):
bpf: Add "live packet" mode for XDP in BPF_PROG_RUN
Documentation/bpf: Add documentation for BPF_PROG_RUN
libbpf: Support batch_size option to bpf_prog_test_run
selftests/bpf: Move open_netns() and close_netns() into
network_helpers.c
selftests/bpf: Add selftest for XDP_REDIRECT in BPF_PROG_RUN
Documentation/bpf/bpf_prog_run.rst | 120 +++++++
Documentation/bpf/index.rst | 1 +
include/uapi/linux/bpf.h | 5 +
kernel/bpf/Kconfig | 1 +
kernel/bpf/syscall.c | 2 +-
net/bpf/test_run.c | 323 +++++++++++++++++-
tools/include/uapi/linux/bpf.h | 5 +
tools/lib/bpf/bpf.c | 1 +
tools/lib/bpf/bpf.h | 3 +-
tools/testing/selftests/bpf/network_helpers.c | 86 +++++
tools/testing/selftests/bpf/network_helpers.h | 9 +
.../selftests/bpf/prog_tests/tc_redirect.c | 87 -----
.../bpf/prog_tests/xdp_do_redirect.c | 176 ++++++++++
.../bpf/progs/test_xdp_do_redirect.c | 85 +++++
14 files changed, 807 insertions(+), 97 deletions(-)
create mode 100644 Documentation/bpf/bpf_prog_run.rst
create mode 100644 tools/testing/selftests/bpf/prog_tests/xdp_do_redirect.c
create mode 100644 tools/testing/selftests/bpf/progs/test_xdp_do_redirect.c
--
2.35.1
