diff options
author | Takashi Iwai <tiwai@suse.de> | 2025-03-19 08:58:07 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2025-03-19 08:58:07 +0100 |
commit | 1a7c3068143be177deea86d977d3042a0c256706 (patch) | |
tree | 82eef5ceb0f3cc15a6cdf617ca4511db3af73e21 /tools/testing/selftests/drivers/net/hw/rss_ctx.py | |
parent | c2820405ba55a38932aa2177f026b70064296663 (diff) | |
parent | 35ef1c79d2e09e9e5a66e28a66fe0df4368b0f3d (diff) |
Merge branch 'for-linus' into for-next
Back-merge of 6.14 devel branch for further developments of TAS
codecsBack-merge of 6.14 devel branch for further developments.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'tools/testing/selftests/drivers/net/hw/rss_ctx.py')
-rwxr-xr-x | tools/testing/selftests/drivers/net/hw/rss_ctx.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/tools/testing/selftests/drivers/net/hw/rss_ctx.py b/tools/testing/selftests/drivers/net/hw/rss_ctx.py index ca8a7edff3dd..319aaa004c40 100755 --- a/tools/testing/selftests/drivers/net/hw/rss_ctx.py +++ b/tools/testing/selftests/drivers/net/hw/rss_ctx.py @@ -252,6 +252,7 @@ def test_rss_queue_reconfigure(cfg, main_ctx=True): try: # this targets queue 4, which doesn't exist ntuple2 = ethtool_create(cfg, "-N", flow) + defer(ethtool, f"-N {cfg.ifname} delete {ntuple2}") except CmdExitFailure: pass else: @@ -259,7 +260,13 @@ def test_rss_queue_reconfigure(cfg, main_ctx=True): # change the table to target queues 0 and 2 ethtool(f"-X {cfg.ifname} {ctx_ref} weight 1 0 1 0") # ntuple rule therefore targets queues 1 and 3 - ntuple2 = ethtool_create(cfg, "-N", flow) + try: + ntuple2 = ethtool_create(cfg, "-N", flow) + except CmdExitFailure: + ksft_pr("Driver does not support rss + queue offset") + return + + defer(ethtool, f"-N {cfg.ifname} delete {ntuple2}") # should replace existing filter ksft_eq(ntuple, ntuple2) _send_traffic_check(cfg, port, ctx_ref, { 'target': (1, 3), |