ethtool netlink interface, part 4
Subsystems (5)
v3 cover ethtool netlink interface, part 4
Implementation of more netlink request types:
- coalescing (ethtool -c/-C, patches 2-4)
- pause parameters (ethtool -a/-A, patches 5-7)
- EEE settings (--show-eee / --set-eee, patches 8-10)
- timestamping info (-T, patches 11-12)
Patch 1 is a fix for netdev reference leak similar to commit 2f599ec422ad ("ethtool: fix reference leak in some *_SET handlers") but fixing a code
Changes in v3
- change "one-step-*" Tx type names to "onestep-*", (patch 11, suggested by Richard Cochran
- use "TSINFO" rather than "TIMESTAMP" for timestamping information constants and adjust symbol names (patch 12, suggested by Richard Cochran)
Changes in v2:
- fix compiler warning in net_hwtstamp_validate() (patch 11)
- fix follow-up lines alignment (whitespace only, patches 3 and 8)
which is only in net-next tree at the moment.
Michal Kubecek (12):
ethtool: fix reference leak in ethnl_set_privflags()
ethtool: provide coalescing parameters with COALESCE_GET request
ethtool: set coalescing parameters with COALESCE_SET request
ethtool: add COALESCE_NTF notification
ethtool: provide pause parameters with PAUSE_GET request
ethtool: set pause parameters with PAUSE_SET request
ethtool: add PAUSE_NTF notification
ethtool: provide EEE settings with EEE_GET request
ethtool: set EEE settings with EEE_SET request
ethtool: add EEE_NTF notification
ethtool: add timestamping related string sets
ethtool: provide timestamping information with TSINFO_GET request
Documentation/networking/ethtool-netlink.rst | 225 +++++++++++- include/uapi/linux/ethtool.h | 6 + include/uapi/linux/ethtool_netlink.h | 93 +++++ include/uapi/linux/net_tstamp.h | 6 + net/core/dev_ioctl.c | 6 + net/ethtool/Makefile | 2 +- net/ethtool/coalesce.c | 353 +++++++++++++++++++ net/ethtool/common.c | 70 ++++ net/ethtool/common.h | 6 + net/ethtool/eee.c | 206 +++++++++++ net/ethtool/ioctl.c | 41 +-- net/ethtool/netlink.c | 53 +++ net/ethtool/netlink.h | 7 + net/ethtool/pause.c | 145 ++++++++ net/ethtool/privflags.c | 4 +- net/ethtool/strset.c | 15 + net/ethtool/tsinfo.c | 143 ++++++++ 17 files changed, 1350 insertions(+), 31 deletions(-) create mode 100644 net/ethtool/coalesce.c create mode 100644 net/ethtool/eee.c create mode 100644 net/ethtool/pause.c create mode 100644 net/ethtool/tsinfo.c
Signature · 1 line
2.25.1
PATCH v3 1/12 ethtool: fix reference leak in ethnl_set_privflags()
Andrew noticed that some handlers for *_SET commands leak a netdev reference if required ethtool_ops callbacks do not exist. One of them is ethnl_set_privflags(), a simple reproducer would be e.g.
ip link add veth1 type veth peer name veth2
ethtool --set-priv-flags veth1 foo on
ip link del veth1
Make sure dev_put() is called when ethtool_ops check fails.
--- net/ethtool/privflags.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
net/ethtool/privflags.c +3 -1
@@ -175,9 +175,10 @@ int ethnl_set_privflags(struct sk_buff *skb, struct genl_info *info)return ret; dev = req_info.dev; ops = dev->ethtool_ops; + ret = -EOPNOTSUPP ;if (!ops->get_priv_flags || !ops->set_priv_flags || !ops->get_sset_count || !ops->get_strings) -return -EOPNOTSUPP ; + goto out_dev;rtnl_lock (); ret =ethnl_ops_begin (dev);
@@ -204,6 +205,7 @@ int ethnl_set_privflags(struct sk_buff *skb, struct genl_info *info)ethnl_ops_complete (dev); out_rtnl:rtnl_unlock (); +out_dev:dev_put (dev);return ret; }
Signature · 1 line
2.25.1
PATCH v3 2/12 ethtool: provide coalescing parameters with COALESCE_GET request
In reply to Michal KubecekImplement COALESCE_GET request to get coalescing parameters of a network device. These are traditionally available via ETHTOOL_GCOALESCE ioctl request. This commit adds only support for device coalescing parameters, not per queue coalescing parameters.
Omit attributes with zero values unless they are declared as supported (i.e. the corresponding bit in ethtool_ops::supported_coalesce_params is set).
--- Documentation/networking/ethtool-netlink.rst | 48 ++++- include/uapi/linux/ethtool_netlink.h | 35 +++ net/ethtool/Makefile | 2 +- net/ethtool/coalesce.c | 214 +++++++++++++++++++ net/ethtool/netlink.c | 8 + net/ethtool/netlink.h | 1 + 6 files changed, 306 insertions(+), 2 deletions(-) create mode 100644 net/ethtool/coalesce.c
Documentation/networking/ethtool-netlink.rst +47 -1
@@ -197,6 +197,7 @@ Userspace to kernel: ``ETHTOOL_MSG_RINGS_SET`` set ring sizes ``ETHTOOL_MSG_CHANNELS_GET`` get channel counts ``ETHTOOL_MSG_CHANNELS_SET`` set channel counts + ``ETHTOOL_MSG_COALESCE_GET`` get coalescing parameters ===================================== ================================ Kernel to userspace:
@@ -221,6 +222,7 @@ Kernel to userspace: ``ETHTOOL_MSG_RINGS_NTF`` ring sizes ``ETHTOOL_MSG_CHANNELS_GET_REPLY`` channel counts ``ETHTOOL_MSG_CHANNELS_NTF`` channel counts + ``ETHTOOL_MSG_COALESCE_GET_REPLY`` coalescing parameters ===================================== ================================= ``GET`` requests are sent by userspace applications to retrieve device
@@ -745,6 +747,50 @@ driver. Driver may impose additional constraints and may not suspport all attributes. +COALESCE_GET +============ + +Gets coalescing parameters like ``ETHTOOL_GCOALESCE`` ioctl request. + +Request contents: + + ==================================== ====== ========================== + ``ETHTOOL_A_COALESCE_HEADER`` nested request header + ==================================== ====== ========================== + +Kernel response contents: + + =========================================== ====== ======================= + ``ETHTOOL_A_COALESCE_HEADER`` nested reply header + ``ETHTOOL_A_COALESCE_RX_USECS`` u32 delay (us), normal Rx + ``ETHTOOL_A_COALESCE_RX_MAX_FRAMES`` u32 max packets, normal Rx + ``ETHTOOL_A_COALESCE_RX_USECS_IRQ`` u32 delay (us), Rx in IRQ + ``ETHTOOL_A_COALESCE_RX_MAX_FRAMES_IRQ`` u32 max packets, Rx in IRQ + ``ETHTOOL_A_COALESCE_TX_USECS`` u32 delay (us), normal Tx + ``ETHTOOL_A_COALESCE_TX_MAX_FRAMES`` u32 max packets, normal Tx + ``ETHTOOL_A_COALESCE_TX_USECS_IRQ`` u32 delay (us), Tx in IRQ + ``ETHTOOL_A_COALESCE_TX_MAX_FRAMES_IRQ`` u32 IRQ packets, Tx in IRQ + ``ETHTOOL_A_COALESCE_STATS_BLOCK_USECS`` u32 delay of stats update + ``ETHTOOL_A_COALESCE_USE_ADAPTIVE_RX`` bool adaptive Rx coalesce + ``ETHTOOL_A_COALESCE_USE_ADAPTIVE_TX`` bool adaptive Tx coalesce + ``ETHTOOL_A_COALESCE_PKT_RATE_LOW`` u32 threshold for low rate + ``ETHTOOL_A_COALESCE_RX_USECS_LOW`` u32 delay (us), low Rx + ``ETHTOOL_A_COALESCE_RX_MAX_FRAMES_LOW`` u32 max packets, low Rx + ``ETHTOOL_A_COALESCE_TX_USECS_LOW`` u32 delay (us), low Tx + ``ETHTOOL_A_COALESCE_TX_MAX_FRAMES_LOW`` u32 max packets, low Tx + ``ETHTOOL_A_COALESCE_PKT_RATE_HIGH`` u32 threshold for high rate + ``ETHTOOL_A_COALESCE_RX_USECS_HIGH`` u32 delay (us), high Rx + ``ETHTOOL_A_COALESCE_RX_MAX_FRAMES_HIGH`` u32 max packets, high Rx + ``ETHTOOL_A_COALESCE_TX_USECS_HIGH`` u32 delay (us), high Tx + ``ETHTOOL_A_COALESCE_TX_MAX_FRAMES_HIGH`` u32 max packets, high Tx + ``ETHTOOL_A_COALESCE_RATE_SAMPLE_INTERVAL`` u32 rate sampling interval + =========================================== ====== ======================= + +Attributes are only included in reply if their value is not zero or the +corresponding bit in ``ethtool_ops::supported_coalesce_params`` is set (i.e. +they are declared as supported by driver). + + Request translation ===================
@@ -769,7 +815,7 @@ have their netlink replacement yet. ``ETHTOOL_GLINK`` ``ETHTOOL_MSG_LINKSTATE_GET`` ``ETHTOOL_GEEPROM`` n/a ``ETHTOOL_SEEPROM`` n/a - ``ETHTOOL_GCOALESCE`` n/a + ``ETHTOOL_GCOALESCE`` ``ETHTOOL_MSG_COALESCE_GET`` ``ETHTOOL_SCOALESCE`` n/a ``ETHTOOL_GRINGPARAM`` ``ETHTOOL_MSG_RINGS_GET`` ``ETHTOOL_SRINGPARAM`` ``ETHTOOL_MSG_RINGS_SET``
include/uapi/linux/ethtool_netlink.h +35 -0
@@ -32,6 +32,7 @@ enum {ETHTOOL_MSG_RINGS_SET ,ETHTOOL_MSG_CHANNELS_GET ,ETHTOOL_MSG_CHANNELS_SET , +ETHTOOL_MSG_COALESCE_GET ,/* add new constants above here */ __ETHTOOL_MSG_USER_CNT,
@@ -60,6 +61,7 @@ enum {ETHTOOL_MSG_RINGS_NTF ,ETHTOOL_MSG_CHANNELS_GET_REPLY ,ETHTOOL_MSG_CHANNELS_NTF , +ETHTOOL_MSG_COALESCE_GET_REPLY ,/* add new constants above here */ __ETHTOOL_MSG_KERNEL_CNT,
@@ -310,6 +312,39 @@ enum { ETHTOOL_A_CHANNELS_MAX = (__ETHTOOL_A_CHANNELS_CNT - 1) }; +/* COALESCE */ + +enum { +ETHTOOL_A_COALESCE_UNSPEC , +ETHTOOL_A_COALESCE_HEADER ,/* nest - _A_HEADER_* */ +ETHTOOL_A_COALESCE_RX_USECS ,/* u32 */ +ETHTOOL_A_COALESCE_RX_MAX_FRAMES ,/* u32 */ +ETHTOOL_A_COALESCE_RX_USECS_IRQ ,/* u32 */ +ETHTOOL_A_COALESCE_RX_MAX_FRAMES_IRQ ,/* u32 */ +ETHTOOL_A_COALESCE_TX_USECS ,/* u32 */ +ETHTOOL_A_COALESCE_TX_MAX_FRAMES ,/* u32 */ +ETHTOOL_A_COALESCE_TX_USECS_IRQ ,/* u32 */ +ETHTOOL_A_COALESCE_TX_MAX_FRAMES_IRQ ,/* u32 */ +ETHTOOL_A_COALESCE_STATS_BLOCK_USECS ,/* u32 */ +ETHTOOL_A_COALESCE_USE_ADAPTIVE_RX ,/* u8 */ +ETHTOOL_A_COALESCE_USE_ADAPTIVE_TX ,/* u8 */ +ETHTOOL_A_COALESCE_PKT_RATE_LOW ,/* u32 */ +ETHTOOL_A_COALESCE_RX_USECS_LOW ,/* u32 */ +ETHTOOL_A_COALESCE_RX_MAX_FRAMES_LOW ,/* u32 */ +ETHTOOL_A_COALESCE_TX_USECS_LOW ,/* u32 */ +ETHTOOL_A_COALESCE_TX_MAX_FRAMES_LOW ,/* u32 */ +ETHTOOL_A_COALESCE_PKT_RATE_HIGH ,/* u32 */ +ETHTOOL_A_COALESCE_RX_USECS_HIGH ,/* u32 */ +ETHTOOL_A_COALESCE_RX_MAX_FRAMES_HIGH ,/* u32 */ +ETHTOOL_A_COALESCE_TX_USECS_HIGH ,/* u32 */ +ETHTOOL_A_COALESCE_TX_MAX_FRAMES_HIGH ,/* u32 */ +ETHTOOL_A_COALESCE_RATE_SAMPLE_INTERVAL ,/* u32 */ + +/* add new constants above here */ + __ETHTOOL_A_COALESCE_CNT, +ETHTOOL_A_COALESCE_MAX = (__ETHTOOL_A_COALESCE_CNT -1 ) +}; +/* generic netlink info */ #define ETHTOOL_GENL_NAME "ethtool"#define ETHTOOL_GENL_VERSION 1
net/ethtool/Makefile +1 -1
@@ -6,4 +6,4 @@ 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 \ - channels.o + channels.o coalesce.o
net/ethtool/coalesce.c new file +214 -0
214 lines not on this page · raw message
net/ethtool/netlink.c +8 -0
@@ -227,6 +227,7 @@ ethnl_default_requests[__ETHTOOL_MSG_USER_CNT] = { [ETHTOOL_MSG_PRIVFLAGS_GET] = ðnl_privflags_request_ops, [ETHTOOL_MSG_RINGS_GET] = ðnl_rings_request_ops, [ETHTOOL_MSG_CHANNELS_GET] = ðnl_channels_request_ops, + [ETHTOOL_MSG_COALESCE_GET] = ðnl_coalesce_request_ops, };static struct ethnl_dump_ctx *ethnl_dump_context (struct netlink_callback *cb)
@@ -786,6 +787,13 @@ static const struct genl_ops ethtool_genl_ops[] = { .flags = GENL_UNS_ADMIN_PERM, .doit = ethnl_set_channels, }, + { + .cmd = ETHTOOL_MSG_COALESCE_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
@@ -341,6 +341,7 @@ 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; +extern const struct ethnl_request_ops ethnl_coalesce_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 v3 3/12 ethtool: set coalescing parameters with COALESCE_SET request
In reply to Michal KubecekImplement COALESCE_SET netlink request to set coalescing parameters of a network device. These are traditionally set with ETHTOOL_SCOALESCE ioctl request. This commit adds only support for device coalescing parameters, not per queue coalescing parameters.
Like the ioctl implementation, the generic ethtool code checks if only supported parameters are modified; if not, first offending attribute is reported using extack.
v2: fix alignment (whitespace only)
--- Documentation/networking/ethtool-netlink.rst | 42 +++++- include/uapi/linux/ethtool_netlink.h | 1 + net/ethtool/coalesce.c | 136 +++++++++++++++++++ net/ethtool/netlink.c | 5 + net/ethtool/netlink.h | 1 + 5 files changed, 184 insertions(+), 1 deletion(-)
Documentation/networking/ethtool-netlink.rst +41 -1
@@ -198,6 +198,7 @@ Userspace to kernel: ``ETHTOOL_MSG_CHANNELS_GET`` get channel counts ``ETHTOOL_MSG_CHANNELS_SET`` set channel counts ``ETHTOOL_MSG_COALESCE_GET`` get coalescing parameters + ``ETHTOOL_MSG_COALESCE_SET`` set coalescing parameters ===================================== ================================ Kernel to userspace:
@@ -791,6 +792,45 @@ corresponding bit in ``ethtool_ops::supported_coalesce_params`` is set (i.e. they are declared as supported by driver). +COALESCE_SET +============ + +Sets coalescing parameters like ``ETHTOOL_SCOALESCE`` ioctl request. + +Request contents: + + =========================================== ====== ======================= + ``ETHTOOL_A_COALESCE_HEADER`` nested request header + ``ETHTOOL_A_COALESCE_RX_USECS`` u32 delay (us), normal Rx + ``ETHTOOL_A_COALESCE_RX_MAX_FRAMES`` u32 max packets, normal Rx + ``ETHTOOL_A_COALESCE_RX_USECS_IRQ`` u32 delay (us), Rx in IRQ + ``ETHTOOL_A_COALESCE_RX_MAX_FRAMES_IRQ`` u32 max packets, Rx in IRQ + ``ETHTOOL_A_COALESCE_TX_USECS`` u32 delay (us), normal Tx + ``ETHTOOL_A_COALESCE_TX_MAX_FRAMES`` u32 max packets, normal Tx + ``ETHTOOL_A_COALESCE_TX_USECS_IRQ`` u32 delay (us), Tx in IRQ + ``ETHTOOL_A_COALESCE_TX_MAX_FRAMES_IRQ`` u32 IRQ packets, Tx in IRQ + ``ETHTOOL_A_COALESCE_STATS_BLOCK_USECS`` u32 delay of stats update + ``ETHTOOL_A_COALESCE_USE_ADAPTIVE_RX`` bool adaptive Rx coalesce + ``ETHTOOL_A_COALESCE_USE_ADAPTIVE_TX`` bool adaptive Tx coalesce + ``ETHTOOL_A_COALESCE_PKT_RATE_LOW`` u32 threshold for low rate + ``ETHTOOL_A_COALESCE_RX_USECS_LOW`` u32 delay (us), low Rx + ``ETHTOOL_A_COALESCE_RX_MAX_FRAMES_LOW`` u32 max packets, low Rx + ``ETHTOOL_A_COALESCE_TX_USECS_LOW`` u32 delay (us), low Tx + ``ETHTOOL_A_COALESCE_TX_MAX_FRAMES_LOW`` u32 max packets, low Tx + ``ETHTOOL_A_COALESCE_PKT_RATE_HIGH`` u32 threshold for high rate + ``ETHTOOL_A_COALESCE_RX_USECS_HIGH`` u32 delay (us), high Rx + ``ETHTOOL_A_COALESCE_RX_MAX_FRAMES_HIGH`` u32 max packets, high Rx + ``ETHTOOL_A_COALESCE_TX_USECS_HIGH`` u32 delay (us), high Tx + ``ETHTOOL_A_COALESCE_TX_MAX_FRAMES_HIGH`` u32 max packets, high Tx + ``ETHTOOL_A_COALESCE_RATE_SAMPLE_INTERVAL`` u32 rate sampling interval + =========================================== ====== ======================= + +Request is rejected if it attributes declared as unsupported by driver (i.e. +such that the corresponding bit in ``ethtool_ops::supported_coalesce_params`` +is not set), regardless of their values. Driver may impose additional +constraints on coalescing parameters and their values. + + Request translation ===================
@@ -816,7 +856,7 @@ have their netlink replacement yet. ``ETHTOOL_GEEPROM`` n/a ``ETHTOOL_SEEPROM`` n/a ``ETHTOOL_GCOALESCE`` ``ETHTOOL_MSG_COALESCE_GET`` - ``ETHTOOL_SCOALESCE`` n/a + ``ETHTOOL_SCOALESCE`` ``ETHTOOL_MSG_COALESCE_SET`` ``ETHTOOL_GRINGPARAM`` ``ETHTOOL_MSG_RINGS_GET`` ``ETHTOOL_SRINGPARAM`` ``ETHTOOL_MSG_RINGS_SET`` ``ETHTOOL_GPAUSEPARAM`` n/a
include/uapi/linux/ethtool_netlink.h +1 -0
@@ -33,6 +33,7 @@ enum {ETHTOOL_MSG_CHANNELS_GET ,ETHTOOL_MSG_CHANNELS_SET ,ETHTOOL_MSG_COALESCE_GET , +ETHTOOL_MSG_COALESCE_SET ,/* add new constants above here */ __ETHTOOL_MSG_USER_CNT,
net/ethtool/coalesce.c +136 -0
139 lines not on this page · raw message
net/ethtool/netlink.c +5 -0
@@ -794,6 +794,11 @@ static const struct genl_ops ethtool_genl_ops[] = { .dumpit = ethnl_default_dumpit, .done = ethnl_default_done, }, + { + .cmd = ETHTOOL_MSG_COALESCE_SET, + .flags = GENL_UNS_ADMIN_PERM, + .doit = ethnl_set_coalesce, + }, };static const struct genl_multicast_group ethtool_nl_mcgrps[] = {
net/ethtool/netlink.h +1 -0
@@ -351,5 +351,6 @@ 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); +int ethnl_set_coalesce (struct sk_buff *skb,struct genl_info *info);#endif /* _NET_ETHTOOL_NETLINK_H */
Signature · 1 line
2.25.1
PATCH v3 4/12 ethtool: add COALESCE_NTF notification
In reply to Michal KubecekSend ETHTOOL_MSG_COALESCE_NTF notification whenever coalescing parameters of a network device are modified using ETHTOOL_MSG_COALESCE_SET netlink message or ETHTOOL_SCOALESCE ioctl request.
--- Documentation/networking/ethtool-netlink.rst | 1 + include/uapi/linux/ethtool_netlink.h | 1 + net/ethtool/coalesce.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
@@ -224,6 +224,7 @@ Kernel to userspace: ``ETHTOOL_MSG_CHANNELS_GET_REPLY`` channel counts ``ETHTOOL_MSG_CHANNELS_NTF`` channel counts ``ETHTOOL_MSG_COALESCE_GET_REPLY`` coalescing parameters + ``ETHTOOL_MSG_COALESCE_NTF`` coalescing parameters ===================================== ================================= ``GET`` requests are sent by userspace applications to retrieve device
include/uapi/linux/ethtool_netlink.h +1 -0
@@ -63,6 +63,7 @@ enum {ETHTOOL_MSG_CHANNELS_GET_REPLY ,ETHTOOL_MSG_CHANNELS_NTF ,ETHTOOL_MSG_COALESCE_GET_REPLY , +ETHTOOL_MSG_COALESCE_NTF ,/* add new constants above here */ __ETHTOOL_MSG_KERNEL_CNT,
net/ethtool/coalesce.c +3 -0
@@ -339,6 +339,9 @@ int ethnl_set_coalesce(struct sk_buff *skb, struct genl_info *info) goto out_ops; ret = dev->ethtool_ops->set_coalesce (dev, &coalesce); +if (ret <0 ) + goto out_ops; +ethtool_notify (dev,ETHTOOL_MSG_COALESCE_NTF ,NULL ); out_ops:ethnl_ops_complete (dev);
net/ethtool/ioctl.c +5 -1
@@ -1571,6 +1571,7 @@ static noinline_for_stack int ethtool_set_coalesce(struct net_device *dev, void __user *useraddr) {struct ethtool_coalesce coalesce; +int ret;if (!dev->ethtool_ops->set_coalesce)return -EOPNOTSUPP ;
@@ -1581,7 +1582,10 @@ static noinline_for_stack int ethtool_set_coalesce(struct net_device *dev,if (!ethtool_set_coalesce_supported (dev, &coalesce))return -EOPNOTSUPP ; -return dev->ethtool_ops->set_coalesce (dev, &coalesce); + ret = dev->ethtool_ops->set_coalesce (dev, &coalesce); +if (!ret) +ethtool_notify (dev,ETHTOOL_MSG_COALESCE_NTF ,NULL ); +return ret; }static int ethtool_get_ringparam (struct net_device *dev,void __user *useraddr)
net/ethtool/netlink.c +2 -0
@@ -544,6 +544,7 @@ ethnl_default_notify_ops[ETHTOOL_MSG_KERNEL_MAX + 1] = { [ETHTOOL_MSG_PRIVFLAGS_NTF] = ðnl_privflags_request_ops, [ETHTOOL_MSG_RINGS_NTF] = ðnl_rings_request_ops, [ETHTOOL_MSG_CHANNELS_NTF] = ðnl_channels_request_ops, + [ETHTOOL_MSG_COALESCE_NTF] = ðnl_coalesce_request_ops, };/* default notification handler */
@@ -633,6 +634,7 @@ static const ethnl_notify_handler_t ethnl_notify_handlers[] = { [ETHTOOL_MSG_PRIVFLAGS_NTF] = ethnl_default_notify, [ETHTOOL_MSG_RINGS_NTF] = ethnl_default_notify, [ETHTOOL_MSG_CHANNELS_NTF] = ethnl_default_notify, + [ETHTOOL_MSG_COALESCE_NTF] = ethnl_default_notify, };void ethtool_notify (struct net_device *dev,unsigned int cmd,const void *data)
Signature · 1 line
2.25.1
PATCH v3 5/12 ethtool: provide pause parameters with PAUSE_GET request
In reply to Michal KubecekImplement PAUSE_GET request to get pause parameters of a network device. These are traditionally available via ETHTOOL_GPAUSEPARAM ioctl request.
--- Documentation/networking/ethtool-netlink.rst | 40 +++++++++- include/uapi/linux/ethtool_netlink.h | 16 ++++ net/ethtool/Makefile | 2 +- net/ethtool/netlink.c | 8 ++ net/ethtool/netlink.h | 1 + net/ethtool/pause.c | 81 ++++++++++++++++++++ 6 files changed, 146 insertions(+), 2 deletions(-) create mode 100644 net/ethtool/pause.c
Documentation/networking/ethtool-netlink.rst +39 -1
@@ -199,6 +199,7 @@ Userspace to kernel: ``ETHTOOL_MSG_CHANNELS_SET`` set channel counts ``ETHTOOL_MSG_COALESCE_GET`` get coalescing parameters ``ETHTOOL_MSG_COALESCE_SET`` set coalescing parameters + ``ETHTOOL_MSG_PAUSE_GET`` get pause parameters ===================================== ================================ Kernel to userspace:
@@ -225,6 +226,7 @@ Kernel to userspace: ``ETHTOOL_MSG_CHANNELS_NTF`` channel counts ``ETHTOOL_MSG_COALESCE_GET_REPLY`` coalescing parameters ``ETHTOOL_MSG_COALESCE_NTF`` coalescing parameters + ``ETHTOOL_MSG_PAUSE_GET_REPLY`` pause parameters ===================================== ================================= ``GET`` requests are sent by userspace applications to retrieve device
@@ -832,6 +834,42 @@ is not set), regardless of their values. Driver may impose additional constraints on coalescing parameters and their values. +PAUSE_GET +============ + +Gets channel counts like ``ETHTOOL_GPAUSE`` ioctl request. + +Request contents: + + ===================================== ====== ========================== + ``ETHTOOL_A_PAUSE_HEADER`` nested request header + ===================================== ====== ========================== + +Kernel response contents: + + ===================================== ====== ========================== + ``ETHTOOL_A_PAUSE_HEADER`` nested request header + ``ETHTOOL_A_PAUSE_AUTONEG`` bool pause autonegotiation + ``ETHTOOL_A_PAUSE_RX`` bool receive pause frames + ``ETHTOOL_A_PAUSE_TX`` bool transmit pause frames + ===================================== ====== ========================== + + +PAUSE_SET +============ + +Sets pause parameters like ``ETHTOOL_GPAUSEPARAM`` ioctl request. + +Request contents: + + ===================================== ====== ========================== + ``ETHTOOL_A_PAUSE_HEADER`` nested request header + ``ETHTOOL_A_PAUSE_AUTONEG`` bool pause autonegotiation + ``ETHTOOL_A_PAUSE_RX`` bool receive pause frames + ``ETHTOOL_A_PAUSE_TX`` bool transmit pause frames + ===================================== ====== ========================== + + Request translation ===================
@@ -860,7 +898,7 @@ have their netlink replacement yet. ``ETHTOOL_SCOALESCE`` ``ETHTOOL_MSG_COALESCE_SET`` ``ETHTOOL_GRINGPARAM`` ``ETHTOOL_MSG_RINGS_GET`` ``ETHTOOL_SRINGPARAM`` ``ETHTOOL_MSG_RINGS_SET`` - ``ETHTOOL_GPAUSEPARAM`` n/a + ``ETHTOOL_GPAUSEPARAM`` ``ETHTOOL_MSG_PAUSE_GET`` ``ETHTOOL_SPAUSEPARAM`` n/a ``ETHTOOL_GRXCSUM`` ``ETHTOOL_MSG_FEATURES_GET`` ``ETHTOOL_SRXCSUM`` ``ETHTOOL_MSG_FEATURES_SET``
include/uapi/linux/ethtool_netlink.h +16 -0
@@ -34,6 +34,7 @@ enum {ETHTOOL_MSG_CHANNELS_SET ,ETHTOOL_MSG_COALESCE_GET ,ETHTOOL_MSG_COALESCE_SET , +ETHTOOL_MSG_PAUSE_GET ,/* add new constants above here */ __ETHTOOL_MSG_USER_CNT,
@@ -64,6 +65,7 @@ enum {ETHTOOL_MSG_CHANNELS_NTF ,ETHTOOL_MSG_COALESCE_GET_REPLY ,ETHTOOL_MSG_COALESCE_NTF , +ETHTOOL_MSG_PAUSE_GET_REPLY ,/* add new constants above here */ __ETHTOOL_MSG_KERNEL_CNT,
@@ -347,6 +349,20 @@ enum { ETHTOOL_A_COALESCE_MAX = (__ETHTOOL_A_COALESCE_CNT - 1) }; +/* PAUSE */ + +enum { +ETHTOOL_A_PAUSE_UNSPEC , +ETHTOOL_A_PAUSE_HEADER ,/* nest - _A_HEADER_* */ +ETHTOOL_A_PAUSE_AUTONEG ,/* u8 */ +ETHTOOL_A_PAUSE_RX ,/* u8 */ +ETHTOOL_A_PAUSE_TX ,/* u8 */ + +/* add new constants above here */ + __ETHTOOL_A_PAUSE_CNT, +ETHTOOL_A_PAUSE_MAX = (__ETHTOOL_A_PAUSE_CNT -1 ) +}; +/* generic netlink info */ #define ETHTOOL_GENL_NAME "ethtool"#define ETHTOOL_GENL_VERSION 1
net/ethtool/Makefile +1 -1
@@ -6,4 +6,4 @@ 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 \ - channels.o coalesce.o + channels.o coalesce.o pause.o
net/ethtool/netlink.c +8 -0
@@ -228,6 +228,7 @@ ethnl_default_requests[__ETHTOOL_MSG_USER_CNT] = { [ETHTOOL_MSG_RINGS_GET] = ðnl_rings_request_ops, [ETHTOOL_MSG_CHANNELS_GET] = ðnl_channels_request_ops, [ETHTOOL_MSG_COALESCE_GET] = ðnl_coalesce_request_ops, + [ETHTOOL_MSG_PAUSE_GET] = ðnl_pause_request_ops, };static struct ethnl_dump_ctx *ethnl_dump_context (struct netlink_callback *cb)
@@ -801,6 +802,13 @@ static const struct genl_ops ethtool_genl_ops[] = { .flags = GENL_UNS_ADMIN_PERM, .doit = ethnl_set_coalesce, }, + { + .cmd = ETHTOOL_MSG_PAUSE_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
@@ -342,6 +342,7 @@ 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;extern const struct ethnl_request_ops ethnl_coalesce_request_ops; +extern const struct ethnl_request_ops ethnl_pause_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/pause.c new file +81 -0
81 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH v3 6/12 ethtool: set pause parameters with PAUSE_SET request
In reply to Michal KubecekImplement PAUSE_SET netlink request to set pause parameters of a network device. Thease are traditionally set with ETHTOOL_SPAUSEPARAM ioctl request.
--- Documentation/networking/ethtool-netlink.rst | 3 +- include/uapi/linux/ethtool_netlink.h | 1 + net/ethtool/netlink.c | 5 ++ net/ethtool/netlink.h | 1 + net/ethtool/pause.c | 61 ++++++++++++++++++++ 5 files changed, 70 insertions(+), 1 deletion(-)
Documentation/networking/ethtool-netlink.rst +2 -1
@@ -200,6 +200,7 @@ Userspace to kernel: ``ETHTOOL_MSG_COALESCE_GET`` get coalescing parameters ``ETHTOOL_MSG_COALESCE_SET`` set coalescing parameters ``ETHTOOL_MSG_PAUSE_GET`` get pause parameters + ``ETHTOOL_MSG_PAUSE_SET`` set pause parameters ===================================== ================================ Kernel to userspace:
@@ -899,7 +900,7 @@ have their netlink replacement yet. ``ETHTOOL_GRINGPARAM`` ``ETHTOOL_MSG_RINGS_GET`` ``ETHTOOL_SRINGPARAM`` ``ETHTOOL_MSG_RINGS_SET`` ``ETHTOOL_GPAUSEPARAM`` ``ETHTOOL_MSG_PAUSE_GET`` - ``ETHTOOL_SPAUSEPARAM`` n/a + ``ETHTOOL_SPAUSEPARAM`` ``ETHTOOL_MSG_PAUSE_SET`` ``ETHTOOL_GRXCSUM`` ``ETHTOOL_MSG_FEATURES_GET`` ``ETHTOOL_SRXCSUM`` ``ETHTOOL_MSG_FEATURES_SET`` ``ETHTOOL_GTXCSUM`` ``ETHTOOL_MSG_FEATURES_GET``
include/uapi/linux/ethtool_netlink.h +1 -0
@@ -35,6 +35,7 @@ enum {ETHTOOL_MSG_COALESCE_GET ,ETHTOOL_MSG_COALESCE_SET ,ETHTOOL_MSG_PAUSE_GET , +ETHTOOL_MSG_PAUSE_SET ,/* add new constants above here */ __ETHTOOL_MSG_USER_CNT,
net/ethtool/netlink.c +5 -0
@@ -809,6 +809,11 @@ static const struct genl_ops ethtool_genl_ops[] = { .dumpit = ethnl_default_dumpit, .done = ethnl_default_done, }, + { + .cmd = ETHTOOL_MSG_PAUSE_SET, + .flags = GENL_UNS_ADMIN_PERM, + .doit = ethnl_set_pause, + }, };static const struct genl_multicast_group ethtool_nl_mcgrps[] = {
net/ethtool/netlink.h +1 -0
@@ -353,5 +353,6 @@ 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);int ethnl_set_coalesce (struct sk_buff *skb,struct genl_info *info); +int ethnl_set_pause (struct sk_buff *skb,struct genl_info *info);#endif /* _NET_ETHTOOL_NETLINK_H */
net/ethtool/pause.c +61 -0
64 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH v3 7/12 ethtool: add PAUSE_NTF notification
In reply to Michal KubecekSend ETHTOOL_MSG_PAUSE_NTF notification whenever pause parameters of a network device are modified using ETHTOOL_MSG_PAUSE_SET netlink message or ETHTOOL_SPAUSEPARAM 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/pause.c | 3 +++ 5 files changed, 12 insertions(+), 1 deletion(-)
Documentation/networking/ethtool-netlink.rst +1 -0
@@ -228,6 +228,7 @@ Kernel to userspace: ``ETHTOOL_MSG_COALESCE_GET_REPLY`` coalescing parameters ``ETHTOOL_MSG_COALESCE_NTF`` coalescing parameters ``ETHTOOL_MSG_PAUSE_GET_REPLY`` pause parameters + ``ETHTOOL_MSG_PAUSE_NTF`` pause parameters ===================================== ================================= ``GET`` requests are sent by userspace applications to retrieve device
include/uapi/linux/ethtool_netlink.h +1 -0
@@ -67,6 +67,7 @@ enum {ETHTOOL_MSG_COALESCE_GET_REPLY ,ETHTOOL_MSG_COALESCE_NTF ,ETHTOOL_MSG_PAUSE_GET_REPLY , +ETHTOOL_MSG_PAUSE_NTF ,/* add new constants above here */ __ETHTOOL_MSG_KERNEL_CNT,
net/ethtool/ioctl.c +5 -1
@@ -1705,6 +1705,7 @@ static int ethtool_get_pauseparam(struct net_device *dev, void __user *useraddr)static int ethtool_set_pauseparam (struct net_device *dev,void __user *useraddr) {struct ethtool_pauseparam pauseparam; +int ret;if (!dev->ethtool_ops->set_pauseparam)return -EOPNOTSUPP ;
@@ -1712,7 +1713,10 @@ static int ethtool_set_pauseparam(struct net_device *dev, void __user *useraddr)if (copy_from_user (&pauseparam, useraddr,sizeof (pauseparam)))return -EFAULT ; -return dev->ethtool_ops->set_pauseparam (dev, &pauseparam); + ret = dev->ethtool_ops->set_pauseparam (dev, &pauseparam); +if (!ret) +ethtool_notify (dev,ETHTOOL_MSG_PAUSE_NTF ,NULL ); +return ret; }static int ethtool_self_test (struct net_device *dev,char __user *useraddr)
net/ethtool/netlink.c +2 -0
@@ -546,6 +546,7 @@ ethnl_default_notify_ops[ETHTOOL_MSG_KERNEL_MAX + 1] = { [ETHTOOL_MSG_RINGS_NTF] = ðnl_rings_request_ops, [ETHTOOL_MSG_CHANNELS_NTF] = ðnl_channels_request_ops, [ETHTOOL_MSG_COALESCE_NTF] = ðnl_coalesce_request_ops, + [ETHTOOL_MSG_PAUSE_NTF] = ðnl_pause_request_ops, };/* default notification handler */
@@ -636,6 +637,7 @@ static const ethnl_notify_handler_t ethnl_notify_handlers[] = { [ETHTOOL_MSG_RINGS_NTF] = ethnl_default_notify, [ETHTOOL_MSG_CHANNELS_NTF] = ethnl_default_notify, [ETHTOOL_MSG_COALESCE_NTF] = ethnl_default_notify, + [ETHTOOL_MSG_PAUSE_NTF] = ethnl_default_notify, };void ethtool_notify (struct net_device *dev,unsigned int cmd,const void *data)
net/ethtool/pause.c +3 -0
@@ -131,6 +131,9 @@ int ethnl_set_pause(struct sk_buff *skb, struct genl_info *info) goto out_ops; ret = dev->ethtool_ops->set_pauseparam (dev, ¶ms); +if (ret <0 ) + goto out_ops; +ethtool_notify (dev,ETHTOOL_MSG_PAUSE_NTF ,NULL ); out_ops:ethnl_ops_complete (dev);
Signature · 1 line
2.25.1
PATCH v3 8/12 ethtool: provide EEE settings with EEE_GET request
In reply to Michal KubecekImplement EEE_GET request to get EEE settings of a network device. These are traditionally available via ETHTOOL_GEEE ioctl request.
The netlink interface allows reporting EEE status for all link modes supported by kernel but only first 32 link modes are provided at the moment as only those are reported by the ethtool_ops callback and drivers.
v2: fix alignment (whitespace only)
--- Documentation/networking/ethtool-netlink.rst | 34 ++++- include/uapi/linux/ethtool_netlink.h | 19 +++ net/ethtool/Makefile | 2 +- net/ethtool/eee.c | 130 +++++++++++++++++++ net/ethtool/netlink.c | 8 ++ net/ethtool/netlink.h | 1 + 6 files changed, 192 insertions(+), 2 deletions(-) create mode 100644 net/ethtool/eee.c
Documentation/networking/ethtool-netlink.rst +33 -1
@@ -201,6 +201,7 @@ Userspace to kernel: ``ETHTOOL_MSG_COALESCE_SET`` set coalescing parameters ``ETHTOOL_MSG_PAUSE_GET`` get pause parameters ``ETHTOOL_MSG_PAUSE_SET`` set pause parameters + ``ETHTOOL_MSG_EEE_GET`` get EEE settings ===================================== ================================ Kernel to userspace:
@@ -229,6 +230,7 @@ Kernel to userspace: ``ETHTOOL_MSG_COALESCE_NTF`` coalescing parameters ``ETHTOOL_MSG_PAUSE_GET_REPLY`` pause parameters ``ETHTOOL_MSG_PAUSE_NTF`` pause parameters + ``ETHTOOL_MSG_EEE_GET_REPLY`` EEE settings ===================================== ================================= ``GET`` requests are sent by userspace applications to retrieve device
@@ -872,6 +874,36 @@ Request contents: ===================================== ====== ========================== +EEE_GET +======= + +Gets channel counts like ``ETHTOOL_GEEE`` ioctl request. + +Request contents: + + ===================================== ====== ========================== + ``ETHTOOL_A_EEE_HEADER`` nested request header + ===================================== ====== ========================== + +Kernel response contents: + + ===================================== ====== ========================== + ``ETHTOOL_A_EEE_HEADER`` nested request header + ``ETHTOOL_A_EEE_MODES_OURS`` bool supported/advertised modes + ``ETHTOOL_A_EEE_MODES_PEER`` bool peer advertised link modes + ``ETHTOOL_A_EEE_ACTIVE`` bool EEE is actively used + ``ETHTOOL_A_EEE_ENABLED`` bool EEE is enabled + ``ETHTOOL_A_EEE_TX_LPI_ENABLED`` bool Tx lpi enabled + ``ETHTOOL_A_EEE_TX_LPI_TIMER`` u32 Tx lpi timeout (in us) + ===================================== ====== ========================== + +In ``ETHTOOL_A_EEE_MODES_OURS``, mask consists of link modes for which EEE is +enabled, value of link modes for which EEE is advertised. Link modes for which +peer advertises EEE are listed in ``ETHTOOL_A_EEE_MODES_PEER`` (no mask). The +netlink interface allows reporting EEE status for all link modes but only +first 32 are provided by the ``ethtool_ops`` callback. + + Request translation ===================
@@ -950,7 +982,7 @@ have their netlink replacement yet. ``ETHTOOL_GET_TS_INFO`` n/a ``ETHTOOL_GMODULEINFO`` n/a ``ETHTOOL_GMODULEEEPROM`` n/a - ``ETHTOOL_GEEE`` n/a + ``ETHTOOL_GEEE`` ``ETHTOOL_MSG_EEE_GET`` ``ETHTOOL_SEEE`` n/a ``ETHTOOL_GRSSH`` n/a ``ETHTOOL_SRSSH`` n/a
include/uapi/linux/ethtool_netlink.h +19 -0
@@ -36,6 +36,7 @@ enum {ETHTOOL_MSG_COALESCE_SET ,ETHTOOL_MSG_PAUSE_GET ,ETHTOOL_MSG_PAUSE_SET , +ETHTOOL_MSG_EEE_GET ,/* add new constants above here */ __ETHTOOL_MSG_USER_CNT,
@@ -68,6 +69,7 @@ enum {ETHTOOL_MSG_COALESCE_NTF ,ETHTOOL_MSG_PAUSE_GET_REPLY ,ETHTOOL_MSG_PAUSE_NTF , +ETHTOOL_MSG_EEE_GET_REPLY ,/* add new constants above here */ __ETHTOOL_MSG_KERNEL_CNT,
@@ -365,6 +367,23 @@ enum { ETHTOOL_A_PAUSE_MAX = (__ETHTOOL_A_PAUSE_CNT - 1) }; +/* EEE */ + +enum { +ETHTOOL_A_EEE_UNSPEC , +ETHTOOL_A_EEE_HEADER ,/* nest - _A_HEADER_* */ +ETHTOOL_A_EEE_MODES_OURS ,/* bitset */ +ETHTOOL_A_EEE_MODES_PEER ,/* bitset */ +ETHTOOL_A_EEE_ACTIVE ,/* u8 */ +ETHTOOL_A_EEE_ENABLED ,/* u8 */ +ETHTOOL_A_EEE_TX_LPI_ENABLED ,/* u8 */ +ETHTOOL_A_EEE_TX_LPI_TIMER ,/* u32 */ + +/* add new constants above here */ + __ETHTOOL_A_EEE_CNT, +ETHTOOL_A_EEE_MAX = (__ETHTOOL_A_EEE_CNT -1 ) +}; +/* generic netlink info */ #define ETHTOOL_GENL_NAME "ethtool"#define ETHTOOL_GENL_VERSION 1
net/ethtool/Makefile +1 -1
@@ -6,4 +6,4 @@ 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 \ - channels.o coalesce.o pause.o + channels.o coalesce.o pause.o eee.o
net/ethtool/eee.c new file +130 -0
130 lines not on this page · raw message
net/ethtool/netlink.c +8 -0
@@ -229,6 +229,7 @@ ethnl_default_requests[__ETHTOOL_MSG_USER_CNT] = { [ETHTOOL_MSG_CHANNELS_GET] = ðnl_channels_request_ops, [ETHTOOL_MSG_COALESCE_GET] = ðnl_coalesce_request_ops, [ETHTOOL_MSG_PAUSE_GET] = ðnl_pause_request_ops, + [ETHTOOL_MSG_EEE_GET] = ðnl_eee_request_ops, };static struct ethnl_dump_ctx *ethnl_dump_context (struct netlink_callback *cb)
@@ -816,6 +817,13 @@ static const struct genl_ops ethtool_genl_ops[] = { .flags = GENL_UNS_ADMIN_PERM, .doit = ethnl_set_pause, }, + { + .cmd = ETHTOOL_MSG_EEE_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
@@ -343,6 +343,7 @@ extern const struct ethnl_request_ops ethnl_rings_request_ops;extern const struct ethnl_request_ops ethnl_channels_request_ops;extern const struct ethnl_request_ops ethnl_coalesce_request_ops;extern const struct ethnl_request_ops ethnl_pause_request_ops; +extern const struct ethnl_request_ops ethnl_eee_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 v3 9/12 ethtool: set EEE settings with EEE_SET request
In reply to Michal KubecekImplement EEE_SET netlink request to set EEE settings of a network device. These are traditionally set with ETHTOOL_SEEE ioctl request.
The netlink interface allows setting the EEE status for all link modes supported by kernel but only first 32 link modes can be set at the moment as only those are supported by the ethtool_ops callback.
--- Documentation/networking/ethtool-netlink.rst | 25 ++++++- include/uapi/linux/ethtool_netlink.h | 1 + net/ethtool/eee.c | 73 ++++++++++++++++++++ net/ethtool/netlink.c | 5 ++ net/ethtool/netlink.h | 1 + 5 files changed, 104 insertions(+), 1 deletion(-)
Documentation/networking/ethtool-netlink.rst +24 -1
@@ -202,6 +202,7 @@ Userspace to kernel: ``ETHTOOL_MSG_PAUSE_GET`` get pause parameters ``ETHTOOL_MSG_PAUSE_SET`` set pause parameters ``ETHTOOL_MSG_EEE_GET`` get EEE settings + ``ETHTOOL_MSG_EEE_SET`` set EEE settings ===================================== ================================ Kernel to userspace:
@@ -904,6 +905,28 @@ netlink interface allows reporting EEE status for all link modes but only first 32 are provided by the ``ethtool_ops`` callback. +EEE_SET +======= + +Sets pause parameters like ``ETHTOOL_GEEEPARAM`` ioctl request. + +Request contents: + + ===================================== ====== ========================== + ``ETHTOOL_A_EEE_HEADER`` nested request header + ``ETHTOOL_A_EEE_MODES_OURS`` bool advertised modes + ``ETHTOOL_A_EEE_ENABLED`` bool EEE is enabled + ``ETHTOOL_A_EEE_TX_LPI_ENABLED`` bool Tx lpi enabled + ``ETHTOOL_A_EEE_TX_LPI_TIMER`` u32 Tx lpi timeout (in us) + ===================================== ====== ========================== + +``ETHTOOL_A_EEE_MODES_OURS`` is used to either list link modes to advertise +EEE for (if there is no mask) or specify changes to the list (if there is +a mask). The netlink interface allows reporting EEE status for all link modes +but only first 32 can be set at the moment as that is what the ``ethtool_ops`` +callback supports. + + Request translation ===================
@@ -983,7 +1006,7 @@ have their netlink replacement yet. ``ETHTOOL_GMODULEINFO`` n/a ``ETHTOOL_GMODULEEEPROM`` n/a ``ETHTOOL_GEEE`` ``ETHTOOL_MSG_EEE_GET`` - ``ETHTOOL_SEEE`` n/a + ``ETHTOOL_SEEE`` ``ETHTOOL_MSG_EEE_SET`` ``ETHTOOL_GRSSH`` n/a ``ETHTOOL_SRSSH`` n/a ``ETHTOOL_GTUNABLE`` n/a
include/uapi/linux/ethtool_netlink.h +1 -0
@@ -37,6 +37,7 @@ enum {ETHTOOL_MSG_PAUSE_GET ,ETHTOOL_MSG_PAUSE_SET ,ETHTOOL_MSG_EEE_GET , +ETHTOOL_MSG_EEE_SET ,/* add new constants above here */ __ETHTOOL_MSG_USER_CNT,
net/ethtool/eee.c +73 -0
76 lines not on this page · raw message
net/ethtool/netlink.c +5 -0
@@ -824,6 +824,11 @@ static const struct genl_ops ethtool_genl_ops[] = { .dumpit = ethnl_default_dumpit, .done = ethnl_default_done, }, + { + .cmd = ETHTOOL_MSG_EEE_SET, + .flags = GENL_UNS_ADMIN_PERM, + .doit = ethnl_set_eee, + }, };static const struct genl_multicast_group ethtool_nl_mcgrps[] = {
net/ethtool/netlink.h +1 -0
@@ -355,5 +355,6 @@ int ethnl_set_rings(struct sk_buff *skb, struct genl_info *info);int ethnl_set_channels (struct sk_buff *skb,struct genl_info *info);int ethnl_set_coalesce (struct sk_buff *skb,struct genl_info *info);int ethnl_set_pause (struct sk_buff *skb,struct genl_info *info); +int ethnl_set_eee (struct sk_buff *skb,struct genl_info *info);#endif /* _NET_ETHTOOL_NETLINK_H */
Signature · 1 line
2.25.1
PATCH v3 10/12 ethtool: add EEE_NTF notification
In reply to Michal KubecekSend ETHTOOL_MSG_EEE_NTF notification whenever EEE settings of a network device are modified using ETHTOOL_MSG_EEE_SET netlink message or ETHTOOL_SEEE ioctl request.
--- Documentation/networking/ethtool-netlink.rst | 1 + include/uapi/linux/ethtool_netlink.h | 1 + net/ethtool/eee.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
@@ -232,6 +232,7 @@ Kernel to userspace: ``ETHTOOL_MSG_PAUSE_GET_REPLY`` pause parameters ``ETHTOOL_MSG_PAUSE_NTF`` pause parameters ``ETHTOOL_MSG_EEE_GET_REPLY`` EEE settings + ``ETHTOOL_MSG_EEE_NTF`` EEE settings ===================================== ================================= ``GET`` requests are sent by userspace applications to retrieve device
include/uapi/linux/ethtool_netlink.h +1 -0
@@ -71,6 +71,7 @@ enum {ETHTOOL_MSG_PAUSE_GET_REPLY ,ETHTOOL_MSG_PAUSE_NTF ,ETHTOOL_MSG_EEE_GET_REPLY , +ETHTOOL_MSG_EEE_NTF ,/* add new constants above here */ __ETHTOOL_MSG_KERNEL_CNT,
net/ethtool/eee.c +3 -0
@@ -192,6 +192,9 @@ int ethnl_set_eee(struct sk_buff *skb, struct genl_info *info) goto out_ops; ret = dev->ethtool_ops->set_eee (dev, &eee); +if (ret <0 ) + goto out_ops; +ethtool_notify (dev,ETHTOOL_MSG_EEE_NTF ,NULL ); out_ops:ethnl_ops_complete (dev);
net/ethtool/ioctl.c +5 -1
@@ -1354,6 +1354,7 @@ static int ethtool_get_eee(struct net_device *dev, char __user *useraddr)static int ethtool_set_eee (struct net_device *dev,char __user *useraddr) {struct ethtool_eee edata; +int ret;if (!dev->ethtool_ops->set_eee)return -EOPNOTSUPP ;
@@ -1361,7 +1362,10 @@ static int ethtool_set_eee(struct net_device *dev, char __user *useraddr)if (copy_from_user (&edata, useraddr,sizeof (edata)))return -EFAULT ; -return dev->ethtool_ops->set_eee (dev, &edata); + ret = dev->ethtool_ops->set_eee (dev, &edata); +if (!ret) +ethtool_notify (dev,ETHTOOL_MSG_EEE_NTF ,NULL ); +return ret; }static int ethtool_nway_reset (struct net_device *dev)
net/ethtool/netlink.c +2 -0
@@ -548,6 +548,7 @@ ethnl_default_notify_ops[ETHTOOL_MSG_KERNEL_MAX + 1] = { [ETHTOOL_MSG_CHANNELS_NTF] = ðnl_channels_request_ops, [ETHTOOL_MSG_COALESCE_NTF] = ðnl_coalesce_request_ops, [ETHTOOL_MSG_PAUSE_NTF] = ðnl_pause_request_ops, + [ETHTOOL_MSG_EEE_NTF] = ðnl_eee_request_ops, };/* default notification handler */
@@ -639,6 +640,7 @@ static const ethnl_notify_handler_t ethnl_notify_handlers[] = { [ETHTOOL_MSG_CHANNELS_NTF] = ethnl_default_notify, [ETHTOOL_MSG_COALESCE_NTF] = ethnl_default_notify, [ETHTOOL_MSG_PAUSE_NTF] = ethnl_default_notify, + [ETHTOOL_MSG_EEE_NTF] = ethnl_default_notify, };void ethtool_notify (struct net_device *dev,unsigned int cmd,const void *data)
Signature · 1 line
2.25.1
PATCH v3 11/12 ethtool: add timestamping related string sets
In reply to Michal KubecekAdd three string sets related to timestamping information:
ETH_SS_SOF_TIMESTAMPING: SOF_TIMESTAMPING_* flags
ETH_SS_TS_TX_TYPES: timestamping Tx types
ETH_SS_TS_RX_FILTERS: timestamping Rx filters
These will be used for TIMESTAMP_GET request.
v2: avoid compiler warning ("enumeration value not handled in switch")
in net_hwtstamp_validate()
v3: omit dash in Tx type names ("one-step-*" -> "onestep-*"), suggested by
Richard Cochran
--- include/uapi/linux/ethtool.h | 6 ++++ include/uapi/linux/net_tstamp.h | 6 ++++ net/core/dev_ioctl.c | 6 ++++ net/ethtool/common.c | 49 +++++++++++++++++++++++++++++++++ net/ethtool/common.h | 5 ++++ net/ethtool/strset.c | 15 ++++++++++ 6 files changed, 87 insertions(+)
include/uapi/linux/ethtool.h +6 -0
@@ -596,6 +596,9 @@ struct ethtool_pauseparam {* @ETH_SS_LINK_MODES: link mode names * @ETH_SS_MSG_CLASSES: debug message class names * @ETH_SS_WOL_MODES: wake-on-lan modes +* @ETH_SS_SOF_TIMESTAMPING: SOF_TIMESTAMPING_* flags +* @ETH_SS_TS_TX_TYPES: timestamping Tx types +* @ETH_SS_TS_RX_FILTERS: timestamping Rx filters */ enum ethtool_stringset {ETH_SS_TEST =0 ,
@@ -610,6 +613,9 @@ enum ethtool_stringset {ETH_SS_LINK_MODES ,ETH_SS_MSG_CLASSES ,ETH_SS_WOL_MODES , +ETH_SS_SOF_TIMESTAMPING , +ETH_SS_TS_TX_TYPES , +ETH_SS_TS_RX_FILTERS ,/* add new constants above here */ ETH_SS_COUNT
include/uapi/linux/net_tstamp.h +6 -0
@@ -98,6 +98,9 @@ enum hwtstamp_tx_types {* receive a time stamp via the socket error queue. */ HWTSTAMP_TX_ONESTEP_P2P , + +/* add new constants above here */ + __HWTSTAMP_TX_CNT };/* possible values for hwtstamp_config->rx_filter */
@@ -140,6 +143,9 @@ enum hwtstamp_rx_filters {/* NTP, UDP, all versions and packet modes */ HWTSTAMP_FILTER_NTP_ALL , + +/* add new constants above here */ + __HWTSTAMP_FILTER_CNT };/* SCM_TIMESTAMPING_PKTINFO control message */
net/core/dev_ioctl.c +6 -0
@@ -190,6 +190,9 @@ static int net_hwtstamp_validate(struct ifreq *ifr)case HWTSTAMP_TX_ONESTEP_P2P : tx_type_valid =1 ;break ; +case __HWTSTAMP_TX_CNT: +/* not a real value */ +break ; }switch (rx_filter) {
@@ -211,6 +214,9 @@ static int net_hwtstamp_validate(struct ifreq *ifr)case HWTSTAMP_FILTER_NTP_ALL : rx_filter_valid =1 ;break ; +case __HWTSTAMP_FILTER_CNT: +/* not a real value */ +break ; }if (!tx_type_valid || !rx_filter_valid)
net/ethtool/common.c +49 -0
60 lines not on this page · raw message
net/ethtool/common.h +5 -0
@@ -12,6 +12,8 @@#define ETHTOOL_LINK_MODE (speed, type, duplex) \ ETHTOOL_LINK_MODE_ ## speed ## base ## type ## _ ## duplex ## _BIT +#define __SOF_TIMESTAMPING_CNT (const_ilog2(SOF_TIMESTAMPING_LAST) + 1) +extern const char netdev_features_strings[NETDEV_FEATURE_COUNT ][ETH_GSTRING_LEN ]; extern const char
@@ -23,6 +25,9 @@ phy_tunable_strings[__ETHTOOL_PHY_TUNABLE_COUNT][ETH_GSTRING_LEN];extern const char link_mode_names[][ETH_GSTRING_LEN ];extern const char netif_msg_class_names[][ETH_GSTRING_LEN ];extern const char wol_mode_names[][ETH_GSTRING_LEN ]; +extern const char sof_timestamping_names[][ETH_GSTRING_LEN ]; +extern const char ts_tx_type_names[][ETH_GSTRING_LEN ]; +extern const char ts_rx_filter_names[][ETH_GSTRING_LEN ];int __ethtool_get_link (struct net_device *dev);
net/ethtool/strset.c +15 -0
@@ -60,6 +60,21 @@ static const struct strset_info info_template[] = { .count = WOL_MODE_COUNT, .strings = wol_mode_names, }, + [ETH_SS_SOF_TIMESTAMPING] = { + .per_dev = false, + .count = __SOF_TIMESTAMPING_CNT, + .strings = sof_timestamping_names, + }, + [ETH_SS_TS_TX_TYPES] = { + .per_dev = false, + .count = __HWTSTAMP_TX_CNT, + .strings = ts_tx_type_names, + }, + [ETH_SS_TS_RX_FILTERS] = { + .per_dev = false, + .count = __HWTSTAMP_FILTER_CNT, + .strings = ts_rx_filter_names, + }, };struct strset_req_info {
Signature · 1 line
2.25.1
PATCH v3 12/12 ethtool: provide timestamping information with TSINFO_GET request
In reply to Michal KubecekImplement TSINFO_GET request to get timestamping information for a network device. This is traditionally available via ETHTOOL_GET_TS_INFO ioctl request.
Move part of ethtool_get_ts_info() into common.c so that ioctl and netlink code use the same logic to get timestamping information from the device.
v3: use "TSINFO" rather than "TIMESTAMP", suggested by Richard Cochran
--- Documentation/networking/ethtool-netlink.rst | 30 +++- include/uapi/linux/ethtool_netlink.h | 17 +++ net/ethtool/Makefile | 2 +- net/ethtool/common.c | 21 +++ net/ethtool/common.h | 1 + net/ethtool/ioctl.c | 23 +-- net/ethtool/netlink.c | 8 ++ net/ethtool/netlink.h | 1 + net/ethtool/tsinfo.c | 143 +++++++++++++++++++ 9 files changed, 225 insertions(+), 21 deletions(-) create mode 100644 net/ethtool/tsinfo.c
Documentation/networking/ethtool-netlink.rst +29 -1
@@ -203,6 +203,7 @@ Userspace to kernel: ``ETHTOOL_MSG_PAUSE_SET`` set pause parameters ``ETHTOOL_MSG_EEE_GET`` get EEE settings ``ETHTOOL_MSG_EEE_SET`` set EEE settings + ``ETHTOOL_MSG_TSINFO_GET`` get timestamping info ===================================== ================================ Kernel to userspace:
@@ -233,6 +234,7 @@ Kernel to userspace: ``ETHTOOL_MSG_PAUSE_NTF`` pause parameters ``ETHTOOL_MSG_EEE_GET_REPLY`` EEE settings ``ETHTOOL_MSG_EEE_NTF`` EEE settings + ``ETHTOOL_MSG_TSINFO_GET_REPLY`` timestamping info ===================================== ================================= ``GET`` requests are sent by userspace applications to retrieve device
@@ -928,6 +930,32 @@ but only first 32 can be set at the moment as that is what the ``ethtool_ops`` callback supports. +TSINFO_GET +========== + +Gets timestamping information like ``ETHTOOL_GET_TS_INFO`` ioctl request. + +Request contents: + + ===================================== ====== ========================== + ``ETHTOOL_A_TSINFO_HEADER`` nested request header + ===================================== ====== ========================== + +Kernel response contents: + + ===================================== ====== ========================== + ``ETHTOOL_A_TSINFO_HEADER`` nested request header + ``ETHTOOL_A_TSINFO_TIMESTAMPING`` bitset SO_TIMESTAMPING flags + ``ETHTOOL_A_TSINFO_TX_TYPES`` bitset supported Tx types + ``ETHTOOL_A_TSINFO_RX_FILTERS`` bitset supported Rx filters + ``ETHTOOL_A_TSINFO_PHC_INDEX`` u32 PTP hw clock index + ===================================== ====== ========================== + +``ETHTOOL_A_TSINFO_PHC_INDEX`` is absent if there is no associated PHC (there +is no special value for this case). The bitset attributes are omitted if they +would be empty (no bit set). + + Request translation ===================
@@ -1003,7 +1031,7 @@ have their netlink replacement yet. ``ETHTOOL_SET_DUMP`` n/a ``ETHTOOL_GET_DUMP_FLAG`` n/a ``ETHTOOL_GET_DUMP_DATA`` n/a - ``ETHTOOL_GET_TS_INFO`` n/a + ``ETHTOOL_GET_TS_INFO`` ``ETHTOOL_MSG_TSINFO_GET`` ``ETHTOOL_GMODULEINFO`` n/a ``ETHTOOL_GMODULEEEPROM`` n/a ``ETHTOOL_GEEE`` ``ETHTOOL_MSG_EEE_GET``
include/uapi/linux/ethtool_netlink.h +17 -0
@@ -38,6 +38,7 @@ enum {ETHTOOL_MSG_PAUSE_SET ,ETHTOOL_MSG_EEE_GET ,ETHTOOL_MSG_EEE_SET , +ETHTOOL_MSG_TSINFO_GET ,/* add new constants above here */ __ETHTOOL_MSG_USER_CNT,
@@ -72,6 +73,7 @@ enum {ETHTOOL_MSG_PAUSE_NTF ,ETHTOOL_MSG_EEE_GET_REPLY ,ETHTOOL_MSG_EEE_NTF , +ETHTOOL_MSG_TSINFO_GET_REPLY ,/* add new constants above here */ __ETHTOOL_MSG_KERNEL_CNT,
@@ -386,6 +388,21 @@ enum { ETHTOOL_A_EEE_MAX = (__ETHTOOL_A_EEE_CNT - 1) }; +/* TSINFO */ + +enum { +ETHTOOL_A_TSINFO_UNSPEC , +ETHTOOL_A_TSINFO_HEADER ,/* nest - _A_HEADER_* */ +ETHTOOL_A_TSINFO_TIMESTAMPING ,/* bitset */ +ETHTOOL_A_TSINFO_TX_TYPES ,/* bitset */ +ETHTOOL_A_TSINFO_RX_FILTERS ,/* bitset */ +ETHTOOL_A_TSINFO_PHC_INDEX ,/* u32 */ + +/* add new constants above here */ + __ETHTOOL_A_TSINFO_CNT, +ETHTOOL_A_TSINFO_MAX = (__ETHTOOL_A_TSINFO_CNT -1 ) +}; +/* generic netlink info */ #define ETHTOOL_GENL_NAME "ethtool"#define ETHTOOL_GENL_VERSION 1
net/ethtool/Makefile +1 -1
@@ -6,4 +6,4 @@ 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 \ - channels.o coalesce.o pause.o eee.o + channels.o coalesce.o pause.o eee.o tsinfo.o
net/ethtool/common.c +21 -0
@@ -1,6 +1,7 @@// SPDX-License-Identifier: GPL-2.0-only #include <linux/net_tstamp.h> +#include <linux/phy.h> #include "common.h"
@@ -350,3 +351,23 @@ int ethtool_check_ops(const struct ethtool_ops *ops)*/ return 0 ; } + +int __ethtool_get_ts_info (struct net_device *dev,struct ethtool_ts_info *info) +{ +const struct ethtool_ops *ops = dev->ethtool_ops; +struct phy_device *phydev = dev->phydev; + +memset (info,0 ,sizeof (*info)); + info->cmd =ETHTOOL_GET_TS_INFO ; + +if (phy_has_tsinfo (phydev)) +return phy_ts_info (phydev, info); +if (ops->get_ts_info) +return ops->get_ts_info (dev, info); + + info->so_timestamping =SOF_TIMESTAMPING_RX_SOFTWARE | +SOF_TIMESTAMPING_SOFTWARE ; + info->phc_index =-1 ; + +return 0 ; +}
net/ethtool/common.h +1 -0
@@ -35,5 +35,6 @@ 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); +int __ethtool_get_ts_info (struct net_device *dev,struct ethtool_ts_info *info);#endif /* _ETHTOOL_COMMON_H */
net/ethtool/ioctl.c +4 -19
@@ -2140,32 +2140,17 @@ static int ethtool_get_dump_data(struct net_device *dev,static int ethtool_get_ts_info (struct net_device *dev,void __user *useraddr) { -int err =0 ;struct ethtool_ts_info info; -const struct ethtool_ops *ops = dev->ethtool_ops; -struct phy_device *phydev = dev->phydev; - -memset (&info,0 ,sizeof (info)); - info.cmd =ETHTOOL_GET_TS_INFO ; - -if (phy_has_tsinfo (phydev)) { - err =phy_ts_info (phydev, &info); - }else if (ops->get_ts_info) { - err = ops->get_ts_info (dev, &info); - }else { - info.so_timestamping = -SOF_TIMESTAMPING_RX_SOFTWARE | -SOF_TIMESTAMPING_SOFTWARE ; - info.phc_index =-1 ; - } +int err; + err =__ethtool_get_ts_info (dev, &info);if (err)return err;if (copy_to_user (useraddr, &info,sizeof (info))) - err = -EFAULT ; +return -EFAULT ; -return err; +return 0 ; } static int __ethtool_get_module_info(struct net_device *dev,
net/ethtool/netlink.c +8 -0
@@ -230,6 +230,7 @@ ethnl_default_requests[__ETHTOOL_MSG_USER_CNT] = { [ETHTOOL_MSG_COALESCE_GET] = ðnl_coalesce_request_ops, [ETHTOOL_MSG_PAUSE_GET] = ðnl_pause_request_ops, [ETHTOOL_MSG_EEE_GET] = ðnl_eee_request_ops, + [ETHTOOL_MSG_TSINFO_GET] = ðnl_tsinfo_request_ops, };static struct ethnl_dump_ctx *ethnl_dump_context (struct netlink_callback *cb)
@@ -831,6 +832,13 @@ static const struct genl_ops ethtool_genl_ops[] = { .flags = GENL_UNS_ADMIN_PERM, .doit = ethnl_set_eee, }, + { + .cmd = ETHTOOL_MSG_TSINFO_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
@@ -344,6 +344,7 @@ extern const struct ethnl_request_ops ethnl_channels_request_ops;extern const struct ethnl_request_ops ethnl_coalesce_request_ops;extern const struct ethnl_request_ops ethnl_pause_request_ops;extern const struct ethnl_request_ops ethnl_eee_request_ops; +extern const struct ethnl_request_ops ethnl_tsinfo_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/tsinfo.c new file +143 -0
143 lines not on this page · raw message
Signature · 1 line
2.25.1
Quoted 22 lines · Sat, Mar 28, 2020 at 12:00:58AM CET, [email protected] wrote:
Implementation of more netlink request types:
- coalescing (ethtool -c/-C, patches 2-4)
- pause parameters (ethtool -a/-A, patches 5-7)
- EEE settings (--show-eee / --set-eee, patches 8-10)
- timestamping info (-T, patches 11-12)Patch 1 is a fix for netdev reference leak similar to commit
2f599ec422ad("ethtool: fix reference leak in some*_SEThandlers") but fixing a codeChanges in v3
- change "one-step-*" Tx type names to "onestep-*", (patch 11, suggested by Richard Cochran
- use "TSINFO" rather than "TIMESTAMP" for timestamping information constants and adjust symbol names (patch 12, suggested by Richard Cochran)Changes in v2:
- fix compiler warning innet_hwtstamp_validate()(patch 11)
- fix follow-up lines alignment (whitespace only, patches 3 and 8)
which is only in net-next tree at the moment.
Quoted 13 lines
Michal Kubecek (12):
ethtool: fix reference leak inethnl_set_privflags()
ethtool: provide coalescing parameters withCOALESCE_GETrequest
ethtool: set coalescing parameters withCOALESCE_SETrequest
ethtool: addCOALESCE_NTFnotification
ethtool: provide pause parameters withPAUSE_GETrequest
ethtool: set pause parameters withPAUSE_SETrequest
ethtool: addPAUSE_NTFnotification
ethtool: provide EEE settings withEEE_GETrequest
ethtool: set EEE settings withEEE_SETrequest
ethtool: addEEE_NTFnotification
ethtool: add timestamping related string sets
ethtool: provide timestamping information withTSINFO_GETrequest
FWIW, this looks fine to me.
set-
Thanks Michal!
David Miller
maintainerFrom: Michal Kubecek <[email protected]>
Date: Sat, 28 Mar 2020 00:00:58 +0100 (CET)
Quoted 17 lines
Implementation of more netlink request types:
- coalescing (ethtool -c/-C, patches 2-4)
- pause parameters (ethtool -a/-A, patches 5-7)
- EEE settings (--show-eee / --set-eee, patches 8-10)
- timestamping info (-T, patches 11-12)Patch 1 is a fix for netdev reference leak similar to commit
2f599ec422ad("ethtool: fix reference leak in some*_SEThandlers") but fixing a codeChanges in v3
- change "one-step-*" Tx type names to "onestep-*", (patch 11, suggested by Richard Cochran
- use "TSINFO" rather than "TIMESTAMP" for timestamping information constants and adjust symbol names (patch 12, suggested by Richard Cochran)
Quoted 4 lines
Changes in v2:
- fix compiler warning innet_hwtstamp_validate()(patch 11)
- fix follow-up lines alignment (whitespace only, patches 3 and 8)
which is only in net-next tree at the moment.
Series applied, thanks.