ethtool: add PAUSE_NTF notification

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

Signed-off-by: Michal Kubecek <mkubecek@suse.cz>
Signed-off-by: David S. Miller <davem@davemloft.net>

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

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

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

diff --git a/net/ethtool/netlink.c b/net/ethtool/netlink.c
index 1ca30578e642587549929c43e3c0d1fd90897bfc..4d492f1b3480638c6f51da4a82dc3196c42e8a86 100644 (file)
--- a/net/ethtool/netlink.c
+++ b/net/ethtool/netlink.c
@@ -546,6 +546,7 @@ ethnl_default_notify_ops[ETHTOOL_MSG_KERNEL_MAX + 1] = {
        [ETHTOOL_MSG_RINGS_NTF]         = &ethnl_rings_request_ops,
        [ETHTOOL_MSG_CHANNELS_NTF]      = &ethnl_channels_request_ops,
        [ETHTOOL_MSG_COALESCE_NTF]      = &ethnl_coalesce_request_ops,
+       [ETHTOOL_MSG_PAUSE_NTF]         = &ethnl_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)

diff --git a/net/ethtool/pause.c b/net/ethtool/pause.c
index c307b91fdfba9d72a03e711d8b6b6796a67ff534..7aea35d1e8a5fd7b4564d0f9bd7e88c0f00c5532 100644 (file)
--- a/net/ethtool/pause.c
+++ b/net/ethtool/pause.c
@@ -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, &params);
+       if (ret < 0)
+               goto out_ops;
+       ethtool_notify(dev, ETHTOOL_MSG_PAUSE_NTF, NULL);
 
 out_ops:
        ethnl_ops_complete(dev);