From patchwork Sat Feb 1 01:30:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 13956019 X-Patchwork-Delegate: kuba@kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5A9CEC2FD for ; Sat, 1 Feb 2025 01:30:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738373459; cv=none; b=eofoCqZNT98P6FWxaquOeQMJb/ckf2dWxG5WDb/jyDPo4MR5LSLYzlkgmbZ0W+zxmPSNHRmvZYATlU8WxYNBlEU4HL1kpu0gnDBA4SiCBbVahcLFDmHFgLvFgkNBI+SFd0XqX5NScrAv3kqdibCM/V5p1badw4/THu/YenHsldY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738373459; c=relaxed/simple; bh=U0dIwxs0IYLwGc4Nc8uxPPTYD82BiMPMrkGSaSyTKcE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kYzC42XHhj0P0pUAmevuI2+NpgLzb9I/rW2N5IyrIfXlbU8peF0TtJojxYhp9WYqFx3sbub/GaBfwsWBi67JS6JsuHObIUq/dsBRDK6WU0HKI+7Y22iJ7z0XqVWl+Tri+mXDY7VJu9TDYCEg3D65AOEigBKzFq7MmJIFiPHfKco= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=p8WwjESR; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="p8WwjESR" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7B098C4CEE4; Sat, 1 Feb 2025 01:30:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1738373458; bh=U0dIwxs0IYLwGc4Nc8uxPPTYD82BiMPMrkGSaSyTKcE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=p8WwjESRkLC4H4to96UyAY0tyHQi9vsgQK/KxNkVJleZtASGoceqrU8spGFlB/MEA LJQlcQ2KoLQ1jOsXi7dTElyNHHiMmGaZVswdFmkxr54zdwb7Zo372wM2s6Q1qJyQ4m /CXO2oiItm9k9eK9br72uRQbw6G41EwlZJxsLt6URnCzqAhPRQolzzxPxzp74oMtHo 42109ravoqVARlLwu2TBMpBmmFNYQaLVrlAgmUoAUvdsC/ksuya4obmK4gYt+yms5a 893ZIpxWdXXcOfnVW8QoxHKzsiUivPnTyhsjyrL7qUfUDWK17Qbsy/0IIcNnlUAp7v dd8BXx1lFcxIQ== From: Jakub Kicinski To: davem@davemloft.net Cc: netdev@vger.kernel.org, edumazet@google.com, pabeni@redhat.com, andrew+netdev@lunn.ch, horms@kernel.org, shuah@kernel.org, ecree.xilinx@gmail.com, gal@nvidia.com, przemyslaw.kitszel@intel.com, Jakub Kicinski Subject: [PATCH net 1/4] ethtool: rss: fix hiding unsupported fields in dumps Date: Fri, 31 Jan 2025 17:30:37 -0800 Message-ID: <20250201013040.725123-2-kuba@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250201013040.725123-1-kuba@kernel.org> References: <20250201013040.725123-1-kuba@kernel.org> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org Commit ec6e57beaf8b ("ethtool: rss: don't report key if device doesn't support it") intended to stop reporting key fields for additional rss contexts if device has a global hashing key. Later we added dump support and the filtering wasn't properly added there. So we end up reporting the key fields in dumps but not in dos: # ./pyynl/cli.py --spec netlink/specs/ethtool.yaml --do rss-get \ --json '{"header": {"dev-index":2}, "context": 1 }' { "header": { ... }, "context": 1, "indir": [0, 1, 2, 3, ...]] } # ./pyynl/cli.py --spec netlink/specs/ethtool.yaml --dump rss-get [ ... snip context 0 ... { "header": { ... }, "context": 1, "indir": [0, 1, 2, 3, ...], -> "input_xfrm": 255, -> "hfunc": 1, -> "hkey": "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" } ] Hide these fields correctly. The drivers/net/hw/rss_ctx.py selftest catches this when run on a device with single key, already: # Check| At /root/./ksft-net-drv/drivers/net/hw/rss_ctx.py, line 381, in test_rss_context_dump: # Check| ksft_ne(set(data.get('hkey', [1])), {0}, "key is all zero") # Check failed {0} == {0} key is all zero not ok 8 rss_ctx.test_rss_context_dump Fixes: f6122900f4e2 ("ethtool: rss: support dumping RSS contexts") Signed-off-by: Jakub Kicinski Reviewed-by: Gal Pressman Reviewed-by: Joe Damato --- net/ethtool/rss.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/ethtool/rss.c b/net/ethtool/rss.c index 7cb106b590ab..58df9ad02ce8 100644 --- a/net/ethtool/rss.c +++ b/net/ethtool/rss.c @@ -107,6 +107,8 @@ rss_prepare_ctx(const struct rss_req_info *request, struct net_device *dev, u32 total_size, indir_bytes; u8 *rss_config; + data->no_key_fields = !dev->ethtool_ops->rxfh_per_ctx_key; + ctx = xa_load(&dev->ethtool->rss_ctx, request->rss_context); if (!ctx) return -ENOENT; @@ -153,7 +155,6 @@ rss_prepare_data(const struct ethnl_req_info *req_base, if (!ops->cap_rss_ctx_supported && !ops->create_rxfh_context) return -EOPNOTSUPP; - data->no_key_fields = !ops->rxfh_per_ctx_key; return rss_prepare_ctx(request, dev, data, info); } From patchwork Sat Feb 1 01:30:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 13956020 X-Patchwork-Delegate: kuba@kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AF2B917C91 for ; Sat, 1 Feb 2025 01:30:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738373459; cv=none; b=Z1u86scqeuP+9mGd34oydfTyYV2LY0lELZItyf8PLcF5KNzwFJ4ScM95cjYOsr1GibTAGHcQuBZxwIdKt39NVZZiCbJeLx5uu07Za4PHUwn4yZk15lBm9ixoYzz5dA0bwTEgtKyhVCoFJKerueDa2d0ADDtGbe3bYuKmnIm7u2E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738373459; c=relaxed/simple; bh=LxvN03VahFM8lOIsUmvolYJQJd9OUEuz0HRUhUCmKAU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mW1rmT0xhX6fx0xpwirqHra5kfPdW6KSxba/i+8Bkaxk0m3vRAgk3qVCvYbfia4CVkO6V+R47UxyZpB8OmmssjqSkw40Gx4IGsHuukayKZAJGNCA90c0QscwKh4kV23kfR1kAckvt9iSjul1I3euIKIiCjo5JcuOWFMVv7SRlnk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Bx32FJv7; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Bx32FJv7" Received: by smtp.kernel.org (Postfix) with ESMTPSA id ED4AFC4CEE7; Sat, 1 Feb 2025 01:30:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1738373459; bh=LxvN03VahFM8lOIsUmvolYJQJd9OUEuz0HRUhUCmKAU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Bx32FJv79d2G+XDsKikzfQkRPjLwUvJi3h8jrrP+Vyse0JC768+W+q/cKOoB54C6Y c/ft+vY1X21PCmTBjLiAiPtpG+pgYfVZpHwLgsPqcF1AQWlXtPHnC7MFmGHcPvzqMA gw7HmiPQ/O7yfe8oClIKxNAb3GIRUJAmbIlZvpRT11nsEJF3WfEulvQtFN5WZ1iMWy vHteLj0S+jK3yjAakbmgDv9BFZy2vweLTfxwQPXBli45VklucKJ24wuWk6P98U3LXz xI8ofJ2p76OOKboUJNDWCVFOgDzVL/I3f24A/lb4yO5l69XLPv/i7g5Y59tk1WgYtq 7IewVecKfezzA== From: Jakub Kicinski To: davem@davemloft.net Cc: netdev@vger.kernel.org, edumazet@google.com, pabeni@redhat.com, andrew+netdev@lunn.ch, horms@kernel.org, shuah@kernel.org, ecree.xilinx@gmail.com, gal@nvidia.com, przemyslaw.kitszel@intel.com, Jakub Kicinski Subject: [PATCH net 2/4] ethtool: ntuple: fix rss + ring_cookie check Date: Fri, 31 Jan 2025 17:30:38 -0800 Message-ID: <20250201013040.725123-3-kuba@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250201013040.725123-1-kuba@kernel.org> References: <20250201013040.725123-1-kuba@kernel.org> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org The info.flow_type is for RXFH commands, ntuple flow_type is inside the flow spec. The check currently does nothing, as info.flow_type is 0 for ETHTOOL_SRXCLSRLINS. Fixes: 9e43ad7a1ede ("net: ethtool: only allow set_rxnfc with rss + ring_cookie if driver opts in") Signed-off-by: Jakub Kicinski Reviewed-by: Gal Pressman Reviewed-by: Joe Damato --- net/ethtool/ioctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/ethtool/ioctl.c b/net/ethtool/ioctl.c index 34bee42e1247..7609ce2b2c5e 100644 --- a/net/ethtool/ioctl.c +++ b/net/ethtool/ioctl.c @@ -993,7 +993,7 @@ static noinline_for_stack int ethtool_set_rxnfc(struct net_device *dev, return rc; /* Nonzero ring with RSS only makes sense if NIC adds them together */ - if (cmd == ETHTOOL_SRXCLSRLINS && info.flow_type & FLOW_RSS && + if (cmd == ETHTOOL_SRXCLSRLINS && info.fs.flow_type & FLOW_RSS && !ops->cap_rss_rxnfc_adds && ethtool_get_flow_spec_ring(info.fs.ring_cookie)) return -EINVAL; From patchwork Sat Feb 1 01:30:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 13956021 X-Patchwork-Delegate: kuba@kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 47670224FD for ; Sat, 1 Feb 2025 01:30:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738373460; cv=none; b=YEcyHpuYCzWNBx6qtt+BfNZfH9P7VBYdjc0SVRLqwZ6CMP7jkFvDtylsR+ddSZx12/S+6Hk3+QtLvlBsCw2abOX2jpt6UWVN8USzjdCWNiJTLuo/eKXk+0PFNdpRMToHvhLl0vwCChMjZjA4luagypYxhm16jhOo+hnX3FF3KVY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738373460; c=relaxed/simple; bh=KiEUqwPPWXAqF3kEmR5c07XcygThCNoHTn6GCjiq178=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=u9aHp0XC4ifRuJclLPUA101rjlVw5VxZApvX7AiI19JG9ygv7R9Tg3a/cKOiy99ZEiOq4AyGoxKDXhXil2gD9d4ApA5PPnR5S/5yQ2MYA1mIHI8eGUbjjTGHQbz08Yqm5I0Q9Zib2wBG/Mef+A9sEcw8/zbykJoP/R0OUXqyhDc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=HJy2bVzW; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="HJy2bVzW" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6F406C4CEE5; Sat, 1 Feb 2025 01:30:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1738373459; bh=KiEUqwPPWXAqF3kEmR5c07XcygThCNoHTn6GCjiq178=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HJy2bVzWkaCuaXsQ2Dg9bjju82qC9oLt6ajtPYzG9p+EymmqHMX9og4YxF6cIiNvJ ZvF1zVHXL41xqQC2FpNwZk1j1XFBRYSs5NCHFOCOmrcah1VBiDAJd7En6qdGPC1Nlv +N5QZVBxaN7s7lNCm0Q4eLFsa8PRjTJufoF9aBXf/VvnZbxfrK83FfVztGlWQR9mX5 6fsnGg/5qYhvCiy1ANrf/LslVKDEpTAREeANNXktcLKo/Zq71695xk3WnhCsU1hV32 up0VvF8kn3pa+hu3ktATYIk/NJ0OFUsLnCHQjUadXqnVHnRbWC6GyK//Vle0vhNSWq Oxmzksn34So/g== From: Jakub Kicinski To: davem@davemloft.net Cc: netdev@vger.kernel.org, edumazet@google.com, pabeni@redhat.com, andrew+netdev@lunn.ch, horms@kernel.org, shuah@kernel.org, ecree.xilinx@gmail.com, gal@nvidia.com, przemyslaw.kitszel@intel.com, Jakub Kicinski Subject: [PATCH net 3/4] selftests: drv-net: rss_ctx: add missing cleanup in queue reconfigure Date: Fri, 31 Jan 2025 17:30:39 -0800 Message-ID: <20250201013040.725123-4-kuba@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250201013040.725123-1-kuba@kernel.org> References: <20250201013040.725123-1-kuba@kernel.org> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org Commit under Fixes adds ntuple rules but never deletes them. Fixes: 29a4bc1fe961 ("selftest: extend test_rss_context_queue_reconfigure for action addition") Signed-off-by: Jakub Kicinski Reviewed-by: Joe Damato --- tools/testing/selftests/drivers/net/hw/rss_ctx.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/testing/selftests/drivers/net/hw/rss_ctx.py b/tools/testing/selftests/drivers/net/hw/rss_ctx.py index ca8a7edff3dd..27e24e20749f 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 @@ from lib.py import ethtool, ip, defer, GenerateTraffic, CmdExitFailure 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: @@ -260,6 +261,7 @@ from lib.py import ethtool, ip, defer, GenerateTraffic, CmdExitFailure 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) + 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), From patchwork Sat Feb 1 01:30:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 13956022 X-Patchwork-Delegate: kuba@kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A88BA3595B for ; Sat, 1 Feb 2025 01:31:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738373460; cv=none; b=mpSVclSF0U+NDe0j89yeO58WTGOhg9ZiziHumBf26VC2cFvBt6KrKhZxeG7KZUcs+nkMjsCp7geGvbQ5+mnT2PukWxgNfs+pS3/pq7kbQzuLXQppIpygJpZSRMU5eymUu1pgin7CQJd1MTJodvS00a2+2CQ9M3+hqsuZrZgwSnU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738373460; c=relaxed/simple; bh=oZ5hG6MZ0mOl6SyF5a3MmSGiuya6GK4fXDqhZNFV2CM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZJkhCr+3asKzvf7p4k4bLmhbcc2H9ZAhYw5xYKF8deDQEcOOsgHoFFls7s8vuXLIk3pcOoKqznKVjBrU+HUn+UtV7rsVHGziwdAAWdQhZ3KLeKdGuxeHXX205xjhgT539C/czaoABnIzsNOl0UPNGrik4PRaGEUccWBbmF2jEOc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=OKctGAuV; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="OKctGAuV" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E07B2C4CED1; Sat, 1 Feb 2025 01:30:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1738373460; bh=oZ5hG6MZ0mOl6SyF5a3MmSGiuya6GK4fXDqhZNFV2CM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OKctGAuVWLay3dO8LGOFSreikpYFHVmQ4vbQtkLgZDajsr6k+wnHEKGsdhOzIceK+ ye6YCcofWXd2q3sqauXjM2odJ0v8+26zXHRYPEnt4OJWL/+IAjxEawxRQ7/36guTr5 XR9eFI9QZChDh0Yxt/OQInyZQyAHB1lz5KwC9wjaapV6WKKJtdC5wCK6KxN2ewcE74 A0Saw5OMvYfo1/rgftCnJJh0Nay0YrwboCApwoc3CBMygTrcJbR98isw8RZmq+HLTM gYNPHxaailfbF4vN6ECl5DSR83+nK67/cHS3vYhOSemh3cyrsrrumQGzL6WWuV6gOe OI1lgNljHac5Q== From: Jakub Kicinski To: davem@davemloft.net Cc: netdev@vger.kernel.org, edumazet@google.com, pabeni@redhat.com, andrew+netdev@lunn.ch, horms@kernel.org, shuah@kernel.org, ecree.xilinx@gmail.com, gal@nvidia.com, przemyslaw.kitszel@intel.com, Jakub Kicinski Subject: [PATCH net 4/4] selftests: drv-net: rss_ctx: don't fail reconfigure test if queue offset not supported Date: Fri, 31 Jan 2025 17:30:40 -0800 Message-ID: <20250201013040.725123-5-kuba@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250201013040.725123-1-kuba@kernel.org> References: <20250201013040.725123-1-kuba@kernel.org> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org Vast majority of drivers does not support queue offset. Simply return if the rss context + queue ntuple fails. Signed-off-by: Jakub Kicinski Reviewed-by: Joe Damato --- tools/testing/selftests/drivers/net/hw/rss_ctx.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/drivers/net/hw/rss_ctx.py b/tools/testing/selftests/drivers/net/hw/rss_ctx.py index 27e24e20749f..319aaa004c40 100755 --- a/tools/testing/selftests/drivers/net/hw/rss_ctx.py +++ b/tools/testing/selftests/drivers/net/hw/rss_ctx.py @@ -260,7 +260,12 @@ from lib.py import ethtool, ip, defer, GenerateTraffic, CmdExitFailure # 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)