superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

net: ethtool: add an extack parameter to new rxfh_context APIs 

Currently passed as NULL, but will allow drivers to report back errors
 when ethnl support for these ops is added.

Signed-off-by: Edward Cree <ecree.xilinx@gmail.com>
Reviewed-by: Przemek Kitszel <przemyslaw.kitszel@intel.com>
Link: https://patch.msgid.link/6e0012347d175fdd1280363d7bfa76a2f2777e17.1719502240.git.ecree.xilinx@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
pull/839/head^2^2
Edward Cree 2024-06-27 16:33:50 +01:00 committed by Jakub Kicinski
parent 847a8ab186
commit 30a32cdf6b
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/linux/ethtool.h
View File

@ -1004,13 +1004,16 @@ struct ethtool_ops {
struct netlink_ext_ack *extack); struct netlink_ext_ack *extack);
int (*create_rxfh_context)(struct net_device *, int (*create_rxfh_context)(struct net_device *,
struct ethtool_rxfh_context *ctx, struct ethtool_rxfh_context *ctx,
const struct ethtool_rxfh_param *rxfh); const struct ethtool_rxfh_param *rxfh,
struct netlink_ext_ack *extack);
int (*modify_rxfh_context)(struct net_device *, int (*modify_rxfh_context)(struct net_device *,
struct ethtool_rxfh_context *ctx, struct ethtool_rxfh_context *ctx,
const struct ethtool_rxfh_param *rxfh); const struct ethtool_rxfh_param *rxfh,
struct netlink_ext_ack *extack);
int (*remove_rxfh_context)(struct net_device *, int (*remove_rxfh_context)(struct net_device *,
struct ethtool_rxfh_context *ctx, struct ethtool_rxfh_context *ctx,
u32 rss_context); u32 rss_context,
struct netlink_ext_ack *extack);
void (*get_channels)(struct net_device *, struct ethtool_channels *); void (*get_channels)(struct net_device *, struct ethtool_channels *);
int (*set_channels)(struct net_device *, struct ethtool_channels *); int (*set_channels)(struct net_device *, struct ethtool_channels *);
int (*get_dump_flag)(struct net_device *, struct ethtool_dump *); int (*get_dump_flag)(struct net_device *, struct ethtool_dump *);

2
net/core/dev.c
View File

@ -11256,7 +11256,7 @@ static void netdev_rss_contexts_free(struct net_device *dev)
xa_erase(&dev->ethtool->rss_ctx, context); xa_erase(&dev->ethtool->rss_ctx, context);
if (dev->ethtool_ops->create_rxfh_context) if (dev->ethtool_ops->create_rxfh_context)
dev->ethtool_ops->remove_rxfh_context(dev, ctx, dev->ethtool_ops->remove_rxfh_context(dev, ctx,
context); context, NULL);
else else
dev->ethtool_ops->set_rxfh(dev, &rxfh, NULL); dev->ethtool_ops->set_rxfh(dev, &rxfh, NULL);
kfree(ctx); kfree(ctx);

9
net/ethtool/ioctl.c
View File

@ -1426,12 +1426,15 @@ static noinline_for_stack int ethtool_set_rxfh(struct net_device *dev,
if (rxfh.rss_context && ops->create_rxfh_context) { if (rxfh.rss_context && ops->create_rxfh_context) {
if (create) if (create)
ret = ops->create_rxfh_context(dev, ctx, &rxfh_dev); ret = ops->create_rxfh_context(dev, ctx, &rxfh_dev,
extack);
else if (rxfh_dev.rss_delete) else if (rxfh_dev.rss_delete)
ret = ops->remove_rxfh_context(dev, ctx, ret = ops->remove_rxfh_context(dev, ctx,
rxfh.rss_context); rxfh.rss_context,
extack);
else else
ret = ops->modify_rxfh_context(dev, ctx, &rxfh_dev); ret = ops->modify_rxfh_context(dev, ctx, &rxfh_dev,
extack);
} else { } else {
ret = ops->set_rxfh(dev, &rxfh_dev, extack); ret = ops->set_rxfh(dev, &rxfh_dev, extack);
} }