bridge: retry adding members after config reload / device start

[project/netifd.git] / bridge.c

diff --git a/bridge.c b/bridge.c
index 4ef0d7e..d0cb048 100644 (file)
--- a/bridge.c
+++ b/bridge.c
@@ -88,9 +88,11 @@ struct bridge_state {
        bool active;
        bool force_active;
 
+       struct uloop_timeout retry;
        struct bridge_member *primary_port;
        struct vlist_tree members;
        int n_present;
+       int n_failed;
 };
 
 struct bridge_member {
@@ -140,6 +142,8 @@ bridge_disable_member(struct bridge_member *bm)
        system_bridge_delif(&bst->dev, bm->dev.dev);
        device_release(&bm->dev);
 
+       device_broadcast_event(&bst->dev, DEV_EVENT_TOPO_CHANGE);
+
        return 0;
 }
 
@@ -152,6 +156,12 @@ bridge_enable_member(struct bridge_member *bm)
        if (!bm->present)
                return 0;
 
+       /* Disable IPv6 for bridge members */
+       if (!(bm->dev.dev->settings.flags & DEV_OPT_IPV6)) {
+               bm->dev.dev->settings.ipv6 = 0;
+               bm->dev.dev->settings.flags |= DEV_OPT_IPV6;
+       }
+
        ret = device_claim(&bm->dev);
        if (ret < 0)
                goto error;
@@ -162,9 +172,12 @@ bridge_enable_member(struct bridge_member *bm)
                goto error;
        }
 
+       device_broadcast_event(&bst->dev, DEV_EVENT_TOPO_CHANGE);
+
        return 0;
 
 error:
+       bst->n_failed++;
        bm->present = false;
        bst->n_present--;
        return ret;
@@ -219,6 +232,15 @@ bridge_free_member(struct bridge_member *bm)
 }
 
 static void
+bridge_check_retry(struct bridge_state *bst)
+{
+       if (!bst->n_failed)
+               return;
+
+       uloop_timeout_set(&bst->retry, 100);
+}
+
+static void
 bridge_member_cb(struct device_user *dev, enum device_event ev)
 {
        struct bridge_member *bm = container_of(dev, struct bridge_member, dev);
@@ -231,10 +253,17 @@ bridge_member_cb(struct device_user *dev, enum device_event ev)
                bm->present = true;
                bst->n_present++;
 
-               if (bst->dev.active)
-                       bridge_enable_member(bm);
-               else if (bst->n_present == 1)
+               if (bst->n_present == 1)
                        device_set_present(&bst->dev, true);
+               if (bst->dev.active && !bridge_enable_member(bm)) {
+                       /*
+                        * Adding a bridge member can overwrite the bridge mtu
+                        * in the kernel, apply the bridge settings in case the
+                        * bridge mtu is set
+                        */
+                       system_if_apply_settings(&bst->dev, &bst->dev.settings,
+                                                DEV_OPT_MTU);
+               }
 
                break;
        case DEV_EVENT_REMOVE:
@@ -280,8 +309,10 @@ bridge_set_up(struct bridge_state *bst)
        if (ret < 0)
                goto out;
 
+       bst->n_failed = 0;
        vlist_for_each_element(&bst->members, bm, node)
                bridge_enable_member(bm);
+       bridge_check_retry(bst);
 
        if (!bst->force_active && !bst->n_present) {
                /* initialization of all member interfaces failed */
@@ -327,7 +358,11 @@ bridge_create_member(struct bridge_state *bst, struct device *dev, bool hotplug)
        strcpy(bm->name, dev->ifname);
        bm->dev.dev = dev;
        vlist_add(&bst->members, &bm->node, bm->name);
-       if (hotplug)
+       // Need to look up the bridge member again as the above
+       // created pointer will be freed in case the bridge member
+       // already existed
+       bm = vlist_find(&bst->members, dev->ifname, bm, node);
+       if (hotplug && bm)
                bm->node.version = -1;
 
        return bm;
@@ -457,6 +492,7 @@ bridge_config_init(struct device *dev)
                device_set_present(&bst->dev, true);
        }
 
+       bst->n_failed = 0;
        vlist_update(&bst->members);
        if (bst->ifnames) {
                blobmsg_for_each_attr(cur, bst->ifnames, rem) {
@@ -464,6 +500,7 @@ bridge_config_init(struct device *dev)
                }
        }
        vlist_flush(&bst->members);
+       bridge_check_retry(bst);
 }
 
 static void
@@ -475,7 +512,7 @@ bridge_apply_settings(struct bridge_state *bst, struct blob_attr **tb)
        /* defaults */
        cfg->stp = false;
        cfg->forward_delay = 2;
-       cfg->igmp_snoop = false;
+       cfg->igmp_snoop = true;
        cfg->bridge_empty = false;
        cfg->priority = 0x7FFF;
 
@@ -560,6 +597,25 @@ bridge_reload(struct device *dev, struct blob_attr *attr)
        return ret;
 }
 
+static void
+bridge_retry_members(struct uloop_timeout *timeout)
+{
+       struct bridge_state *bst = container_of(timeout, struct bridge_state, retry);
+       struct bridge_member *bm;
+
+       bst->n_failed = 0;
+       vlist_for_each_element(&bst->members, bm, node) {
+               if (bm->present)
+                       continue;
+
+               if (!bm->dev.dev->present)
+                       continue;
+
+               bm->present = true;
+               bridge_enable_member(bm);
+       }
+}
+
 static struct device *
 bridge_create(const char *name, struct blob_attr *attr)
 {
@@ -573,6 +629,7 @@ bridge_create(const char *name, struct blob_attr *attr)
        dev = &bst->dev;
        device_init(dev, &bridge_device_type, name);
        dev->config_pending = true;
+       bst->retry.cb = bridge_retry_members;
 
        bst->set_state = dev->set_state;
        dev->set_state = bridge_set_state;