hsr: use upper/lower device infrastructure

netdev_upper_dev_link() is useful to manage lower/upper interfaces.
And this function internally validates looping, maximum depth.
All or most virtual interfaces that could have a real interface
(e.g. macsec, macvlan, ipvlan etc.) use lower/upper infrastructure.

Signed-off-by: Taehee Yoo <ap420073@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/hsr/hsr_device.c b/net/hsr/hsr_device.c
index 00532d14fc7c6038bdee9e8bca69b8ccc68fd097..fc7027314ad8079fa9a9bd5095cd5f0dca671026 100644 (file)
--- a/net/hsr/hsr_device.c
+++ b/net/hsr/hsr_device.c
@@ -341,22 +341,33 @@ static void hsr_announce(struct timer_list *t)
        rcu_read_unlock();
 }
 
+static void hsr_del_ports(struct hsr_priv *hsr)
+{
+       struct hsr_port *port;
+
+       port = hsr_port_get_hsr(hsr, HSR_PT_SLAVE_A);
+       if (port)
+               hsr_del_port(port);
+
+       port = hsr_port_get_hsr(hsr, HSR_PT_SLAVE_B);
+       if (port)
+               hsr_del_port(port);
+
+       port = hsr_port_get_hsr(hsr, HSR_PT_MASTER);
+       if (port)
+               hsr_del_port(port);
+}
+
 /* This has to be called after all the readers are gone.
  * Otherwise we would have to check the return value of
  * hsr_port_get_hsr().
  */
 static void hsr_dev_destroy(struct net_device *hsr_dev)
 {
-       struct hsr_priv *hsr;
-       struct hsr_port *port;
-       struct hsr_port *tmp;
-
-       hsr = netdev_priv(hsr_dev);
+       struct hsr_priv *hsr = netdev_priv(hsr_dev);
 
        hsr_debugfs_term(hsr);
-
-       list_for_each_entry_safe(port, tmp, &hsr->ports, port_list)
-               hsr_del_port(port);
+       hsr_del_ports(hsr);
 
        del_timer_sync(&hsr->prune_timer);
        del_timer_sync(&hsr->announce_timer);
@@ -426,8 +437,6 @@ int hsr_dev_finalize(struct net_device *hsr_dev, struct net_device *slave[2],
                     struct netlink_ext_ack *extack)
 {
        struct hsr_priv *hsr;
-       struct hsr_port *port;
-       struct hsr_port *tmp;
        int res;
 
        hsr = netdev_priv(hsr_dev);
@@ -494,8 +503,7 @@ int hsr_dev_finalize(struct net_device *hsr_dev, struct net_device *slave[2],
 err_add_slaves:
        unregister_netdevice(hsr_dev);
 err_unregister:
-       list_for_each_entry_safe(port, tmp, &hsr->ports, port_list)
-               hsr_del_port(port);
+       hsr_del_ports(hsr);
 err_add_master:
        hsr_del_self_node(hsr);
 

diff --git a/net/hsr/hsr_main.c b/net/hsr/hsr_main.c
index 9e389accbfc7e52bc677b5f3d8cb59e93f4d9bf0..26d6c39f24e16bd7901856238ae56b9c60cd4d05 100644 (file)
--- a/net/hsr/hsr_main.c
+++ b/net/hsr/hsr_main.c
@@ -85,7 +85,8 @@ static int hsr_netdev_notify(struct notifier_block *nb, unsigned long event,
                master->dev->mtu = mtu_max;
                break;
        case NETDEV_UNREGISTER:
-               hsr_del_port(port);
+               if (!is_hsr_master(dev))
+                       hsr_del_port(port);
                break;
        case NETDEV_PRE_TYPE_CHANGE:
                /* HSR works only on Ethernet devices. Refuse slave to change

diff --git a/net/hsr/hsr_slave.c b/net/hsr/hsr_slave.c
index 07edc7f626fedc5be7893c3a452d9312cb77eff2..123605cb542087c8f9355a81534abb3ed7b3215a 100644 (file)
--- a/net/hsr/hsr_slave.c
+++ b/net/hsr/hsr_slave.c
@@ -97,19 +97,25 @@ static int hsr_check_dev_ok(struct net_device *dev,
 }
 
 /* Setup device to be added to the HSR bridge. */
-static int hsr_portdev_setup(struct net_device *dev, struct hsr_port *port)
+static int hsr_portdev_setup(struct hsr_priv *hsr, struct net_device *dev,
+                            struct hsr_port *port,
+                            struct netlink_ext_ack *extack)
+
 {
+       struct net_device *hsr_dev;
+       struct hsr_port *master;
        int res;
 
-       dev_hold(dev);
        res = dev_set_promiscuity(dev, 1);
        if (res)
                goto fail_promiscuity;
 
-       /* FIXME:
-        * What does net device "adjacency" mean? Should we do
-        * res = netdev_master_upper_dev_link(port->dev, port->hsr->dev); ?
-        */
+       master = hsr_port_get_hsr(hsr, HSR_PT_MASTER);
+       hsr_dev = master->dev;
+
+       res = netdev_upper_dev_link(dev, hsr_dev, extack);
+       if (res)
+               goto fail_upper_dev_link;
 
        res = netdev_rx_handler_register(dev, hsr_handle_frame, port);
        if (res)
@@ -119,6 +125,8 @@ static int hsr_portdev_setup(struct net_device *dev, struct hsr_port *port)
        return 0;
 
 fail_rx_handler:
+       netdev_upper_dev_unlink(dev, hsr_dev);
+fail_upper_dev_link:
        dev_set_promiscuity(dev, -1);
 fail_promiscuity:
        dev_put(dev);
@@ -147,7 +155,7 @@ int hsr_add_port(struct hsr_priv *hsr, struct net_device *dev,
                return -ENOMEM;
 
        if (type != HSR_PT_MASTER) {
-               res = hsr_portdev_setup(dev, port);
+               res = hsr_portdev_setup(hsr, dev, port, extack);
                if (res)
                        goto fail_dev_setup;
        }
@@ -180,21 +188,14 @@ void hsr_del_port(struct hsr_port *port)
        list_del_rcu(&port->port_list);
 
        if (port != master) {
-               if (master) {
-                       netdev_update_features(master->dev);
-                       dev_set_mtu(master->dev, hsr_get_max_mtu(hsr));
-               }
+               netdev_update_features(master->dev);
+               dev_set_mtu(master->dev, hsr_get_max_mtu(hsr));
                netdev_rx_handler_unregister(port->dev);
                dev_set_promiscuity(port->dev, -1);
+               netdev_upper_dev_unlink(port->dev, master->dev);
        }
 
-       /* FIXME?
-        * netdev_upper_dev_unlink(port->dev, port->hsr->dev);
-        */
-
        synchronize_rcu();
 
-       if (port != master)
-               dev_put(port->dev);
        kfree(port);
 }