mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-16 10:11:38 -04:00
selftests/net: parametrise iou-zcrx.py with ksft_variants
Use ksft_variants to parametrise tests in iou-zcrx.py to either use single queues or RSS contexts, reducing duplication. Signed-off-by: David Wei <dw@davidwei.uk> Link: https://patch.msgid.link/20260108234521.3619621-1-dw@davidwei.uk Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
David Wei
committed by
Jakub Kicinski
Jakub Kicinski
parent
9086984ff5
commit
de7c600e2d
@@ -3,132 +3,114 @@
|
||||
|
||||
import re
|
||||
from os import path
|
||||
from lib.py import ksft_run, ksft_exit, KsftSkipEx
|
||||
from lib.py import ksft_run, ksft_exit, KsftSkipEx, ksft_variants, KsftNamedVariant
|
||||
from lib.py import NetDrvEpEnv
|
||||
from lib.py import bkg, cmd, defer, ethtool, rand_port, wait_port_listen
|
||||
from lib.py import EthtoolFamily
|
||||
|
||||
|
||||
def _get_current_settings(cfg):
|
||||
output = ethtool(f"-g {cfg.ifname}", json=True)[0]
|
||||
return (output['rx'], output['hds-thresh'])
|
||||
|
||||
|
||||
def _get_combined_channels(cfg):
|
||||
output = ethtool(f"-l {cfg.ifname}").stdout
|
||||
values = re.findall(r'Combined:\s+(\d+)', output)
|
||||
return int(values[1])
|
||||
|
||||
|
||||
def _create_rss_ctx(cfg, chan):
|
||||
output = ethtool(f"-X {cfg.ifname} context new start {chan} equal 1").stdout
|
||||
def create_rss_ctx(cfg):
|
||||
output = ethtool(f"-X {cfg.ifname} context new start {cfg.target} equal 1").stdout
|
||||
values = re.search(r'New RSS context is (\d+)', output).group(1)
|
||||
ctx_id = int(values)
|
||||
return (ctx_id, defer(ethtool, f"-X {cfg.ifname} delete context {ctx_id}"))
|
||||
return int(values)
|
||||
|
||||
|
||||
def _set_flow_rule(cfg, port, chan):
|
||||
output = ethtool(f"-N {cfg.ifname} flow-type tcp6 dst-port {port} action {chan}").stdout
|
||||
def set_flow_rule(cfg):
|
||||
output = ethtool(f"-N {cfg.ifname} flow-type tcp6 dst-port {cfg.port} action {cfg.target}").stdout
|
||||
values = re.search(r'ID (\d+)', output).group(1)
|
||||
return int(values)
|
||||
|
||||
|
||||
def _set_flow_rule_rss(cfg, port, ctx_id):
|
||||
output = ethtool(f"-N {cfg.ifname} flow-type tcp6 dst-port {port} context {ctx_id}").stdout
|
||||
def set_flow_rule_rss(cfg, rss_ctx_id):
|
||||
output = ethtool(f"-N {cfg.ifname} flow-type tcp6 dst-port {cfg.port} context {rss_ctx_id}").stdout
|
||||
values = re.search(r'ID (\d+)', output).group(1)
|
||||
return int(values)
|
||||
|
||||
|
||||
def test_zcrx(cfg) -> None:
|
||||
cfg.require_ipver('6')
|
||||
def single(cfg):
|
||||
channels = cfg.ethnl.channels_get({'header': {'dev-index': cfg.ifindex}})
|
||||
channels = channels['combined-count']
|
||||
if channels < 2:
|
||||
raise KsftSkipEx('Test requires NETIF with at least 2 combined channels')
|
||||
|
||||
combined_chans = _get_combined_channels(cfg)
|
||||
if combined_chans < 2:
|
||||
raise KsftSkipEx('at least 2 combined channels required')
|
||||
(rx_ring, hds_thresh) = _get_current_settings(cfg)
|
||||
port = rand_port()
|
||||
rings = cfg.ethnl.rings_get({'header': {'dev-index': cfg.ifindex}})
|
||||
rx_rings = rings['rx']
|
||||
hds_thresh = rings.get('hds-thresh', 0)
|
||||
|
||||
ethtool(f"-G {cfg.ifname} tcp-data-split on")
|
||||
defer(ethtool, f"-G {cfg.ifname} tcp-data-split auto")
|
||||
cfg.ethnl.rings_set({'header': {'dev-index': cfg.ifindex},
|
||||
'tcp-data-split': 'enabled',
|
||||
'hds-thresh': 0,
|
||||
'rx': 64})
|
||||
defer(cfg.ethnl.rings_set, {'header': {'dev-index': cfg.ifindex},
|
||||
'tcp-data-split': 'unknown',
|
||||
'hds-thresh': hds_thresh,
|
||||
'rx': rx_rings})
|
||||
|
||||
ethtool(f"-G {cfg.ifname} hds-thresh 0")
|
||||
defer(ethtool, f"-G {cfg.ifname} hds-thresh {hds_thresh}")
|
||||
|
||||
ethtool(f"-G {cfg.ifname} rx 64")
|
||||
defer(ethtool, f"-G {cfg.ifname} rx {rx_ring}")
|
||||
|
||||
ethtool(f"-X {cfg.ifname} equal {combined_chans - 1}")
|
||||
cfg.target = channels - 1
|
||||
ethtool(f"-X {cfg.ifname} equal {cfg.target}")
|
||||
defer(ethtool, f"-X {cfg.ifname} default")
|
||||
|
||||
flow_rule_id = _set_flow_rule(cfg, port, combined_chans - 1)
|
||||
flow_rule_id = set_flow_rule(cfg)
|
||||
defer(ethtool, f"-N {cfg.ifname} delete {flow_rule_id}")
|
||||
|
||||
rx_cmd = f"{cfg.bin_local} -s -p {port} -i {cfg.ifname} -q {combined_chans - 1}"
|
||||
tx_cmd = f"{cfg.bin_remote} -c -h {cfg.addr_v['6']} -p {port} -l 12840"
|
||||
|
||||
def rss(cfg):
|
||||
channels = cfg.ethnl.channels_get({'header': {'dev-index': cfg.ifindex}})
|
||||
channels = channels['combined-count']
|
||||
if channels < 2:
|
||||
raise KsftSkipEx('Test requires NETIF with at least 2 combined channels')
|
||||
|
||||
rings = cfg.ethnl.rings_get({'header': {'dev-index': cfg.ifindex}})
|
||||
rx_rings = rings['rx']
|
||||
hds_thresh = rings.get('hds-thresh', 0)
|
||||
|
||||
cfg.ethnl.rings_set({'header': {'dev-index': cfg.ifindex},
|
||||
'tcp-data-split': 'enabled',
|
||||
'hds-thresh': 0,
|
||||
'rx': 64})
|
||||
defer(cfg.ethnl.rings_set, {'header': {'dev-index': cfg.ifindex},
|
||||
'tcp-data-split': 'unknown',
|
||||
'hds-thresh': hds_thresh,
|
||||
'rx': rx_rings})
|
||||
|
||||
cfg.target = channels - 1
|
||||
ethtool(f"-X {cfg.ifname} equal {cfg.target}")
|
||||
defer(ethtool, f"-X {cfg.ifname} default")
|
||||
|
||||
rss_ctx_id = create_rss_ctx(cfg)
|
||||
defer(ethtool, f"-X {cfg.ifname} delete context {rss_ctx_id}")
|
||||
|
||||
flow_rule_id = set_flow_rule_rss(cfg, rss_ctx_id)
|
||||
defer(ethtool, f"-N {cfg.ifname} delete {flow_rule_id}")
|
||||
|
||||
|
||||
@ksft_variants([
|
||||
KsftNamedVariant("single", single),
|
||||
KsftNamedVariant("rss", rss),
|
||||
])
|
||||
def test_zcrx(cfg, setup) -> None:
|
||||
cfg.require_ipver('6')
|
||||
|
||||
setup(cfg)
|
||||
rx_cmd = f"{cfg.bin_local} -s -p {cfg.port} -i {cfg.ifname} -q {cfg.target}"
|
||||
tx_cmd = f"{cfg.bin_remote} -c -h {cfg.addr_v['6']} -p {cfg.port} -l 12840"
|
||||
with bkg(rx_cmd, exit_wait=True):
|
||||
wait_port_listen(port, proto="tcp")
|
||||
wait_port_listen(cfg.port, proto="tcp")
|
||||
cmd(tx_cmd, host=cfg.remote)
|
||||
|
||||
|
||||
def test_zcrx_oneshot(cfg) -> None:
|
||||
@ksft_variants([
|
||||
KsftNamedVariant("single", single),
|
||||
KsftNamedVariant("rss", rss),
|
||||
])
|
||||
def test_zcrx_oneshot(cfg, setup) -> None:
|
||||
cfg.require_ipver('6')
|
||||
|
||||
combined_chans = _get_combined_channels(cfg)
|
||||
if combined_chans < 2:
|
||||
raise KsftSkipEx('at least 2 combined channels required')
|
||||
(rx_ring, hds_thresh) = _get_current_settings(cfg)
|
||||
port = rand_port()
|
||||
|
||||
ethtool(f"-G {cfg.ifname} tcp-data-split on")
|
||||
defer(ethtool, f"-G {cfg.ifname} tcp-data-split auto")
|
||||
|
||||
ethtool(f"-G {cfg.ifname} hds-thresh 0")
|
||||
defer(ethtool, f"-G {cfg.ifname} hds-thresh {hds_thresh}")
|
||||
|
||||
ethtool(f"-G {cfg.ifname} rx 64")
|
||||
defer(ethtool, f"-G {cfg.ifname} rx {rx_ring}")
|
||||
|
||||
ethtool(f"-X {cfg.ifname} equal {combined_chans - 1}")
|
||||
defer(ethtool, f"-X {cfg.ifname} default")
|
||||
|
||||
flow_rule_id = _set_flow_rule(cfg, port, combined_chans - 1)
|
||||
defer(ethtool, f"-N {cfg.ifname} delete {flow_rule_id}")
|
||||
|
||||
rx_cmd = f"{cfg.bin_local} -s -p {port} -i {cfg.ifname} -q {combined_chans - 1} -o 4"
|
||||
tx_cmd = f"{cfg.bin_remote} -c -h {cfg.addr_v['6']} -p {port} -l 4096 -z 16384"
|
||||
setup(cfg)
|
||||
rx_cmd = f"{cfg.bin_local} -s -p {cfg.port} -i {cfg.ifname} -q {cfg.target} -o 4"
|
||||
tx_cmd = f"{cfg.bin_remote} -c -h {cfg.addr_v['6']} -p {cfg.port} -l 4096 -z 16384"
|
||||
with bkg(rx_cmd, exit_wait=True):
|
||||
wait_port_listen(port, proto="tcp")
|
||||
cmd(tx_cmd, host=cfg.remote)
|
||||
|
||||
|
||||
def test_zcrx_rss(cfg) -> None:
|
||||
cfg.require_ipver('6')
|
||||
|
||||
combined_chans = _get_combined_channels(cfg)
|
||||
if combined_chans < 2:
|
||||
raise KsftSkipEx('at least 2 combined channels required')
|
||||
(rx_ring, hds_thresh) = _get_current_settings(cfg)
|
||||
port = rand_port()
|
||||
|
||||
ethtool(f"-G {cfg.ifname} tcp-data-split on")
|
||||
defer(ethtool, f"-G {cfg.ifname} tcp-data-split auto")
|
||||
|
||||
ethtool(f"-G {cfg.ifname} hds-thresh 0")
|
||||
defer(ethtool, f"-G {cfg.ifname} hds-thresh {hds_thresh}")
|
||||
|
||||
ethtool(f"-G {cfg.ifname} rx 64")
|
||||
defer(ethtool, f"-G {cfg.ifname} rx {rx_ring}")
|
||||
|
||||
ethtool(f"-X {cfg.ifname} equal {combined_chans - 1}")
|
||||
defer(ethtool, f"-X {cfg.ifname} default")
|
||||
|
||||
(ctx_id, delete_ctx) = _create_rss_ctx(cfg, combined_chans - 1)
|
||||
flow_rule_id = _set_flow_rule_rss(cfg, port, ctx_id)
|
||||
defer(ethtool, f"-N {cfg.ifname} delete {flow_rule_id}")
|
||||
|
||||
rx_cmd = f"{cfg.bin_local} -s -p {port} -i {cfg.ifname} -q {combined_chans - 1}"
|
||||
tx_cmd = f"{cfg.bin_remote} -c -h {cfg.addr_v['6']} -p {port} -l 12840"
|
||||
with bkg(rx_cmd, exit_wait=True):
|
||||
wait_port_listen(port, proto="tcp")
|
||||
wait_port_listen(cfg.port, proto="tcp")
|
||||
cmd(tx_cmd, host=cfg.remote)
|
||||
|
||||
|
||||
@@ -137,7 +119,9 @@ def main() -> None:
|
||||
cfg.bin_local = path.abspath(path.dirname(__file__) + "/../../../drivers/net/hw/iou-zcrx")
|
||||
cfg.bin_remote = cfg.remote.deploy(cfg.bin_local)
|
||||
|
||||
ksft_run(globs=globals(), case_pfx={"test_"}, args=(cfg, ))
|
||||
cfg.ethnl = EthtoolFamily()
|
||||
cfg.port = rand_port()
|
||||
ksft_run(globs=globals(), cases=[test_zcrx, test_zcrx_oneshot], args=(cfg, ))
|
||||
ksft_exit()
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user