| Message ID | 20221116232554.310466-1-sudheer.mogilappagari@intel.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next,v3] ethtool: add netlink based get rss support | expand |
On Wed, Nov 16, 2022 at 03:25:54PM -0800, Sudheer Mogilappagari wrote: > Add netlink based support for "ethtool -x <dev> [context x]" > command by implementing ETHTOOL_MSG_RSS_GET netlink message. > This is equivalent to functionality provided via ETHTOOL_GRSSH > in ioctl path. It fetches RSS table, hash key and hash function > of an interface to user space. > > This patch implements existing functionality available > in ioctl path and enables addition of new RSS context > based parameters in future. > > Signed-off-by: Sudheer Mogilappagari <sudheer.mogilappagari@intel.com> > --- > v3: > -Define parse_request and make use of ethnl_default_parse. > -Have indir table and hask hey as seprate attributes. > -Remove dumpit op for RSS_GET. > -Use RSS instead of RXFH. > > v2: Fix cleanup in error path instead of returning. > --- [...] > diff --git a/include/uapi/linux/ethtool_netlink.h b/include/uapi/linux/ethtool_netlink.h > index aaf7c6963d61..ad837f034ac3 100644 > --- a/include/uapi/linux/ethtool_netlink.h > +++ b/include/uapi/linux/ethtool_netlink.h > @@ -51,6 +51,7 @@ enum { > ETHTOOL_MSG_MODULE_SET, > ETHTOOL_MSG_PSE_GET, > ETHTOOL_MSG_PSE_SET, > + ETHTOOL_MSG_RSS_GET, > > /* add new constants above here */ > __ETHTOOL_MSG_USER_CNT, > @@ -97,6 +98,7 @@ enum { > ETHTOOL_MSG_MODULE_GET_REPLY, > ETHTOOL_MSG_MODULE_NTF, > ETHTOOL_MSG_PSE_GET_REPLY, > + ETHTOOL_MSG_RSS_GET_REPLY, > > /* add new constants above here */ > __ETHTOOL_MSG_KERNEL_CNT, > @@ -880,6 +882,18 @@ enum { > ETHTOOL_A_PSE_MAX = (__ETHTOOL_A_PSE_CNT - 1) > }; > > +enum { > + ETHTOOL_A_RSS_UNSPEC, > + ETHTOOL_A_RSS_HEADER, > + ETHTOOL_A_RSS_CONTEXT, /* u32 */ > + ETHTOOL_A_RSS_HFUNC, /* u32 */ > + ETHTOOL_A_RSS_INDIR, /* array */ > + ETHTOOL_A_RSS_HKEY, /* array */ These two are binaries, not arrays. > + > + __ETHTOOL_A_RSS_CNT, > + ETHTOOL_A_RSS_MAX = (__ETHTOOL_A_RSS_CNT - 1), > +}; > + > /* generic netlink info */ > #define ETHTOOL_GENL_NAME "ethtool" > #define ETHTOOL_GENL_VERSION 1 [...] > diff --git a/net/ethtool/rss.c b/net/ethtool/rss.c > new file mode 100644 > index 000000000000..f4a700db3e9b > --- /dev/null > +++ b/net/ethtool/rss.c [...] > +static int > +rss_parse_request(struct ethnl_req_info *req_info, struct nlattr **tb, > + struct netlink_ext_ack *extack) > +{ > + struct rss_req_info *request = RSS_REQINFO(req_info); > + > + if (!tb[ETHTOOL_A_RSS_CONTEXT]) > + return -EINVAL; Unlike with ioctl, we do not need to represent "no context" with a special value of zero. It would be IMHO cleaner to represent request and reply without context (which should be the most frequent case, AFAICS) by absence of the ETHTOOL_A_RSS_CONTEXT attribute. > + > + request->rss_context = nla_get_u32(tb[ETHTOOL_A_RSS_CONTEXT]); > + return 0; > +} [...] > +static int > +rss_reply_size(const struct ethnl_req_info *req_base, > + const struct ethnl_reply_data *reply_base) > +{ > + const struct rss_reply_data *data = RSS_REPDATA(reply_base); > + int len; > + > + len = nla_total_size(sizeof(u32)) + /* _RSS_CONTEXT */ > + nla_total_size(sizeof(u32)) + /* _RSS_HFUNC */ > + nla_total_size(sizeof(u32)) * data->indir_size + /* _RSS_INDIR */ A nitpick: you pad the whole attribute, not each u32 separately, so that it would make more sense to write this as nla_total_size(sizeof(u32) * data->indir_size) (The result will be the same, of course.) Michal > + data->hkey_size; /* _RSS_HKEY */ > + > + return len; > +}
On Wed, 16 Nov 2022 15:25:54 -0800 Sudheer Mogilappagari wrote: > +RSS_GET > +======== One too many = > + { > + .cmd = ETHTOOL_MSG_RSS_GET, > + .doit = ethnl_default_doit, > + .start = ethnl_default_start, > + .done = ethnl_default_done, start and done are part of the dump procedure, since we have no dump now I think we should drop those > + .policy = ethnl_rss_get_policy, > + .maxattr = ARRAY_SIZE(ethnl_rss_get_policy) - 1, > + }, > };
Sudheer Mogilappagari <sudheer.mogilappagari@intel.com> : > Add netlink based support for "ethtool -x <dev> [context x]" > command by implementing ETHTOOL_MSG_RSS_GET netlink message. > This is equivalent to functionality provided via ETHTOOL_GRSSH ^^^^^^^^^^^^^ Nit: s/ETHTOOL_GRSSH/ETHTOOL_GRXFH/
> -----Original Message----- > From: Francois Romieu <romieu@fr.zoreil.com> > Subject: Re: [PATCH net-next v3] ethtool: add netlink based get rss > support > > Sudheer Mogilappagari <sudheer.mogilappagari@intel.com> : > > Add netlink based support for "ethtool -x <dev> [context x]" > > command by implementing ETHTOOL_MSG_RSS_GET netlink message. > > This is equivalent to functionality provided via ETHTOOL_GRSSH > ^^^^^^^^^^^^^ > Nit: s/ETHTOOL_GRSSH/ETHTOOL_GRXFH/ > Hi Ueimor, My observation is there is mix-up of names in current ioctl implementation where ethtool_get_rxfh() is called for ETHTOOL_GRSSH command. Since this implementation is for ETHTOOL_GRSSH ioctl, we are using RSS instead of RXFH as Jakub suggested earlier. Why do you think it should be ETHOOL_GRXFH ? https://elixir.bootlin.com/linux/latest/source/net/ethtool/ioctl.c#L2916 case ETHTOOL_GRXFH: rc = ethtool_get_rxnfc(dev, ethcmd, useraddr); case ETHTOOL_GRSSH: rc = ethtool_get_rxfh(dev, useraddr); -Sudheer
Mogilappagari, Sudheer <sudheer.mogilappagari@intel.com> : [...] > My observation is there is mix-up of names in current ioctl > implementation where ethtool_get_rxfh() is called for ETHTOOL_GRSSH > command. Since this implementation is for ETHTOOL_GRSSH ioctl, we > are using RSS instead of RXFH as Jakub suggested earlier. Why do you > think it should be ETHOOL_GRXFH ? Well... I got confused. :o( Sorry for the noise.
On Sun, Nov 20, 2022 at 08:40:19AM +0000, Mogilappagari, Sudheer wrote: > > -----Original Message----- > > From: Francois Romieu <romieu@fr.zoreil.com> > > Subject: Re: [PATCH net-next v3] ethtool: add netlink based get rss > > support > > > > Sudheer Mogilappagari <sudheer.mogilappagari@intel.com> : > > > Add netlink based support for "ethtool -x <dev> [context x]" > > > command by implementing ETHTOOL_MSG_RSS_GET netlink message. > > > This is equivalent to functionality provided via ETHTOOL_GRSSH > > ^^^^^^^^^^^^^ > > Nit: s/ETHTOOL_GRSSH/ETHTOOL_GRXFH/ > > > > Hi Ueimor, > My observation is there is mix-up of names in current ioctl implementation where ethtool_get_rxfh() is called for ETHTOOL_GRSSH command. Since this implementation is for ETHTOOL_GRSSH ioctl, we are using RSS instead of RXFH as Jakub suggested earlier. Why do you think it should be ETHOOL_GRXFH ? > > https://elixir.bootlin.com/linux/latest/source/net/ethtool/ioctl.c#L2916 > > case ETHTOOL_GRXFH: > rc = ethtool_get_rxnfc(dev, ethcmd, useraddr); > > case ETHTOOL_GRSSH: > rc = ethtool_get_rxfh(dev, useraddr); > > -Sudheer The mapping between ioctl subcommand and netlink message types does not have to be 1:1, new ioctl subcommands were often added just because the structures passed via ioctl could not be extended. In this case, ETHTOOL_MSG_RSS_GET would reimplement ETHTOOL_GRSSH as well as ETHTOOL_GRXFHINDIR, and ETHTOOL_MSG_RSS_SET would reimplement ETHTOOL_SRSSH as well as ETHTOOL_SRXFHINDIR. It's IMHO clear that there should be a GET/SET pair of messages for RSS hash configuration (ethtool -n rx-flow-hash) and one for RSS rule configuration (ethtool -n rule). That would leave us with two questions: 1. What to do with ETHTOOL_GRXRING? Can we use ETHTOOL_MSG_RINGS_GET as it is? (I.e. should the count be always equal to rx + combined?) If not, should we extend it or put the count into ETHTOOL_MSG_RSS_GET? 2. What would be the best way to handle creation and deletion of RSS contexts? I guess either a separate message type or combining the functionality into ETHTOOL_MSG_RSS_SET somehow (but surely not via some magic values like it's done in ioctl). Michal
On Sun, 20 Nov 2022 22:02:17 +0100 Michal Kubecek wrote: > That would leave us with two questions: Here's my 2 cents: > 1. What to do with ETHTOOL_GRXRING? Can we use ETHTOOL_MSG_RINGS_GET as > it is? (I.e. should the count be always equal to rx + combined?) If not, > should we extend it or put the count into ETHTOOL_MSG_RSS_GET? That'd be great.. but there are drivers out there for which rx + combined is incorrect. Maybe we need to add an attr to ETHTOOL_MSG_RINGS_GET which core will fill in by default to rx + combined but broken drivers can correct it to whatever is right for them? We can either create that attr already or wait for someone to complain? The same info is needed to size AF_XDP tables, which was a bit of a unifying force to do the right thing (i.e. make rx + combined correct). I'm torn, because I'm happy for the driver authors who got this wrong to suffer and get complaints. But that implies that users also suffer which is not cool :( > 2. What would be the best way to handle creation and deletion of RSS > contexts? I guess either a separate message type or combining the > functionality into ETHTOOL_MSG_RSS_SET somehow (but surely not via some > magic values like it's done in ioctl). Explicit RSS_CTX_ADD / RSS_CTX_DEL seems reasonable. And we should have the core keep an explicit list of the contexts while at it :/
> -----Original Message----- > From: Jakub Kicinski <kuba@kernel.org> > Subject: Re: [PATCH net-next v3] ethtool: add netlink based get rss > support > > On Sun, 20 Nov 2022 22:02:17 +0100 Michal Kubecek wrote: > > That would leave us with two questions: > > Here's my 2 cents: > > > 1. What to do with ETHTOOL_GRXRING? Can we use ETHTOOL_MSG_RINGS_GET > > as it is? (I.e. should the count be always equal to rx + combined?) > If > > not, should we extend it or put the count into ETHTOOL_MSG_RSS_GET? > > That'd be great.. but there are drivers out there for which rx + > combined is incorrect. > > Maybe we need to add an attr to ETHTOOL_MSG_RINGS_GET which core will > fill in by default to rx + combined but broken drivers can correct it > to whatever is right for them? > > We can either create that attr already or wait for someone to complain? > The same info is needed to size AF_XDP tables, which was a bit of a > unifying force to do the right thing (i.e. make rx + combined correct). > > I'm torn, because I'm happy for the driver authors who got this wrong > to suffer and get complaints. But that implies that users also suffer > which is not cool :( Based on this discussion, I added ring count attribute to ETHTOOL_MSG_RSS_GET in v5 to return queue count info also to user space. This simplifies user space code by avoiding another netlink call to just get ring count. If there are concerns, we can pull out rings attribute and send v6. -Sudheer > > > 2. What would be the best way to handle creation and deletion of RSS > > contexts? I guess either a separate message type or combining the > > functionality into ETHTOOL_MSG_RSS_SET somehow (but surely not via > > some magic values like it's done in ioctl). > > Explicit RSS_CTX_ADD / RSS_CTX_DEL seems reasonable. And we should have > the core keep an explicit list of the contexts while at it :/
diff --git a/Documentation/networking/ethtool-netlink.rst b/Documentation/networking/ethtool-netlink.rst index bede24ef44fd..84c9471c3d64 100644 --- a/Documentation/networking/ethtool-netlink.rst +++ b/Documentation/networking/ethtool-netlink.rst @@ -222,6 +222,7 @@ Userspace to kernel: ``ETHTOOL_MSG_MODULE_GET`` get transceiver module parameters ``ETHTOOL_MSG_PSE_SET`` set PSE parameters ``ETHTOOL_MSG_PSE_GET`` get PSE parameters + ``ETHTOOL_MSG_RSS_GET`` get RSS settings ===================================== ================================= Kernel to userspace: @@ -263,6 +264,7 @@ Kernel to userspace: ``ETHTOOL_MSG_PHC_VCLOCKS_GET_REPLY`` PHC virtual clocks info ``ETHTOOL_MSG_MODULE_GET_REPLY`` transceiver module parameters ``ETHTOOL_MSG_PSE_GET_REPLY`` PSE parameters + ``ETHTOOL_MSG_RSS_GET_REPLY`` RSS settings ======================================== ================================= ``GET`` requests are sent by userspace applications to retrieve device @@ -1687,6 +1689,29 @@ to control PoDL PSE Admin functions. This option is implementing ``IEEE 802.3-2018`` 30.15.1.2.1 acPoDLPSEAdminControl. See ``ETHTOOL_A_PODL_PSE_ADMIN_STATE`` for supported values. +RSS_GET +======== + +Get indirection table, hash key and hash function info associated with a +RSS context of an interface similar to ``ETHTOOL_GRSSH`` ioctl request. + +Request contents: + +===================================== ====== ========================== + ``ETHTOOL_A_RSS_HEADER`` nested request header + ``ETHTOOL_A_RSS_CONTEXT`` u32 context number + ==================================== ====== ========================== + +Kernel response contents: + +===================================== ====== ========================== + ``ETHTOOL_A_RSS_HEADER`` nested reply header + ``ETHTOOL_A_RSS_CONTEXT`` u32 RSS context number + ``ETHTOOL_A_RSS_HFUNC`` u32 RSS hash func + ``ETHTOOL_A_RSS_INDIR`` binary Indir table bytes + ``ETHTOOL_A_RSS_HKEY`` binary Hash key bytes + ==================================== ====== ========================== + Request translation =================== @@ -1768,7 +1793,7 @@ are netlink only. ``ETHTOOL_GMODULEEEPROM`` ``ETHTOOL_MSG_MODULE_EEPROM_GET`` ``ETHTOOL_GEEE`` ``ETHTOOL_MSG_EEE_GET`` ``ETHTOOL_SEEE`` ``ETHTOOL_MSG_EEE_SET`` - ``ETHTOOL_GRSSH`` n/a + ``ETHTOOL_GRSSH`` ``ETHTOOL_MSG_RSS_GET`` ``ETHTOOL_SRSSH`` n/a ``ETHTOOL_GTUNABLE`` n/a ``ETHTOOL_STUNABLE`` n/a diff --git a/include/uapi/linux/ethtool_netlink.h b/include/uapi/linux/ethtool_netlink.h index aaf7c6963d61..ad837f034ac3 100644 --- a/include/uapi/linux/ethtool_netlink.h +++ b/include/uapi/linux/ethtool_netlink.h @@ -51,6 +51,7 @@ enum { ETHTOOL_MSG_MODULE_SET, ETHTOOL_MSG_PSE_GET, ETHTOOL_MSG_PSE_SET, + ETHTOOL_MSG_RSS_GET, /* add new constants above here */ __ETHTOOL_MSG_USER_CNT, @@ -97,6 +98,7 @@ enum { ETHTOOL_MSG_MODULE_GET_REPLY, ETHTOOL_MSG_MODULE_NTF, ETHTOOL_MSG_PSE_GET_REPLY, + ETHTOOL_MSG_RSS_GET_REPLY, /* add new constants above here */ __ETHTOOL_MSG_KERNEL_CNT, @@ -880,6 +882,18 @@ enum { ETHTOOL_A_PSE_MAX = (__ETHTOOL_A_PSE_CNT - 1) }; +enum { + ETHTOOL_A_RSS_UNSPEC, + ETHTOOL_A_RSS_HEADER, + ETHTOOL_A_RSS_CONTEXT, /* u32 */ + ETHTOOL_A_RSS_HFUNC, /* u32 */ + ETHTOOL_A_RSS_INDIR, /* array */ + ETHTOOL_A_RSS_HKEY, /* array */ + + __ETHTOOL_A_RSS_CNT, + ETHTOOL_A_RSS_MAX = (__ETHTOOL_A_RSS_CNT - 1), +}; + /* generic netlink info */ #define ETHTOOL_GENL_NAME "ethtool" #define ETHTOOL_GENL_VERSION 1 diff --git a/net/ethtool/Makefile b/net/ethtool/Makefile index 72ab0944262a..228f13df2e18 100644 --- a/net/ethtool/Makefile +++ b/net/ethtool/Makefile @@ -4,7 +4,7 @@ obj-y += ioctl.o common.o obj-$(CONFIG_ETHTOOL_NETLINK) += ethtool_nl.o -ethtool_nl-y := netlink.o bitset.o strset.o linkinfo.o linkmodes.o \ +ethtool_nl-y := netlink.o bitset.o strset.o linkinfo.o linkmodes.o rss.o \ linkstate.o debug.o wol.o features.o privflags.o rings.o \ channels.o coalesce.o pause.o eee.o tsinfo.o cabletest.o \ tunnels.o fec.o eeprom.o stats.o phc_vclocks.o module.o \ diff --git a/net/ethtool/netlink.c b/net/ethtool/netlink.c index 1a4c11356c96..ad6bdf0d10a9 100644 --- a/net/ethtool/netlink.c +++ b/net/ethtool/netlink.c @@ -287,6 +287,7 @@ ethnl_default_requests[__ETHTOOL_MSG_USER_CNT] = { [ETHTOOL_MSG_PHC_VCLOCKS_GET] = ðnl_phc_vclocks_request_ops, [ETHTOOL_MSG_MODULE_GET] = ðnl_module_request_ops, [ETHTOOL_MSG_PSE_GET] = ðnl_pse_request_ops, + [ETHTOOL_MSG_RSS_GET] = ðnl_rss_request_ops, }; static struct ethnl_dump_ctx *ethnl_dump_context(struct netlink_callback *cb) @@ -1040,6 +1041,14 @@ static const struct genl_ops ethtool_genl_ops[] = { .policy = ethnl_pse_set_policy, .maxattr = ARRAY_SIZE(ethnl_pse_set_policy) - 1, }, + { + .cmd = ETHTOOL_MSG_RSS_GET, + .doit = ethnl_default_doit, + .start = ethnl_default_start, + .done = ethnl_default_done, + .policy = ethnl_rss_get_policy, + .maxattr = ARRAY_SIZE(ethnl_rss_get_policy) - 1, + }, }; static const struct genl_multicast_group ethtool_nl_mcgrps[] = { diff --git a/net/ethtool/netlink.h b/net/ethtool/netlink.h index 1bfd374f9718..3753787ba233 100644 --- a/net/ethtool/netlink.h +++ b/net/ethtool/netlink.h @@ -346,6 +346,7 @@ extern const struct ethnl_request_ops ethnl_stats_request_ops; extern const struct ethnl_request_ops ethnl_phc_vclocks_request_ops; extern const struct ethnl_request_ops ethnl_module_request_ops; extern const struct ethnl_request_ops ethnl_pse_request_ops; +extern const struct ethnl_request_ops ethnl_rss_request_ops; extern const struct nla_policy ethnl_header_policy[ETHTOOL_A_HEADER_FLAGS + 1]; extern const struct nla_policy ethnl_header_policy_stats[ETHTOOL_A_HEADER_FLAGS + 1]; @@ -386,6 +387,7 @@ extern const struct nla_policy ethnl_module_get_policy[ETHTOOL_A_MODULE_HEADER + extern const struct nla_policy ethnl_module_set_policy[ETHTOOL_A_MODULE_POWER_MODE_POLICY + 1]; extern const struct nla_policy ethnl_pse_get_policy[ETHTOOL_A_PSE_HEADER + 1]; extern const struct nla_policy ethnl_pse_set_policy[ETHTOOL_A_PSE_MAX + 1]; +extern const struct nla_policy ethnl_rss_get_policy[ETHTOOL_A_RSS_CONTEXT + 1]; int ethnl_set_linkinfo(struct sk_buff *skb, struct genl_info *info); int ethnl_set_linkmodes(struct sk_buff *skb, struct genl_info *info); diff --git a/net/ethtool/rss.c b/net/ethtool/rss.c new file mode 100644 index 000000000000..f4a700db3e9b --- /dev/null +++ b/net/ethtool/rss.c @@ -0,0 +1,157 @@ +// SPDX-License-Identifier: GPL-2.0-only + +#include "netlink.h" +#include "common.h" + +struct rss_req_info { + struct ethnl_req_info base; + u32 rss_context; +}; + +struct rss_reply_data { + struct ethnl_reply_data base; + u32 rss_context; + u32 indir_size; + u32 hkey_size; + u32 hfunc; + u32 *indir_table; + u8 *hkey; +}; + +#define RSS_REQINFO(__req_base) \ + container_of(__req_base, struct rss_req_info, base) + +#define RSS_REPDATA(__reply_base) \ + container_of(__reply_base, struct rss_reply_data, base) + +const struct nla_policy ethnl_rss_get_policy[] = { + [ETHTOOL_A_RSS_HEADER] = NLA_POLICY_NESTED(ethnl_header_policy), + [ETHTOOL_A_RSS_CONTEXT] = { .type = NLA_U32 }, +}; + +static int +rss_parse_request(struct ethnl_req_info *req_info, struct nlattr **tb, + struct netlink_ext_ack *extack) +{ + struct rss_req_info *request = RSS_REQINFO(req_info); + + if (!tb[ETHTOOL_A_RSS_CONTEXT]) + return -EINVAL; + + request->rss_context = nla_get_u32(tb[ETHTOOL_A_RSS_CONTEXT]); + return 0; +} + +static int +rss_prepare_data(const struct ethnl_req_info *req_base, + struct ethnl_reply_data *reply_base, struct genl_info *info) +{ + struct rss_reply_data *data = RSS_REPDATA(reply_base); + struct rss_req_info *request = RSS_REQINFO(req_base); + struct net_device *dev = reply_base->dev; + const struct ethtool_ops *ops; + u32 total_size, indir_bytes; + u8 dev_hfunc = 0; + u8 *rss_config; + int ret; + + ops = dev->ethtool_ops; + if (!ops->get_rxfh) + return -EOPNOTSUPP; + + /* Some drivers don't handle rss_context */ + if (request->rss_context && !ops->get_rxfh_context) + return -EOPNOTSUPP; + + data->rss_context = request->rss_context; + + ret = ethnl_ops_begin(dev); + if (ret < 0) + return ret; + + data->indir_size = 0; + data->hkey_size = 0; + if (ops->get_rxfh_indir_size) + data->indir_size = ops->get_rxfh_indir_size(dev); + if (ops->get_rxfh_key_size) + data->hkey_size = ops->get_rxfh_key_size(dev); + + indir_bytes = data->indir_size * sizeof(u32); + total_size = indir_bytes + data->hkey_size; + rss_config = kzalloc(total_size, GFP_KERNEL); + if (!rss_config) { + ret = -ENOMEM; + goto out_ops; + } + + if (data->indir_size) + data->indir_table = (u32 *)rss_config; + + if (data->hkey_size) + data->hkey = rss_config + indir_bytes; + + if (data->rss_context) + ret = ops->get_rxfh_context(dev, data->indir_table, data->hkey, + &dev_hfunc, data->rss_context); + else + ret = ops->get_rxfh(dev, data->indir_table, data->hkey, + &dev_hfunc); + + data->hfunc = dev_hfunc; + +out_ops: + ethnl_ops_complete(dev); + return ret; +} + +static int +rss_reply_size(const struct ethnl_req_info *req_base, + const struct ethnl_reply_data *reply_base) +{ + const struct rss_reply_data *data = RSS_REPDATA(reply_base); + int len; + + len = nla_total_size(sizeof(u32)) + /* _RSS_CONTEXT */ + nla_total_size(sizeof(u32)) + /* _RSS_HFUNC */ + nla_total_size(sizeof(u32)) * data->indir_size + /* _RSS_INDIR */ + data->hkey_size; /* _RSS_HKEY */ + + return len; +} + +static int +rss_fill_reply(struct sk_buff *skb, const struct ethnl_req_info *req_base, + const struct ethnl_reply_data *reply_base) +{ + const struct rss_reply_data *data = RSS_REPDATA(reply_base); + + if (nla_put_u32(skb, ETHTOOL_A_RSS_CONTEXT, data->rss_context) || + nla_put_u32(skb, ETHTOOL_A_RSS_HFUNC, data->hfunc) || + nla_put(skb, ETHTOOL_A_RSS_INDIR, + sizeof(u32) * data->indir_size, data->indir_table) || + nla_put(skb, ETHTOOL_A_RSS_HKEY, data->hkey_size, data->hkey)) + return -EMSGSIZE; + + return 0; +} + +static void rss_cleanup_data(struct ethnl_reply_data *reply_base) +{ + const struct rss_reply_data *data = RSS_REPDATA(reply_base); + + kfree(data->indir_table); +} + +const struct ethnl_request_ops ethnl_rss_request_ops = { + .request_cmd = ETHTOOL_MSG_RSS_GET, + .reply_cmd = ETHTOOL_MSG_RSS_GET_REPLY, + .hdr_attr = ETHTOOL_A_RSS_HEADER, + .req_info_size = sizeof(struct rss_req_info), + .reply_data_size = sizeof(struct rss_reply_data), + + .parse_request = rss_parse_request, + .prepare_data = rss_prepare_data, + .reply_size = rss_reply_size, + .fill_reply = rss_fill_reply, + .cleanup_data = rss_cleanup_data, +};
Add netlink based support for "ethtool -x <dev> [context x]" command by implementing ETHTOOL_MSG_RSS_GET netlink message. This is equivalent to functionality provided via ETHTOOL_GRSSH in ioctl path. It fetches RSS table, hash key and hash function of an interface to user space. This patch implements existing functionality available in ioctl path and enables addition of new RSS context based parameters in future. Signed-off-by: Sudheer Mogilappagari <sudheer.mogilappagari@intel.com> --- v3: -Define parse_request and make use of ethnl_default_parse. -Have indir table and hask hey as seprate attributes. -Remove dumpit op for RSS_GET. -Use RSS instead of RXFH. v2: Fix cleanup in error path instead of returning. --- Documentation/networking/ethtool-netlink.rst | 27 +++- include/uapi/linux/ethtool_netlink.h | 14 ++ net/ethtool/Makefile | 2 +- net/ethtool/netlink.c | 9 ++ net/ethtool/netlink.h | 2 + net/ethtool/rss.c | 157 +++++++++++++++++++ 6 files changed, 209 insertions(+), 2 deletions(-) create mode 100644 net/ethtool/rss.c