[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <a3eec616634b86a9368e5a17fe3eea1ff16133cb.1681236654.git.ecree.xilinx@gmail.com>
Date: Tue, 11 Apr 2023 19:26:13 +0100
From: <edward.cree@....com>
To: <linux-net-drivers@....com>, <davem@...emloft.net>,
<kuba@...nel.org>, <pabeni@...hat.com>, <edumazet@...gle.com>
CC: Edward Cree <ecree.xilinx@...il.com>, <netdev@...r.kernel.org>,
<habetsm.xilinx@...il.com>, <sudheer.mogilappagari@...el.com>
Subject: [RFC PATCH v2 net-next 5/7] net: ethtool: add an extack parameter to new rxfh_context APIs
From: Edward Cree <ecree.xilinx@...il.com>
Currently passed as NULL, but will allow drivers to report back errors
when ethnl support for these ops is added.
Suggested-by: Jakub Kicinski <kuba@...nel.org>
Signed-off-by: Edward Cree <ecree.xilinx@...il.com>
---
Changes in v2: New patch.
---
include/linux/ethtool.h | 9 ++++++---
net/core/dev.c | 3 ++-
net/ethtool/ioctl.c | 9 ++++++---
3 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h
index 12ed3b79be68..724da9234cf1 100644
--- a/include/linux/ethtool.h
+++ b/include/linux/ethtool.h
@@ -926,14 +926,17 @@ struct ethtool_ops {
int (*create_rxfh_context)(struct net_device *,
struct ethtool_rxfh_context *ctx,
const u32 *indir, const u8 *key,
- const u8 hfunc, u32 rss_context);
+ const u8 hfunc, u32 rss_context,
+ struct netlink_ext_ack *extack);
int (*modify_rxfh_context)(struct net_device *,
struct ethtool_rxfh_context *ctx,
const u32 *indir, const u8 *key,
- const u8 hfunc, u32 rss_context);
+ const u8 hfunc, u32 rss_context,
+ struct netlink_ext_ack *extack);
int (*remove_rxfh_context)(struct net_device *,
struct ethtool_rxfh_context *ctx,
- u32 rss_context);
+ u32 rss_context,
+ struct netlink_ext_ack *extack);
int (*set_rxfh_context)(struct net_device *, const u32 *indir,
const u8 *key, const u8 hfunc,
u32 *rss_context, bool delete);
diff --git a/net/core/dev.c b/net/core/dev.c
index 4feb58b0beb3..44668386f376 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -10798,7 +10798,8 @@ static void netdev_rss_contexts_free(struct net_device *dev)
idr_remove(&dev->ethtool->rss_ctx, context);
if (dev->ethtool_ops->create_rxfh_context)
- dev->ethtool_ops->remove_rxfh_context(dev, ctx, context);
+ dev->ethtool_ops->remove_rxfh_context(dev, ctx, context,
+ NULL);
else
dev->ethtool_ops->set_rxfh_context(dev, indir, key,
ctx->hfunc,
diff --git a/net/ethtool/ioctl.c b/net/ethtool/ioctl.c
index 20154d6159a1..abd1cf50e681 100644
--- a/net/ethtool/ioctl.c
+++ b/net/ethtool/ioctl.c
@@ -1384,14 +1384,17 @@ static noinline_for_stack int ethtool_set_rxfh(struct net_device *dev,
if (create)
ret = ops->create_rxfh_context(dev, ctx, indir,
hkey, rxfh.hfunc,
- rxfh.rss_context);
+ rxfh.rss_context,
+ NULL);
else if (delete)
ret = ops->remove_rxfh_context(dev, ctx,
- rxfh.rss_context);
+ rxfh.rss_context,
+ NULL);
else
ret = ops->modify_rxfh_context(dev, ctx, indir,
hkey, rxfh.hfunc,
- rxfh.rss_context);
+ rxfh.rss_context,
+ NULL);
} else {
ret = ops->set_rxfh_context(dev, indir, hkey,
rxfh.hfunc,
Powered by blists - more mailing lists