From: Jakub Kicinski <kuba@kernel•org>
To: davem@davemloft•net
Cc: netdev@vger•kernel.org, edumazet@google•com, pabeni@redhat•com,
dxu@dxuuu•xyz, ecree.xilinx@gmail•com,
przemyslaw.kitszel@intel•com, donald.hunter@gmail•com,
gal.pressman@linux•dev, tariqt@nvidia•com,
willemdebruijn.kernel@gmail•com, Jakub Kicinski <kuba@kernel•org>
Subject: [PATCH net-next 04/12] ethtool: make ethtool_ops::cap_rss_ctx_supported optional
Date: Thu, 1 Aug 2024 17:17:53 -0700 [thread overview]
Message-ID: <20240802001801.565176-5-kuba@kernel.org> (raw)
In-Reply-To: <20240802001801.565176-1-kuba@kernel.org>
cap_rss_ctx_supported was created because the API for creating
and configuring additional contexts is mux'ed with the normal
RSS API. Presence of ops does not imply driver can actually
support rss_context != 0 (in fact drivers mostly ignore that
field). cap_rss_ctx_supported lets core check that the driver
is context-aware before calling it.
Now that we have .create_rxfh_context, there is no such
ambiguity. We can depend on presence of the op.
Make setting the bit optional.
Signed-off-by: Jakub Kicinski <kuba@kernel•org>
---
include/linux/ethtool.h | 3 ++-
net/ethtool/ioctl.c | 6 ++++--
| 3 ++-
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h
index 303fda54ef17..55c9f613ab64 100644
--- a/include/linux/ethtool.h
+++ b/include/linux/ethtool.h
@@ -727,7 +727,8 @@ struct kernel_ethtool_ts_info {
* @cap_link_lanes_supported: indicates if the driver supports lanes
* parameter.
* @cap_rss_ctx_supported: indicates if the driver supports RSS
- * contexts.
+ * contexts via legacy API, drivers implementing @create_rxfh_context
+ * do not have to set this bit.
* @cap_rss_sym_xor_supported: indicates if the driver supports symmetric-xor
* RSS.
* @rxfh_indir_space: max size of RSS indirection tables, if indirection table
diff --git a/net/ethtool/ioctl.c b/net/ethtool/ioctl.c
index 8ca13208d240..52dfb07393a6 100644
--- a/net/ethtool/ioctl.c
+++ b/net/ethtool/ioctl.c
@@ -1227,7 +1227,8 @@ static noinline_for_stack int ethtool_get_rxfh(struct net_device *dev,
if (rxfh.rsvd8[0] || rxfh.rsvd8[1] || rxfh.rsvd32)
return -EINVAL;
/* Most drivers don't handle rss_context, check it's 0 as well */
- if (rxfh.rss_context && !ops->cap_rss_ctx_supported)
+ if (rxfh.rss_context && !(ops->cap_rss_ctx_supported ||
+ ops->create_rxfh_context))
return -EOPNOTSUPP;
rxfh.indir_size = rxfh_dev.indir_size;
@@ -1357,7 +1358,8 @@ static noinline_for_stack int ethtool_set_rxfh(struct net_device *dev,
if (rxfh.rsvd8[0] || rxfh.rsvd8[1] || rxfh.rsvd32)
return -EINVAL;
/* Most drivers don't handle rss_context, check it's 0 as well */
- if (rxfh.rss_context && !ops->cap_rss_ctx_supported)
+ if (rxfh.rss_context && !(ops->cap_rss_ctx_supported ||
+ ops->create_rxfh_context))
return -EOPNOTSUPP;
/* Check input data transformation capabilities */
if (rxfh.input_xfrm && rxfh.input_xfrm != RXH_XFRM_SYM_XOR &&
--git a/net/ethtool/rss.c b/net/ethtool/rss.c
index 5c4c4505ab9a..a06bdac8b8a2 100644
--- a/net/ethtool/rss.c
+++ b/net/ethtool/rss.c
@@ -60,7 +60,8 @@ rss_prepare_data(const struct ethnl_req_info *req_base,
return -EOPNOTSUPP;
/* Some drivers don't handle rss_context */
- if (request->rss_context && !ops->cap_rss_ctx_supported)
+ if (request->rss_context && !(ops->cap_rss_ctx_supported ||
+ ops->create_rxfh_context))
return -EOPNOTSUPP;
ret = ethnl_ops_begin(dev);
--
2.45.2
next prev parent reply other threads:[~2024-08-02 0:18 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-02 0:17 [PATCH net-next 00/12] ethtool: rss: driver tweaks and netlink context dumps Jakub Kicinski
2024-08-02 0:17 ` [PATCH net-next 01/12] selftests: drv-net: rss_ctx: add identifier to traffic comments Jakub Kicinski
2024-08-02 11:23 ` Joe Damato
2024-08-02 0:17 ` [PATCH net-next 02/12] eth: mvpp2: implement new RSS context API Jakub Kicinski
2024-08-02 0:17 ` [PATCH net-next 03/12] eth: mlx5: allow disabling queues when RSS contexts exist Jakub Kicinski
2024-08-02 11:27 ` Joe Damato
2024-08-02 0:17 ` Jakub Kicinski [this message]
2024-08-02 11:35 ` [PATCH net-next 04/12] ethtool: make ethtool_ops::cap_rss_ctx_supported optional Joe Damato
2024-08-02 0:17 ` [PATCH net-next 05/12] eth: remove .cap_rss_ctx_supported from updated drivers Jakub Kicinski
2024-08-02 11:41 ` Joe Damato
2024-08-02 0:17 ` [PATCH net-next 06/12] ethtool: rss: don't report key if device doesn't support it Jakub Kicinski
2024-08-02 11:58 ` Joe Damato
2024-08-02 0:17 ` [PATCH net-next 07/12] ethtool: rss: move the device op invocation out of rss_prepare_data() Jakub Kicinski
2024-08-02 13:15 ` Joe Damato
2024-08-02 0:17 ` [PATCH net-next 08/12] ethtool: rss: report info about additional contexts from XArray Jakub Kicinski
2024-08-02 13:18 ` Joe Damato
2024-08-02 0:17 ` [PATCH net-next 09/12] ethtool: rss: support dumping RSS contexts Jakub Kicinski
2024-08-02 0:17 ` [PATCH net-next 10/12] ethtool: rss: support skipping contexts during dump Jakub Kicinski
2024-08-02 0:18 ` [PATCH net-next 11/12] netlink: specs: decode indirection table as u32 array Jakub Kicinski
2024-08-02 0:18 ` [PATCH net-next 12/12] selftests: drv-net: rss_ctx: test dumping RSS contexts Jakub Kicinski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240802001801.565176-5-kuba@kernel.org \
--to=kuba@kernel$(echo .)org \
--cc=davem@davemloft$(echo .)net \
--cc=donald.hunter@gmail$(echo .)com \
--cc=dxu@dxuuu$(echo .)xyz \
--cc=ecree.xilinx@gmail$(echo .)com \
--cc=edumazet@google$(echo .)com \
--cc=gal.pressman@linux$(echo .)dev \
--cc=netdev@vger$(echo .)kernel.org \
--cc=pabeni@redhat$(echo .)com \
--cc=przemyslaw.kitszel@intel$(echo .)com \
--cc=tariqt@nvidia$(echo .)com \
--cc=willemdebruijn.kernel@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox