net: introduce change upper device notifier change info

Add info that is passed along with NETDEV_CHANGEUPPER event.

Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit 0e4ead9d7b3655d76371604abb9b0dcc4e79bb7d)
Orabug: 28122104
Signed-off-by: Vijay Balakrishna <vijay.balakrishna@oracle.com>
Reviewed-by: Si-Wei Liu <si-wei.liu@oracle.com>
Reviewed-by: Shannon Nelson <shannon.nelson@oracle.com>
Signed-off-by: Brian Maly <brian.maly@oracle.com>

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 53e2cf63fbfe65e730e047abdffa6454c3ac1876..63f38d13a7e56c5db9a115c35334a8ec402668fc 100644 (file)
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -2112,6 +2112,13 @@ struct netdev_notifier_change_info {
        unsigned int flags_changed;
 };
 
+struct netdev_notifier_changeupper_info {
+       struct netdev_notifier_info info; /* must be first */
+       struct net_device *upper_dev; /* new upper dev */
+       bool master; /* is upper dev master */
+       bool linking; /* is the nofication for link or unlink */
+};
+
 static inline void netdev_notifier_info_init(struct netdev_notifier_info *info,
                                             struct net_device *dev)
 {

diff --git a/net/core/dev.c b/net/core/dev.c
index 137b494d05cd30f6cafced7e596b84b69ab6bb8c..a81d39c31ac6951b515e374995edff7d2a5502eb 100644 (file)
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -5254,6 +5254,7 @@ static int __netdev_upper_dev_link(struct net_device *dev,
                                   struct net_device *upper_dev, bool master,
                                   void *private)
 {
+       struct netdev_notifier_changeupper_info changeupper_info;
        struct netdev_adjacent *i, *j, *to_i, *to_j;
        int ret = 0;
 
@@ -5272,6 +5273,10 @@ static int __netdev_upper_dev_link(struct net_device *dev,
        if (master && netdev_master_upper_dev_get(dev))
                return -EBUSY;
 
+       changeupper_info.upper_dev = upper_dev;
+       changeupper_info.master = master;
+       changeupper_info.linking = true;
+
        ret = __netdev_adjacent_dev_link_neighbour(dev, upper_dev, private,
                                                   master);
        if (ret)
@@ -5310,7 +5315,8 @@ static int __netdev_upper_dev_link(struct net_device *dev,
                        goto rollback_lower_mesh;
        }
 
-       call_netdevice_notifiers(NETDEV_CHANGEUPPER, dev);
+       call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev,
+                                     &changeupper_info.info);
        return 0;
 
 rollback_lower_mesh:
@@ -5405,9 +5411,14 @@ EXPORT_SYMBOL(netdev_master_upper_dev_link_private);
 void netdev_upper_dev_unlink(struct net_device *dev,
                             struct net_device *upper_dev)
 {
+       struct netdev_notifier_changeupper_info changeupper_info;
        struct netdev_adjacent *i, *j;
        ASSERT_RTNL();
 
+       changeupper_info.upper_dev = upper_dev;
+       changeupper_info.master = netdev_master_upper_dev_get(dev) == upper_dev;
+       changeupper_info.linking = false;
+
        __netdev_adjacent_dev_unlink_neighbour(dev, upper_dev);
 
        /* Here is the tricky part. We must remove all dev's lower
@@ -5427,7 +5438,8 @@ void netdev_upper_dev_unlink(struct net_device *dev,
        list_for_each_entry(i, &upper_dev->all_adj_list.upper, list)
                __netdev_adjacent_dev_unlink(dev, i->dev);
 
-       call_netdevice_notifiers(NETDEV_CHANGEUPPER, dev);
+       call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev,
+                                     &changeupper_info.info);
 }
 EXPORT_SYMBOL(netdev_upper_dev_unlink);