net: Add support for XDP in egress path
From: | David Ahern <dsahern-AT-kernel.org> | |
To: | netdev-AT-vger.kernel.org | |
Subject: | [PATCH v2 bpf-next 00/17] net: Add support for XDP in egress path | |
Date: | Thu, 23 Apr 2020 20:11:31 -0600 | |
Message-ID: | <20200424021148.83015-1-dsahern@kernel.org> | |
Cc: | davem-AT-davemloft.net, kuba-AT-kernel.org, prashantbhole.linux-AT-gmail.com, jasowang-AT-redhat.com, brouer-AT-redhat.com, toke-AT-redhat.com, toshiaki.makita1-AT-gmail.com, daniel-AT-iogearbox.net, john.fastabend-AT-gmail.com, ast-AT-kernel.org, kafai-AT-fb.com, songliubraving-AT-fb.com, yhs-AT-fb.com, andriin-AT-fb.com, dsahern-AT-gmail.com | |
Archive-link: | Article |
From: David Ahern <dsahern@gmail.com> This series adds support for XDP in the egress path by introducing a new XDP attachment type, BPF_XDP_EGRESS, and adding a UAPI to if_link.h for attaching the program to a netdevice and reporting the program. bpf programs can be run on all packets in the Tx path - skbs or redirected xdp frames. The intent is to emulate the current RX path for XDP as much as possible to maintain consistency and symmetry in the 2 paths with their APIs. This is a missing primitive for XDP allowing solutions to build small, targeted programs properly distributed in the networking path allowing, for example, an egress firewall/ACL/traffic verification or packet manipulation and encapping an entire ethernet frame whether it is locally generated traffic, forwarded via the slow path (ie., full stack processing) or xdp redirected frames. Nothing about running a program in the Tx path requires driver specific resources like the Rx path has. Thus, programs can be run in core code and attached to the net_device struct similar to skb mode. The existing XDP_FLAGS_*_MODE are not relevant at the moment, so none can be set in the attach. XDP_FLAGS_HW_MODE can be used in the future (e.g., the work on offloading programs from a VM). The locations chosen to run the egress program - __netdev_start_xmit before the call to ndo_start_xmit and bq_xmit_all before invoking ndo_xdp_xmit - allow follow on patch sets to handle tx queueing and setting the queue index if multi-queue with consistency in handling both packet formats. A few of the patches trace back to work done on offloading programs from a VM by Jason Wang and Prashant Bole. v2: - changed rx checks in xdp_is_valid_access to any expected_attach_type - add xdp_egress argument to bpftool prog rst document - do not allow IFLA_XDP and IFLA_XDP_EGRESS in the same config. There is no way to rollback IFLA_XDP if IFLA_XDP_EGRESS fails. - comments from Andrii on libbpf - bpftool documentationa and bash completion - Quentin v1: - add selftests - flip the order of xdp generic patches as requested by Toke - fixed the count arg to do_xdp_egress_frame - Toke - remove meta data invalidate in __xdp_egress_frame - Toke - fixed data_hard_start in __xdp_egress_frame - Jesper - refactored convert_to_xdp_frame to reuse buf to frame code - Jesper - added missed refactoring patch when generating patch set RFC v5: - updated cover letter - moved running of ebpf program to from ndo_{start,xdp}_xmit to core code. Dropped all tun and vhost related changes. - added egress support to bpftool RFC v4: - updated cover letter - patches related to code movement between tuntap, headers and vhost are dropped; previous RFC ran the XDP program in vhost context vs this set which runs them before queueing to vhost. As a part of this moved invocation of egress program to tun_net_xmit and tun_xdp_xmit. - renamed do_xdp_generic to do_xdp_generic_rx to emphasize is called in the Rx path; added rx argument to do_xdp_generic_core since it is used for both directions and needs to know which queue values to set in xdp_buff RFC v3: - reworked the patches - splitting patch 1 from RFC v2 into 3, combining patch 2 from RFC v2 into the first 3, combining patches 6 and 7 from RFC v2 into 1 since both did a trivial rename and export. Reordered the patches such that kernel changes are first followed by libbpf and an enhancement to a sample. - moved small xdp related helper functions from tun.c to tun.h to make tun_ptr_free usable from the tap code. This is needed to handle the case of tap builtin and tun built as a module. - pkt_ptrs added to `struct tun_file` and passed to tun_consume_packets rather than declaring pkts as an array on the stack. RFC v2: - New XDP attachment type: Jesper, Toke and Alexei discussed whether to introduce a new program type. Since this set adds a way to attach regular XDP program to the tx path, as per Alexei's suggestion, a new attachment type BPF_XDP_EGRESS is introduced. - libbpf API changes: Alexei had suggested _opts() style of API extension. Considering it two new libbpf APIs are introduced which are equivalent to existing APIs. New ones can be extended easily. Please see individual patches for details. xdp1 sample program is modified to use new APIs. - tun: Some patches from previous set are removed as they are irrelevant in this series. They will in introduced later. David Ahern (17): net: Refactor convert_to_xdp_frame net: Move handling of IFLA_XDP attribute out of do_setlink net: Add XDP setup and query commands for Tx programs net: Add BPF_XDP_EGRESS as a bpf_attach_type xdp: Add xdp_txq_info to xdp_buff net: Add IFLA_XDP_EGRESS for XDP programs in the egress path net: Rename do_xdp_generic to do_xdp_generic_rx net: rename netif_receive_generic_xdp to do_generic_xdp_core net: set XDP egress program on netdevice net: Support xdp in the Tx path for packets as an skb net: Support xdp in the Tx path for xdp_frames libbpf: Refactor get_xdp_info libbpf: Add egress XDP support bpftool: Add support for XDP egress selftest: Add test for xdp_egress selftest: Add xdp_egress attach tests samples/bpf: add XDP egress support to xdp1 drivers/net/tun.c | 4 +- include/linux/netdevice.h | 23 +- include/net/xdp.h | 35 ++- include/uapi/linux/bpf.h | 3 + include/uapi/linux/if_link.h | 3 + kernel/bpf/devmap.c | 19 +- net/core/dev.c | 251 ++++++++++++++---- net/core/filter.c | 26 ++ net/core/rtnetlink.c | 186 ++++++++++--- samples/bpf/xdp1_user.c | 39 ++- .../bpf/bpftool/Documentation/bpftool-net.rst | 4 +- tools/bpf/bpftool/bash-completion/bpftool | 2 +- tools/bpf/bpftool/main.h | 2 +- tools/bpf/bpftool/net.c | 48 +++- tools/bpf/bpftool/netlink_dumper.c | 12 +- tools/include/uapi/linux/bpf.h | 3 + tools/include/uapi/linux/if_link.h | 3 + tools/lib/bpf/libbpf.c | 2 + tools/lib/bpf/libbpf.h | 6 +- tools/lib/bpf/libbpf.map | 5 + tools/lib/bpf/netlink.c | 86 ++++-- tools/testing/selftests/bpf/Makefile | 1 + .../bpf/prog_tests/xdp_egress_attach.c | 62 +++++ .../selftests/bpf/progs/test_xdp_egress.c | 12 + .../bpf/progs/test_xdp_egress_fail.c | 16 ++ tools/testing/selftests/bpf/progs/xdp_drop.c | 25 ++ .../testing/selftests/bpf/test_xdp_egress.sh | 159 +++++++++++ 27 files changed, 881 insertions(+), 156 deletions(-) create mode 100644 tools/testing/selftests/bpf/prog_tests/xdp_egress_attach.c create mode 100644 tools/testing/selftests/bpf/progs/test_xdp_egress.c create mode 100644 tools/testing/selftests/bpf/progs/test_xdp_egress_fail.c create mode 100644 tools/testing/selftests/bpf/progs/xdp_drop.c create mode 100755 tools/testing/selftests/bpf/test_xdp_egress.sh -- 2.21.1 (Apple Git-122.3)