Commit b4ec6a19 authored by Magnus Karlsson's avatar Magnus Karlsson Committed by Daniel Borkmann

selftests, xsk: Fix rx_full stats test

Fix the rx_full stats test so that it correctly reports pass even when
the fill ring is not full of buffers.

Fixes: 872a1184 ("selftests: xsk: Put the same buffer only once in the fill ring")
Signed-off-by: default avatarMagnus Karlsson <magnus.karlsson@intel.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Tested-by: default avatarMaciej Fijalkowski <maciej.fijalkowski@intel.com>
Acked-by: default avatarMaciej Fijalkowski <maciej.fijalkowski@intel.com>
Link: https://lore.kernel.org/bpf/20220121123508.12759-1-magnus.karlsson@gmail.com
parent ed8bb032
...@@ -906,7 +906,10 @@ static bool rx_stats_are_valid(struct ifobject *ifobject) ...@@ -906,7 +906,10 @@ static bool rx_stats_are_valid(struct ifobject *ifobject)
return true; return true;
case STAT_TEST_RX_FULL: case STAT_TEST_RX_FULL:
xsk_stat = stats.rx_ring_full; xsk_stat = stats.rx_ring_full;
expected_stat -= RX_FULL_RXQSIZE; if (ifobject->umem->num_frames < XSK_RING_PROD__DEFAULT_NUM_DESCS)
expected_stat = ifobject->umem->num_frames - RX_FULL_RXQSIZE;
else
expected_stat = XSK_RING_PROD__DEFAULT_NUM_DESCS - RX_FULL_RXQSIZE;
break; break;
case STAT_TEST_RX_FILL_EMPTY: case STAT_TEST_RX_FILL_EMPTY:
xsk_stat = stats.rx_fill_ring_empty_descs; xsk_stat = stats.rx_fill_ring_empty_descs;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment