[PATCH net-next] io_uring/zcrx: enable tcp-data-split in selftest

[PATCH net-next] io_uring/zcrx: enable tcp-data-split in selftest

[David Wei]

For bnxt when the agg ring is used then tcp-data-split is automatically
reported to be enabled, but __net_mp_open_rxq() requires tcp-data-split
to be explicitly enabled by the user.

Enable tcp-data-split explicitly in io_uring zc rx selftest.

Signed-off-by: David Wei <dw@davidwei.uk>
---
 tools/testing/selftests/drivers/net/hw/iou-zcrx.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tools/testing/selftests/drivers/net/hw/iou-zcrx.py b/tools/testing/selftests/drivers/net/hw/iou-zcrx.py
index 9f271ab6ec04..6a0378e06cab 100755
--- a/tools/testing/selftests/drivers/net/hw/iou-zcrx.py
+++ b/tools/testing/selftests/drivers/net/hw/iou-zcrx.py
@@ -35,6 +35,7 @@ def test_zcrx(cfg) -> None:
     rx_ring = _get_rx_ring_entries(cfg)
 
     try:
+        ethtool(f"-G {cfg.ifname} tcp-data-split on", host=cfg.remote)
         ethtool(f"-G {cfg.ifname} rx 64", host=cfg.remote)
         ethtool(f"-X {cfg.ifname} equal {combined_chans - 1}", host=cfg.remote)
         flow_rule_id = _set_flow_rule(cfg, combined_chans - 1)
@@ -48,6 +49,7 @@ def test_zcrx(cfg) -> None:
         ethtool(f"-N {cfg.ifname} delete {flow_rule_id}", host=cfg.remote)
         ethtool(f"-X {cfg.ifname} default", host=cfg.remote)
         ethtool(f"-G {cfg.ifname} rx {rx_ring}", host=cfg.remote)
+        ethtool(f"-G {cfg.ifname} tcp-data-split auto", host=cfg.remote)
 
 
 def test_zcrx_oneshot(cfg) -> None:
@@ -59,6 +61,7 @@ def test_zcrx_oneshot(cfg) -> None:
     rx_ring = _get_rx_ring_entries(cfg)
 
     try:
+        ethtool(f"-G {cfg.ifname} tcp-data-split on", host=cfg.remote)
         ethtool(f"-G {cfg.ifname} rx 64", host=cfg.remote)
         ethtool(f"-X {cfg.ifname} equal {combined_chans - 1}", host=cfg.remote)
         flow_rule_id = _set_flow_rule(cfg, combined_chans - 1)
@@ -72,6 +75,7 @@ def test_zcrx_oneshot(cfg) -> None:
         ethtool(f"-N {cfg.ifname} delete {flow_rule_id}", host=cfg.remote)
         ethtool(f"-X {cfg.ifname} default", host=cfg.remote)
         ethtool(f"-G {cfg.ifname} rx {rx_ring}", host=cfg.remote)
+        ethtool(f"-G {cfg.ifname} tcp-data-split auto", host=cfg.remote)
 
 
 def main() -> None:
-- 
2.47.1

Re: [PATCH net-next] io_uring/zcrx: enable tcp-data-split in selftest

[Jakub Kicinski]

On Wed,  9 Apr 2025 09:31:53 -0700 David Wei wrote:
> For bnxt when the agg ring is used then tcp-data-split is automatically
> reported to be enabled, but __net_mp_open_rxq() requires tcp-data-split
> to be explicitly enabled by the user.

> diff --git a/tools/testing/selftests/drivers/net/hw/iou-zcrx.py b/tools/testing/selftests/drivers/net/hw/iou-zcrx.py
> index 9f271ab6ec04..6a0378e06cab 100755
> --- a/tools/testing/selftests/drivers/net/hw/iou-zcrx.py
> +++ b/tools/testing/selftests/drivers/net/hw/iou-zcrx.py
> @@ -35,6 +35,7 @@ def test_zcrx(cfg) -> None:
>      rx_ring = _get_rx_ring_entries(cfg)
>  
>      try:
> +        ethtool(f"-G {cfg.ifname} tcp-data-split on", host=cfg.remote)

You should really use defer() to register the "undo" actions
individually. Something like:

         ethtool(f"-G {cfg.ifname} tcp-data-split on", host=cfg.remote)
         defer(ethtool, f"-G {cfg.ifname} rx {rx_ring}", 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)
         ...

This patch is fine. But could you follow up and convert the test fully?

Re: [PATCH net-next] io_uring/zcrx: enable tcp-data-split in selftest

[David Wei]

On 2025-04-09 17:06, Jakub Kicinski wrote:
> On Wed,  9 Apr 2025 09:31:53 -0700 David Wei wrote:
>> For bnxt when the agg ring is used then tcp-data-split is automatically
>> reported to be enabled, but __net_mp_open_rxq() requires tcp-data-split
>> to be explicitly enabled by the user.
> 
>> diff --git a/tools/testing/selftests/drivers/net/hw/iou-zcrx.py b/tools/testing/selftests/drivers/net/hw/iou-zcrx.py
>> index 9f271ab6ec04..6a0378e06cab 100755
>> --- a/tools/testing/selftests/drivers/net/hw/iou-zcrx.py
>> +++ b/tools/testing/selftests/drivers/net/hw/iou-zcrx.py
>> @@ -35,6 +35,7 @@ def test_zcrx(cfg) -> None:
>>      rx_ring = _get_rx_ring_entries(cfg)
>>  
>>      try:
>> +        ethtool(f"-G {cfg.ifname} tcp-data-split on", host=cfg.remote)
> 
> You should really use defer() to register the "undo" actions
> individually. Something like:
> 
>          ethtool(f"-G {cfg.ifname} tcp-data-split on", host=cfg.remote)
>          defer(ethtool, f"-G {cfg.ifname} rx {rx_ring}", 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)
>          ...
> 
> This patch is fine. But could you follow up and convert the test fully?

I'll send a follow up, one to switch to defer(), then another to call
tcp-data-split on.

Re: [PATCH net-next] io_uring/zcrx: enable tcp-data-split in selftest

[Jakub Kicinski]

On Wed, 9 Apr 2025 19:06:13 -0700 David Wei wrote:
> > You should really use defer() to register the "undo" actions
> > individually. Something like:
> > 
> >          ethtool(f"-G {cfg.ifname} tcp-data-split on", host=cfg.remote)
> >          defer(ethtool, f"-G {cfg.ifname} rx {rx_ring}", 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)
> >          ...
> > 
> > This patch is fine. But could you follow up and convert the test fully?  
> 
> I'll send a follow up, one to switch to defer(), then another to call
> tcp-data-split on.

Thinking again this should go to net, rather than net-next.
I'll apply it now, but just letting you know that the follow up needs
to wait a week for trees to converge.

Re: [PATCH net-next] io_uring/zcrx: enable tcp-data-split in selftest

[patchwork-bot+netdevbpf]

Hello:

This patch was applied to netdev/net.git (main)
by Jakub Kicinski <kuba@kernel.org>:

On Wed,  9 Apr 2025 09:31:53 -0700 you wrote:
> For bnxt when the agg ring is used then tcp-data-split is automatically
> reported to be enabled, but __net_mp_open_rxq() requires tcp-data-split
> to be explicitly enabled by the user.
> 
> Enable tcp-data-split explicitly in io_uring zc rx selftest.
> 
> Signed-off-by: David Wei <dw@davidwei.uk>
> 
> [...]

Here is the summary with links:
  - [net-next] io_uring/zcrx: enable tcp-data-split in selftest
    https://git.kernel.org/netdev/net/c/6afd0a3c7ecb

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html