]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
io_uring/zcrx: fix selftests w/ updated netdev Python helpers
authorDavid Wei <dw@davidwei.uk>
Wed, 2 Apr 2025 17:24:14 +0000 (10:24 -0700)
committerJakub Kicinski <kuba@kernel.org>
Thu, 3 Apr 2025 22:45:30 +0000 (15:45 -0700)
Fix io_uring zero copy rx selftest with updated netdev Python helpers.

Signed-off-by: David Wei <dw@davidwei.uk>
Link: https://patch.msgid.link/20250402172414.895276-1-dw@davidwei.uk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
tools/testing/selftests/drivers/net/hw/iou-zcrx.py

index d301d9b356f71238f9eca45b5dda4e4b330085a1..9f271ab6ec04e6bd78664439177d64ae3edb18c9 100755 (executable)
@@ -27,7 +27,7 @@ def _set_flow_rule(cfg, chan):
 
 
 def test_zcrx(cfg) -> None:
-    cfg.require_v6()
+    cfg.require_ipver('6')
 
     combined_chans = _get_combined_channels(cfg)
     if combined_chans < 2:
@@ -40,7 +40,7 @@ def test_zcrx(cfg) -> None:
         flow_rule_id = _set_flow_rule(cfg, combined_chans - 1)
 
         rx_cmd = f"{cfg.bin_remote} -s -p 9999 -i {cfg.ifname} -q {combined_chans - 1}"
-        tx_cmd = f"{cfg.bin_local} -c -h {cfg.remote_v6} -p 9999 -l 12840"
+        tx_cmd = f"{cfg.bin_local} -c -h {cfg.remote_addr_v['6']} -p 9999 -l 12840"
         with bkg(rx_cmd, host=cfg.remote, exit_wait=True):
             wait_port_listen(9999, proto="tcp", host=cfg.remote)
             cmd(tx_cmd)
@@ -51,7 +51,7 @@ def test_zcrx(cfg) -> None:
 
 
 def test_zcrx_oneshot(cfg) -> None:
-    cfg.require_v6()
+    cfg.require_ipver('6')
 
     combined_chans = _get_combined_channels(cfg)
     if combined_chans < 2:
@@ -64,7 +64,7 @@ def test_zcrx_oneshot(cfg) -> None:
         flow_rule_id = _set_flow_rule(cfg, combined_chans - 1)
 
         rx_cmd = f"{cfg.bin_remote} -s -p 9999 -i {cfg.ifname} -q {combined_chans - 1} -o 4"
-        tx_cmd = f"{cfg.bin_local} -c -h {cfg.remote_v6} -p 9999 -l 4096 -z 16384"
+        tx_cmd = f"{cfg.bin_local} -c -h {cfg.remote_addr_v['6']} -p 9999 -l 4096 -z 16384"
         with bkg(rx_cmd, host=cfg.remote, exit_wait=True):
             wait_port_listen(9999, proto="tcp", host=cfg.remote)
             cmd(tx_cmd)