| Message ID | 20231127190319.1190813-1-sdf@google.com (mailing list archive) |
|---|---|
| Headers | show |
| Series | xsk: TX metadata | expand |
Hello: This series was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <ast@kernel.org>: On Mon, 27 Nov 2023 11:03:06 -0800 you wrote: > This series implements initial TX metadata (offloads) for AF_XDP. > See patch #2 for the main implementation and mlx5/stmmac ones for the > example on how to consume the metadata on the device side. > > Starting with two types of offloads: > - request TX timestamp (and write it back into the metadata area) > - request TX checksum offload > > [...] Here is the summary with links: - [bpf-next,v6,01/13] xsk: Support tx_metadata_len https://git.kernel.org/bpf/bpf-next/c/341ac980eab9 - [bpf-next,v6,02/13] xsk: Add TX timestamp and TX checksum offload support https://git.kernel.org/bpf/bpf-next/c/48eb03dd2630 - [bpf-next,v6,03/13] tools: ynl: Print xsk-features from the sample https://git.kernel.org/bpf/bpf-next/c/9276009d35d3 - [bpf-next,v6,04/13] net/mlx5e: Implement AF_XDP TX timestamp and checksum offload https://git.kernel.org/bpf/bpf-next/c/ec706a860eba - [bpf-next,v6,05/13] net: stmmac: Add Tx HWTS support to XDP ZC https://git.kernel.org/bpf/bpf-next/c/1347b419318d - [bpf-next,v6,06/13] xsk: Document tx_metadata_len layout https://git.kernel.org/bpf/bpf-next/c/9620e956d5b5 - [bpf-next,v6,07/13] xsk: Validate xsk_tx_metadata flags https://git.kernel.org/bpf/bpf-next/c/ce59f9686e0e - [bpf-next,v6,08/13] xsk: Add option to calculate TX checksum in SW https://git.kernel.org/bpf/bpf-next/c/11614723af26 - [bpf-next,v6,09/13] selftests/xsk: Support tx_metadata_len https://git.kernel.org/bpf/bpf-next/c/df3ed0003ec4 - [bpf-next,v6,10/13] selftests/bpf: Add csum helpers https://git.kernel.org/bpf/bpf-next/c/f6642de0c3e9 - [bpf-next,v6,11/13] selftests/bpf: Add TX side to xdp_metadata https://git.kernel.org/bpf/bpf-next/c/40808a237d9c - [bpf-next,v6,12/13] selftests/bpf: Convert xdp_hw_metadata to XDP_USE_NEED_WAKEUP https://git.kernel.org/bpf/bpf-next/c/12b4b7963d3c - [bpf-next,v6,13/13] selftests/bpf: Add TX side to xdp_hw_metadata https://git.kernel.org/bpf/bpf-next/c/60523115c1b1 You are awesome, thank you!
This series implements initial TX metadata (offloads) for AF_XDP. See patch #2 for the main implementation and mlx5/stmmac ones for the example on how to consume the metadata on the device side. Starting with two types of offloads: - request TX timestamp (and write it back into the metadata area) - request TX checksum offload Changes since v5: - preserve xsk_tx_metadata flags across tx and completion by moving them out of 'request' union (Jesper) - fix xdp_metadata checksum failure in big endian (Alexei) - add SPDX to xdp-rx-metadata.rst (Simon) v5: https://lore.kernel.org/bpf/20231102225837.1141915-1-sdf@google.com/ Performance (mlx5): I've implemented a small xskgen tool to try to saturate single tx queue: https://github.com/fomichev/xskgen/tree/master Here are the performance numbers with some analysis. 1. Baseline. Running with commit eb62e6aef940 ("Merge branch 'bpf: Support bpf_get_func_ip helper in uprobes'"), nothing from this series: - with 1400 bytes of payload: 98 gbps, 8 mpps ./xskgen -s 1400 -b eth3 10:70:fd:48:10:77 10:70:fd:48:10:87 fe80::1270:fdff:fe48:1077 fe80::1270:fdff:fe48:1087 1 1 sent 10000000 packets 116960000000 bits, took 1.189130 sec, 98.357623 gbps 8.409509 mpps - with 200 bytes of payload: 49 gbps, 23 mpps ./xskgen -s 200 -b eth3 10:70:fd:48:10:77 10:70:fd:48:10:87 fe80::1270:fdff:fe48:1077 fe80::1270:fdff:fe48:1087 1 1 sent 10000064 packets 20960134144 bits, took 0.422235 sec, 49.640921 gbps 23.683645 mpps 2. Adding single commit that supports reserving tx_metadata_len changes nothing numbers-wise. - baseline for 1400 ./xskgen -s 1400 -b eth3 10:70:fd:48:10:77 10:70:fd:48:10:87 fe80::1270:fdff:fe48:1077 fe80::1270:fdff:fe48:1087 1 1 sent 10000000 packets 116960000000 bits, took 1.189247 sec, 98.347946 gbps 8.408682 mpps - baseline for 200 ./xskgen -s 200 -b eth3 10:70:fd:48:10:77 10:70:fd:48:10:87 fe80::1270:fdff:fe48:1077 fe80::1270:fdff:fe48:1087 1 1 sent 10000000 packets 20960000000 bits, took 0.421248 sec, 49.756913 gbps 23.738985 mpps 3. Adding -M flag causes xskgen to reserve the metadata and fill it, but doesn't set XDP_TX_METADATA descriptor option. - new baseline for 1400 (with only filling the metadata) ./xskgen -M -s 1400 -b eth3 10:70:fd:48:10:77 10:70:fd:48:10:87 fe80::1270:fdff:fe48:1077 fe80::1270:fdff:fe48:1087 1 1 sent 10000000 packets 116960000000 bits, took 1.188767 sec, 98.387657 gbps 8.412077 mpps - new baseline for 200 (with only filling the metadata) ./xskgen -M -s 200 -b eth3 10:70:fd:48:10:77 10:70:fd:48:10:87 fe80::1270:fdff:fe48:1077 fe80::1270:fdff:fe48:1087 1 1 sent 10000000 packets 20960000000 bits, took 0.410213 sec, 51.095407 gbps 24.377579 mpps (the numbers go sligtly up here, not really sure why, maybe some cache-related side-effects? 4. Next, I'm running the same test but with the commit that adds actual general infra to parse XDP_TX_METADATA (but no driver support). Essentially applying "xsk: add TX timestamp and TX checksum offload support" from this series. Numbers are the same. - fill metadata for 1400 ./xskgen -M -s 1400 -b eth3 10:70:fd:48:10:77 10:70:fd:48:10:87 fe80::1270:fdff:fe48:1077 fe80::1270:fdff:fe48:1087 1 1 sent 10000000 packets 116960000000 bits, took 1.188430 sec, 98.415557 gbps 8.414463 mpps - fill metadata for 200 ./xskgen -M -s 200 -b eth3 10:70:fd:48:10:77 10:70:fd:48:10:87 fe80::1270:fdff:fe48:1077 fe80::1270:fdff:fe48:1087 1 1 sent 10000000 packets 20960000000 bits, took 0.411559 sec, 50.928299 gbps 24.297853 mpps - request metadata for 1400 ./xskgen -m -s 1400 -b eth3 10:70:fd:48:10:77 10:70:fd:48:10:87 fe80::1270:fdff:fe48:1077 fe80::1270:fdff:fe48:1087 1 1 sent 10000000 packets 116960000000 bits, took 1.188723 sec, 98.391299 gbps 8.412389 mpps - request metadata for 200 ./xskgen -m -s 200 -b eth3 10:70:fd:48:10:77 10:70:fd:48:10:87 fe80::1270:fdff:fe48:1077 fe80::1270:fdff:fe48:1087 1 1 sent 10000064 packets 20960134144 bits, took 0.411240 sec, 50.968131 gbps 24.316856 mpps 5. Now, for the most interesting part, I'm adding mlx5 driver support. The mpps for 200 bytes case goes down from 23 mpps to 19 mpps, but _only_ when I enable the metadata. This looks like a side effect of me pushing extra metadata pointer via mlx5e_xdpi_fifo_push. Hence, this part is wrapped into 'if (xp_tx_metadata_enabled)' to not affect the existing non-metadata use-cases. Since this is not regressing existing workloads, I'm not spending any time trying to optimize it more (and leaving it up to mlx owners to purse if they see any good way to do it). - same baseline ./xskgen -s 1400 -b eth3 10:70:fd:48:10:77 10:70:fd:48:10:87 fe80::1270:fdff:fe48:1077 fe80::1270:fdff:fe48:1087 1 1 sent 10000000 packets 116960000000 bits, took 1.189434 sec, 98.332484 gbps 8.407360 mpps ./xskgen -s 200 -b eth3 10:70:fd:48:10:77 10:70:fd:48:10:87 fe80::1270:fdff:fe48:1077 fe80::1270:fdff:fe48:1087 1 1 sent 10000128 packets 20960268288 bits, took 0.425254 sec, 49.288821 gbps 23.515659 mpps - fill metadata for 1400 ./xskgen -M -s 1400 -b eth3 10:70:fd:48:10:77 10:70:fd:48:10:87 fe80::1270:fdff:fe48:1077 fe80::1270:fdff:fe48:1087 1 1 sent 10000000 packets 116960000000 bits, took 1.189528 sec, 98.324714 gbps 8.406696 mpps - fill metadata for 200 ./xskgen -M -s 200 -b eth3 10:70:fd:48:10:77 10:70:fd:48:10:87 fe80::1270:fdff:fe48:1077 fe80::1270:fdff:fe48:1087 1 1 sent 10000128 packets 20960268288 bits, took 0.519085 sec, 40.379260 gbps 19.264914 mpps - request metadata for 1400 ./xskgen -m -s 1400 -b eth3 10:70:fd:48:10:77 10:70:fd:48:10:87 fe80::1270:fdff:fe48:1077 fe80::1270:fdff:fe48:1087 1 1 sent 10000000 packets 116960000000 bits, took 1.189329 sec, 98.341165 gbps 8.408102 mpps - request metadata for 200 ./xskgen -m -s 200 -b eth3 10:70:fd:48:10:77 10:70:fd:48:10:87 fe80::1270:fdff:fe48:1077 fe80::1270:fdff:fe48:1087 1 1 sent 10000128 packets 20960268288 bits, took 0.519929 sec, 40.313713 gbps 19.233642 mpps Acked-by: Magnus Karlsson <magnus.karlsson@intel.com> Acked-by: Jakub Kicinski <kuba@kernel.org> Song Yoong Siang (1): net: stmmac: Add Tx HWTS support to XDP ZC Stanislav Fomichev (12): xsk: Support tx_metadata_len xsk: Add TX timestamp and TX checksum offload support tools: ynl: Print xsk-features from the sample net/mlx5e: Implement AF_XDP TX timestamp and checksum offload xsk: Document tx_metadata_len layout xsk: Validate xsk_tx_metadata flags xsk: Add option to calculate TX checksum in SW selftests/xsk: Support tx_metadata_len selftests/bpf: Add csum helpers selftests/bpf: Add TX side to xdp_metadata selftests/bpf: Convert xdp_hw_metadata to XDP_USE_NEED_WAKEUP selftests/bpf: Add TX side to xdp_hw_metadata Documentation/netlink/specs/netdev.yaml | 19 +- Documentation/networking/index.rst | 1 + Documentation/networking/xdp-rx-metadata.rst | 2 + Documentation/networking/xsk-tx-metadata.rst | 79 ++++++ drivers/net/ethernet/mellanox/mlx5/core/en.h | 4 +- .../net/ethernet/mellanox/mlx5/core/en/xdp.c | 72 +++++- .../net/ethernet/mellanox/mlx5/core/en/xdp.h | 11 +- .../ethernet/mellanox/mlx5/core/en/xsk/tx.c | 17 +- .../net/ethernet/mellanox/mlx5/core/en_main.c | 1 + drivers/net/ethernet/stmicro/stmmac/stmmac.h | 12 + .../net/ethernet/stmicro/stmmac/stmmac_main.c | 64 ++++- include/linux/netdevice.h | 2 + include/linux/skbuff.h | 14 +- include/net/xdp_sock.h | 111 +++++++++ include/net/xdp_sock_drv.h | 34 +++ include/net/xsk_buff_pool.h | 8 + include/uapi/linux/if_xdp.h | 47 +++- include/uapi/linux/netdev.h | 16 ++ net/core/netdev-genl.c | 13 +- net/xdp/xdp_umem.c | 11 +- net/xdp/xsk.c | 56 ++++- net/xdp/xsk_buff_pool.c | 2 + net/xdp/xsk_queue.h | 19 +- tools/include/uapi/linux/if_xdp.h | 61 ++++- tools/include/uapi/linux/netdev.h | 16 ++ tools/net/ynl/generated/netdev-user.c | 19 ++ tools/net/ynl/generated/netdev-user.h | 3 + tools/net/ynl/samples/netdev.c | 10 +- tools/testing/selftests/bpf/network_helpers.h | 43 ++++ .../selftests/bpf/prog_tests/xdp_metadata.c | 33 ++- tools/testing/selftests/bpf/xdp_hw_metadata.c | 235 ++++++++++++++++-- tools/testing/selftests/bpf/xsk.c | 3 + tools/testing/selftests/bpf/xsk.h | 1 + 33 files changed, 969 insertions(+), 70 deletions(-) create mode 100644 Documentation/networking/xsk-tx-metadata.rst