diff options
| author | David Wei <dw@davidwei.uk> | 2025-04-25 05:20:48 +0300 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2025-04-26 04:44:10 +0300 |
| commit | 4ce3ade36f251e47fc6b0345afb73a09794fb2e9 (patch) | |
| tree | 8e58770f79362f5b4f649de556def8a441af30a9 /tools/testing/selftests/drivers/net/hw | |
| parent | 43fd0054f3569d8063b2a5b6a3987031cd0d36f6 (diff) | |
| download | linux-4ce3ade36f251e47fc6b0345afb73a09794fb2e9.tar.xz | |
io_uring/zcrx: selftests: set hds_thresh to 0
Setting hds_thresh to 0 is required for queue reset.
Signed-off-by: David Wei <dw@davidwei.uk>
Reviewed-by: Simon Horman <horms@kernel.org>
Reviewed-by: Joe Damato <jdamato@fastly.com>
Link: https://patch.msgid.link/20250425022049.3474590-3-dw@davidwei.uk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'tools/testing/selftests/drivers/net/hw')
| -rwxr-xr-x | tools/testing/selftests/drivers/net/hw/iou-zcrx.py | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/tools/testing/selftests/drivers/net/hw/iou-zcrx.py b/tools/testing/selftests/drivers/net/hw/iou-zcrx.py index 698f29cfd7eb..0b0b6a261159 100755 --- a/tools/testing/selftests/drivers/net/hw/iou-zcrx.py +++ b/tools/testing/selftests/drivers/net/hw/iou-zcrx.py @@ -8,10 +8,11 @@ from lib.py import NetDrvEpEnv from lib.py import bkg, cmd, defer, ethtool, wait_port_listen -def _get_rx_ring_entries(cfg): +def _get_current_settings(cfg): output = ethtool(f"-g {cfg.ifname}", host=cfg.remote).stdout - values = re.findall(r'RX:\s+(\d+)', output) - return int(values[1]) + rx_ring = re.findall(r'RX:\s+(\d+)', output) + hds_thresh = re.findall(r'HDS thresh:\s+(\d+)', output) + return (int(rx_ring[1]), int(hds_thresh[1])) def _get_combined_channels(cfg): @@ -32,11 +33,12 @@ def test_zcrx(cfg) -> None: combined_chans = _get_combined_channels(cfg) if combined_chans < 2: raise KsftSkipEx('at least 2 combined channels required') - rx_ring = _get_rx_ring_entries(cfg) - + (rx_ring, hds_thresh) = _get_current_settings(cfg) ethtool(f"-G {cfg.ifname} tcp-data-split on", host=cfg.remote) defer(ethtool, f"-G {cfg.ifname} tcp-data-split auto", host=cfg.remote) + ethtool(f"-G {cfg.ifname} hds-thresh 0", host=cfg.remote) + defer(ethtool, f"-G {cfg.ifname} hds-thresh {hds_thresh}", host=cfg.remote) ethtool(f"-G {cfg.ifname} rx 64", host=cfg.remote) defer(ethtool, f"-G {cfg.ifname} rx {rx_ring}", host=cfg.remote) ethtool(f"-X {cfg.ifname} equal {combined_chans - 1}", host=cfg.remote) @@ -57,10 +59,12 @@ def test_zcrx_oneshot(cfg) -> None: combined_chans = _get_combined_channels(cfg) if combined_chans < 2: raise KsftSkipEx('at least 2 combined channels required') - rx_ring = _get_rx_ring_entries(cfg) + (rx_ring, hds_thresh) = _get_current_settings(cfg) ethtool(f"-G {cfg.ifname} tcp-data-split on", host=cfg.remote) defer(ethtool, f"-G {cfg.ifname} tcp-data-split auto", host=cfg.remote) + ethtool(f"-G {cfg.ifname} hds-thresh 0", host=cfg.remote) + defer(ethtool, f"-G {cfg.ifname} hds-thresh {hds_thresh}", host=cfg.remote) ethtool(f"-G {cfg.ifname} rx 64", host=cfg.remote) defer(ethtool, f"-G {cfg.ifname} rx {rx_ring}", host=cfg.remote) ethtool(f"-X {cfg.ifname} equal {combined_chans - 1}", host=cfg.remote) |