bridge: a netlink notification should be sent when those attributes are changed by...

Now when we change the attributes of bridge or br_port by netlink,
a relevant netlink notification will be sent, but if we change them
by ioctl or sysfs, no notification will be sent.

We should ensure that whenever those attributes change internally or from
sysfs/ioctl, that a netlink notification is sent out to listeners.

Also, NetworkManager will use this in the future to listen for out-of-band
bridge master attribute updates and incorporate them into the runtime
configuration.

This patch is used for br_sysfs_br. and we also need to remove some
rtnl_trylock in old functions so that we can call it in a common one.

For group_addr_store, we cannot make it use store_bridge_parm, because
it's not a string-to-long convert, we will add notification on it
individually.

Signed-off-by: Xin Long <lucien.xin@gmail.com>
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/bridge/br_sysfs_br.c b/net/bridge/br_sysfs_br.c
index f9d484ecae07b77b2bad7ab5193242ffc14f5cc9..70bddfd0f3e9f32c92083383690138e084776dff 100644 (file)
--- a/net/bridge/br_sysfs_br.c
+++ b/net/bridge/br_sysfs_br.c
@@ -43,7 +43,14 @@ static ssize_t store_bridge_parm(struct device *d,
        if (endp == buf)
                return -EINVAL;
 
+       if (!rtnl_trylock())
+               return restart_syscall();
+
        err = (*set)(br, val);
+       if (!err)
+               netdev_state_change(br->dev);
+       rtnl_unlock();
+
        return err ? err : len;
 }
 
@@ -101,15 +108,7 @@ static ssize_t ageing_time_show(struct device *d,
 
 static int set_ageing_time(struct net_bridge *br, unsigned long val)
 {
-       int ret;
-
-       if (!rtnl_trylock())
-               return restart_syscall();
-
-       ret = br_set_ageing_time(br, val);
-       rtnl_unlock();
-
-       return ret;
+       return br_set_ageing_time(br, val);
 }
 
 static ssize_t ageing_time_store(struct device *d,
@@ -130,10 +129,7 @@ static ssize_t stp_state_show(struct device *d,
 
 static int set_stp_state(struct net_bridge *br, unsigned long val)
 {
-       if (!rtnl_trylock())
-               return restart_syscall();
        br_stp_set_enabled(br, val);
-       rtnl_unlock();
 
        return 0;
 }
@@ -315,6 +311,7 @@ static ssize_t group_addr_store(struct device *d,
 
        br->group_addr_set = true;
        br_recalculate_fwd_mask(br);
+       netdev_state_change(br->dev);
 
        rtnl_unlock();
 

diff --git a/net/bridge/br_vlan.c b/net/bridge/br_vlan.c
index 9309bb4f2a5b240edcea6f9c3a4a45d2c6413874..e001152d6ad1a406c81c4fe3e91d6f983b189aeb 100644 (file)
--- a/net/bridge/br_vlan.c
+++ b/net/bridge/br_vlan.c
@@ -651,15 +651,7 @@ int __br_vlan_filter_toggle(struct net_bridge *br, unsigned long val)
 
 int br_vlan_filter_toggle(struct net_bridge *br, unsigned long val)
 {
-       int err;
-
-       if (!rtnl_trylock())
-               return restart_syscall();
-
-       err = __br_vlan_filter_toggle(br, val);
-       rtnl_unlock();
-
-       return err;
+       return __br_vlan_filter_toggle(br, val);
 }
 
 int __br_vlan_set_proto(struct net_bridge *br, __be16 proto)
@@ -713,18 +705,10 @@ err_filt:
 
 int br_vlan_set_proto(struct net_bridge *br, unsigned long val)
 {
-       int err;
-
        if (val != ETH_P_8021Q && val != ETH_P_8021AD)
                return -EPROTONOSUPPORT;
 
-       if (!rtnl_trylock())
-               return restart_syscall();
-
-       err = __br_vlan_set_proto(br, htons(val));
-       rtnl_unlock();
-
-       return err;
+       return __br_vlan_set_proto(br, htons(val));
 }
 
 static bool vlan_default_pvid(struct net_bridge_vlan_group *vg, u16 vid)
@@ -855,21 +839,17 @@ int br_vlan_set_default_pvid(struct net_bridge *br, unsigned long val)
        if (val >= VLAN_VID_MASK)
                return -EINVAL;
 
-       if (!rtnl_trylock())
-               return restart_syscall();
-
        if (pvid == br->default_pvid)
-               goto unlock;
+               goto out;
 
        /* Only allow default pvid change when filtering is disabled */
        if (br->vlan_enabled) {
                pr_info_once("Please disable vlan filtering to change default_pvid\n");
                err = -EPERM;
-               goto unlock;
+               goto out;
        }
        err = __br_vlan_set_default_pvid(br, pvid);
-unlock:
-       rtnl_unlock();
+out:
        return err;
 }