ethtool netlink interface, part 3
Subsystems (4)
v2 cover ethtool netlink interface, part 3
Implementation of more netlink request types:
- netdev features (ethtool -k/-K, patches 3-6)
- private flags (--show-priv-flags / --set-priv-flags, patches 7-9)
- ring sizes (ethtool -g/-G, patches 10-12)
- channel counts (ethtool -l/-L, patches 13-15)
Patch 1 is a style cleanup suggested in part 2 review and patch 2 updates the mapping between netdev features and legacy ioctl requests (which are still used by ethtool for backward compatibility).
Changes in v2:
- fix netdev reference leaks in error path of ethnl_set_rings() and ethnl_set_channels() (found by Jakub Kicinski)
- use __set_bit() rather than set_bit() (suggested by David Miller)
- in replies to RINGS_GET and CHANNELS_GET requests, omit ring and channel types not supported by driver/device (suggested by Jakub Kicinski)
- more descriptive message size calculations in rings_reply_size() and channels_reply_size() (suggested by Jakub Kicinski)
- coding style cleanup (suggested by Jakub Kicinski)
Michal Kubecek (15):
ethtool: rename ethnl_parse_header() to ethnl_parse_header_dev_get()
ethtool: update mapping of features to legacy ioctl requests
ethtool: provide netdev features with FEATURES_GET request
ethtool: add ethnl_parse_bitset() helper
ethtool: set netdev features with FEATURES_SET request
ethtool: add FEATURES_NTF notification
ethtool: provide private flags with PRIVFLAGS_GET request
ethtool: set device private flags with PRIVFLAGS_SET request
ethtool: add PRIVFLAGS_NTF notification
ethtool: provide ring sizes with RINGS_GET request
ethtool: set device ring sizes with RINGS_SET request
ethtool: add RINGS_NTF notification
ethtool: provide channel counts with CHANNELS_GET request
ethtool: set device channel counts with CHANNELS_SET request
ethtool: add CHANNELS_NTF notification
Documentation/networking/ethtool-netlink.rst | 272 +++++++++++++++-- include/uapi/linux/ethtool_netlink.h | 82 +++++ net/ethtool/Makefile | 3 +- net/ethtool/bitset.c | 94 ++++++ net/ethtool/bitset.h | 4 + net/ethtool/channels.c | 227 ++++++++++++++ net/ethtool/common.c | 31 ++ net/ethtool/common.h | 3 + net/ethtool/debug.c | 6 +- net/ethtool/features.c | 304 +++++++++++++++++++ net/ethtool/ioctl.c | 52 +--- net/ethtool/linkinfo.c | 6 +- net/ethtool/linkmodes.c | 6 +- net/ethtool/netlink.c | 99 +++++- net/ethtool/netlink.h | 15 +- net/ethtool/privflags.c | 209 +++++++++++++ net/ethtool/rings.c | 200 ++++++++++++ net/ethtool/wol.c | 5 +- 18 files changed, 1538 insertions(+), 80 deletions(-) create mode 100644 net/ethtool/channels.c create mode 100644 net/ethtool/features.c create mode 100644 net/ethtool/privflags.c create mode 100644 net/ethtool/rings.c
Signature · 1 line
2.25.1
PATCH v2 1/15 ethtool: rename ethnl_parse_header() to ethnl_parse_header_dev_get()
Andrew Lunn pointed out that even if it's documented that ethnl_parse_header() takes reference to network device if it fills it into the target structure, its name doesn't make it apparent so that corresponding dev_put() looks like mismatched.
Rename the function ethnl_parse_header_dev_get() to indicate that it takes a reference.
--- net/ethtool/debug.c | 6 ++++-- net/ethtool/linkinfo.c | 6 ++++-- net/ethtool/linkmodes.c | 6 ++++-- net/ethtool/netlink.c | 12 ++++++------ net/ethtool/netlink.h | 7 ++++--- net/ethtool/wol.c | 5 +++-- 6 files changed, 25 insertions(+), 17 deletions(-)
net/ethtool/debug.c +4 -2
@@ -102,8 +102,10 @@ int ethnl_set_debug(struct sk_buff *skb, struct genl_info *info) info->extack);if (ret <0 )return ret; - ret =ethnl_parse_header (&req_info, tb[ETHTOOL_A_DEBUG_HEADER ], -genl_info_net (info), info->extack, true); + ret =ethnl_parse_header_dev_get (&req_info, + tb[ETHTOOL_A_DEBUG_HEADER ], +genl_info_net (info), info->extack, + true);if (ret <0 )return ret; dev = req_info.dev;
net/ethtool/linkinfo.c +4 -2
@@ -121,8 +121,10 @@ int ethnl_set_linkinfo(struct sk_buff *skb, struct genl_info *info) info->extack);if (ret <0 )return ret; - ret =ethnl_parse_header (&req_info, tb[ETHTOOL_A_LINKINFO_HEADER ], -genl_info_net (info), info->extack, true); + ret =ethnl_parse_header_dev_get (&req_info, + tb[ETHTOOL_A_LINKINFO_HEADER ], +genl_info_net (info), info->extack, + true);if (ret <0 )return ret; dev = req_info.dev;
net/ethtool/linkmodes.c +4 -2
@@ -334,8 +334,10 @@ int ethnl_set_linkmodes(struct sk_buff *skb, struct genl_info *info) info->extack);if (ret <0 )return ret; - ret =ethnl_parse_header (&req_info, tb[ETHTOOL_A_LINKMODES_HEADER ], -genl_info_net (info), info->extack, true); + ret =ethnl_parse_header_dev_get (&req_info, + tb[ETHTOOL_A_LINKMODES_HEADER ], +genl_info_net (info), info->extack, + true);if (ret <0 )return ret; dev = req_info.dev;
net/ethtool/netlink.c +6 -6
@@ -18,7 +18,7 @@ static const struct nla_policy ethnl_header_policy[ETHTOOL_A_HEADER_MAX + 1] = { };/** -* ethnl_parse_header() - parse request header +* ethnl_parse_header_dev_get() - parse request header * @req_info: structure to put results into * @header: nest attribute with request header * @net: request netns
@@ -33,9 +33,9 @@ static const struct nla_policy ethnl_header_policy[ETHTOOL_A_HEADER_MAX + 1] = {* * Return: 0 on success or negative error code */ -int ethnl_parse_header (struct ethnl_req_info *req_info, -const struct nlattr *header,struct net *net, -struct netlink_ext_ack *extack,bool require_dev) +int ethnl_parse_header_dev_get (struct ethnl_req_info *req_info, +const struct nlattr *header,struct net *net, +struct netlink_ext_ack *extack,bool require_dev) {struct nlattr *tb[ETHTOOL_A_HEADER_MAX +1 ];const struct nlattr *devname_attr;
@@ -253,8 +253,8 @@ static int ethnl_default_parse(struct ethnl_req_info *req_info, request_ops->request_policy, extack);if (ret <0 ) goto out; - ret =ethnl_parse_header (req_info, tb[request_ops->hdr_attr], net, - extack, require_dev); + ret =ethnl_parse_header_dev_get (req_info, tb[request_ops->hdr_attr], + net, extack, require_dev);if (ret <0 ) goto out;
net/ethtool/netlink.h +4 -3
@@ -10,9 +10,10 @@struct ethnl_req_info ; -int ethnl_parse_header (struct ethnl_req_info *req_info, -const struct nlattr *nest,struct net *net, -struct netlink_ext_ack *extack,bool require_dev); +int ethnl_parse_header_dev_get (struct ethnl_req_info *req_info, +const struct nlattr *nest,struct net *net, +struct netlink_ext_ack *extack, +bool require_dev);int ethnl_fill_reply_header (struct sk_buff *skb,struct net_device *dev,u16 attrtype); struct sk_buff *ethnl_reply_init(size_t payload, struct net_device *dev, u8 cmd,
net/ethtool/wol.c +3 -2
@@ -123,8 +123,9 @@ int ethnl_set_wol(struct sk_buff *skb, struct genl_info *info) wol_set_policy, info->extack);if (ret <0 )return ret; - ret =ethnl_parse_header (&req_info, tb[ETHTOOL_A_WOL_HEADER ], -genl_info_net (info), info->extack, true); + ret =ethnl_parse_header_dev_get (&req_info, tb[ETHTOOL_A_WOL_HEADER ], +genl_info_net (info), info->extack, + true);if (ret <0 )return ret; dev = req_info.dev;
Signature · 1 line
2.25.1
PATCH v2 2/15 ethtool: update mapping of features to legacy ioctl requests
In reply to Michal KubecekLegacy ioctl request like ETHTOOL_GTXCSUM are still used by ethtool utility to get values of legacy flags (which rather work as feature groups). These are calculated from values of actual features and request to set them is implemented as an attempt to set all features mapping to them but there are two inconsistencies:
- tx-checksum-fcoe-crc is shown under tx-checksumming but NETIF_F_FCOE_CRC is not included in ETHTOOL_GTXCSUM/ETHTOOL_STXCSUM
- tx-scatter-gather-fraglist is shown under scatter-gather but NETIF_F_FRAGLIST is not included in ETHTOOL_GSG/ETHTOOL_SSG
As the mapping in ethtool output is more correct from logical point of view, fix ethtool_get_feature_mask() to match it.
--- net/ethtool/ioctl.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
net/ethtool/ioctl.c +3 -2
@@ -198,13 +198,14 @@ static netdev_features_t ethtool_get_feature_mask(u32 eth_cmd)switch (eth_cmd) {case ETHTOOL_GTXCSUM :case ETHTOOL_STXCSUM : -return NETIF_F_CSUM_MASK |NETIF_F_SCTP_CRC ; +return NETIF_F_CSUM_MASK |NETIF_F_FCOE_CRC_BIT | +NETIF_F_SCTP_CRC ;case ETHTOOL_GRXCSUM :case ETHTOOL_SRXCSUM :return NETIF_F_RXCSUM ;case ETHTOOL_GSG :case ETHTOOL_SSG : -return NETIF_F_SG ; +return NETIF_F_SG |NETIF_F_FRAGLIST ;case ETHTOOL_GTSO :case ETHTOOL_STSO :return NETIF_F_ALL_TSO ;
Signature · 1 line
2.25.1
PATCH v2 3/15 ethtool: provide netdev features with FEATURES_GET request
In reply to Michal KubecekImplement FEATURES_GET request to get network device features. These are traditionally available via ETHTOOL_GFEATURES ioctl request.
v2:
- style cleanup suggested by Jakub Kicinski
--- Documentation/networking/ethtool-netlink.rst | 51 ++++++-- include/uapi/linux/ethtool_netlink.h | 17 +++ net/ethtool/Makefile | 2 +- net/ethtool/common.h | 2 + net/ethtool/features.c | 131 +++++++++++++++++++ net/ethtool/ioctl.c | 2 - net/ethtool/netlink.c | 8 ++ net/ethtool/netlink.h | 1 + 8 files changed, 202 insertions(+), 12 deletions(-) create mode 100644 net/ethtool/features.c
Documentation/networking/ethtool-netlink.rst +42 -9
@@ -189,6 +189,7 @@ Userspace to kernel: ``ETHTOOL_MSG_DEBUG_SET`` set debugging settings ``ETHTOOL_MSG_WOL_GET`` get wake-on-lan settings ``ETHTOOL_MSG_WOL_SET`` set wake-on-lan settings + ``ETHTOOL_MSG_FEATURES_GET`` get device features ===================================== ================================ Kernel to userspace:
@@ -204,6 +205,7 @@ Kernel to userspace: ``ETHTOOL_MSG_DEBUG_NTF`` debugging settings notification ``ETHTOOL_MSG_WOL_GET_REPLY`` wake-on-lan settings ``ETHTOOL_MSG_WOL_NTF`` wake-on-lan settings notification + ``ETHTOOL_MSG_FEATURES_GET_REPLY`` device features ===================================== ================================= ``GET`` requests are sent by userspace applications to retrieve device
@@ -521,6 +523,37 @@ Request contents: ``WAKE_MAGICSECURE`` mode. +FEATURES_GET +============ + +Gets netdev features like ``ETHTOOL_GFEATURES`` ioctl request. + +Request contents: + + ==================================== ====== ========================== + ``ETHTOOL_A_FEATURES_HEADER`` nested request header + ==================================== ====== ========================== + +Kernel response contents: + + ==================================== ====== ========================== + ``ETHTOOL_A_FEATURES_HEADER`` nested reply header + ``ETHTOOL_A_FEATURES_HW`` bitset dev->hw_features + ``ETHTOOL_A_FEATURES_WANTED`` bitset dev->wanted_features + ``ETHTOOL_A_FEATURES_ACTIVE`` bitset dev->features + ``ETHTOOL_A_FEATURES_NOCHANGE`` bitset NETIF_F_NEVER_CHANGE + ==================================== ====== ========================== + +Bitmaps in kernel response have the same meaning as bitmaps used in ioctl +interference but attribute names are different (they are based on +corresponding members of struct net_device). Legacy "flags" are not provided, +if userspace needs them (most likely only ethtool for backward compatibility), +it can calculate their values from related feature bits itself. +ETHA_FEATURES_HW uses mask consisting of all features recognized by kernel (to +provide all names when using verbose bitmap format), the other three use no +mask (simple bit lists). + + Request translation ===================
@@ -551,30 +584,30 @@ have their netlink replacement yet. ``ETHTOOL_SRINGPARAM`` n/a ``ETHTOOL_GPAUSEPARAM`` n/a ``ETHTOOL_SPAUSEPARAM`` n/a - ``ETHTOOL_GRXCSUM`` n/a + ``ETHTOOL_GRXCSUM`` ``ETHTOOL_MSG_FEATURES_GET`` ``ETHTOOL_SRXCSUM`` n/a - ``ETHTOOL_GTXCSUM`` n/a + ``ETHTOOL_GTXCSUM`` ``ETHTOOL_MSG_FEATURES_GET`` ``ETHTOOL_STXCSUM`` n/a - ``ETHTOOL_GSG`` n/a + ``ETHTOOL_GSG`` ``ETHTOOL_MSG_FEATURES_GET`` ``ETHTOOL_SSG`` n/a ``ETHTOOL_TEST`` n/a ``ETHTOOL_GSTRINGS`` ``ETHTOOL_MSG_STRSET_GET`` ``ETHTOOL_PHYS_ID`` n/a ``ETHTOOL_GSTATS`` n/a - ``ETHTOOL_GTSO`` n/a + ``ETHTOOL_GTSO`` ``ETHTOOL_MSG_FEATURES_GET`` ``ETHTOOL_STSO`` n/a ``ETHTOOL_GPERMADDR`` rtnetlink ``RTM_GETLINK`` - ``ETHTOOL_GUFO`` n/a + ``ETHTOOL_GUFO`` ``ETHTOOL_MSG_FEATURES_GET`` ``ETHTOOL_SUFO`` n/a - ``ETHTOOL_GGSO`` n/a + ``ETHTOOL_GGSO`` ``ETHTOOL_MSG_FEATURES_GET`` ``ETHTOOL_SGSO`` n/a - ``ETHTOOL_GFLAGS`` n/a + ``ETHTOOL_GFLAGS`` ``ETHTOOL_MSG_FEATURES_GET`` ``ETHTOOL_SFLAGS`` n/a ``ETHTOOL_GPFLAGS`` n/a ``ETHTOOL_SPFLAGS`` n/a ``ETHTOOL_GRXFH`` n/a ``ETHTOOL_SRXFH`` n/a - ``ETHTOOL_GGRO`` n/a + ``ETHTOOL_GGRO`` ``ETHTOOL_MSG_FEATURES_GET`` ``ETHTOOL_SGRO`` n/a ``ETHTOOL_GRXRINGS`` n/a ``ETHTOOL_GRXCLSRLCNT`` n/a
@@ -589,7 +622,7 @@ have their netlink replacement yet. ``ETHTOOL_GSSET_INFO`` ``ETHTOOL_MSG_STRSET_GET`` ``ETHTOOL_GRXFHINDIR`` n/a ``ETHTOOL_SRXFHINDIR`` n/a - ``ETHTOOL_GFEATURES`` n/a + ``ETHTOOL_GFEATURES`` ``ETHTOOL_MSG_FEATURES_GET`` ``ETHTOOL_SFEATURES`` n/a ``ETHTOOL_GCHANNELS`` n/a ``ETHTOOL_SCHANNELS`` n/a
include/uapi/linux/ethtool_netlink.h +17 -0
@@ -24,6 +24,7 @@ enum {ETHTOOL_MSG_DEBUG_SET ,ETHTOOL_MSG_WOL_GET ,ETHTOOL_MSG_WOL_SET , +ETHTOOL_MSG_FEATURES_GET ,/* add new constants above here */ __ETHTOOL_MSG_USER_CNT,
@@ -43,6 +44,7 @@ enum {ETHTOOL_MSG_DEBUG_NTF ,ETHTOOL_MSG_WOL_GET_REPLY ,ETHTOOL_MSG_WOL_NTF , +ETHTOOL_MSG_FEATURES_GET_REPLY ,/* add new constants above here */ __ETHTOOL_MSG_KERNEL_CNT,
@@ -228,6 +230,21 @@ enum { ETHTOOL_A_WOL_MAX = __ETHTOOL_A_WOL_CNT - 1 }; +/* FEATURES */ + +enum { +ETHTOOL_A_FEATURES_UNSPEC , +ETHTOOL_A_FEATURES_HEADER ,/* nest - _A_HEADER_* */ +ETHTOOL_A_FEATURES_HW ,/* bitset */ +ETHTOOL_A_FEATURES_WANTED ,/* bitset */ +ETHTOOL_A_FEATURES_ACTIVE ,/* bitset */ +ETHTOOL_A_FEATURES_NOCHANGE ,/* bitset */ + +/* add new constants above here */ + __ETHTOOL_A_FEATURES_CNT, +ETHTOOL_A_FEATURES_MAX = __ETHTOOL_A_FEATURES_CNT -1 +}; +/* generic netlink info */ #define ETHTOOL_GENL_NAME "ethtool"#define ETHTOOL_GENL_VERSION 1
net/ethtool/Makefile +1 -1
@@ -5,4 +5,4 @@ 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 \ - linkstate.o debug.o wol.o + linkstate.o debug.o wol.o features.o
net/ethtool/common.h +2 -0
@@ -6,6 +6,8 @@#include <linux/netdevice.h> #include <linux/ethtool.h> +#define ETHTOOL_DEV_FEATURE_WORDS DIV_ROUND_UP(NETDEV_FEATURE_COUNT, 32) +/* compose link mode index from speed, type and duplex */ #define ETHTOOL_LINK_MODE (speed, type, duplex) \ ETHTOOL_LINK_MODE_ ## speed ## base ## type ## _ ## duplex ## _BIT
net/ethtool/features.c new file +131 -0
131 lines not on this page · raw message
net/ethtool/ioctl.c +0 -2
@@ -56,8 +56,6 @@ EXPORT_SYMBOL(ethtool_op_get_ts_info);/* Handlers for each ethtool command */ -#define ETHTOOL_DEV_FEATURE_WORDS ((NETDEV_FEATURE_COUNT + 31) / 32) -static int ethtool_get_features (struct net_device *dev,void __user *useraddr) {struct ethtool_gfeatures cmd = {
net/ethtool/netlink.c +8 -0
@@ -215,6 +215,7 @@ ethnl_default_requests[__ETHTOOL_MSG_USER_CNT] = { [ETHTOOL_MSG_LINKSTATE_GET] = ðnl_linkstate_request_ops, [ETHTOOL_MSG_DEBUG_GET] = ðnl_debug_request_ops, [ETHTOOL_MSG_WOL_GET] = ðnl_wol_request_ops, + [ETHTOOL_MSG_FEATURES_GET] = ðnl_features_request_ops, };static struct ethnl_dump_ctx *ethnl_dump_context (struct netlink_callback *cb)
@@ -695,6 +696,13 @@ static const struct genl_ops ethtool_genl_ops[] = { .flags = GENL_UNS_ADMIN_PERM, .doit = ethnl_set_wol, }, + { + .cmd = ETHTOOL_MSG_FEATURES_GET, + .doit = ethnl_default_doit, + .start = ethnl_default_start, + .dumpit = ethnl_default_dumpit, + .done = ethnl_default_done, + }, };static const struct genl_multicast_group ethtool_nl_mcgrps[] = {
net/ethtool/netlink.h +1 -0
@@ -337,6 +337,7 @@ extern const struct ethnl_request_ops ethnl_linkmodes_request_ops;extern const struct ethnl_request_ops ethnl_linkstate_request_ops;extern const struct ethnl_request_ops ethnl_debug_request_ops;extern const struct ethnl_request_ops ethnl_wol_request_ops; +extern const struct ethnl_request_ops ethnl_features_request_ops;int ethnl_set_linkinfo (struct sk_buff *skb,struct genl_info *info);int ethnl_set_linkmodes (struct sk_buff *skb,struct genl_info *info);
Signature · 1 line
2.25.1
PATCH v2 4/15 ethtool: add ethnl_parse_bitset() helper
In reply to Michal KubecekUnlike other SET type commands, modifying netdev features is required to provide a reply telling userspace what was actually changed, compared to what was requested. For that purpose, the "modified" flag provided by ethnl_update_bitset() is not sufficient, we need full information which bits were requested to change.
Therefore provide ethnl_parse_bitset() returning effective value and mask bitmaps equivalent to the contents of a bitset nested attribute.
v2: use non-atomic __set_bit() (suggested by David Miller)
--- net/ethtool/bitset.c | 94 ++++++++++++++++++++++++++++++++++++++++++++ net/ethtool/bitset.h | 4 ++ 2 files changed, 98 insertions(+)
net/ethtool/bitset.c +94 -0
@@ -588,6 +588,100 @@ int ethnl_update_bitset32(u32 *bitmap, unsigned int nbits,return 0 ; } +/** +* ethnl_parse_bitset() - Compute effective value and mask from bitset nest +* @val: unsigned long based bitmap to put value into +* @mask: unsigned long based bitmap to put mask into +* @nbits: size of @val and @mask bitmaps +* @attr: nest attribute to parse and apply +* @names: array of bit names; may be null for compact format +* @extack: extack for error reporting +* +* Provide @nbits size long bitmaps for value and mask so that +* x = (val & mask) | (x & ~mask) would modify any @nbits sized bitmap x +* the same way ethnl_update_bitset() with the same bitset attribute would. +* +* Return: negative error code on failure, 0 on success +*/ +int ethnl_parse_bitset (unsigned long *val,unsigned long *mask, +unsigned int nbits,const struct nlattr *attr, +ethnl_string_array_t names, +struct netlink_ext_ack *extack) +{ +struct nlattr *tb[ETHTOOL_A_BITSET_MAX +1 ]; +const struct nlattr *bit_attr; +bool no_mask; +int rem; +int ret; + +if (!attr) +return 0 ; + ret =nla_parse_nested (tb,ETHTOOL_A_BITSET_MAX , attr, bitset_policy, + extack); +if (ret <0 ) +return ret; + no_mask = tb[ETHTOOL_A_BITSET_NOMASK ]; + +if (!tb[ETHTOOL_A_BITSET_BITS ]) { +unsigned int change_bits; + + ret =ethnl_compact_sanity_checks (nbits, attr, tb, extack); +if (ret <0 ) +return ret; + + change_bits =nla_get_u32 (tb[ETHTOOL_A_BITSET_SIZE ]); +bitmap_from_arr32 (val,nla_data (tb[ETHTOOL_A_BITSET_VALUE ]), + change_bits); +if (change_bits < nbits) +bitmap_clear (val, change_bits, nbits - change_bits); +if (no_mask) { +bitmap_fill (mask, nbits); + }else { +bitmap_from_arr32 (mask, +nla_data (tb[ETHTOOL_A_BITSET_MASK ]), + change_bits); +if (change_bits < nbits) +bitmap_clear (mask, change_bits, + nbits - change_bits); + } + +return 0 ; + } + +if (tb[ETHTOOL_A_BITSET_VALUE ]) { +NL_SET_ERR_MSG_ATTR (extack, tb[ETHTOOL_A_BITSET_VALUE ], +"value only allowed in compact bitset" ); +return -EINVAL ; + } +if (tb[ETHTOOL_A_BITSET_MASK ]) { +NL_SET_ERR_MSG_ATTR (extack, tb[ETHTOOL_A_BITSET_MASK ], +"mask only allowed in compact bitset" ); +return -EINVAL ; + } + +bitmap_zero (val, nbits); +if (no_mask) +bitmap_fill (mask, nbits); +else +bitmap_zero (mask, nbits); + +nla_for_each_nested (bit_attr, tb[ETHTOOL_A_BITSET_BITS ], rem) { +unsigned int idx; +bool bit_val; + + ret =ethnl_parse_bit (&idx, &bit_val, nbits, bit_attr, no_mask, + names, extack); +if (ret <0 ) +return ret; +if (bit_val) +__set_bit (idx, val); +if (!no_mask) +__set_bit (idx, mask); + } + +return 0 ; +} +#if BITS_PER_LONG ==64 && defined(__BIG_ENDIAN)/* 64-bit big endian architectures are the only case when u32 based bitmaps
net/ethtool/bitset.h +4 -0
@@ -26,5 +26,9 @@ int ethnl_update_bitset(unsigned long *bitmap, unsigned int nbits,int ethnl_update_bitset32 (u32 *bitmap,unsigned int nbits,const struct nlattr *attr,ethnl_string_array_t names,struct netlink_ext_ack *extack,bool *mod); +int ethnl_parse_bitset (unsigned long *val,unsigned long *mask, +unsigned int nbits,const struct nlattr *attr, +ethnl_string_array_t names, +struct netlink_ext_ack *extack);#endif /* _NET_ETHTOOL_BITSET_H */
Signature · 1 line
2.25.1
PATCH v2 5/15 ethtool: set netdev features with FEATURES_SET request
In reply to Michal KubecekImplement FEATURES_SET netlink request to set network device features. These are traditionally set using ETHTOOL_SFEATURES ioctl request.
Actual change is subject to netdev_change_features() sanity checks so that it can differ from what was requested. Unlike with most other SET requests, in addition to error code and optional extack, kernel provides an optional reply message (ETHTOOL_MSG_FEATURES_SET_REPLY) in the same format but with different semantics: information about difference between user request and actual result and difference between old and new state of dev->features. This reply message can be suppressed by setting ETHTOOL_FLAG_OMIT_REPLY flag in request header.
--- Documentation/networking/ethtool-netlink.rst | 56 +++++- include/uapi/linux/ethtool_netlink.h | 2 + net/ethtool/features.c | 169 +++++++++++++++++++ net/ethtool/netlink.c | 5 + net/ethtool/netlink.h | 1 + 5 files changed, 224 insertions(+), 9 deletions(-)
Documentation/networking/ethtool-netlink.rst +47 -9
@@ -190,6 +190,7 @@ Userspace to kernel: ``ETHTOOL_MSG_WOL_GET`` get wake-on-lan settings ``ETHTOOL_MSG_WOL_SET`` set wake-on-lan settings ``ETHTOOL_MSG_FEATURES_GET`` get device features + ``ETHTOOL_MSG_FEATURES_SET`` set device features ===================================== ================================ Kernel to userspace:
@@ -206,6 +207,7 @@ Kernel to userspace: ``ETHTOOL_MSG_WOL_GET_REPLY`` wake-on-lan settings ``ETHTOOL_MSG_WOL_NTF`` wake-on-lan settings notification ``ETHTOOL_MSG_FEATURES_GET_REPLY`` device features + ``ETHTOOL_MSG_FEATURES_SET_REPLY`` optional reply to FEATURES_SET ===================================== ================================= ``GET`` requests are sent by userspace applications to retrieve device
@@ -554,6 +556,42 @@ provide all names when using verbose bitmap format), the other three use no mask (simple bit lists). +FEATURES_SET +============ + +Request to set netdev features like ``ETHTOOL_SFEATURES`` ioctl request. + +Request contents: + + ==================================== ====== ========================== + ``ETHTOOL_A_FEATURES_HEADER`` nested request header + ``ETHTOOL_A_FEATURES_WANTED`` bitset requested features + ==================================== ====== ========================== + +Kernel response contents: + + ==================================== ====== ========================== + ``ETHTOOL_A_FEATURES_HEADER`` nested reply header + ``ETHTOOL_A_FEATURES_WANTED`` bitset diff wanted vs. result + ``ETHTOOL_A_FEATURES_ACTIVE`` bitset diff old vs. new active + ==================================== ====== ========================== + +Request constains only one bitset which can be either value/mask pair (request +to change specific feature bits and leave the rest) or only a value (request +to set all features to specified set). + +As request is subject to netdev_change_features() sanity checks, optional +kernel reply (can be suppressed by ``ETHTOOL_FLAG_OMIT_REPLY`` flag in request +header) informs client about the actual result. ``ETHTOOL_A_FEATURES_WANTED`` +reports the difference between client request and actual result: mask consists +of bits which differ between requested features and result (dev->features +after the operation), value consists of values of these bits in the request +(i.e. negated values from resulting features). ``ETHTOOL_A_FEATURES_ACTIVE`` +reports the difference between old and new dev->features: mask consists of +bits which have changed, values are their values in new dev->features (after +the operation). + + Request translation ===================
@@ -585,30 +623,30 @@ have their netlink replacement yet. ``ETHTOOL_GPAUSEPARAM`` n/a ``ETHTOOL_SPAUSEPARAM`` n/a ``ETHTOOL_GRXCSUM`` ``ETHTOOL_MSG_FEATURES_GET`` - ``ETHTOOL_SRXCSUM`` n/a + ``ETHTOOL_SRXCSUM`` ``ETHTOOL_MSG_FEATURES_SET`` ``ETHTOOL_GTXCSUM`` ``ETHTOOL_MSG_FEATURES_GET`` - ``ETHTOOL_STXCSUM`` n/a + ``ETHTOOL_STXCSUM`` ``ETHTOOL_MSG_FEATURES_SET`` ``ETHTOOL_GSG`` ``ETHTOOL_MSG_FEATURES_GET`` - ``ETHTOOL_SSG`` n/a + ``ETHTOOL_SSG`` ``ETHTOOL_MSG_FEATURES_SET`` ``ETHTOOL_TEST`` n/a ``ETHTOOL_GSTRINGS`` ``ETHTOOL_MSG_STRSET_GET`` ``ETHTOOL_PHYS_ID`` n/a ``ETHTOOL_GSTATS`` n/a ``ETHTOOL_GTSO`` ``ETHTOOL_MSG_FEATURES_GET`` - ``ETHTOOL_STSO`` n/a + ``ETHTOOL_STSO`` ``ETHTOOL_MSG_FEATURES_SET`` ``ETHTOOL_GPERMADDR`` rtnetlink ``RTM_GETLINK`` ``ETHTOOL_GUFO`` ``ETHTOOL_MSG_FEATURES_GET`` - ``ETHTOOL_SUFO`` n/a + ``ETHTOOL_SUFO`` ``ETHTOOL_MSG_FEATURES_SET`` ``ETHTOOL_GGSO`` ``ETHTOOL_MSG_FEATURES_GET`` - ``ETHTOOL_SGSO`` n/a + ``ETHTOOL_SGSO`` ``ETHTOOL_MSG_FEATURES_SET`` ``ETHTOOL_GFLAGS`` ``ETHTOOL_MSG_FEATURES_GET`` - ``ETHTOOL_SFLAGS`` n/a + ``ETHTOOL_SFLAGS`` ``ETHTOOL_MSG_FEATURES_SET`` ``ETHTOOL_GPFLAGS`` n/a ``ETHTOOL_SPFLAGS`` n/a ``ETHTOOL_GRXFH`` n/a ``ETHTOOL_SRXFH`` n/a ``ETHTOOL_GGRO`` ``ETHTOOL_MSG_FEATURES_GET`` - ``ETHTOOL_SGRO`` n/a + ``ETHTOOL_SGRO`` ``ETHTOOL_MSG_FEATURES_SET`` ``ETHTOOL_GRXRINGS`` n/a ``ETHTOOL_GRXCLSRLCNT`` n/a ``ETHTOOL_GRXCLSRULE`` n/a
@@ -623,7 +661,7 @@ have their netlink replacement yet. ``ETHTOOL_GRXFHINDIR`` n/a ``ETHTOOL_SRXFHINDIR`` n/a ``ETHTOOL_GFEATURES`` ``ETHTOOL_MSG_FEATURES_GET`` - ``ETHTOOL_SFEATURES`` n/a + ``ETHTOOL_SFEATURES`` ``ETHTOOL_MSG_FEATURES_SET`` ``ETHTOOL_GCHANNELS`` n/a ``ETHTOOL_SCHANNELS`` n/a ``ETHTOOL_SET_DUMP`` n/a
include/uapi/linux/ethtool_netlink.h +2 -0
@@ -25,6 +25,7 @@ enum {ETHTOOL_MSG_WOL_GET ,ETHTOOL_MSG_WOL_SET ,ETHTOOL_MSG_FEATURES_GET , +ETHTOOL_MSG_FEATURES_SET ,/* add new constants above here */ __ETHTOOL_MSG_USER_CNT,
@@ -45,6 +46,7 @@ enum {ETHTOOL_MSG_WOL_GET_REPLY ,ETHTOOL_MSG_WOL_NTF ,ETHTOOL_MSG_FEATURES_GET_REPLY , +ETHTOOL_MSG_FEATURES_SET_REPLY ,/* add new constants above here */ __ETHTOOL_MSG_KERNEL_CNT,
net/ethtool/features.c +169 -0
172 lines not on this page · raw message
net/ethtool/netlink.c +5 -0
@@ -703,6 +703,11 @@ static const struct genl_ops ethtool_genl_ops[] = { .dumpit = ethnl_default_dumpit, .done = ethnl_default_done, }, + { + .cmd = ETHTOOL_MSG_FEATURES_SET, + .flags = GENL_UNS_ADMIN_PERM, + .doit = ethnl_set_features, + }, };static const struct genl_multicast_group ethtool_nl_mcgrps[] = {
net/ethtool/netlink.h +1 -0
@@ -343,5 +343,6 @@ int ethnl_set_linkinfo(struct sk_buff *skb, struct genl_info *info);int ethnl_set_linkmodes (struct sk_buff *skb,struct genl_info *info);int ethnl_set_debug (struct sk_buff *skb,struct genl_info *info);int ethnl_set_wol (struct sk_buff *skb,struct genl_info *info); +int ethnl_set_features (struct sk_buff *skb,struct genl_info *info);#endif /* _NET_ETHTOOL_NETLINK_H */
Signature · 1 line
2.25.1
PATCH v2 6/15 ethtool: add FEATURES_NTF notification
In reply to Michal KubecekSend ETHTOOL_MSG_FEATURES_NTF notification whenever network device features are modified using ETHTOOL_MSG_FEATURES_SET netlink message, ethtool ioctl request or any other way resulting in call to netdev_update_features() or netdev_change_features()
--- Documentation/networking/ethtool-netlink.rst | 6 ++++ include/uapi/linux/ethtool_netlink.h | 1 + net/ethtool/features.c | 4 +++ net/ethtool/netlink.c | 29 +++++++++++++++++++- 4 files changed, 39 insertions(+), 1 deletion(-)
Documentation/networking/ethtool-netlink.rst +6 -0
@@ -208,6 +208,7 @@ Kernel to userspace: ``ETHTOOL_MSG_WOL_NTF`` wake-on-lan settings notification ``ETHTOOL_MSG_FEATURES_GET_REPLY`` device features ``ETHTOOL_MSG_FEATURES_SET_REPLY`` optional reply to FEATURES_SET + ``ETHTOOL_MSG_FEATURES_NTF`` netdev features notification ===================================== ================================= ``GET`` requests are sent by userspace applications to retrieve device
@@ -591,6 +592,11 @@ reports the difference between old and new dev->features: mask consists of bits which have changed, values are their values in new dev->features (after the operation). +``ETHTOOL_MSG_FEATURES_NTF`` notification is sent not only if device features +are modified using ``ETHTOOL_MSG_FEATURES_SET`` request or on of ethtool ioctl +request but also each time features are modified with netdev_update_features() +or netdev_change_features(). + Request translation ===================
include/uapi/linux/ethtool_netlink.h +1 -0
@@ -47,6 +47,7 @@ enum {ETHTOOL_MSG_WOL_NTF ,ETHTOOL_MSG_FEATURES_GET_REPLY ,ETHTOOL_MSG_FEATURES_SET_REPLY , +ETHTOOL_MSG_FEATURES_NTF ,/* add new constants above here */ __ETHTOOL_MSG_KERNEL_CNT,
net/ethtool/features.c +4 -0
@@ -230,6 +230,7 @@ int ethnl_set_features(struct sk_buff *skb, struct genl_info *info)struct nlattr *tb[ETHTOOL_A_FEATURES_MAX +1 ];struct ethnl_req_info req_info = {};struct net_device *dev; +bool mod;int ret; ret = nlmsg_parse(info->nlhdr, GENL_HDRLEN, tb,
@@ -272,6 +273,7 @@ int ethnl_set_features(struct sk_buff *skb, struct genl_info *info) dev->wanted_features =ethnl_bitmap_to_features (req_wanted);__netdev_update_features (dev);ethnl_features_to_bitmap (new_active, dev->features); + mod = !bitmap_equal (old_active, new_active,NETDEV_FEATURE_COUNT ); ret =0 ;if (!(req_info.flags ÐTOOL_FLAG_OMIT_REPLY )) {
@@ -292,6 +294,8 @@ int ethnl_set_features(struct sk_buff *skb, struct genl_info *info) wanted_diff_mask, new_active, active_diff_mask, compact); } +if (mod) +ethtool_notify (dev,ETHTOOL_MSG_FEATURES_NTF ,NULL ); out_rtnl:rtnl_unlock ();
net/ethtool/netlink.c +28 -1
@@ -528,6 +528,7 @@ ethnl_default_notify_ops[ETHTOOL_MSG_KERNEL_MAX + 1] = { [ETHTOOL_MSG_LINKMODES_NTF] = ðnl_linkmodes_request_ops, [ETHTOOL_MSG_DEBUG_NTF] = ðnl_debug_request_ops, [ETHTOOL_MSG_WOL_NTF] = ðnl_wol_request_ops, + [ETHTOOL_MSG_FEATURES_NTF] = ðnl_features_request_ops, };/* default notification handler */
@@ -613,6 +614,7 @@ static const ethnl_notify_handler_t ethnl_notify_handlers[] = { [ETHTOOL_MSG_LINKMODES_NTF] = ethnl_default_notify, [ETHTOOL_MSG_DEBUG_NTF] = ethnl_default_notify, [ETHTOOL_MSG_WOL_NTF] = ethnl_default_notify, + [ETHTOOL_MSG_FEATURES_NTF] = ethnl_default_notify, };void ethtool_notify (struct net_device *dev,unsigned int cmd,const void *data)
@@ -630,6 +632,29 @@ void ethtool_notify(struct net_device *dev, unsigned int cmd, const void *data) }EXPORT_SYMBOL (ethtool_notify); +static void ethnl_notify_features (struct netdev_notifier_info *info) +{ +struct net_device *dev =netdev_notifier_info_to_dev (info); + +ethtool_notify (dev,ETHTOOL_MSG_FEATURES_NTF ,NULL ); +} + +static int ethnl_netdev_event (struct notifier_block *this,unsigned long event, +void *ptr) +{ +switch (event) { +case NETDEV_FEAT_CHANGE : +ethnl_notify_features (ptr); +break ; + } + +return NOTIFY_DONE ; +} + +static struct notifier_block ethnl_netdev_notifier = { + .notifier_call = ethnl_netdev_event, +}; +/* genetlink setup */ static const struct genl_ops ethtool_genl_ops[] = {
@@ -736,7 +761,9 @@ static int __init ethnl_init(void)return ret; ethnl_ok = true; -return 0 ; + ret =register_netdevice_notifier (ðnl_netdev_notifier); +WARN (ret <0 ,"ethtool: net device notifier registration failed" ); +return ret; }subsys_initcall (ethnl_init);
Signature · 1 line
2.25.1
PATCH v2 7/15 ethtool: provide private flags with PRIVFLAGS_GET request
In reply to Michal KubecekImplement PRIVFLAGS_GET request to get private flags for a network device. These are traditionally available via ETHTOOL_GPFLAGS ioctl request.
--- Documentation/networking/ethtool-netlink.rst | 30 +++- include/uapi/linux/ethtool_netlink.h | 14 ++ net/ethtool/Makefile | 2 +- net/ethtool/netlink.c | 8 ++ net/ethtool/netlink.h | 1 + net/ethtool/privflags.c | 136 +++++++++++++++++++ 6 files changed, 189 insertions(+), 2 deletions(-) create mode 100644 net/ethtool/privflags.c
Documentation/networking/ethtool-netlink.rst +29 -1
@@ -191,6 +191,7 @@ Userspace to kernel: ``ETHTOOL_MSG_WOL_SET`` set wake-on-lan settings ``ETHTOOL_MSG_FEATURES_GET`` get device features ``ETHTOOL_MSG_FEATURES_SET`` set device features + ``ETHTOOL_MSG_PRIVFLAGS_GET`` get private flags ===================================== ================================ Kernel to userspace:
@@ -209,6 +210,7 @@ Kernel to userspace: ``ETHTOOL_MSG_FEATURES_GET_REPLY`` device features ``ETHTOOL_MSG_FEATURES_SET_REPLY`` optional reply to FEATURES_SET ``ETHTOOL_MSG_FEATURES_NTF`` netdev features notification + ``ETHTOOL_MSG_PRIVFLAGS_GET_REPLY`` private flags ===================================== ================================= ``GET`` requests are sent by userspace applications to retrieve device
@@ -598,6 +600,32 @@ request but also each time features are modified with netdev_update_features() or netdev_change_features(). +PRIVFLAGS_GET +============= + +Gets private flags like ``ETHTOOL_GPFLAGS`` ioctl request. + +Request contents: + + ==================================== ====== ========================== + ``ETHTOOL_A_PRIVFLAGS_HEADER`` nested request header + ==================================== ====== ========================== + +Kernel response contents: + + ==================================== ====== ========================== + ``ETHTOOL_A_PRIVFLAGS_HEADER`` nested reply header + ``ETHTOOL_A_PRIVFLAGS_FLAGS`` bitset private flags + ==================================== ====== ========================== + +``ETHTOOL_A_PRIVFLAGS_FLAGS`` is a bitset with values of device private flags. +These flags are defined by driver, their number and names (and also meaning) +are device dependent. For compact bitset format, names can be retrieved as +``ETH_SS_PRIV_FLAGS`` string set. If verbose bitset format is requested, +response uses all private flags supported by the device as mask so that client +gets the full information without having to fetch the string set with names. + + Request translation ===================
@@ -647,7 +675,7 @@ have their netlink replacement yet. ``ETHTOOL_SGSO`` ``ETHTOOL_MSG_FEATURES_SET`` ``ETHTOOL_GFLAGS`` ``ETHTOOL_MSG_FEATURES_GET`` ``ETHTOOL_SFLAGS`` ``ETHTOOL_MSG_FEATURES_SET`` - ``ETHTOOL_GPFLAGS`` n/a + ``ETHTOOL_GPFLAGS`` ``ETHTOOL_MSG_PRIVFLAGS_GET`` ``ETHTOOL_SPFLAGS`` n/a ``ETHTOOL_GRXFH`` n/a ``ETHTOOL_SRXFH`` n/a
include/uapi/linux/ethtool_netlink.h +14 -0
@@ -26,6 +26,7 @@ enum {ETHTOOL_MSG_WOL_SET ,ETHTOOL_MSG_FEATURES_GET ,ETHTOOL_MSG_FEATURES_SET , +ETHTOOL_MSG_PRIVFLAGS_GET ,/* add new constants above here */ __ETHTOOL_MSG_USER_CNT,
@@ -48,6 +49,7 @@ enum {ETHTOOL_MSG_FEATURES_GET_REPLY ,ETHTOOL_MSG_FEATURES_SET_REPLY ,ETHTOOL_MSG_FEATURES_NTF , +ETHTOOL_MSG_PRIVFLAGS_GET_REPLY ,/* add new constants above here */ __ETHTOOL_MSG_KERNEL_CNT,
@@ -248,6 +250,18 @@ enum { ETHTOOL_A_FEATURES_MAX = __ETHTOOL_A_FEATURES_CNT - 1 }; +/* PRIVFLAGS */ + +enum { +ETHTOOL_A_PRIVFLAGS_UNSPEC , +ETHTOOL_A_PRIVFLAGS_HEADER ,/* nest - _A_HEADER_* */ +ETHTOOL_A_PRIVFLAGS_FLAGS ,/* bitset */ + +/* add new constants above here */ + __ETHTOOL_A_PRIVFLAGS_CNT, +ETHTOOL_A_PRIVFLAGS_MAX = __ETHTOOL_A_PRIVFLAGS_CNT -1 +}; +/* generic netlink info */ #define ETHTOOL_GENL_NAME "ethtool"#define ETHTOOL_GENL_VERSION 1
net/ethtool/Makefile +1 -1
@@ -5,4 +5,4 @@ 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 \ - linkstate.o debug.o wol.o features.o + linkstate.o debug.o wol.o features.o privflags.o
net/ethtool/netlink.c +8 -0
@@ -216,6 +216,7 @@ ethnl_default_requests[__ETHTOOL_MSG_USER_CNT] = { [ETHTOOL_MSG_DEBUG_GET] = ðnl_debug_request_ops, [ETHTOOL_MSG_WOL_GET] = ðnl_wol_request_ops, [ETHTOOL_MSG_FEATURES_GET] = ðnl_features_request_ops, + [ETHTOOL_MSG_PRIVFLAGS_GET] = ðnl_privflags_request_ops, };static struct ethnl_dump_ctx *ethnl_dump_context (struct netlink_callback *cb)
@@ -733,6 +734,13 @@ static const struct genl_ops ethtool_genl_ops[] = { .flags = GENL_UNS_ADMIN_PERM, .doit = ethnl_set_features, }, + { + .cmd = ETHTOOL_MSG_PRIVFLAGS_GET, + .doit = ethnl_default_doit, + .start = ethnl_default_start, + .dumpit = ethnl_default_dumpit, + .done = ethnl_default_done, + }, };static const struct genl_multicast_group ethtool_nl_mcgrps[] = {
net/ethtool/netlink.h +1 -0
@@ -338,6 +338,7 @@ extern const struct ethnl_request_ops ethnl_linkstate_request_ops;extern const struct ethnl_request_ops ethnl_debug_request_ops;extern const struct ethnl_request_ops ethnl_wol_request_ops;extern const struct ethnl_request_ops ethnl_features_request_ops; +extern const struct ethnl_request_ops ethnl_privflags_request_ops;int ethnl_set_linkinfo (struct sk_buff *skb,struct genl_info *info);int ethnl_set_linkmodes (struct sk_buff *skb,struct genl_info *info);
net/ethtool/privflags.c new file +136 -0
136 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH v2 8/15 ethtool: set device private flags with PRIVFLAGS_SET request
In reply to Michal KubecekImplement PRIVFLAGS_SET netlink request to set private flags of a network device. These are traditionally set with ETHTOOL_SPFLAGS ioctl request.
--- Documentation/networking/ethtool-netlink.rst | 21 +++++- include/uapi/linux/ethtool_netlink.h | 1 + net/ethtool/netlink.c | 5 ++ net/ethtool/netlink.h | 1 + net/ethtool/privflags.c | 70 ++++++++++++++++++++ 5 files changed, 97 insertions(+), 1 deletion(-)
Documentation/networking/ethtool-netlink.rst +20 -1
@@ -192,6 +192,7 @@ Userspace to kernel: ``ETHTOOL_MSG_FEATURES_GET`` get device features ``ETHTOOL_MSG_FEATURES_SET`` set device features ``ETHTOOL_MSG_PRIVFLAGS_GET`` get private flags + ``ETHTOOL_MSG_PRIVFLAGS_SET`` set private flags ===================================== ================================ Kernel to userspace:
@@ -211,6 +212,7 @@ Kernel to userspace: ``ETHTOOL_MSG_FEATURES_SET_REPLY`` optional reply to FEATURES_SET ``ETHTOOL_MSG_FEATURES_NTF`` netdev features notification ``ETHTOOL_MSG_PRIVFLAGS_GET_REPLY`` private flags + ``ETHTOOL_MSG_PRIVFLAGS_NTF`` private flags ===================================== ================================= ``GET`` requests are sent by userspace applications to retrieve device
@@ -626,6 +628,23 @@ response uses all private flags supported by the device as mask so that client gets the full information without having to fetch the string set with names. +PRIVFLAGS_SET +============= + +Sets or modifies values of device private flags like ``ETHTOOL_SPFLAGS`` +ioctl request. + +Request contents: + + ==================================== ====== ========================== + ``ETHTOOL_A_PRIVFLAGS_HEADER`` nested request header + ``ETHTOOL_A_PRIVFLAGS_FLAGS`` bitset private flags + ==================================== ====== ========================== + +``ETHTOOL_A_PRIVFLAGS_FLAGS`` can either set the whole set of private flags or +modify only values of some of them. + + Request translation ===================
@@ -676,7 +695,7 @@ have their netlink replacement yet. ``ETHTOOL_GFLAGS`` ``ETHTOOL_MSG_FEATURES_GET`` ``ETHTOOL_SFLAGS`` ``ETHTOOL_MSG_FEATURES_SET`` ``ETHTOOL_GPFLAGS`` ``ETHTOOL_MSG_PRIVFLAGS_GET`` - ``ETHTOOL_SPFLAGS`` n/a + ``ETHTOOL_SPFLAGS`` ``ETHTOOL_MSG_PRIVFLAGS_SET`` ``ETHTOOL_GRXFH`` n/a ``ETHTOOL_SRXFH`` n/a ``ETHTOOL_GGRO`` ``ETHTOOL_MSG_FEATURES_GET``
include/uapi/linux/ethtool_netlink.h +1 -0
@@ -27,6 +27,7 @@ enum {ETHTOOL_MSG_FEATURES_GET ,ETHTOOL_MSG_FEATURES_SET ,ETHTOOL_MSG_PRIVFLAGS_GET , +ETHTOOL_MSG_PRIVFLAGS_SET ,/* add new constants above here */ __ETHTOOL_MSG_USER_CNT,
net/ethtool/netlink.c +5 -0
@@ -741,6 +741,11 @@ static const struct genl_ops ethtool_genl_ops[] = { .dumpit = ethnl_default_dumpit, .done = ethnl_default_done, }, + { + .cmd = ETHTOOL_MSG_PRIVFLAGS_SET, + .flags = GENL_UNS_ADMIN_PERM, + .doit = ethnl_set_privflags, + }, };static const struct genl_multicast_group ethtool_nl_mcgrps[] = {
net/ethtool/netlink.h +1 -0
@@ -345,5 +345,6 @@ int ethnl_set_linkmodes(struct sk_buff *skb, struct genl_info *info);int ethnl_set_debug (struct sk_buff *skb,struct genl_info *info);int ethnl_set_wol (struct sk_buff *skb,struct genl_info *info);int ethnl_set_features (struct sk_buff *skb,struct genl_info *info); +int ethnl_set_privflags (struct sk_buff *skb,struct genl_info *info);#endif /* _NET_ETHTOOL_NETLINK_H */
net/ethtool/privflags.c +70 -0
73 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH v2 9/15 ethtool: add PRIVFLAGS_NTF notification
In reply to Michal KubecekSend ETHTOOL_MSG_PRIVFLAGS_NTF notification whenever private flags of a network device are modified using ETHTOOL_MSG_PRIVFLAGS_SET netlink message or ETHTOOL_SPFLAGS ioctl request.
--- include/uapi/linux/ethtool_netlink.h | 1 + net/ethtool/ioctl.c | 2 ++ net/ethtool/netlink.c | 2 ++ net/ethtool/privflags.c | 3 +++ 4 files changed, 8 insertions(+)
include/uapi/linux/ethtool_netlink.h +1 -0
@@ -51,6 +51,7 @@ enum {ETHTOOL_MSG_FEATURES_SET_REPLY ,ETHTOOL_MSG_FEATURES_NTF ,ETHTOOL_MSG_PRIVFLAGS_GET_REPLY , +ETHTOOL_MSG_PRIVFLAGS_NTF ,/* add new constants above here */ __ETHTOOL_MSG_KERNEL_CNT,
net/ethtool/ioctl.c +2 -0
@@ -2716,6 +2716,8 @@ int dev_ethtool(struct net *net, struct ifreq *ifr)case ETHTOOL_GPFLAGS : rc =ethtool_get_value (dev, useraddr, ethcmd, dev->ethtool_ops->get_priv_flags); +if (!rc) +ethtool_notify (dev,ETHTOOL_MSG_PRIVFLAGS_NTF ,NULL );break ;case ETHTOOL_SPFLAGS : rc = ethtool_set_value(dev, useraddr,
net/ethtool/netlink.c +2 -0
@@ -530,6 +530,7 @@ ethnl_default_notify_ops[ETHTOOL_MSG_KERNEL_MAX + 1] = { [ETHTOOL_MSG_DEBUG_NTF] = ðnl_debug_request_ops, [ETHTOOL_MSG_WOL_NTF] = ðnl_wol_request_ops, [ETHTOOL_MSG_FEATURES_NTF] = ðnl_features_request_ops, + [ETHTOOL_MSG_PRIVFLAGS_NTF] = ðnl_privflags_request_ops, };/* default notification handler */
@@ -616,6 +617,7 @@ static const ethnl_notify_handler_t ethnl_notify_handlers[] = { [ETHTOOL_MSG_DEBUG_NTF] = ethnl_default_notify, [ETHTOOL_MSG_WOL_NTF] = ethnl_default_notify, [ETHTOOL_MSG_FEATURES_NTF] = ethnl_default_notify, + [ETHTOOL_MSG_PRIVFLAGS_NTF] = ethnl_default_notify, };void ethtool_notify (struct net_device *dev,unsigned int cmd,const void *data)
net/ethtool/privflags.c +3 -0
@@ -194,6 +194,9 @@ int ethnl_set_privflags(struct sk_buff *skb, struct genl_info *info)if (ret <0 || !mod) goto out_free; ret = ops->set_priv_flags (dev, flags); +if (ret <0 ) + goto out_free; +ethtool_notify (dev,ETHTOOL_MSG_PRIVFLAGS_NTF ,NULL ); out_free:kfree (names);
Signature · 1 line
2.25.1
PATCH v2 10/15 ethtool: provide ring sizes with RINGS_GET request
In reply to Michal KubecekImplement RINGS_GET request to get ring sizes of a network device. These are traditionally available via ETHTOOL_GRINGPARAM ioctl request.
Omit attributes for ring types which are not supported by driver or device (zero reported for maximum).
v2: (all suggested by Jakub Kicinski)
- minor cleanup in rings_prepare_data()
- more descriptive rings_reply_size()
- omit attributes with zero max size
--- Documentation/networking/ethtool-netlink.rst | 30 +++++- include/uapi/linux/ethtool_netlink.h | 21 ++++ net/ethtool/Makefile | 2 +- net/ethtool/netlink.c | 8 ++ net/ethtool/netlink.h | 1 + net/ethtool/rings.c | 108 +++++++++++++++++++ 6 files changed, 168 insertions(+), 2 deletions(-) create mode 100644 net/ethtool/rings.c
Documentation/networking/ethtool-netlink.rst +29 -1
@@ -193,6 +193,7 @@ Userspace to kernel: ``ETHTOOL_MSG_FEATURES_SET`` set device features ``ETHTOOL_MSG_PRIVFLAGS_GET`` get private flags ``ETHTOOL_MSG_PRIVFLAGS_SET`` set private flags + ``ETHTOOL_MSG_RINGS_GET`` get ring sizes ===================================== ================================ Kernel to userspace:
@@ -213,6 +214,7 @@ Kernel to userspace: ``ETHTOOL_MSG_FEATURES_NTF`` netdev features notification ``ETHTOOL_MSG_PRIVFLAGS_GET_REPLY`` private flags ``ETHTOOL_MSG_PRIVFLAGS_NTF`` private flags + ``ETHTOOL_MSG_RINGS_GET_REPLY`` ring sizes ===================================== ================================= ``GET`` requests are sent by userspace applications to retrieve device
@@ -645,6 +647,32 @@ Request contents: modify only values of some of them. +RINGS_GET +========= + +Gets ring sizes like ``ETHTOOL_GRINGPARAM`` ioctl request. + +Request contents: + + ==================================== ====== ========================== + ``ETHTOOL_A_RINGS_HEADER`` nested request header + ==================================== ====== ========================== + +Kernel response contents: + + ==================================== ====== ========================== + ``ETHTOOL_A_RINGS_HEADER`` nested reply header + ``ETHTOOL_A_RINGS_RX_MAX`` u32 max size of RX ring + ``ETHTOOL_A_RINGS_RX_MINI_MAX`` u32 max size of RX mini ring + ``ETHTOOL_A_RINGS_RX_JUMBO_MAX`` u32 max size of RX jumbo ring + ``ETHTOOL_A_RINGS_TX_MAX`` u32 max size of TX ring + ``ETHTOOL_A_RINGS_RX`` u32 size of RX ring + ``ETHTOOL_A_RINGS_RX_MINI`` u32 size of RX mini ring + ``ETHTOOL_A_RINGS_RX_JUMBO`` u32 size of RX jumbo ring + ``ETHTOOL_A_RINGS_TX`` u32 size of TX ring + ==================================== ====== ========================== + + Request translation ===================
@@ -671,7 +699,7 @@ have their netlink replacement yet. ``ETHTOOL_SEEPROM`` n/a ``ETHTOOL_GCOALESCE`` n/a ``ETHTOOL_SCOALESCE`` n/a - ``ETHTOOL_GRINGPARAM`` n/a + ``ETHTOOL_GRINGPARAM`` ``ETHTOOL_MSG_RINGS_GET`` ``ETHTOOL_SRINGPARAM`` n/a ``ETHTOOL_GPAUSEPARAM`` n/a ``ETHTOOL_SPAUSEPARAM`` n/a
include/uapi/linux/ethtool_netlink.h +21 -0
@@ -28,6 +28,7 @@ enum {ETHTOOL_MSG_FEATURES_SET ,ETHTOOL_MSG_PRIVFLAGS_GET ,ETHTOOL_MSG_PRIVFLAGS_SET , +ETHTOOL_MSG_RINGS_GET ,/* add new constants above here */ __ETHTOOL_MSG_USER_CNT,
@@ -52,6 +53,7 @@ enum {ETHTOOL_MSG_FEATURES_NTF ,ETHTOOL_MSG_PRIVFLAGS_GET_REPLY ,ETHTOOL_MSG_PRIVFLAGS_NTF , +ETHTOOL_MSG_RINGS_GET_REPLY ,/* add new constants above here */ __ETHTOOL_MSG_KERNEL_CNT,
@@ -264,6 +266,25 @@ enum { ETHTOOL_A_PRIVFLAGS_MAX = __ETHTOOL_A_PRIVFLAGS_CNT - 1 }; +/* RINGS */ + +enum { +ETHTOOL_A_RINGS_UNSPEC , +ETHTOOL_A_RINGS_HEADER ,/* nest - _A_HEADER_* */ +ETHTOOL_A_RINGS_RX_MAX ,/* u32 */ +ETHTOOL_A_RINGS_RX_MINI_MAX ,/* u32 */ +ETHTOOL_A_RINGS_RX_JUMBO_MAX ,/* u32 */ +ETHTOOL_A_RINGS_TX_MAX ,/* u32 */ +ETHTOOL_A_RINGS_RX ,/* u32 */ +ETHTOOL_A_RINGS_RX_MINI ,/* u32 */ +ETHTOOL_A_RINGS_RX_JUMBO ,/* u32 */ +ETHTOOL_A_RINGS_TX ,/* u32 */ + +/* add new constants above here */ + __ETHTOOL_A_RINGS_CNT, +ETHTOOL_A_RINGS_MAX = (__ETHTOOL_A_RINGS_CNT -1 ) +}; +/* generic netlink info */ #define ETHTOOL_GENL_NAME "ethtool"#define ETHTOOL_GENL_VERSION 1
net/ethtool/Makefile +1 -1
@@ -5,4 +5,4 @@ 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 \ - linkstate.o debug.o wol.o features.o privflags.o + linkstate.o debug.o wol.o features.o privflags.o rings.o
net/ethtool/netlink.c +8 -0
@@ -217,6 +217,7 @@ ethnl_default_requests[__ETHTOOL_MSG_USER_CNT] = { [ETHTOOL_MSG_WOL_GET] = ðnl_wol_request_ops, [ETHTOOL_MSG_FEATURES_GET] = ðnl_features_request_ops, [ETHTOOL_MSG_PRIVFLAGS_GET] = ðnl_privflags_request_ops, + [ETHTOOL_MSG_RINGS_GET] = ðnl_rings_request_ops, };static struct ethnl_dump_ctx *ethnl_dump_context (struct netlink_callback *cb)
@@ -748,6 +749,13 @@ static const struct genl_ops ethtool_genl_ops[] = { .flags = GENL_UNS_ADMIN_PERM, .doit = ethnl_set_privflags, }, + { + .cmd = ETHTOOL_MSG_RINGS_GET, + .doit = ethnl_default_doit, + .start = ethnl_default_start, + .dumpit = ethnl_default_dumpit, + .done = ethnl_default_done, + }, };static const struct genl_multicast_group ethtool_nl_mcgrps[] = {
net/ethtool/netlink.h +1 -0
@@ -339,6 +339,7 @@ extern const struct ethnl_request_ops ethnl_debug_request_ops;extern const struct ethnl_request_ops ethnl_wol_request_ops;extern const struct ethnl_request_ops ethnl_features_request_ops;extern const struct ethnl_request_ops ethnl_privflags_request_ops; +extern const struct ethnl_request_ops ethnl_rings_request_ops;int ethnl_set_linkinfo (struct sk_buff *skb,struct genl_info *info);int ethnl_set_linkmodes (struct sk_buff *skb,struct genl_info *info);
net/ethtool/rings.c new file +108 -0
108 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH v2 11/15 ethtool: set device ring sizes with RINGS_SET request
In reply to Michal KubecekImplement RINGS_SET netlink request to set ring sizes of a network device. These are traditionally set with ETHTOOL_SRINGPARAM ioctl request.
Like the ioctl implementation, the generic ethtool code checks if supplied values do not exceed driver defined limits; if they do, first offending attribute is reported using extack.
v2:
- fix netdev reference leak in error path (found by Jakub Kicinsky)
--- Documentation/networking/ethtool-netlink.rst | 23 ++++- include/uapi/linux/ethtool_netlink.h | 1 + net/ethtool/netlink.c | 5 ++ net/ethtool/netlink.h | 1 + net/ethtool/rings.c | 89 ++++++++++++++++++++ 5 files changed, 118 insertions(+), 1 deletion(-)
Documentation/networking/ethtool-netlink.rst +22 -1
@@ -194,6 +194,7 @@ Userspace to kernel: ``ETHTOOL_MSG_PRIVFLAGS_GET`` get private flags ``ETHTOOL_MSG_PRIVFLAGS_SET`` set private flags ``ETHTOOL_MSG_RINGS_GET`` get ring sizes + ``ETHTOOL_MSG_RINGS_SET`` set ring sizes ===================================== ================================ Kernel to userspace:
@@ -673,6 +674,26 @@ Kernel response contents: ==================================== ====== ========================== +RINGS_SET +========= + +Sets ring sizes like ``ETHTOOL_SRINGPARAM`` ioctl request. + +Request contents: + + ==================================== ====== ========================== + ``ETHTOOL_A_RINGS_HEADER`` nested reply header + ``ETHTOOL_A_RINGS_RX`` u32 size of RX ring + ``ETHTOOL_A_RINGS_RX_MINI`` u32 size of RX mini ring + ``ETHTOOL_A_RINGS_RX_JUMBO`` u32 size of RX jumbo ring + ``ETHTOOL_A_RINGS_TX`` u32 size of TX ring + ==================================== ====== ========================== + +Kernel checks that requested ring sizes do not exceed limits reported by +driver. Driver may impose additional constraints and may not suspport all +attributes. + + Request translation ===================
@@ -700,7 +721,7 @@ have their netlink replacement yet. ``ETHTOOL_GCOALESCE`` n/a ``ETHTOOL_SCOALESCE`` n/a ``ETHTOOL_GRINGPARAM`` ``ETHTOOL_MSG_RINGS_GET`` - ``ETHTOOL_SRINGPARAM`` n/a + ``ETHTOOL_SRINGPARAM`` ``ETHTOOL_MSG_RINGS_SET`` ``ETHTOOL_GPAUSEPARAM`` n/a ``ETHTOOL_SPAUSEPARAM`` n/a ``ETHTOOL_GRXCSUM`` ``ETHTOOL_MSG_FEATURES_GET``
include/uapi/linux/ethtool_netlink.h +1 -0
@@ -29,6 +29,7 @@ enum {ETHTOOL_MSG_PRIVFLAGS_GET ,ETHTOOL_MSG_PRIVFLAGS_SET ,ETHTOOL_MSG_RINGS_GET , +ETHTOOL_MSG_RINGS_SET ,/* add new constants above here */ __ETHTOOL_MSG_USER_CNT,
net/ethtool/netlink.c +5 -0
@@ -756,6 +756,11 @@ static const struct genl_ops ethtool_genl_ops[] = { .dumpit = ethnl_default_dumpit, .done = ethnl_default_done, }, + { + .cmd = ETHTOOL_MSG_RINGS_SET, + .flags = GENL_UNS_ADMIN_PERM, + .doit = ethnl_set_rings, + }, };static const struct genl_multicast_group ethtool_nl_mcgrps[] = {
net/ethtool/netlink.h +1 -0
@@ -347,5 +347,6 @@ int ethnl_set_debug(struct sk_buff *skb, struct genl_info *info);int ethnl_set_wol (struct sk_buff *skb,struct genl_info *info);int ethnl_set_features (struct sk_buff *skb,struct genl_info *info);int ethnl_set_privflags (struct sk_buff *skb,struct genl_info *info); +int ethnl_set_rings (struct sk_buff *skb,struct genl_info *info);#endif /* _NET_ETHTOOL_NETLINK_H */
net/ethtool/rings.c +89 -0
92 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH v2 12/15 ethtool: add RINGS_NTF notification
In reply to Michal KubecekSend ETHTOOL_MSG_RINGS_NTF notification whenever ring sizes of a network device are modified using ETHTOOL_MSG_RINGS_SET netlink message or ETHTOOL_SRINGPARAM ioctl request.
--- Documentation/networking/ethtool-netlink.rst | 1 + include/uapi/linux/ethtool_netlink.h | 1 + net/ethtool/ioctl.c | 6 +++++- net/ethtool/netlink.c | 2 ++ net/ethtool/rings.c | 3 +++ 5 files changed, 12 insertions(+), 1 deletion(-)
Documentation/networking/ethtool-netlink.rst +1 -0
@@ -216,6 +216,7 @@ Kernel to userspace: ``ETHTOOL_MSG_PRIVFLAGS_GET_REPLY`` private flags ``ETHTOOL_MSG_PRIVFLAGS_NTF`` private flags ``ETHTOOL_MSG_RINGS_GET_REPLY`` ring sizes + ``ETHTOOL_MSG_RINGS_NTF`` ring sizes ===================================== ================================= ``GET`` requests are sent by userspace applications to retrieve device
include/uapi/linux/ethtool_netlink.h +1 -0
@@ -55,6 +55,7 @@ enum {ETHTOOL_MSG_PRIVFLAGS_GET_REPLY ,ETHTOOL_MSG_PRIVFLAGS_NTF ,ETHTOOL_MSG_RINGS_GET_REPLY , +ETHTOOL_MSG_RINGS_NTF ,/* add new constants above here */ __ETHTOOL_MSG_KERNEL_CNT,
net/ethtool/ioctl.c +5 -1
@@ -1635,6 +1635,7 @@ static int ethtool_get_ringparam(struct net_device *dev, void __user *useraddr)static int ethtool_set_ringparam (struct net_device *dev,void __user *useraddr) {struct ethtool_ringparam ringparam, max = { .cmd =ETHTOOL_GRINGPARAM }; +int ret;if (!dev->ethtool_ops->set_ringparam || !dev->ethtool_ops->get_ringparam)return -EOPNOTSUPP ;
@@ -1651,7 +1652,10 @@ static int ethtool_set_ringparam(struct net_device *dev, void __user *useraddr) ringparam.tx_pending > max.tx_max_pending) return -EINVAL; -return dev->ethtool_ops->set_ringparam (dev, &ringparam); + ret = dev->ethtool_ops->set_ringparam (dev, &ringparam); +if (!ret) +ethtool_notify (dev,ETHTOOL_MSG_RINGS_NTF ,NULL ); +return ret; } static noinline_for_stack int ethtool_get_channels(struct net_device *dev,
net/ethtool/netlink.c +2 -0
@@ -532,6 +532,7 @@ ethnl_default_notify_ops[ETHTOOL_MSG_KERNEL_MAX + 1] = { [ETHTOOL_MSG_WOL_NTF] = ðnl_wol_request_ops, [ETHTOOL_MSG_FEATURES_NTF] = ðnl_features_request_ops, [ETHTOOL_MSG_PRIVFLAGS_NTF] = ðnl_privflags_request_ops, + [ETHTOOL_MSG_RINGS_NTF] = ðnl_rings_request_ops, };/* default notification handler */
@@ -619,6 +620,7 @@ static const ethnl_notify_handler_t ethnl_notify_handlers[] = { [ETHTOOL_MSG_WOL_NTF] = ethnl_default_notify, [ETHTOOL_MSG_FEATURES_NTF] = ethnl_default_notify, [ETHTOOL_MSG_PRIVFLAGS_NTF] = ethnl_default_notify, + [ETHTOOL_MSG_RINGS_NTF] = ethnl_default_notify, };void ethtool_notify (struct net_device *dev,unsigned int cmd,const void *data)
net/ethtool/rings.c +3 -0
@@ -186,6 +186,9 @@ int ethnl_set_rings(struct sk_buff *skb, struct genl_info *info) } ret = dev->ethtool_ops->set_ringparam (dev, &ringparam); +if (ret <0 ) + goto out_ops; +ethtool_notify (dev,ETHTOOL_MSG_RINGS_NTF ,NULL ); out_ops:ethnl_ops_complete (dev);
Signature · 1 line
2.25.1
PATCH v2 13/15 ethtool: provide channel counts with CHANNELS_GET request
In reply to Michal KubecekImplement CHANNELS_GET request to get channel counts of a network device. These are traditionally available via ETHTOOL_GCHANNELS ioctl request.
Omit attributes for channel types which are not supported by driver or device (zero reported for maximum).
v2: (all suggested by Jakub Kicinski)
- minor cleanup in channels_prepare_data()
- more descriptive channels_reply_size()
- omit attributes with zero max count
--- Documentation/networking/ethtool-netlink.rst | 30 +++++- include/uapi/linux/ethtool_netlink.h | 21 ++++ net/ethtool/Makefile | 3 +- net/ethtool/channels.c | 108 +++++++++++++++++++ net/ethtool/netlink.c | 8 ++ net/ethtool/netlink.h | 1 + 6 files changed, 169 insertions(+), 2 deletions(-) create mode 100644 net/ethtool/channels.c
Documentation/networking/ethtool-netlink.rst +29 -1
@@ -195,6 +195,7 @@ Userspace to kernel: ``ETHTOOL_MSG_PRIVFLAGS_SET`` set private flags ``ETHTOOL_MSG_RINGS_GET`` get ring sizes ``ETHTOOL_MSG_RINGS_SET`` set ring sizes + ``ETHTOOL_MSG_CHANNELS_GET`` get channel counts ===================================== ================================ Kernel to userspace:
@@ -217,6 +218,7 @@ Kernel to userspace: ``ETHTOOL_MSG_PRIVFLAGS_NTF`` private flags ``ETHTOOL_MSG_RINGS_GET_REPLY`` ring sizes ``ETHTOOL_MSG_RINGS_NTF`` ring sizes + ``ETHTOOL_MSG_CHANNELS_GET_REPLY`` channel counts ===================================== ================================= ``GET`` requests are sent by userspace applications to retrieve device
@@ -695,6 +697,32 @@ driver. Driver may impose additional constraints and may not suspport all attributes. +CHANNELS_GET +============ + +Gets channel counts like ``ETHTOOL_GCHANNELS`` ioctl request. + +Request contents: + + ==================================== ====== ========================== + ``ETHTOOL_A_CHANNELS_HEADER`` nested request header + ==================================== ====== ========================== + +Kernel response contents: + + ===================================== ====== ========================== + ``ETHTOOL_A_CHANNELS_HEADER`` nested reply header + ``ETHTOOL_A_CHANNELS_RX_MAX`` u32 max receive channels + ``ETHTOOL_A_CHANNELS_TX_MAX`` u32 max transmit channels + ``ETHTOOL_A_CHANNELS_OTHER_MAX`` u32 max other channels + ``ETHTOOL_A_CHANNELS_COMBINED_MAX`` u32 max combined channels + ``ETHTOOL_A_CHANNELS_RX_COUNT`` u32 receive channel count + ``ETHTOOL_A_CHANNELS_TX_COUNT`` u32 transmit channel count + ``ETHTOOL_A_CHANNELS_OTHER_COUNT`` u32 other channel count + ``ETHTOOL_A_CHANNELS_COMBINED_COUNT`` u32 combined channel count + ===================================== ====== ========================== + + Request translation ===================
@@ -765,7 +793,7 @@ have their netlink replacement yet. ``ETHTOOL_SRXFHINDIR`` n/a ``ETHTOOL_GFEATURES`` ``ETHTOOL_MSG_FEATURES_GET`` ``ETHTOOL_SFEATURES`` ``ETHTOOL_MSG_FEATURES_SET`` - ``ETHTOOL_GCHANNELS`` n/a + ``ETHTOOL_GCHANNELS`` ``ETHTOOL_MSG_CHANNELS_GET`` ``ETHTOOL_SCHANNELS`` n/a ``ETHTOOL_SET_DUMP`` n/a ``ETHTOOL_GET_DUMP_FLAG`` n/a
include/uapi/linux/ethtool_netlink.h +21 -0
@@ -30,6 +30,7 @@ enum {ETHTOOL_MSG_PRIVFLAGS_SET ,ETHTOOL_MSG_RINGS_GET ,ETHTOOL_MSG_RINGS_SET , +ETHTOOL_MSG_CHANNELS_GET ,/* add new constants above here */ __ETHTOOL_MSG_USER_CNT,
@@ -56,6 +57,7 @@ enum {ETHTOOL_MSG_PRIVFLAGS_NTF ,ETHTOOL_MSG_RINGS_GET_REPLY ,ETHTOOL_MSG_RINGS_NTF , +ETHTOOL_MSG_CHANNELS_GET_REPLY ,/* add new constants above here */ __ETHTOOL_MSG_KERNEL_CNT,
@@ -287,6 +289,25 @@ enum { ETHTOOL_A_RINGS_MAX = (__ETHTOOL_A_RINGS_CNT - 1) }; +/* CHANNELS */ + +enum { +ETHTOOL_A_CHANNELS_UNSPEC , +ETHTOOL_A_CHANNELS_HEADER ,/* nest - _A_HEADER_* */ +ETHTOOL_A_CHANNELS_RX_MAX ,/* u32 */ +ETHTOOL_A_CHANNELS_TX_MAX ,/* u32 */ +ETHTOOL_A_CHANNELS_OTHER_MAX ,/* u32 */ +ETHTOOL_A_CHANNELS_COMBINED_MAX ,/* u32 */ +ETHTOOL_A_CHANNELS_RX_COUNT ,/* u32 */ +ETHTOOL_A_CHANNELS_TX_COUNT ,/* u32 */ +ETHTOOL_A_CHANNELS_OTHER_COUNT ,/* u32 */ +ETHTOOL_A_CHANNELS_COMBINED_COUNT ,/* u32 */ + +/* add new constants above here */ + __ETHTOOL_A_CHANNELS_CNT, +ETHTOOL_A_CHANNELS_MAX = (__ETHTOOL_A_CHANNELS_CNT -1 ) +}; +/* generic netlink info */ #define ETHTOOL_GENL_NAME "ethtool"#define ETHTOOL_GENL_VERSION 1
net/ethtool/Makefile +2 -1
@@ -5,4 +5,5 @@ 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 \ - linkstate.o debug.o wol.o features.o privflags.o rings.o + linkstate.o debug.o wol.o features.o privflags.o rings.o \ + channels.o
net/ethtool/channels.c new file +108 -0
108 lines not on this page · raw message
net/ethtool/netlink.c +8 -0
@@ -218,6 +218,7 @@ ethnl_default_requests[__ETHTOOL_MSG_USER_CNT] = { [ETHTOOL_MSG_FEATURES_GET] = ðnl_features_request_ops, [ETHTOOL_MSG_PRIVFLAGS_GET] = ðnl_privflags_request_ops, [ETHTOOL_MSG_RINGS_GET] = ðnl_rings_request_ops, + [ETHTOOL_MSG_CHANNELS_GET] = ðnl_channels_request_ops, };static struct ethnl_dump_ctx *ethnl_dump_context (struct netlink_callback *cb)
@@ -763,6 +764,13 @@ static const struct genl_ops ethtool_genl_ops[] = { .flags = GENL_UNS_ADMIN_PERM, .doit = ethnl_set_rings, }, + { + .cmd = ETHTOOL_MSG_CHANNELS_GET, + .doit = ethnl_default_doit, + .start = ethnl_default_start, + .dumpit = ethnl_default_dumpit, + .done = ethnl_default_done, + }, };static const struct genl_multicast_group ethtool_nl_mcgrps[] = {
net/ethtool/netlink.h +1 -0
@@ -340,6 +340,7 @@ extern const struct ethnl_request_ops ethnl_wol_request_ops;extern const struct ethnl_request_ops ethnl_features_request_ops;extern const struct ethnl_request_ops ethnl_privflags_request_ops;extern const struct ethnl_request_ops ethnl_rings_request_ops; +extern const struct ethnl_request_ops ethnl_channels_request_ops;int ethnl_set_linkinfo (struct sk_buff *skb,struct genl_info *info);int ethnl_set_linkmodes (struct sk_buff *skb,struct genl_info *info);
Signature · 1 line
2.25.1
PATCH v2 14/15 ethtool: set device channel counts with CHANNELS_SET request
In reply to Michal KubecekImplement CHANNELS_SET netlink request to set channel counts of a network device. These are traditionally set with ETHTOOL_SCHANNELS ioctl request.
Like the ioctl implementation, the generic ethtool code checks if supplied values do not exceed driver defined limits; if they do, first offending attribute is reported using extack. Checks preventing removing channels used for RX indirection table or zerocopy AF_XDP socket are also implemented.
Move ethtool_get_max_rxfh_channel() helper into common.c so that it can be used by both ioctl and netlink code.
v2:
- fix netdev reference leak in error path (found by Jakub Kicinsky)
--- Documentation/networking/ethtool-netlink.rst | 23 +++- include/uapi/linux/ethtool_netlink.h | 1 + net/ethtool/channels.c | 116 +++++++++++++++++++ net/ethtool/common.c | 31 +++++ net/ethtool/common.h | 1 + net/ethtool/ioctl.c | 31 ----- net/ethtool/netlink.c | 5 + net/ethtool/netlink.h | 1 + 8 files changed, 177 insertions(+), 32 deletions(-)
Documentation/networking/ethtool-netlink.rst +22 -1
@@ -196,6 +196,7 @@ Userspace to kernel: ``ETHTOOL_MSG_RINGS_GET`` get ring sizes ``ETHTOOL_MSG_RINGS_SET`` set ring sizes ``ETHTOOL_MSG_CHANNELS_GET`` get channel counts + ``ETHTOOL_MSG_CHANNELS_SET`` set channel counts ===================================== ================================ Kernel to userspace:
@@ -723,6 +724,26 @@ Kernel response contents: ===================================== ====== ========================== +CHANNELS_SET +============ + +Sets channel counts like ``ETHTOOL_SCHANNELS`` ioctl request. + +Request contents: + + ===================================== ====== ========================== + ``ETHTOOL_A_CHANNELS_HEADER`` nested request header + ``ETHTOOL_A_CHANNELS_RX_COUNT`` u32 receive channel count + ``ETHTOOL_A_CHANNELS_TX_COUNT`` u32 transmit channel count + ``ETHTOOL_A_CHANNELS_OTHER_COUNT`` u32 other channel count + ``ETHTOOL_A_CHANNELS_COMBINED_COUNT`` u32 combined channel count + ===================================== ====== ========================== + +Kernel checks that requested channel counts do not exceed limits reported by +driver. Driver may impose additional constraints and may not suspport all +attributes. + + Request translation ===================
@@ -794,7 +815,7 @@ have their netlink replacement yet. ``ETHTOOL_GFEATURES`` ``ETHTOOL_MSG_FEATURES_GET`` ``ETHTOOL_SFEATURES`` ``ETHTOOL_MSG_FEATURES_SET`` ``ETHTOOL_GCHANNELS`` ``ETHTOOL_MSG_CHANNELS_GET`` - ``ETHTOOL_SCHANNELS`` n/a + ``ETHTOOL_SCHANNELS`` ``ETHTOOL_MSG_CHANNELS_SET`` ``ETHTOOL_SET_DUMP`` n/a ``ETHTOOL_GET_DUMP_FLAG`` n/a ``ETHTOOL_GET_DUMP_DATA`` n/a
include/uapi/linux/ethtool_netlink.h +1 -0
@@ -31,6 +31,7 @@ enum {ETHTOOL_MSG_RINGS_GET ,ETHTOOL_MSG_RINGS_SET ,ETHTOOL_MSG_CHANNELS_GET , +ETHTOOL_MSG_CHANNELS_SET ,/* add new constants above here */ __ETHTOOL_MSG_USER_CNT,
net/ethtool/channels.c +116 -0
124 lines not on this page · raw message
net/ethtool/common.c +31 -0
@@ -258,3 +258,34 @@ int __ethtool_get_link(struct net_device *dev)return netif_running (dev) && dev->ethtool_ops->get_link (dev); } + +int ethtool_get_max_rxfh_channel (struct net_device *dev,u32 *max) +{ +u32 dev_size, current_max =0 ; +u32 *indir; +int ret; + +if (!dev->ethtool_ops->get_rxfh_indir_size || + !dev->ethtool_ops->get_rxfh) +return -EOPNOTSUPP ; + dev_size = dev->ethtool_ops->get_rxfh_indir_size (dev); +if (dev_size ==0 ) +return -EOPNOTSUPP ; + + indir =kcalloc (dev_size,sizeof (indir[0 ]),GFP_USER ); +if (!indir) +return -ENOMEM ; + + ret = dev->ethtool_ops->get_rxfh (dev, indir,NULL ,NULL ); +if (ret) + goto out; + +while (dev_size--) + current_max =max (current_max, indir[dev_size]); + + *max = current_max; + +out: +kfree (indir); +return ret; +}
net/ethtool/common.h +1 -0
@@ -29,5 +29,6 @@ int __ethtool_get_link(struct net_device *dev);bool convert_legacy_settings_to_link_ksettings (struct ethtool_link_ksettings *link_ksettings,const struct ethtool_cmd *legacy_settings); +int ethtool_get_max_rxfh_channel (struct net_device *dev,u32 *max);#endif /* _ETHTOOL_COMMON_H */
net/ethtool/ioctl.c +0 -31
@@ -929,37 +929,6 @@ void netdev_rss_key_fill(void *buffer, size_t len) }EXPORT_SYMBOL (netdev_rss_key_fill); -static int ethtool_get_max_rxfh_channel (struct net_device *dev,u32 *max) -{ -u32 dev_size, current_max =0 ; -u32 *indir; -int ret; - -if (!dev->ethtool_ops->get_rxfh_indir_size || - !dev->ethtool_ops->get_rxfh) -return -EOPNOTSUPP ; - dev_size = dev->ethtool_ops->get_rxfh_indir_size (dev); -if (dev_size ==0 ) -return -EOPNOTSUPP ; - - indir =kcalloc (dev_size,sizeof (indir[0 ]),GFP_USER ); -if (!indir) -return -ENOMEM ; - - ret = dev->ethtool_ops->get_rxfh (dev, indir,NULL ,NULL ); -if (ret) - goto out; - -while (dev_size--) - current_max =max (current_max, indir[dev_size]); - - *max = current_max; - -out: -kfree (indir); -return ret; -} - static noinline_for_stack int ethtool_get_rxfh_indir(struct net_device *dev,void __user *useraddr) {
net/ethtool/netlink.c +5 -0
@@ -771,6 +771,11 @@ static const struct genl_ops ethtool_genl_ops[] = { .dumpit = ethnl_default_dumpit, .done = ethnl_default_done, }, + { + .cmd = ETHTOOL_MSG_CHANNELS_SET, + .flags = GENL_UNS_ADMIN_PERM, + .doit = ethnl_set_channels, + }, };static const struct genl_multicast_group ethtool_nl_mcgrps[] = {
net/ethtool/netlink.h +1 -0
@@ -349,5 +349,6 @@ int ethnl_set_wol(struct sk_buff *skb, struct genl_info *info);int ethnl_set_features (struct sk_buff *skb,struct genl_info *info);int ethnl_set_privflags (struct sk_buff *skb,struct genl_info *info);int ethnl_set_rings (struct sk_buff *skb,struct genl_info *info); +int ethnl_set_channels (struct sk_buff *skb,struct genl_info *info);#endif /* _NET_ETHTOOL_NETLINK_H */
Signature · 1 line
2.25.1
PATCH v2 15/15 ethtool: add CHANNELS_NTF notification
In reply to Michal KubecekSend ETHTOOL_MSG_CHANNELS_NTF notification whenever channel counts of a network device are modified using ETHTOOL_MSG_CHANNELS_SET netlink message or ETHTOOL_SCHANNELS ioctl request.
--- Documentation/networking/ethtool-netlink.rst | 1 + include/uapi/linux/ethtool_netlink.h | 1 + net/ethtool/channels.c | 3 +++ net/ethtool/ioctl.c | 6 +++++- net/ethtool/netlink.c | 2 ++ 5 files changed, 12 insertions(+), 1 deletion(-)
Documentation/networking/ethtool-netlink.rst +1 -0
@@ -220,6 +220,7 @@ Kernel to userspace: ``ETHTOOL_MSG_RINGS_GET_REPLY`` ring sizes ``ETHTOOL_MSG_RINGS_NTF`` ring sizes ``ETHTOOL_MSG_CHANNELS_GET_REPLY`` channel counts + ``ETHTOOL_MSG_CHANNELS_NTF`` channel counts ===================================== ================================= ``GET`` requests are sent by userspace applications to retrieve device
include/uapi/linux/ethtool_netlink.h +1 -0
@@ -59,6 +59,7 @@ enum {ETHTOOL_MSG_RINGS_GET_REPLY ,ETHTOOL_MSG_RINGS_NTF ,ETHTOOL_MSG_CHANNELS_GET_REPLY , +ETHTOOL_MSG_CHANNELS_NTF ,/* add new constants above here */ __ETHTOOL_MSG_KERNEL_CNT,
net/ethtool/channels.c +3 -0
@@ -213,6 +213,9 @@ int ethnl_set_channels(struct sk_buff *skb, struct genl_info *info) } ret = dev->ethtool_ops->set_channels (dev, &channels); +if (ret <0 ) + goto out_ops; +ethtool_notify (dev,ETHTOOL_MSG_CHANNELS_NTF ,NULL ); out_ops:ethnl_ops_complete (dev);
net/ethtool/ioctl.c +5 -1
@@ -1649,6 +1649,7 @@ static noinline_for_stack int ethtool_set_channels(struct net_device *dev,u16 from_channel, to_channel;u32 max_rx_in_use =0 ;unsigned int i; +int ret;if (!dev->ethtool_ops->set_channels || !dev->ethtool_ops->get_channels)return -EOPNOTSUPP ;
@@ -1680,7 +1681,10 @@ static noinline_for_stack int ethtool_set_channels(struct net_device *dev,if (xdp_get_umem_from_qid (dev, i))return -EINVAL ; -return dev->ethtool_ops->set_channels (dev, &channels); + ret = dev->ethtool_ops->set_channels (dev, &channels); +if (!ret) +ethtool_notify (dev,ETHTOOL_MSG_CHANNELS_NTF ,NULL ); +return ret; }static int ethtool_get_pauseparam (struct net_device *dev,void __user *useraddr)
net/ethtool/netlink.c +2 -0
@@ -534,6 +534,7 @@ ethnl_default_notify_ops[ETHTOOL_MSG_KERNEL_MAX + 1] = { [ETHTOOL_MSG_FEATURES_NTF] = ðnl_features_request_ops, [ETHTOOL_MSG_PRIVFLAGS_NTF] = ðnl_privflags_request_ops, [ETHTOOL_MSG_RINGS_NTF] = ðnl_rings_request_ops, + [ETHTOOL_MSG_CHANNELS_NTF] = ðnl_channels_request_ops, };/* default notification handler */
@@ -622,6 +623,7 @@ static const ethnl_notify_handler_t ethnl_notify_handlers[] = { [ETHTOOL_MSG_FEATURES_NTF] = ethnl_default_notify, [ETHTOOL_MSG_PRIVFLAGS_NTF] = ethnl_default_notify, [ETHTOOL_MSG_RINGS_NTF] = ethnl_default_notify, + [ETHTOOL_MSG_CHANNELS_NTF] = ethnl_default_notify, };void ethtool_notify (struct net_device *dev,unsigned int cmd,const void *data)
Signature · 1 line
2.25.1
Re: [PATCH net-next v2 10/15] ethtool: provide ring sizes with RINGS_GET request
In reply to Michal KubecekQuoted 6 lines · On Thu, 12 Mar 2020 21:08:23 +0100 (CET) Michal Kubecek wrote:
Implement
RINGS_GETrequest to get ring sizes of a network device. These are traditionally available viaETHTOOL_GRINGPARAMioctl request.Omit attributes for ring types which are not supported by driver or device (zero reported for maximum).
Quoted 6 lines
v2: (all suggested by Jakub Kicinski)
- minor cleanup inrings_prepare_data()
- more descriptiverings_reply_size()
- omit attributes with zero max sizeSigned-off-by Michal Kubecek <[email protected]>
Re: [PATCH net-next v2 11/15] ethtool: set device ring sizes with RINGS_SET request
In reply to Michal KubecekQuoted 11 lines · On Thu, 12 Mar 2020 21:08:28 +0100 (CET) Michal Kubecek wrote:
Implement
RINGS_SETnetlink request to set ring sizes of a network device. These are traditionally set withETHTOOL_SRINGPARAMioctl request.Like the ioctl implementation, the generic ethtool code checks if supplied values do not exceed driver defined limits; if they do, first offending attribute is reported using extack.
v2:
- fix netdev reference leak in error path (found by Jakub Kicinsky)Signed-off-by Michal Kubecek <[email protected]>
Re: [PATCH net-next v2 13/15] ethtool: provide channel counts with CHANNELS_GET request
In reply to Michal KubecekQuoted 6 lines · On Thu, 12 Mar 2020 21:08:38 +0100 (CET) Michal Kubecek wrote:
Implement
CHANNELS_GETrequest to get channel counts of a network device. These are traditionally available viaETHTOOL_GCHANNELSioctl request.Omit attributes for channel types which are not supported by driver or device (zero reported for maximum).
Quoted 6 lines
v2: (all suggested by Jakub Kicinski)
- minor cleanup inchannels_prepare_data()
- more descriptivechannels_reply_size()
- omit attributes with zero max countSigned-off-by Michal Kubecek <[email protected]>
Re: [PATCH net-next v2 14/15] ethtool: set device channel counts with CHANNELS_SET request
In reply to Michal KubecekQuoted 9 lines · On Thu, 12 Mar 2020 21:08:43 +0100 (CET) Michal Kubecek wrote:
Implement
CHANNELS_SETnetlink request to set channel counts of a network device. These are traditionally set withETHTOOL_SCHANNELSioctl request.Like the ioctl implementation, the generic ethtool code checks if supplied values do not exceed driver defined limits; if they do, first offending attribute is reported using extack. Checks preventing removing channels used for RX indirection table or zerocopy
AF_XDPsocket are also implemented.
Quoted 7 lines
Move
ethtool_get_max_rxfh_channel()helper intocommon.cso that it can be used by both ioctl and netlink code.v2:
- fix netdev reference leak in error path (found by Jakub Kicinsky)Signed-off-by Michal Kubecek <[email protected]>
Thanks!
David Miller
maintainerFrom: Michal Kubecek <[email protected]>
Date: Thu, 12 Mar 2020 21:07:33 +0100 (CET)
Quoted 11 lines
Implementation of more netlink request types:
- netdev features (ethtool -k/-K, patches 3-6)
- private flags (--show-priv-flags / --set-priv-flags, patches 7-9)
- ring sizes (ethtool -g/-G, patches 10-12)
- channel counts (ethtool -l/-L, patches 13-15)Patch 1 is a style cleanup suggested in part 2 review and patch 2 updates the mapping between netdev features and legacy ioctl requests (which are still used by ethtool for backward compatibility).
Quoted 10 lines
Changes in v2:
- fix netdev reference leaks in error path ofethnl_set_rings()andethnl_set_channels()(found by Jakub Kicinski)
- use__set_bit()rather thanset_bit()(suggested by David Miller)
- in replies toRINGS_GETandCHANNELS_GETrequests, omit ring and channel types not supported by driver/device (suggested by Jakub Kicinski)
- more descriptive message size calculations inrings_reply_size()andchannels_reply_size()(suggested by Jakub Kicinski)
- coding style cleanup (suggested by Jakub Kicinski)
Series applied, thanks Michal.