Commit 090ef84e authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'io_uring-zcrx-selftests-more-cleanups' 

David Wei says:

====================
io_uring/zcrx: selftests: more cleanups

Patch 1 use rand_port() instead of hard coding port 9999. Patch 2 parses
JSON from ethtool -g instead of string.
====================

Link: https://patch.msgid.link/20250426195525.1906774-1-dw@davidwei.uk


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 5fe6530c 6fbb4d3f

tools/testing/selftests/drivers/net/hw/iou-zcrx.py

+33 −21
Original line number Diff line number Diff line
@@ -5,14 +5,12 @@ import re 
from os import path

from lib.py import ksft_run, ksft_exit

from lib.py import NetDrvEpEnv

from lib.py import bkg, cmd, defer, ethtool, wait_port_listen

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):
@@ -28,14 +26,14 @@ def _create_rss_ctx(cfg, chans): 
    return (ctx_id, defer(ethtool, f"-X {cfg.ifname} delete context {ctx_id}", host=cfg.remote))





def _set_flow_rule(cfg, chan):

    output = ethtool(f"-N {cfg.ifname} flow-type tcp6 dst-port 9999 action {chan}", host=cfg.remote).stdout

def _set_flow_rule(cfg, port, chan):

    output = ethtool(f"-N {cfg.ifname} flow-type tcp6 dst-port {port} action {chan}", host=cfg.remote).stdout

    values = re.search(r'ID (\d+)', output).group(1)

    return int(values)





def _set_flow_rule_rss(cfg, chan):

    output = ethtool(f"-N {cfg.ifname} flow-type tcp6 dst-port 9999 action {chan}", host=cfg.remote).stdout

def _set_flow_rule_rss(cfg, port, chan):

    output = ethtool(f"-N {cfg.ifname} flow-type tcp6 dst-port {port} action {chan}", host=cfg.remote).stdout

    values = re.search(r'ID (\d+)', output).group(1)

    return int(values)
@@ -47,22 +45,27 @@ def test_zcrx(cfg) -> None: 
    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", 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)

    defer(ethtool, f"-X {cfg.ifname} default", host=cfg.remote)

    flow_rule_id = _set_flow_rule(cfg, combined_chans - 1)



    flow_rule_id = _set_flow_rule(cfg, port, combined_chans - 1)

    defer(ethtool, f"-N {cfg.ifname} delete {flow_rule_id}", host=cfg.remote)



    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_addr_v['6']} -p 9999 -l 12840"

    rx_cmd = f"{cfg.bin_remote} -s -p {port} -i {cfg.ifname} -q {combined_chans - 1}"

    tx_cmd = f"{cfg.bin_local} -c -h {cfg.remote_addr_v['6']} -p {port} -l 12840"

    with bkg(rx_cmd, host=cfg.remote, exit_wait=True):

        wait_port_listen(9999, proto="tcp", host=cfg.remote)

        wait_port_listen(port, proto="tcp", host=cfg.remote)

        cmd(tx_cmd)
@@ -73,22 +76,27 @@ def test_zcrx_oneshot(cfg) -> None: 
    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", 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)

    defer(ethtool, f"-X {cfg.ifname} default", host=cfg.remote)

    flow_rule_id = _set_flow_rule(cfg, combined_chans - 1)



    flow_rule_id = _set_flow_rule(cfg, port, combined_chans - 1)

    defer(ethtool, f"-N {cfg.ifname} delete {flow_rule_id}", host=cfg.remote)



    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_addr_v['6']} -p 9999 -l 4096 -z 16384"

    rx_cmd = f"{cfg.bin_remote} -s -p {port} -i {cfg.ifname} -q {combined_chans - 1} -o 4"

    tx_cmd = f"{cfg.bin_local} -c -h {cfg.remote_addr_v['6']} -p {port} -l 4096 -z 16384"

    with bkg(rx_cmd, host=cfg.remote, exit_wait=True):

        wait_port_listen(9999, proto="tcp", host=cfg.remote)

        wait_port_listen(port, proto="tcp", host=cfg.remote)

        cmd(tx_cmd)
@@ -99,24 +107,28 @@ def test_zcrx_rss(cfg) -> None: 
    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", 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)

    defer(ethtool, f"-X {cfg.ifname} default", host=cfg.remote)



    (ctx_id, delete_ctx) = _create_rss_ctx(cfg, combined_chans)

    flow_rule_id = _set_flow_rule_rss(cfg, ctx_id)

    flow_rule_id = _set_flow_rule_rss(cfg, port, ctx_id)

    defer(ethtool, f"-N {cfg.ifname} delete {flow_rule_id}", host=cfg.remote)



    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_addr_v['6']} -p 9999 -l 12840"

    rx_cmd = f"{cfg.bin_remote} -s -p {port} -i {cfg.ifname} -q {combined_chans - 1}"

    tx_cmd = f"{cfg.bin_local} -c -h {cfg.remote_addr_v['6']} -p {port} -l 12840"

    with bkg(rx_cmd, host=cfg.remote, exit_wait=True):

        wait_port_listen(9999, proto="tcp", host=cfg.remote)

        wait_port_listen(port, proto="tcp", host=cfg.remote)

        cmd(tx_cmd)