ethtool: add COALESCE_NTF notification

Send 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.

Signed-off-by: Michal Kubecek <mkubecek@suse.cz>
Reviewed-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/Documentation/networking/ethtool-netlink.rst b/Documentation/networking/ethtool-netlink.rst
index b593c7f509341026d8b2c8d24a913ce74bba7a05..d4be0a63786dd4160c5abee2a2123640f8afb320 100644 (file)
--- a/Documentation/networking/ethtool-netlink.rst
+++ b/Documentation/networking/ethtool-netlink.rst
@@ -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

diff --git a/include/uapi/linux/ethtool_netlink.h b/include/uapi/linux/ethtool_netlink.h
index d9f4047c64c3fd6ffc7d456a527897c1c68b42be..fdbcaf76df1e6689a40a27c7e6dade4b70ee1961 100644 (file)
--- a/include/uapi/linux/ethtool_netlink.h
+++ b/include/uapi/linux/ethtool_netlink.h
@@ -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,

diff --git a/net/ethtool/coalesce.c b/net/ethtool/coalesce.c
index 6cf1a7ebf0c54614de17c55ee74c5a4d5b856373..6afd99042d67310df0b25ff1dfc9ba8637ed892e 100644 (file)
--- a/net/ethtool/coalesce.c
+++ b/net/ethtool/coalesce.c
@@ -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);

diff --git a/net/ethtool/ioctl.c b/net/ethtool/ioctl.c
index 10d929abdf6aaafa12a5c19ac615fd3b72a903c8..198825ebc1143faae6878e272398a1024f1e841a 100644 (file)
--- a/net/ethtool/ioctl.c
+++ b/net/ethtool/ioctl.c
@@ -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)

diff --git a/net/ethtool/netlink.c b/net/ethtool/netlink.c
index 3a236b4dfbf390270b4f15ed81b9f76f936dcce3..117971e695ca8cd494e38d2d7a960390265eadb8 100644 (file)
--- a/net/ethtool/netlink.c
+++ b/net/ethtool/netlink.c
@@ -544,6 +544,7 @@ ethnl_default_notify_ops[ETHTOOL_MSG_KERNEL_MAX + 1] = {
        [ETHTOOL_MSG_PRIVFLAGS_NTF]     = &ethnl_privflags_request_ops,
        [ETHTOOL_MSG_RINGS_NTF]         = &ethnl_rings_request_ops,
        [ETHTOOL_MSG_CHANNELS_NTF]      = &ethnl_channels_request_ops,
+       [ETHTOOL_MSG_COALESCE_NTF]      = &ethnl_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)