mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-10 15:13:44 -04:00
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>
This commit is contained in:
committed by
Jakub Kicinski
parent
43fd0054f3
commit
4ce3ade36f
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user