Re: [PATCH net-next 6/7] selftests: drv-net: extend so_txtime with hw offload

[Paolo Abeni <pabeni@redhat.com>]

On 7/6/26 3:34 PM, Willem de Bruijn wrote:
> @@ -38,6 +41,34 @@ def test_so_txtime(cfg, clockid, ipver, args_tx, args_rx, expect_success):
>          cmd(cmd_tx)
>  
>  
> +def _dev_setup_pacing_offload(cfg):
> +    """Configure pacing-offload-horizon."""
> +    ethnl = EthtoolFamily()
> +
> +    try:
> +        rings = ethnl.rings_get({'header': {'dev-index': cfg.ifindex}})
> +    except NlError:
> +        raise KsftSkipEx('ring-get not supported by device')

pylint complains:

tools/testing/selftests/drivers/net/so_txtime.py:51:8: W0707: Consider
explicitly re-raising using 'except NlError as exc' and 'raise
KsftSkipEx('ring-get not supported by device') from exc'
(raise-missing-from)

> +
> +    if 'pacing-offload-horizon' not in rings or \
> +       'pacing-offload-horizon-max' not in rings:
> +        raise KsftSkipEx('pacing offload horizon not supported by device')
> +
> +    if rings['pacing-offload-horizon-max'] < 50_000:
> +        raise KsftSkipEx('pacing offload max horizon too small')
> +
> +    cur_horizon = rings['pacing-offload-horizon']
> +    new_horizon = 50_000
> +    ethnl.rings_set({
> +        'header': {'dev-index': cfg.ifindex},
> +        'pacing-offload-horizon': new_horizon,
> +    })
> +    defer(ethnl.rings_set, {
> +        'header': {'dev-index': cfg.ifindex},
> +        'pacing-offload-horizon': cur_horizon
> +    })
> +
> +
>  def _qdisc_setup(ifname, qdisc, optargs=""):
>      """Replace root qdisc. Restore the original after the test.
>  
> @@ -56,6 +87,7 @@ def _test_variants_fq():
>              ["one_pkt", "a,10", "a,10"],
>              ["in_order", "a,10,b,20", "a,10,b,20"],
>              ["reverse_order", "a,20,b,10", "b,10,a,20"],
> +            ["beyond_hw_horizon", "a,70", "a,70"],
>          ]:
>              name = f"v{ipver}_{testcase[0]}"
>              yield KsftNamedVariant(name, ipver, testcase[1], testcase[2])
> @@ -64,15 +96,42 @@ def _test_variants_fq():
>  @ksft_variants(_test_variants_fq())
>  def test_so_txtime_fq_mono(cfg, ipver, args_tx, args_rx):
>      """Run all variants of monotonic (fq) tests."""
> -    cfg.require_ipver(ipver)
>      _qdisc_setup(cfg.ifname, "fq")
>      test_so_txtime(cfg, "mono", ipver, args_tx, args_rx, True)
>  
>  
> +@ksft_variants(_test_variants_fq())
> +def test_so_txtime_fq_mono_hw(cfg, ipver, args_tx, args_rx):
> +    """Run all variants of monotonic fq tests, with offload horizon."""
> +    cfg.require_nsim(nsim_test=False)
> +
> +    _dev_setup_pacing_offload(cfg)
> +    try:
> +        _qdisc_setup(cfg.ifname, "fq", "offload_horizon 50ms")
> +    except Exception as e:
> +        raise KsftSkipEx("netdev does not support offload. skipping") from e
> +
> +    # Expect all tests to use only hw pacing, except beyond_hw_horizon.
> +    hw_only = "-h" if args_tx != "a,70" else ""
> +    test_so_txtime(cfg, "mono", ipver, f"{hw_only} {args_tx}", args_rx, True)
> +
> +
> +@ksft_variants(_test_variants_fq())
> +def test_so_txtime_pfifofast_mono_hw(cfg, ipver, args_tx, args_rx):
> +    """Run all variants of monotonic tests, without fq pacing sw backup."""
> +    cfg.require_nsim(nsim_test=False)
> +
> +    _dev_setup_pacing_offload(cfg)
> +    _qdisc_setup(cfg.ifname, "pfifo_fast")
> +
> +    # Expect all tests to pass, except beyond_hw_horizon without sw fallback.
> +    expect_pass = False if args_tx == "a,70" else True

pylint says:

tools/testing/selftests/drivers/net/so_txtime.py:128:18: R1719: The if
expression can be replaced with 'not test' (simplifiable-if-expression)

/P