]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
io_uring/zcrx: selftests: parse json from ethtool -g
authorDavid Wei <dw@davidwei.uk>
Sat, 26 Apr 2025 19:55:25 +0000 (12:55 -0700)
committerJakub Kicinski <kuba@kernel.org>
Tue, 29 Apr 2025 18:09:50 +0000 (11:09 -0700)
Parse JSON from ethtool -g instead of parsing text output.

Signed-off-by: David Wei <dw@davidwei.uk>
Reviewed-by: Joe Damato <jdamato@fastly.com>
Link: https://patch.msgid.link/20250426195525.1906774-3-dw@davidwei.uk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
tools/testing/selftests/drivers/net/hw/iou-zcrx.py

index a19550419771d4b17ceb4a2f502fc7ce2b465039..aef43f82edd565b02d5abbf5e66b7fb74900e6b9 100755 (executable)
@@ -9,10 +9,8 @@ from lib.py import bkg, cmd, defer, ethtool, rand_port, wait_port_listen
 
 
 def _get_current_settings(cfg):
-    output = ethtool(f"-g {cfg.ifname}", host=cfg.remote).stdout
-    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]))
+    output = ethtool(f"-g {cfg.ifname}", json=True, host=cfg.remote)[0]
+    return (output['rx'], output['hds-thresh'])
 
 
 def _get_combined_channels(cfg):