bridge: Add netlink interface to configure vlans on bridge ports

Add a netlink interface to add and remove vlan configuration on bridge port.
The interface uses the RTM_SETLINK message and encodes the vlan
configuration inside the IFLA_AF_SPEC.  It is possble to include multiple
vlans to either add or remove in a single message.

Signed-off-by: Vlad Yasevich <vyasevic@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

7 files changed, 207 insertions, 18 deletions

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 25bd46f52877..1b90f9401000 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -1020,6 +1020,8 @@ struct net_device_ops {
         int                     (*ndo_bridge_getlink)(struct sk_buff *skb,
                                                       u32 pid, u32 seq,
                                                       struct net_device *dev);
+        int                     (*ndo_bridge_dellink)(struct net_device *dev,
+                                                      struct nlmsghdr *nlh);
         int                     (*ndo_change_carrier)(struct net_device *dev,
                                                       bool new_carrier);
 };
diff --git a/include/uapi/linux/if_bridge.h b/include/uapi/linux/if_bridge.h
index 5db297514aec..3ca9817ca7e8 100644
--- a/include/uapi/linux/if_bridge.h
+++ b/include/uapi/linux/if_bridge.h
@@ -108,15 +108,24 @@ struct __fdb_entry {
  * [IFLA_AF_SPEC] = {
  *     [IFLA_BRIDGE_FLAGS]
  *     [IFLA_BRIDGE_MODE]
+ *     [IFLA_BRIDGE_VLAN_INFO]
  * }
  */
 enum {
         IFLA_BRIDGE_FLAGS,
         IFLA_BRIDGE_MODE,
+        IFLA_BRIDGE_VLAN_INFO,
         __IFLA_BRIDGE_MAX,
 };
 #define IFLA_BRIDGE_MAX (__IFLA_BRIDGE_MAX - 1)
 
+#define BRIDGE_VLAN_INFO_MASTER (1<<0)  /* Operate on Bridge device as well */
+
+struct bridge_vlan_info {
+        u16 flags;
+        u16 vid;
+};
+
 /* Bridge multicast database attributes
  * [MDBA_MDB] = {
  *     [MDBA_MDB_ENTRY] = {
diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c
index 35a2c2c84f33..091bedf266a0 100644
--- a/net/bridge/br_device.c
+++ b/net/bridge/br_device.c
@@ -316,6 +316,7 @@ static const struct net_device_ops br_netdev_ops = {
         .ndo_fdb_dump            = br_fdb_dump,
         .ndo_bridge_getlink      = br_getlink,
         .ndo_bridge_setlink      = br_setlink,
+        .ndo_bridge_dellink      = br_dellink,
 };
 
 static void br_dev_free(struct net_device *dev)
diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index af9d65ab4001..335c60cebfd1 100644
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
@@ -23,6 +23,7 @@
 #include <linux/if_ether.h>
 #include <linux/slab.h>
 #include <net/sock.h>
+#include <linux/if_vlan.h>
 
 #include "br_private.h"
 
diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
index 39ca9796f3f7..534a9f4587a9 100644
--- a/net/bridge/br_netlink.c
+++ b/net/bridge/br_netlink.c
@@ -16,6 +16,7 @@
 #include <net/rtnetlink.h>
 #include <net/net_namespace.h>
 #include <net/sock.h>
+#include <uapi/linux/if_bridge.h>
 
 #include "br_private.h"
 #include "br_private_stp.h"
@@ -119,10 +120,14 @@ nla_put_failure:
  */
 void br_ifinfo_notify(int event, struct net_bridge_port *port)
 {
-        struct net *net = dev_net(port->dev);
+        struct net *net;
         struct sk_buff *skb;
         int err = -ENOBUFS;
 
+        if (!port)
+                return;
+
+        net = dev_net(port->dev);
         br_debug(port->br, "port %u(%s) event %d\n",
                  (unsigned int)port->port_no, port->dev->name, event);
 
@@ -144,6 +149,7 @@ errout:
                 rtnl_set_sk_err(net, RTNLGRP_LINK, err);
 }
 
+
 /*
  * Dump information about all ports, in response to GETLINK
  */
@@ -162,6 +168,64 @@ out:
         return err;
 }
 
+const struct nla_policy ifla_br_policy[IFLA_MAX+1] = {
+        [IFLA_BRIDGE_FLAGS]     = { .type = NLA_U16 },
+        [IFLA_BRIDGE_MODE]      = { .type = NLA_U16 },
+        [IFLA_BRIDGE_VLAN_INFO] = { .type = NLA_BINARY,
+                                    .len = sizeof(struct bridge_vlan_info), },
+};
+
+static int br_afspec(struct net_bridge *br,
+                     struct net_bridge_port *p,
+                     struct nlattr *af_spec,
+                     int cmd)
+{
+        struct nlattr *tb[IFLA_BRIDGE_MAX+1];
+        int err = 0;
+
+        err = nla_parse_nested(tb, IFLA_BRIDGE_MAX, af_spec, ifla_br_policy);
+        if (err)
+                return err;
+
+        if (tb[IFLA_BRIDGE_VLAN_INFO]) {
+                struct bridge_vlan_info *vinfo;
+
+                vinfo = nla_data(tb[IFLA_BRIDGE_VLAN_INFO]);
+
+                if (vinfo->vid >= VLAN_N_VID)
+                        return -EINVAL;
+
+                switch (cmd) {
+                case RTM_SETLINK:
+                        if (p) {
+                                err = nbp_vlan_add(p, vinfo->vid);
+                                if (err)
+                                        break;
+
+                                if (vinfo->flags & BRIDGE_VLAN_INFO_MASTER)
+                                        err = br_vlan_add(p->br, vinfo->vid);
+                        } else
+                                err = br_vlan_add(br, vinfo->vid);
+
+                        if (err)
+                                break;
+
+                        break;
+
+                case RTM_DELLINK:
+                        if (p) {
+                                nbp_vlan_delete(p, vinfo->vid);
+                                if (vinfo->flags & BRIDGE_VLAN_INFO_MASTER)
+                                        br_vlan_delete(p->br, vinfo->vid);
+                        } else
+                                br_vlan_delete(br, vinfo->vid);
+                        break;
+                }
+        }
+
+        return err;
+}
+
 static const struct nla_policy ifla_brport_policy[IFLA_BRPORT_MAX + 1] = {
         [IFLA_BRPORT_STATE]     = { .type = NLA_U8 },
         [IFLA_BRPORT_COST]      = { .type = NLA_U32 },
@@ -241,6 +305,7 @@ int br_setlink(struct net_device *dev, struct nlmsghdr *nlh)
 {
         struct ifinfomsg *ifm;
         struct nlattr *protinfo;
+        struct nlattr *afspec;