The XDP and devmem attachment rules must work in either order. A native program with frags support should coexist with a devmem RX binding; generic and single-buffer programs must remain rejected. Test these rules on netdevsim with header split enabled. The test does not send packets with provider fragments. Signed-off-by: Björn Töpel --- tools/testing/selftests/net/nl_netdev.py | 54 +++++++++++++++++++++++- 1 file changed, 52 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/net/nl_netdev.py b/tools/testing/selftests/net/nl_netdev.py index dd0321c0b463..15326fb66362 100755 --- a/tools/testing/selftests/net/nl_netdev.py +++ b/tools/testing/selftests/net/nl_netdev.py @@ -13,7 +13,8 @@ import struct from os import system from lib.py import ksft_run, ksft_exit, KsftFailEx, KsftSkipEx from lib.py import ksft_eq, ksft_ge, ksft_ne, ksft_raises, ksft_busy_wait -from lib.py import EthtoolFamily, NetdevFamily, NetdevSimDev, NlError, defer, ip +from lib.py import CmdExitFailure, EthtoolFamily, NetdevFamily, NetdevSimDev +from lib.py import NlError, defer, ip def empty_check(nf) -> None: @@ -483,6 +484,54 @@ def devmem_bind_tx_unregister_check(_nf) -> None: nf_priv.close() +def devmem_xdp_check(_nf) -> None: + """Native XDP with frags runs next to a devmem binding, in either order.""" + prog = os.path.join(os.path.dirname(os.path.abspath(__file__)), + "lib", "xdp_dummy.bpf.o") + if not os.path.exists(prog): + raise KsftSkipEx(f"{prog} is not built") + + dmabuf_fd = _create_udmabuf() + defer(os.close, dmabuf_fd) + nf_priv = NetdevFamily() + defer(nf_priv.close) + nsimdev = NetdevSimDev(queue_count=2) + defer(nsimdev.remove) + nsim = nsimdev.nsims[0] + dev = nsim.ifname + + ip(f"link set dev {dev} up") + with EthtoolFamily() as ef: + ef.rings_set({"header": {"dev-index": nsim.ifindex}, + "tcp-data-split": "enabled"}) + + # A generic program keeps the provider away + ip(f"link set dev {dev} xdpgeneric obj {prog} sec xdp.frags") + with ksft_raises(NlError) as cm: + nf_priv.bind_rx({"ifindex": nsim.ifindex, "fd": dmabuf_fd, + "queues": [{"id": 1, "type": "rx"}]}) + ksft_eq(cm.exception.nl_msg.error, -errno.EEXIST) + ip(f"link set dev {dev} xdpgeneric off") + + # A native program first, then the provider + ip(f"link set dev {dev} xdpdrv obj {prog} sec xdp.frags") + _devmem_bind(nf_priv.bind_rx, { + "ifindex": nsim.ifindex, + "fd": dmabuf_fd, + "queues": [{"id": 1, "type": "rx"}], + }) + ip(f"link set dev {dev} xdpdrv off") + + # The provider first: native programs with frags only. Header split + # already refuses single-buffer programs. + ip(f"link set dev {dev} xdpdrv obj {prog} sec xdp.frags") + ip(f"link set dev {dev} xdpdrv off") + with ksft_raises(CmdExitFailure): + ip(f"link set dev {dev} xdpdrv obj {prog} sec xdp") + with ksft_raises(CmdExitFailure): + ip(f"link set dev {dev} xdpgeneric obj {prog} sec xdp.frags") + + def main() -> None: """ Ksft boiler plate main """ nf = NetdevFamily() @@ -498,7 +547,8 @@ def main() -> None: page_pool_ifindex_leak_check, page_pool_stats_ifindex_check, devmem_bind_rx_unregister_check, - devmem_bind_tx_unregister_check + devmem_bind_tx_unregister_check, + devmem_xdp_check ], args=(nf, )) ksft_exit() -- 2.56.1