Changes since v3: - do not unload netlink-based XDP prog when updating map elem failed and current socket was not the creator of XDP resources (Toke) - pull out code paths based on prog_id value within __xsk_setup_xdp_prog so that teardown in case of error at any point is more clear Changes since v2: - fix c&p failure in veth's get_channels implementation (Magnus) - provide a backward compatibilty if bpf_link is not supported (Andrii) - check for a link type while looking up existing bpf_links (Andrii) Changes since v1: - selftests improvements and test case for bpf_link persistence itself - do not unload netlink-based prog when --force flag is set (John) - simplify return semantics in xsk_link_lookup (John) v3: https://lore.kernel.org/bpf/20210322205816.65159-1-maciej.fijalkowski@xxxxxxxxx/ v2: https://lore.kernel.org/bpf/20210311152910.56760-1-maciej.fijalkowski@xxxxxxxxx/ v1: https://lore.kernel.org/bpf/20210215154638.4627-1-maciej.fijalkowski@xxxxxxxxx/ -------------------------------------------------- This set is another approach towards addressing the below issue: // load xdp prog and xskmap and add entry to xskmap at idx 10 $ sudo ./xdpsock -i ens801f0 -t -q 10 // add entry to xskmap at idx 11 $ sudo ./xdpsock -i ens801f0 -t -q 11 terminate one of the processes and another one is unable to work due to the fact that the XDP prog was unloaded from interface. Previous attempt was, to put it mildly, a bit broken, as there was no synchronization between updates to additional map, as Bjorn pointed out. See https://lore.kernel.org/netdev/20190603131907.13395-5-maciej.fijalkowski@xxxxxxxxx/ In the meantime bpf_link was introduced and it seems that it can address the issue of refcounting the XDP prog on interface. Although the bpf_link is the meat of the set, selftests improvements are a bigger part of it. Overall, we've been able to reduce the complexity of xsk selftests by removing a bunch of synchronization resources and simplifying logic and structs. Last but not least, for multiqueue veth working with AF-XDP, ethtool's get_channels API needs to be implemented, so it's also included in that set. Note also that in order to make it work, a commit from bpf tree: veth: store queue_mapping independently of XDP prog presence https://lore.kernel.org/bpf/20210303152903.11172-1-maciej.fijalkowski@xxxxxxxxx/ is needed. Thanks, Maciej Björn Töpel (3): selftests: xsk: remove thread attribute selftests: xsk: Remove mutex and condition variable selftests: xsk: Remove unused defines Maciej Fijalkowski (14): selftests: xsk: don't call worker_pkt_dump() for stats test selftests: xsk: remove struct ifaceconfigobj selftests: xsk: remove unused function selftests: xsk: remove inline keyword from source file selftests: xsk: simplify frame traversal in dumping thread libbpf: xsk: use bpf_link samples: bpf: do not unload prog within xdpsock selftests: xsk: remove thread for netns switch selftests: xsk: split worker thread selftests: xsk: remove Tx synchronization resources selftests: xsk: refactor teardown/bidi test cases and testapp_validate selftests: xsk: remove sync_mutex_tx and atomic var veth: implement ethtool's get_channels() callback selftests: xsk: implement bpf_link test drivers/net/veth.c | 12 + samples/bpf/xdpsock_user.c | 55 +- tools/lib/bpf/xsk.c | 259 +++++++-- tools/testing/selftests/bpf/test_xsk.sh | 3 +- tools/testing/selftests/bpf/xdpxceiver.c | 700 ++++++++++------------- tools/testing/selftests/bpf/xdpxceiver.h | 49 +- 6 files changed, 574 insertions(+), 504 deletions(-) -- 2.20.1
