admin/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2025-12-07 20:06:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

selftests: drv-net: xdp: make the XDP qstats tests less flaky

Browse Source 
The XDP qstats tests send 2k packets over a single socket.
Looks like when netdev CI is busy running those tests in QEMU
occasionally flakes. The target doesn't get to run at all
before all 2000 packets are sent.

Lower the number of packets to 1000 and reopen the socket
every 50 packets, to give RSS a chance to spread the packets
to multiple queues.

For the netdev CI testing either lowering the count or using
multiple sockets is enough, but let's do both for extra resiliency.

Acked-by: Stanislav Fomichev <sdf@fomichev.me>
Link: https://patch.msgid.link/20251113152703.3819756-1-kuba@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Jakub Kicinski
2025-11-13 07:27:03 -08:00
parent e1215d1d38
commit eca8b8fc74
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tools/testing/selftests/drivers/net/xdp.py
View File

@@ -687,9 +687,12 @@ def _test_xdp_native_ifc_stats(cfg, act):
"/dev/null"
# Listener runs on "remote" in case of XDP_TX
rx_host = cfg.remote if act == XDPAction.TX else None
# We want to spew 2000 packets quickly, bash seems to do a good enough job
tx_udp = f"exec 5<>/dev/udp/{cfg.addr}/{port}; " \
"for i in `seq 2000`; do echo a >&5; done; exec 5>&-"
# We want to spew 1000 packets quickly, bash seems to do a good enough job
# Each reopening of the socket gives us a differenot local port (for RSS)
tx_udp = "for _ in `seq 20`; do " \
f"exec 5<>/dev/udp/{cfg.addr}/{port}; " \
"for i in `seq 50`; do echo a >&5; done; " \
"exec 5>&-; done"
cfg.wait_hw_stats_settle()
# Qstats have more clearly defined semantics than rtnetlink.
@@ -704,11 +707,11 @@ def _test_xdp_native_ifc_stats(cfg, act):
cfg.wait_hw_stats_settle()
after = cfg.netnl.qstats_get({"ifindex": cfg.ifindex}, dump=True)[0]
ksft_ge(after['rx-packets'] - before['rx-packets'], 2000)
expected_pkts = 1000
ksft_ge(after['rx-packets'] - before['rx-packets'], expected_pkts)
if act == XDPAction.TX:
ksft_ge(after['tx-packets'] - before['tx-packets'], 2000)
ksft_ge(after['tx-packets'] - before['tx-packets'], expected_pkts)
expected_pkts = 2000
stats = _get_stats(prog_info["maps"]["map_xdp_stats"])
ksft_eq(stats[XDPStats.RX.value], expected_pkts, "XDP RX stats mismatch")
if act == XDPAction.TX: