Vlad Yasevich | 243a2e6 | 2013-02-13 12:00:09 +0000 | [diff] [blame] | 1 | #include <linux/kernel.h> |
| 2 | #include <linux/netdevice.h> |
| 3 | #include <linux/rtnetlink.h> |
| 4 | #include <linux/slab.h> |
Scott Feldman | 7f10953 | 2015-06-12 17:39:50 -0700 | [diff] [blame] | 5 | #include <net/switchdev.h> |
Vlad Yasevich | 243a2e6 | 2013-02-13 12:00:09 +0000 | [diff] [blame] | 6 | |
| 7 | #include "br_private.h" |
| 8 | |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 9 | static inline int br_vlan_cmp(struct rhashtable_compare_arg *arg, |
| 10 | const void *ptr) |
Vlad Yasevich | 552406c | 2013-02-13 12:00:15 +0000 | [diff] [blame] | 11 | { |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 12 | const struct net_bridge_vlan *vle = ptr; |
| 13 | u16 vid = *(u16 *)arg->key; |
| 14 | |
| 15 | return vle->vid != vid; |
| 16 | } |
| 17 | |
| 18 | static const struct rhashtable_params br_vlan_rht_params = { |
| 19 | .head_offset = offsetof(struct net_bridge_vlan, vnode), |
| 20 | .key_offset = offsetof(struct net_bridge_vlan, vid), |
| 21 | .key_len = sizeof(u16), |
Nikolay Aleksandrov | 8af78b6 | 2015-09-30 20:16:51 +0200 | [diff] [blame] | 22 | .nelem_hint = 3, |
| 23 | .locks_mul = 1, |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 24 | .max_size = VLAN_N_VID, |
| 25 | .obj_cmpfn = br_vlan_cmp, |
| 26 | .automatic_shrinking = true, |
| 27 | }; |
| 28 | |
| 29 | static struct net_bridge_vlan *br_vlan_lookup(struct rhashtable *tbl, u16 vid) |
| 30 | { |
| 31 | return rhashtable_lookup_fast(tbl, &vid, br_vlan_rht_params); |
| 32 | } |
| 33 | |
Nikolay Aleksandrov | 77751ee | 2015-09-30 20:16:53 +0200 | [diff] [blame] | 34 | static void __vlan_add_pvid(struct net_bridge_vlan_group *vg, u16 vid) |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 35 | { |
Nikolay Aleksandrov | 77751ee | 2015-09-30 20:16:53 +0200 | [diff] [blame] | 36 | if (vg->pvid == vid) |
Vlad Yasevich | 552406c | 2013-02-13 12:00:15 +0000 | [diff] [blame] | 37 | return; |
| 38 | |
| 39 | smp_wmb(); |
Nikolay Aleksandrov | 77751ee | 2015-09-30 20:16:53 +0200 | [diff] [blame] | 40 | vg->pvid = vid; |
Vlad Yasevich | 552406c | 2013-02-13 12:00:15 +0000 | [diff] [blame] | 41 | } |
| 42 | |
Nikolay Aleksandrov | 77751ee | 2015-09-30 20:16:53 +0200 | [diff] [blame] | 43 | static void __vlan_delete_pvid(struct net_bridge_vlan_group *vg, u16 vid) |
Vlad Yasevich | 552406c | 2013-02-13 12:00:15 +0000 | [diff] [blame] | 44 | { |
Nikolay Aleksandrov | 77751ee | 2015-09-30 20:16:53 +0200 | [diff] [blame] | 45 | if (vg->pvid != vid) |
Vlad Yasevich | 552406c | 2013-02-13 12:00:15 +0000 | [diff] [blame] | 46 | return; |
| 47 | |
| 48 | smp_wmb(); |
Nikolay Aleksandrov | 77751ee | 2015-09-30 20:16:53 +0200 | [diff] [blame] | 49 | vg->pvid = 0; |
Vlad Yasevich | 552406c | 2013-02-13 12:00:15 +0000 | [diff] [blame] | 50 | } |
| 51 | |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 52 | static void __vlan_add_flags(struct net_bridge_vlan *v, u16 flags) |
Vlad Yasevich | 35e03f3 | 2013-02-13 12:00:20 +0000 | [diff] [blame] | 53 | { |
Nikolay Aleksandrov | 77751ee | 2015-09-30 20:16:53 +0200 | [diff] [blame] | 54 | struct net_bridge_vlan_group *vg; |
| 55 | |
| 56 | if (br_vlan_is_master(v)) |
| 57 | vg = v->br->vlgrp; |
| 58 | else |
| 59 | vg = v->port->vlgrp; |
| 60 | |
| 61 | if (flags & BRIDGE_VLAN_INFO_PVID) |
| 62 | __vlan_add_pvid(vg, v->vid); |
| 63 | else |
| 64 | __vlan_delete_pvid(vg, v->vid); |
Vlad Yasevich | 35e03f3 | 2013-02-13 12:00:20 +0000 | [diff] [blame] | 65 | |
| 66 | if (flags & BRIDGE_VLAN_INFO_UNTAGGED) |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 67 | v->flags |= BRIDGE_VLAN_INFO_UNTAGGED; |
Vlad Yasevich | 635126b | 2014-09-12 16:26:17 -0400 | [diff] [blame] | 68 | else |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 69 | v->flags &= ~BRIDGE_VLAN_INFO_UNTAGGED; |
Vlad Yasevich | 35e03f3 | 2013-02-13 12:00:20 +0000 | [diff] [blame] | 70 | } |
| 71 | |
Scott Feldman | 7f10953 | 2015-06-12 17:39:50 -0700 | [diff] [blame] | 72 | static int __vlan_vid_add(struct net_device *dev, struct net_bridge *br, |
| 73 | u16 vid, u16 flags) |
| 74 | { |
Jiri Pirko | 0944d6b | 2015-10-09 13:54:11 +0200 | [diff] [blame^] | 75 | struct switchdev_obj_port_vlan v = { |
| 76 | .obj.id = SWITCHDEV_OBJ_ID_PORT_VLAN, |
| 77 | .flags = flags, |
| 78 | .vid_begin = vid, |
| 79 | .vid_end = vid, |
| 80 | }; |
Scott Feldman | 7f10953 | 2015-06-12 17:39:50 -0700 | [diff] [blame] | 81 | int err; |
| 82 | |
Jiri Pirko | 0944d6b | 2015-10-09 13:54:11 +0200 | [diff] [blame^] | 83 | /* Try switchdev op first. In case it is not supported, fallback to |
| 84 | * 8021q add. |
Scott Feldman | 7f10953 | 2015-06-12 17:39:50 -0700 | [diff] [blame] | 85 | */ |
Jiri Pirko | 0944d6b | 2015-10-09 13:54:11 +0200 | [diff] [blame^] | 86 | err = switchdev_port_obj_add(dev, &v.obj); |
| 87 | if (err == -EOPNOTSUPP) |
| 88 | return vlan_vid_add(dev, br->vlan_proto, vid); |
Scott Feldman | 7f10953 | 2015-06-12 17:39:50 -0700 | [diff] [blame] | 89 | return err; |
| 90 | } |
| 91 | |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 92 | static void __vlan_add_list(struct net_bridge_vlan *v) |
Vlad Yasevich | 243a2e6 | 2013-02-13 12:00:09 +0000 | [diff] [blame] | 93 | { |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 94 | struct list_head *headp, *hpos; |
| 95 | struct net_bridge_vlan *vent; |
Vlad Yasevich | 243a2e6 | 2013-02-13 12:00:09 +0000 | [diff] [blame] | 96 | |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 97 | headp = br_vlan_is_master(v) ? &v->br->vlgrp->vlan_list : |
| 98 | &v->port->vlgrp->vlan_list; |
| 99 | list_for_each_prev(hpos, headp) { |
| 100 | vent = list_entry(hpos, struct net_bridge_vlan, vlist); |
| 101 | if (v->vid < vent->vid) |
| 102 | continue; |
| 103 | else |
| 104 | break; |
Vlad Yasevich | 552406c | 2013-02-13 12:00:15 +0000 | [diff] [blame] | 105 | } |
Nikolay Aleksandrov | 586c2b5 | 2015-10-02 15:05:10 +0200 | [diff] [blame] | 106 | list_add_rcu(&v->vlist, hpos); |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 107 | } |
Vlad Yasevich | 243a2e6 | 2013-02-13 12:00:09 +0000 | [diff] [blame] | 108 | |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 109 | static void __vlan_del_list(struct net_bridge_vlan *v) |
| 110 | { |
Nikolay Aleksandrov | 586c2b5 | 2015-10-02 15:05:10 +0200 | [diff] [blame] | 111 | list_del_rcu(&v->vlist); |
Vlad Yasevich | 243a2e6 | 2013-02-13 12:00:09 +0000 | [diff] [blame] | 112 | } |
| 113 | |
Vivien Didelot | bf361ad | 2015-09-05 21:27:57 -0400 | [diff] [blame] | 114 | static int __vlan_vid_del(struct net_device *dev, struct net_bridge *br, |
| 115 | u16 vid) |
Scott Feldman | 7f10953 | 2015-06-12 17:39:50 -0700 | [diff] [blame] | 116 | { |
Jiri Pirko | 0944d6b | 2015-10-09 13:54:11 +0200 | [diff] [blame^] | 117 | struct switchdev_obj_port_vlan v = { |
| 118 | .obj.id = SWITCHDEV_OBJ_ID_PORT_VLAN, |
| 119 | .vid_begin = vid, |
| 120 | .vid_end = vid, |
| 121 | }; |
| 122 | int err; |
Scott Feldman | 7f10953 | 2015-06-12 17:39:50 -0700 | [diff] [blame] | 123 | |
Jiri Pirko | 0944d6b | 2015-10-09 13:54:11 +0200 | [diff] [blame^] | 124 | /* Try switchdev op first. In case it is not supported, fallback to |
| 125 | * 8021q del. |
Scott Feldman | 7f10953 | 2015-06-12 17:39:50 -0700 | [diff] [blame] | 126 | */ |
Jiri Pirko | 0944d6b | 2015-10-09 13:54:11 +0200 | [diff] [blame^] | 127 | err = switchdev_port_obj_del(dev, &v.obj); |
| 128 | if (err == -EOPNOTSUPP) { |
Scott Feldman | 7f10953 | 2015-06-12 17:39:50 -0700 | [diff] [blame] | 129 | vlan_vid_del(dev, br->vlan_proto, vid); |
Jiri Pirko | 0944d6b | 2015-10-09 13:54:11 +0200 | [diff] [blame^] | 130 | return 0; |
Scott Feldman | 7f10953 | 2015-06-12 17:39:50 -0700 | [diff] [blame] | 131 | } |
Vivien Didelot | bf361ad | 2015-09-05 21:27:57 -0400 | [diff] [blame] | 132 | return err; |
Scott Feldman | 7f10953 | 2015-06-12 17:39:50 -0700 | [diff] [blame] | 133 | } |
| 134 | |
Nikolay Aleksandrov | f8ed289 | 2015-10-02 15:05:11 +0200 | [diff] [blame] | 135 | /* Returns a master vlan, if it didn't exist it gets created. In all cases a |
| 136 | * a reference is taken to the master vlan before returning. |
| 137 | */ |
| 138 | static struct net_bridge_vlan *br_vlan_get_master(struct net_bridge *br, u16 vid) |
| 139 | { |
| 140 | struct net_bridge_vlan *masterv; |
| 141 | |
| 142 | masterv = br_vlan_find(br->vlgrp, vid); |
| 143 | if (!masterv) { |
| 144 | /* missing global ctx, create it now */ |
| 145 | if (br_vlan_add(br, vid, 0)) |
| 146 | return NULL; |
| 147 | masterv = br_vlan_find(br->vlgrp, vid); |
| 148 | if (WARN_ON(!masterv)) |
| 149 | return NULL; |
| 150 | } |
| 151 | atomic_inc(&masterv->refcnt); |
| 152 | |
| 153 | return masterv; |
| 154 | } |
| 155 | |
| 156 | static void br_vlan_put_master(struct net_bridge_vlan *masterv) |
| 157 | { |
| 158 | if (!br_vlan_is_master(masterv)) |
| 159 | return; |
| 160 | |
| 161 | if (atomic_dec_and_test(&masterv->refcnt)) { |
| 162 | rhashtable_remove_fast(&masterv->br->vlgrp->vlan_hash, |
| 163 | &masterv->vnode, br_vlan_rht_params); |
| 164 | __vlan_del_list(masterv); |
| 165 | kfree_rcu(masterv, rcu); |
| 166 | } |
| 167 | } |
| 168 | |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 169 | /* This is the shared VLAN add function which works for both ports and bridge |
| 170 | * devices. There are four possible calls to this function in terms of the |
| 171 | * vlan entry type: |
| 172 | * 1. vlan is being added on a port (no master flags, global entry exists) |
| 173 | * 2. vlan is being added on a bridge (both master and brvlan flags) |
| 174 | * 3. vlan is being added on a port, but a global entry didn't exist which |
| 175 | * is being created right now (master flag set, brvlan flag unset), the |
| 176 | * global entry is used for global per-vlan features, but not for filtering |
| 177 | * 4. same as 3 but with both master and brvlan flags set so the entry |
| 178 | * will be used for filtering in both the port and the bridge |
| 179 | */ |
| 180 | static int __vlan_add(struct net_bridge_vlan *v, u16 flags) |
Vlad Yasevich | 243a2e6 | 2013-02-13 12:00:09 +0000 | [diff] [blame] | 181 | { |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 182 | struct net_bridge_vlan *masterv = NULL; |
| 183 | struct net_bridge_port *p = NULL; |
Nikolay Aleksandrov | 6be144f | 2015-10-02 15:05:13 +0200 | [diff] [blame] | 184 | struct net_bridge_vlan_group *vg; |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 185 | struct net_device *dev; |
| 186 | struct net_bridge *br; |
| 187 | int err; |
Vlad Yasevich | 243a2e6 | 2013-02-13 12:00:09 +0000 | [diff] [blame] | 188 | |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 189 | if (br_vlan_is_master(v)) { |
| 190 | br = v->br; |
| 191 | dev = br->dev; |
Nikolay Aleksandrov | 6be144f | 2015-10-02 15:05:13 +0200 | [diff] [blame] | 192 | vg = br->vlgrp; |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 193 | } else { |
| 194 | p = v->port; |
| 195 | br = p->br; |
| 196 | dev = p->dev; |
Nikolay Aleksandrov | 6be144f | 2015-10-02 15:05:13 +0200 | [diff] [blame] | 197 | vg = p->vlgrp; |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 198 | } |
Vlad Yasevich | 552406c | 2013-02-13 12:00:15 +0000 | [diff] [blame] | 199 | |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 200 | if (p) { |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 201 | /* Add VLAN to the device filter if it is supported. |
| 202 | * This ensures tagged traffic enters the bridge when |
| 203 | * promiscuous mode is disabled by br_manage_promisc(). |
| 204 | */ |
| 205 | err = __vlan_vid_add(dev, br, v->vid, flags); |
Vivien Didelot | bf361ad | 2015-09-05 21:27:57 -0400 | [diff] [blame] | 206 | if (err) |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 207 | goto out; |
| 208 | |
| 209 | /* need to work on the master vlan too */ |
| 210 | if (flags & BRIDGE_VLAN_INFO_MASTER) { |
Nikolay Aleksandrov | 2ffdf508 | 2015-10-02 15:05:12 +0200 | [diff] [blame] | 211 | err = br_vlan_add(br, v->vid, flags | |
| 212 | BRIDGE_VLAN_INFO_BRENTRY); |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 213 | if (err) |
| 214 | goto out_filt; |
| 215 | } |
| 216 | |
Nikolay Aleksandrov | f8ed289 | 2015-10-02 15:05:11 +0200 | [diff] [blame] | 217 | masterv = br_vlan_get_master(br, v->vid); |
| 218 | if (!masterv) |
| 219 | goto out_filt; |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 220 | v->brvlan = masterv; |
Toshiaki Makita | 8580e21 | 2014-06-10 20:59:23 +0900 | [diff] [blame] | 221 | } |
Vlad Yasevich | 243a2e6 | 2013-02-13 12:00:09 +0000 | [diff] [blame] | 222 | |
Nikolay Aleksandrov | 6be144f | 2015-10-02 15:05:13 +0200 | [diff] [blame] | 223 | /* Add the dev mac and count the vlan only if it's usable */ |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 224 | if (br_vlan_should_use(v)) { |
| 225 | err = br_fdb_insert(br, p, dev->dev_addr, v->vid); |
| 226 | if (err) { |
| 227 | br_err(br, "failed insert local address into bridge forwarding table\n"); |
| 228 | goto out_filt; |
| 229 | } |
Nikolay Aleksandrov | 6be144f | 2015-10-02 15:05:13 +0200 | [diff] [blame] | 230 | vg->num_vlans++; |
Vlad Yasevich | 243a2e6 | 2013-02-13 12:00:09 +0000 | [diff] [blame] | 231 | } |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 232 | |
Nikolay Aleksandrov | 6be144f | 2015-10-02 15:05:13 +0200 | [diff] [blame] | 233 | err = rhashtable_lookup_insert_fast(&vg->vlan_hash, &v->vnode, |
| 234 | br_vlan_rht_params); |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 235 | if (err) |
| 236 | goto out_fdb_insert; |
| 237 | |
| 238 | __vlan_add_list(v); |
| 239 | __vlan_add_flags(v, flags); |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 240 | out: |
| 241 | return err; |
| 242 | |
| 243 | out_fdb_insert: |
Nikolay Aleksandrov | 6be144f | 2015-10-02 15:05:13 +0200 | [diff] [blame] | 244 | if (br_vlan_should_use(v)) { |
| 245 | br_fdb_find_delete_local(br, p, dev->dev_addr, v->vid); |
| 246 | vg->num_vlans--; |
| 247 | } |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 248 | |
| 249 | out_filt: |
| 250 | if (p) { |
| 251 | __vlan_vid_del(dev, br, v->vid); |
| 252 | if (masterv) { |
Nikolay Aleksandrov | f8ed289 | 2015-10-02 15:05:11 +0200 | [diff] [blame] | 253 | br_vlan_put_master(masterv); |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 254 | v->brvlan = NULL; |
| 255 | } |
| 256 | } |
| 257 | |
| 258 | goto out; |
Vlad Yasevich | 243a2e6 | 2013-02-13 12:00:09 +0000 | [diff] [blame] | 259 | } |
| 260 | |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 261 | static int __vlan_del(struct net_bridge_vlan *v) |
Vlad Yasevich | 243a2e6 | 2013-02-13 12:00:09 +0000 | [diff] [blame] | 262 | { |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 263 | struct net_bridge_vlan *masterv = v; |
Nikolay Aleksandrov | 77751ee | 2015-09-30 20:16:53 +0200 | [diff] [blame] | 264 | struct net_bridge_vlan_group *vg; |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 265 | struct net_bridge_port *p = NULL; |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 266 | int err = 0; |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 267 | |
| 268 | if (br_vlan_is_master(v)) { |
Nikolay Aleksandrov | 77751ee | 2015-09-30 20:16:53 +0200 | [diff] [blame] | 269 | vg = v->br->vlgrp; |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 270 | } else { |
| 271 | p = v->port; |
Nikolay Aleksandrov | 77751ee | 2015-09-30 20:16:53 +0200 | [diff] [blame] | 272 | vg = v->port->vlgrp; |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 273 | masterv = v->brvlan; |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 274 | } |
| 275 | |
Nikolay Aleksandrov | 77751ee | 2015-09-30 20:16:53 +0200 | [diff] [blame] | 276 | __vlan_delete_pvid(vg, v->vid); |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 277 | if (p) { |
| 278 | err = __vlan_vid_del(p->dev, p->br, v->vid); |
| 279 | if (err) |
| 280 | goto out; |
| 281 | } |
| 282 | |
Nikolay Aleksandrov | 6be144f | 2015-10-02 15:05:13 +0200 | [diff] [blame] | 283 | if (br_vlan_should_use(v)) { |
| 284 | v->flags &= ~BRIDGE_VLAN_INFO_BRENTRY; |
| 285 | vg->num_vlans--; |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 286 | } |
| 287 | |
| 288 | if (masterv != v) { |
Nikolay Aleksandrov | 77751ee | 2015-09-30 20:16:53 +0200 | [diff] [blame] | 289 | rhashtable_remove_fast(&vg->vlan_hash, &v->vnode, |
| 290 | br_vlan_rht_params); |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 291 | __vlan_del_list(v); |
| 292 | kfree_rcu(v, rcu); |
| 293 | } |
| 294 | |
Nikolay Aleksandrov | f8ed289 | 2015-10-02 15:05:11 +0200 | [diff] [blame] | 295 | br_vlan_put_master(masterv); |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 296 | out: |
| 297 | return err; |
| 298 | } |
| 299 | |
Nikolay Aleksandrov | 77751ee | 2015-09-30 20:16:53 +0200 | [diff] [blame] | 300 | static void __vlan_flush(struct net_bridge_vlan_group *vlgrp) |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 301 | { |
| 302 | struct net_bridge_vlan *vlan, *tmp; |
| 303 | |
Nikolay Aleksandrov | 77751ee | 2015-09-30 20:16:53 +0200 | [diff] [blame] | 304 | __vlan_delete_pvid(vlgrp, vlgrp->pvid); |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 305 | list_for_each_entry_safe(vlan, tmp, &vlgrp->vlan_list, vlist) |
| 306 | __vlan_del(vlan); |
| 307 | rhashtable_destroy(&vlgrp->vlan_hash); |
| 308 | kfree(vlgrp); |
Vlad Yasevich | 243a2e6 | 2013-02-13 12:00:09 +0000 | [diff] [blame] | 309 | } |
| 310 | |
Vlad Yasevich | 7885198 | 2013-02-13 12:00:14 +0000 | [diff] [blame] | 311 | struct sk_buff *br_handle_vlan(struct net_bridge *br, |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 312 | struct net_bridge_vlan_group *vg, |
Vlad Yasevich | 7885198 | 2013-02-13 12:00:14 +0000 | [diff] [blame] | 313 | struct sk_buff *skb) |
Vlad Yasevich | a37b85c | 2013-02-13 12:00:10 +0000 | [diff] [blame] | 314 | { |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 315 | struct net_bridge_vlan *v; |
Vlad Yasevich | a37b85c | 2013-02-13 12:00:10 +0000 | [diff] [blame] | 316 | u16 vid; |
| 317 | |
Vlad Yasevich | 20adfa1 | 2014-09-12 16:26:16 -0400 | [diff] [blame] | 318 | /* If this packet was not filtered at input, let it pass */ |
| 319 | if (!BR_INPUT_SKB_CB(skb)->vlan_filtered) |
Vlad Yasevich | 7885198 | 2013-02-13 12:00:14 +0000 | [diff] [blame] | 320 | goto out; |
| 321 | |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 322 | /* At this point, we know that the frame was filtered and contains |
| 323 | * a valid vlan id. If the vlan id has untagged flag set, |
| 324 | * send untagged; otherwise, send tagged. |
| 325 | */ |
| 326 | br_vlan_get_tag(skb, &vid); |
| 327 | v = br_vlan_find(vg, vid); |
| 328 | /* Vlan entry must be configured at this point. The |
Vlad Yasevich | fc92f74 | 2014-03-27 21:51:18 -0400 | [diff] [blame] | 329 | * only exception is the bridge is set in promisc mode and the |
| 330 | * packet is destined for the bridge device. In this case |
| 331 | * pass the packet as is. |
| 332 | */ |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 333 | if (!v || !br_vlan_should_use(v)) { |
Vlad Yasevich | fc92f74 | 2014-03-27 21:51:18 -0400 | [diff] [blame] | 334 | if ((br->dev->flags & IFF_PROMISC) && skb->dev == br->dev) { |
| 335 | goto out; |
| 336 | } else { |
| 337 | kfree_skb(skb); |
| 338 | return NULL; |
| 339 | } |
| 340 | } |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 341 | if (v->flags & BRIDGE_VLAN_INFO_UNTAGGED) |
Toshiaki Makita | 99b192d | 2014-03-27 21:46:56 +0900 | [diff] [blame] | 342 | skb->vlan_tci = 0; |
Vlad Yasevich | 7885198 | 2013-02-13 12:00:14 +0000 | [diff] [blame] | 343 | |
| 344 | out: |
| 345 | return skb; |
| 346 | } |
| 347 | |
| 348 | /* Called under RCU */ |
Nikolay Aleksandrov | 77751ee | 2015-09-30 20:16:53 +0200 | [diff] [blame] | 349 | static bool __allowed_ingress(struct net_bridge_vlan_group *vg, __be16 proto, |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 350 | struct sk_buff *skb, u16 *vid) |
Vlad Yasevich | 7885198 | 2013-02-13 12:00:14 +0000 | [diff] [blame] | 351 | { |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 352 | const struct net_bridge_vlan *v; |
Toshiaki Makita | 8580e21 | 2014-06-10 20:59:23 +0900 | [diff] [blame] | 353 | bool tagged; |
Vlad Yasevich | a37b85c | 2013-02-13 12:00:10 +0000 | [diff] [blame] | 354 | |
Vlad Yasevich | 20adfa1 | 2014-09-12 16:26:16 -0400 | [diff] [blame] | 355 | BR_INPUT_SKB_CB(skb)->vlan_filtered = true; |
Toshiaki Makita | 12464bb | 2014-03-27 21:46:55 +0900 | [diff] [blame] | 356 | /* If vlan tx offload is disabled on bridge device and frame was |
| 357 | * sent from vlan device on the bridge device, it does not have |
| 358 | * HW accelerated vlan tag. |
| 359 | */ |
Jiri Pirko | df8a39d | 2015-01-13 17:13:44 +0100 | [diff] [blame] | 360 | if (unlikely(!skb_vlan_tag_present(skb) && |
Toshiaki Makita | 8580e21 | 2014-06-10 20:59:23 +0900 | [diff] [blame] | 361 | skb->protocol == proto)) { |
Vlad Yasevich | 0d5501c | 2014-08-08 14:42:13 -0400 | [diff] [blame] | 362 | skb = skb_vlan_untag(skb); |
Toshiaki Makita | 12464bb | 2014-03-27 21:46:55 +0900 | [diff] [blame] | 363 | if (unlikely(!skb)) |
| 364 | return false; |
| 365 | } |
| 366 | |
Toshiaki Makita | 8580e21 | 2014-06-10 20:59:23 +0900 | [diff] [blame] | 367 | if (!br_vlan_get_tag(skb, vid)) { |
| 368 | /* Tagged frame */ |
| 369 | if (skb->vlan_proto != proto) { |
| 370 | /* Protocol-mismatch, empty out vlan_tci for new tag */ |
| 371 | skb_push(skb, ETH_HLEN); |
Jiri Pirko | 62749e2 | 2014-11-19 14:04:58 +0100 | [diff] [blame] | 372 | skb = vlan_insert_tag_set_proto(skb, skb->vlan_proto, |
Jiri Pirko | df8a39d | 2015-01-13 17:13:44 +0100 | [diff] [blame] | 373 | skb_vlan_tag_get(skb)); |
Toshiaki Makita | 8580e21 | 2014-06-10 20:59:23 +0900 | [diff] [blame] | 374 | if (unlikely(!skb)) |
| 375 | return false; |
| 376 | |
| 377 | skb_pull(skb, ETH_HLEN); |
| 378 | skb_reset_mac_len(skb); |
| 379 | *vid = 0; |
| 380 | tagged = false; |
| 381 | } else { |
| 382 | tagged = true; |
| 383 | } |
| 384 | } else { |
| 385 | /* Untagged frame */ |
| 386 | tagged = false; |
| 387 | } |
| 388 | |
Toshiaki Makita | b90356ce | 2013-10-16 17:07:14 +0900 | [diff] [blame] | 389 | if (!*vid) { |
Nikolay Aleksandrov | 77751ee | 2015-09-30 20:16:53 +0200 | [diff] [blame] | 390 | u16 pvid = br_get_pvid(vg); |
| 391 | |
Toshiaki Makita | b90356ce | 2013-10-16 17:07:14 +0900 | [diff] [blame] | 392 | /* Frame had a tag with VID 0 or did not have a tag. |
| 393 | * See if pvid is set on this port. That tells us which |
| 394 | * vlan untagged or priority-tagged traffic belongs to. |
Vlad Yasevich | 7885198 | 2013-02-13 12:00:14 +0000 | [diff] [blame] | 395 | */ |
Vlad Yasevich | 3df6bf4 | 2014-10-03 11:29:17 -0400 | [diff] [blame] | 396 | if (!pvid) |
Toshiaki Makita | eb70761 | 2014-04-09 17:00:30 +0900 | [diff] [blame] | 397 | goto drop; |
Vlad Yasevich | 7885198 | 2013-02-13 12:00:14 +0000 | [diff] [blame] | 398 | |
Toshiaki Makita | b90356ce | 2013-10-16 17:07:14 +0900 | [diff] [blame] | 399 | /* PVID is set on this port. Any untagged or priority-tagged |
| 400 | * ingress frame is considered to belong to this vlan. |
Vlad Yasevich | 7885198 | 2013-02-13 12:00:14 +0000 | [diff] [blame] | 401 | */ |
Toshiaki Makita | dfb5fa3 | 2013-10-16 17:07:16 +0900 | [diff] [blame] | 402 | *vid = pvid; |
Toshiaki Makita | 8580e21 | 2014-06-10 20:59:23 +0900 | [diff] [blame] | 403 | if (likely(!tagged)) |
Toshiaki Makita | b90356ce | 2013-10-16 17:07:14 +0900 | [diff] [blame] | 404 | /* Untagged Frame. */ |
Toshiaki Makita | 8580e21 | 2014-06-10 20:59:23 +0900 | [diff] [blame] | 405 | __vlan_hwaccel_put_tag(skb, proto, pvid); |
Toshiaki Makita | b90356ce | 2013-10-16 17:07:14 +0900 | [diff] [blame] | 406 | else |
| 407 | /* Priority-tagged Frame. |
| 408 | * At this point, We know that skb->vlan_tci had |
| 409 | * VLAN_TAG_PRESENT bit and its VID field was 0x000. |
| 410 | * We update only VID field and preserve PCP field. |
| 411 | */ |
| 412 | skb->vlan_tci |= pvid; |
| 413 | |
Vlad Yasevich | 7885198 | 2013-02-13 12:00:14 +0000 | [diff] [blame] | 414 | return true; |
| 415 | } |
| 416 | |
| 417 | /* Frame had a valid vlan tag. See if vlan is allowed */ |
Nikolay Aleksandrov | 77751ee | 2015-09-30 20:16:53 +0200 | [diff] [blame] | 418 | v = br_vlan_find(vg, *vid); |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 419 | if (v && br_vlan_should_use(v)) |
Vlad Yasevich | a37b85c | 2013-02-13 12:00:10 +0000 | [diff] [blame] | 420 | return true; |
Toshiaki Makita | eb70761 | 2014-04-09 17:00:30 +0900 | [diff] [blame] | 421 | drop: |
| 422 | kfree_skb(skb); |
Vlad Yasevich | a37b85c | 2013-02-13 12:00:10 +0000 | [diff] [blame] | 423 | return false; |
| 424 | } |
| 425 | |
Nikolay Aleksandrov | 77751ee | 2015-09-30 20:16:53 +0200 | [diff] [blame] | 426 | bool br_allowed_ingress(const struct net_bridge *br, |
| 427 | struct net_bridge_vlan_group *vg, struct sk_buff *skb, |
| 428 | u16 *vid) |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 429 | { |
| 430 | /* If VLAN filtering is disabled on the bridge, all packets are |
| 431 | * permitted. |
| 432 | */ |
| 433 | if (!br->vlan_enabled) { |
| 434 | BR_INPUT_SKB_CB(skb)->vlan_filtered = false; |
| 435 | return true; |
| 436 | } |
| 437 | |
Nikolay Aleksandrov | 77751ee | 2015-09-30 20:16:53 +0200 | [diff] [blame] | 438 | return __allowed_ingress(vg, br->vlan_proto, skb, vid); |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 439 | } |
| 440 | |
Vlad Yasevich | 85f46c6 | 2013-02-13 12:00:11 +0000 | [diff] [blame] | 441 | /* Called under RCU. */ |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 442 | bool br_allowed_egress(struct net_bridge_vlan_group *vg, |
Vlad Yasevich | 85f46c6 | 2013-02-13 12:00:11 +0000 | [diff] [blame] | 443 | const struct sk_buff *skb) |
| 444 | { |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 445 | const struct net_bridge_vlan *v; |
Vlad Yasevich | 85f46c6 | 2013-02-13 12:00:11 +0000 | [diff] [blame] | 446 | u16 vid; |
| 447 | |
Vlad Yasevich | 20adfa1 | 2014-09-12 16:26:16 -0400 | [diff] [blame] | 448 | /* If this packet was not filtered at input, let it pass */ |
| 449 | if (!BR_INPUT_SKB_CB(skb)->vlan_filtered) |
Vlad Yasevich | 85f46c6 | 2013-02-13 12:00:11 +0000 | [diff] [blame] | 450 | return true; |
| 451 | |
Vlad Yasevich | 85f46c6 | 2013-02-13 12:00:11 +0000 | [diff] [blame] | 452 | br_vlan_get_tag(skb, &vid); |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 453 | v = br_vlan_find(vg, vid); |
| 454 | if (v && br_vlan_should_use(v)) |
Vlad Yasevich | 85f46c6 | 2013-02-13 12:00:11 +0000 | [diff] [blame] | 455 | return true; |
| 456 | |
| 457 | return false; |
| 458 | } |
| 459 | |
Toshiaki Makita | e0d7968 | 2014-05-26 15:15:53 +0900 | [diff] [blame] | 460 | /* Called under RCU */ |
| 461 | bool br_should_learn(struct net_bridge_port *p, struct sk_buff *skb, u16 *vid) |
| 462 | { |
Nikolay Aleksandrov | 468e794 | 2015-09-30 20:16:52 +0200 | [diff] [blame] | 463 | struct net_bridge_vlan_group *vg; |
Toshiaki Makita | e0d7968 | 2014-05-26 15:15:53 +0900 | [diff] [blame] | 464 | struct net_bridge *br = p->br; |
Toshiaki Makita | e0d7968 | 2014-05-26 15:15:53 +0900 | [diff] [blame] | 465 | |
Vlad Yasevich | 20adfa1 | 2014-09-12 16:26:16 -0400 | [diff] [blame] | 466 | /* If filtering was disabled at input, let it pass. */ |
Vlad Yasevich | c095f24 | 2014-09-15 15:24:26 -0400 | [diff] [blame] | 467 | if (!br->vlan_enabled) |
Toshiaki Makita | e0d7968 | 2014-05-26 15:15:53 +0900 | [diff] [blame] | 468 | return true; |
| 469 | |
Nikolay Aleksandrov | 468e794 | 2015-09-30 20:16:52 +0200 | [diff] [blame] | 470 | vg = p->vlgrp; |
| 471 | if (!vg || !vg->num_vlans) |
Toshiaki Makita | e0d7968 | 2014-05-26 15:15:53 +0900 | [diff] [blame] | 472 | return false; |
| 473 | |
Toshiaki Makita | 8580e21 | 2014-06-10 20:59:23 +0900 | [diff] [blame] | 474 | if (!br_vlan_get_tag(skb, vid) && skb->vlan_proto != br->vlan_proto) |
| 475 | *vid = 0; |
| 476 | |
Toshiaki Makita | e0d7968 | 2014-05-26 15:15:53 +0900 | [diff] [blame] | 477 | if (!*vid) { |
Nikolay Aleksandrov | 77751ee | 2015-09-30 20:16:53 +0200 | [diff] [blame] | 478 | *vid = br_get_pvid(vg); |
Vlad Yasevich | 3df6bf4 | 2014-10-03 11:29:17 -0400 | [diff] [blame] | 479 | if (!*vid) |
Toshiaki Makita | e0d7968 | 2014-05-26 15:15:53 +0900 | [diff] [blame] | 480 | return false; |
| 481 | |
| 482 | return true; |
| 483 | } |
| 484 | |
Nikolay Aleksandrov | 77751ee | 2015-09-30 20:16:53 +0200 | [diff] [blame] | 485 | if (br_vlan_find(vg, *vid)) |
Toshiaki Makita | e0d7968 | 2014-05-26 15:15:53 +0900 | [diff] [blame] | 486 | return true; |
| 487 | |
| 488 | return false; |
| 489 | } |
| 490 | |
Toshiaki Makita | 8adff41 | 2013-10-16 17:07:13 +0900 | [diff] [blame] | 491 | /* Must be protected by RTNL. |
| 492 | * Must be called with vid in range from 1 to 4094 inclusive. |
| 493 | */ |
Vlad Yasevich | 552406c | 2013-02-13 12:00:15 +0000 | [diff] [blame] | 494 | int br_vlan_add(struct net_bridge *br, u16 vid, u16 flags) |
Vlad Yasevich | 243a2e6 | 2013-02-13 12:00:09 +0000 | [diff] [blame] | 495 | { |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 496 | struct net_bridge_vlan *vlan; |
| 497 | int ret; |
Vlad Yasevich | 243a2e6 | 2013-02-13 12:00:09 +0000 | [diff] [blame] | 498 | |
| 499 | ASSERT_RTNL(); |
| 500 | |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 501 | vlan = br_vlan_find(br->vlgrp, vid); |
| 502 | if (vlan) { |
| 503 | if (!br_vlan_is_brentry(vlan)) { |
| 504 | /* Trying to change flags of non-existent bridge vlan */ |
| 505 | if (!(flags & BRIDGE_VLAN_INFO_BRENTRY)) |
| 506 | return -EINVAL; |
| 507 | /* It was only kept for port vlans, now make it real */ |
| 508 | ret = br_fdb_insert(br, NULL, br->dev->dev_addr, |
| 509 | vlan->vid); |
| 510 | if (ret) { |
| 511 | br_err(br, "failed insert local address into bridge forwarding table\n"); |
| 512 | return ret; |
| 513 | } |
| 514 | atomic_inc(&vlan->refcnt); |
| 515 | vlan->flags |= BRIDGE_VLAN_INFO_BRENTRY; |
| 516 | br->vlgrp->num_vlans++; |
| 517 | } |
| 518 | __vlan_add_flags(vlan, flags); |
| 519 | return 0; |
| 520 | } |
Vlad Yasevich | 243a2e6 | 2013-02-13 12:00:09 +0000 | [diff] [blame] | 521 | |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 522 | vlan = kzalloc(sizeof(*vlan), GFP_KERNEL); |
| 523 | if (!vlan) |
Vlad Yasevich | 243a2e6 | 2013-02-13 12:00:09 +0000 | [diff] [blame] | 524 | return -ENOMEM; |
| 525 | |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 526 | vlan->vid = vid; |
| 527 | vlan->flags = flags | BRIDGE_VLAN_INFO_MASTER; |
| 528 | vlan->flags &= ~BRIDGE_VLAN_INFO_PVID; |
| 529 | vlan->br = br; |
| 530 | if (flags & BRIDGE_VLAN_INFO_BRENTRY) |
| 531 | atomic_set(&vlan->refcnt, 1); |
| 532 | ret = __vlan_add(vlan, flags); |
| 533 | if (ret) |
| 534 | kfree(vlan); |
Vlad Yasevich | 243a2e6 | 2013-02-13 12:00:09 +0000 | [diff] [blame] | 535 | |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 536 | return ret; |
Vlad Yasevich | 243a2e6 | 2013-02-13 12:00:09 +0000 | [diff] [blame] | 537 | } |
| 538 | |
Toshiaki Makita | 8adff41 | 2013-10-16 17:07:13 +0900 | [diff] [blame] | 539 | /* Must be protected by RTNL. |
| 540 | * Must be called with vid in range from 1 to 4094 inclusive. |
| 541 | */ |
Vlad Yasevich | 243a2e6 | 2013-02-13 12:00:09 +0000 | [diff] [blame] | 542 | int br_vlan_delete(struct net_bridge *br, u16 vid) |
| 543 | { |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 544 | struct net_bridge_vlan *v; |
Vlad Yasevich | 243a2e6 | 2013-02-13 12:00:09 +0000 | [diff] [blame] | 545 | |
| 546 | ASSERT_RTNL(); |
| 547 | |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 548 | v = br_vlan_find(br->vlgrp, vid); |
| 549 | if (!v || !br_vlan_is_brentry(v)) |
| 550 | return -ENOENT; |
Vlad Yasevich | 243a2e6 | 2013-02-13 12:00:09 +0000 | [diff] [blame] | 551 | |
Toshiaki Makita | 424bb9c | 2014-02-07 16:48:25 +0900 | [diff] [blame] | 552 | br_fdb_find_delete_local(br, NULL, br->dev->dev_addr, vid); |
Roopa Prabhu | 3741873 | 2015-10-08 10:38:52 -0700 | [diff] [blame] | 553 | br_fdb_delete_by_port(br, NULL, vid, 0); |
Vlad Yasevich | bc9a25d | 2013-02-13 12:00:19 +0000 | [diff] [blame] | 554 | |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 555 | return __vlan_del(v); |
Vlad Yasevich | 243a2e6 | 2013-02-13 12:00:09 +0000 | [diff] [blame] | 556 | } |
| 557 | |
| 558 | void br_vlan_flush(struct net_bridge *br) |
| 559 | { |
Vlad Yasevich | 243a2e6 | 2013-02-13 12:00:09 +0000 | [diff] [blame] | 560 | ASSERT_RTNL(); |
Vlad Yasevich | 243a2e6 | 2013-02-13 12:00:09 +0000 | [diff] [blame] | 561 | |
Nikolay Aleksandrov | 77751ee | 2015-09-30 20:16:53 +0200 | [diff] [blame] | 562 | __vlan_flush(br_vlan_group(br)); |
Vlad Yasevich | 243a2e6 | 2013-02-13 12:00:09 +0000 | [diff] [blame] | 563 | } |
| 564 | |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 565 | struct net_bridge_vlan *br_vlan_find(struct net_bridge_vlan_group *vg, u16 vid) |
Toshiaki Makita | 2b292fb | 2014-02-07 16:48:22 +0900 | [diff] [blame] | 566 | { |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 567 | if (!vg) |
| 568 | return NULL; |
Toshiaki Makita | 2b292fb | 2014-02-07 16:48:22 +0900 | [diff] [blame] | 569 | |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 570 | return br_vlan_lookup(&vg->vlan_hash, vid); |
Toshiaki Makita | 2b292fb | 2014-02-07 16:48:22 +0900 | [diff] [blame] | 571 | } |
| 572 | |
Toshiaki Makita | 204177f | 2014-06-10 20:59:25 +0900 | [diff] [blame] | 573 | /* Must be protected by RTNL. */ |
| 574 | static void recalculate_group_addr(struct net_bridge *br) |
| 575 | { |
| 576 | if (br->group_addr_set) |
| 577 | return; |
| 578 | |
| 579 | spin_lock_bh(&br->lock); |
| 580 | if (!br->vlan_enabled || br->vlan_proto == htons(ETH_P_8021Q)) { |
| 581 | /* Bridge Group Address */ |
| 582 | br->group_addr[5] = 0x00; |
| 583 | } else { /* vlan_enabled && ETH_P_8021AD */ |
| 584 | /* Provider Bridge Group Address */ |
| 585 | br->group_addr[5] = 0x08; |
| 586 | } |
| 587 | spin_unlock_bh(&br->lock); |
| 588 | } |
| 589 | |
| 590 | /* Must be protected by RTNL. */ |
| 591 | void br_recalculate_fwd_mask(struct net_bridge *br) |
| 592 | { |
| 593 | if (!br->vlan_enabled || br->vlan_proto == htons(ETH_P_8021Q)) |
| 594 | br->group_fwd_mask_required = BR_GROUPFWD_DEFAULT; |
| 595 | else /* vlan_enabled && ETH_P_8021AD */ |
| 596 | br->group_fwd_mask_required = BR_GROUPFWD_8021AD & |
| 597 | ~(1u << br->group_addr[5]); |
| 598 | } |
| 599 | |
Nikolay Aleksandrov | a785403 | 2015-08-07 19:40:45 +0300 | [diff] [blame] | 600 | int __br_vlan_filter_toggle(struct net_bridge *br, unsigned long val) |
Vlad Yasevich | 243a2e6 | 2013-02-13 12:00:09 +0000 | [diff] [blame] | 601 | { |
Vlad Yasevich | 243a2e6 | 2013-02-13 12:00:09 +0000 | [diff] [blame] | 602 | if (br->vlan_enabled == val) |
Nikolay Aleksandrov | a785403 | 2015-08-07 19:40:45 +0300 | [diff] [blame] | 603 | return 0; |
Vlad Yasevich | 243a2e6 | 2013-02-13 12:00:09 +0000 | [diff] [blame] | 604 | |
| 605 | br->vlan_enabled = val; |
Vlad Yasevich | 2796d0c | 2014-05-16 09:59:20 -0400 | [diff] [blame] | 606 | br_manage_promisc(br); |
Toshiaki Makita | 204177f | 2014-06-10 20:59:25 +0900 | [diff] [blame] | 607 | recalculate_group_addr(br); |
| 608 | br_recalculate_fwd_mask(br); |
Vlad Yasevich | 243a2e6 | 2013-02-13 12:00:09 +0000 | [diff] [blame] | 609 | |
Nikolay Aleksandrov | a785403 | 2015-08-07 19:40:45 +0300 | [diff] [blame] | 610 | return 0; |
| 611 | } |
| 612 | |
| 613 | int br_vlan_filter_toggle(struct net_bridge *br, unsigned long val) |
| 614 | { |
| 615 | if (!rtnl_trylock()) |
| 616 | return restart_syscall(); |
| 617 | |
| 618 | __br_vlan_filter_toggle(br, val); |
Vlad Yasevich | 243a2e6 | 2013-02-13 12:00:09 +0000 | [diff] [blame] | 619 | rtnl_unlock(); |
Nikolay Aleksandrov | a785403 | 2015-08-07 19:40:45 +0300 | [diff] [blame] | 620 | |
Vlad Yasevich | 243a2e6 | 2013-02-13 12:00:09 +0000 | [diff] [blame] | 621 | return 0; |
| 622 | } |
| 623 | |
Toshiaki Makita | d2d427b | 2015-08-27 15:32:26 +0900 | [diff] [blame] | 624 | int __br_vlan_set_proto(struct net_bridge *br, __be16 proto) |
Toshiaki Makita | 204177f | 2014-06-10 20:59:25 +0900 | [diff] [blame] | 625 | { |
| 626 | int err = 0; |
| 627 | struct net_bridge_port *p; |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 628 | struct net_bridge_vlan *vlan; |
Toshiaki Makita | d2d427b | 2015-08-27 15:32:26 +0900 | [diff] [blame] | 629 | __be16 oldproto; |
Toshiaki Makita | 204177f | 2014-06-10 20:59:25 +0900 | [diff] [blame] | 630 | |
Toshiaki Makita | 204177f | 2014-06-10 20:59:25 +0900 | [diff] [blame] | 631 | if (br->vlan_proto == proto) |
Toshiaki Makita | d2d427b | 2015-08-27 15:32:26 +0900 | [diff] [blame] | 632 | return 0; |
Toshiaki Makita | 204177f | 2014-06-10 20:59:25 +0900 | [diff] [blame] | 633 | |
| 634 | /* Add VLANs for the new proto to the device filter. */ |
| 635 | list_for_each_entry(p, &br->port_list, list) { |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 636 | list_for_each_entry(vlan, &p->vlgrp->vlan_list, vlist) { |
| 637 | err = vlan_vid_add(p->dev, proto, vlan->vid); |
Toshiaki Makita | 204177f | 2014-06-10 20:59:25 +0900 | [diff] [blame] | 638 | if (err) |
| 639 | goto err_filt; |
| 640 | } |
| 641 | } |
| 642 | |
| 643 | oldproto = br->vlan_proto; |
| 644 | br->vlan_proto = proto; |
| 645 | |
| 646 | recalculate_group_addr(br); |
| 647 | br_recalculate_fwd_mask(br); |
| 648 | |
| 649 | /* Delete VLANs for the old proto from the device filter. */ |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 650 | list_for_each_entry(p, &br->port_list, list) |
| 651 | list_for_each_entry(vlan, &p->vlgrp->vlan_list, vlist) |
| 652 | vlan_vid_del(p->dev, oldproto, vlan->vid); |
Toshiaki Makita | 204177f | 2014-06-10 20:59:25 +0900 | [diff] [blame] | 653 | |
Toshiaki Makita | d2d427b | 2015-08-27 15:32:26 +0900 | [diff] [blame] | 654 | return 0; |
Toshiaki Makita | 204177f | 2014-06-10 20:59:25 +0900 | [diff] [blame] | 655 | |
| 656 | err_filt: |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 657 | list_for_each_entry_continue_reverse(vlan, &p->vlgrp->vlan_list, vlist) |
| 658 | vlan_vid_del(p->dev, proto, vlan->vid); |
Toshiaki Makita | 204177f | 2014-06-10 20:59:25 +0900 | [diff] [blame] | 659 | |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 660 | list_for_each_entry_continue_reverse(p, &br->port_list, list) |
| 661 | list_for_each_entry(vlan, &p->vlgrp->vlan_list, vlist) |
| 662 | vlan_vid_del(p->dev, proto, vlan->vid); |
Toshiaki Makita | 204177f | 2014-06-10 20:59:25 +0900 | [diff] [blame] | 663 | |
Toshiaki Makita | d2d427b | 2015-08-27 15:32:26 +0900 | [diff] [blame] | 664 | return err; |
| 665 | } |
| 666 | |
| 667 | int br_vlan_set_proto(struct net_bridge *br, unsigned long val) |
| 668 | { |
| 669 | int err; |
| 670 | |
| 671 | if (val != ETH_P_8021Q && val != ETH_P_8021AD) |
| 672 | return -EPROTONOSUPPORT; |
| 673 | |
| 674 | if (!rtnl_trylock()) |
| 675 | return restart_syscall(); |
| 676 | |
| 677 | err = __br_vlan_set_proto(br, htons(val)); |
| 678 | rtnl_unlock(); |
| 679 | |
| 680 | return err; |
Toshiaki Makita | 204177f | 2014-06-10 20:59:25 +0900 | [diff] [blame] | 681 | } |
| 682 | |
Nikolay Aleksandrov | 77751ee | 2015-09-30 20:16:53 +0200 | [diff] [blame] | 683 | static bool vlan_default_pvid(struct net_bridge_vlan_group *vg, u16 vid) |
Vlad Yasevich | 5be5a2d | 2014-10-03 11:29:18 -0400 | [diff] [blame] | 684 | { |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 685 | struct net_bridge_vlan *v; |
| 686 | |
Nikolay Aleksandrov | 77751ee | 2015-09-30 20:16:53 +0200 | [diff] [blame] | 687 | if (vid != vg->pvid) |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 688 | return false; |
| 689 | |
| 690 | v = br_vlan_lookup(&vg->vlan_hash, vid); |
| 691 | if (v && br_vlan_should_use(v) && |
| 692 | (v->flags & BRIDGE_VLAN_INFO_UNTAGGED)) |
| 693 | return true; |
| 694 | |
| 695 | return false; |
Vlad Yasevich | 5be5a2d | 2014-10-03 11:29:18 -0400 | [diff] [blame] | 696 | } |
| 697 | |
| 698 | static void br_vlan_disable_default_pvid(struct net_bridge *br) |
| 699 | { |
| 700 | struct net_bridge_port *p; |
| 701 | u16 pvid = br->default_pvid; |
| 702 | |
| 703 | /* Disable default_pvid on all ports where it is still |
| 704 | * configured. |
| 705 | */ |
Nikolay Aleksandrov | 77751ee | 2015-09-30 20:16:53 +0200 | [diff] [blame] | 706 | if (vlan_default_pvid(br->vlgrp, pvid)) |
Vlad Yasevich | 5be5a2d | 2014-10-03 11:29:18 -0400 | [diff] [blame] | 707 | br_vlan_delete(br, pvid); |
| 708 | |
| 709 | list_for_each_entry(p, &br->port_list, list) { |
Nikolay Aleksandrov | 77751ee | 2015-09-30 20:16:53 +0200 | [diff] [blame] | 710 | if (vlan_default_pvid(p->vlgrp, pvid)) |
Vlad Yasevich | 5be5a2d | 2014-10-03 11:29:18 -0400 | [diff] [blame] | 711 | nbp_vlan_delete(p, pvid); |
| 712 | } |
| 713 | |
| 714 | br->default_pvid = 0; |
| 715 | } |
| 716 | |
Nikolay Aleksandrov | 0f963b7 | 2015-10-04 14:23:47 +0200 | [diff] [blame] | 717 | int __br_vlan_set_default_pvid(struct net_bridge *br, u16 pvid) |
Vlad Yasevich | 5be5a2d | 2014-10-03 11:29:18 -0400 | [diff] [blame] | 718 | { |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 719 | const struct net_bridge_vlan *pvent; |
Vlad Yasevich | 5be5a2d | 2014-10-03 11:29:18 -0400 | [diff] [blame] | 720 | struct net_bridge_port *p; |
| 721 | u16 old_pvid; |
| 722 | int err = 0; |
| 723 | unsigned long *changed; |
| 724 | |
Nikolay Aleksandrov | 0f963b7 | 2015-10-04 14:23:47 +0200 | [diff] [blame] | 725 | if (!pvid) { |
| 726 | br_vlan_disable_default_pvid(br); |
| 727 | return 0; |
| 728 | } |
| 729 | |
Vlad Yasevich | 5be5a2d | 2014-10-03 11:29:18 -0400 | [diff] [blame] | 730 | changed = kcalloc(BITS_TO_LONGS(BR_MAX_PORTS), sizeof(unsigned long), |
| 731 | GFP_KERNEL); |
| 732 | if (!changed) |
| 733 | return -ENOMEM; |
| 734 | |
| 735 | old_pvid = br->default_pvid; |
| 736 | |
| 737 | /* Update default_pvid config only if we do not conflict with |
| 738 | * user configuration. |
| 739 | */ |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 740 | pvent = br_vlan_find(br->vlgrp, pvid); |
Nikolay Aleksandrov | 77751ee | 2015-09-30 20:16:53 +0200 | [diff] [blame] | 741 | if ((!old_pvid || vlan_default_pvid(br->vlgrp, old_pvid)) && |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 742 | (!pvent || !br_vlan_should_use(pvent))) { |
Vlad Yasevich | 5be5a2d | 2014-10-03 11:29:18 -0400 | [diff] [blame] | 743 | err = br_vlan_add(br, pvid, |
| 744 | BRIDGE_VLAN_INFO_PVID | |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 745 | BRIDGE_VLAN_INFO_UNTAGGED | |
| 746 | BRIDGE_VLAN_INFO_BRENTRY); |
Vlad Yasevich | 5be5a2d | 2014-10-03 11:29:18 -0400 | [diff] [blame] | 747 | if (err) |
| 748 | goto out; |
| 749 | br_vlan_delete(br, old_pvid); |
| 750 | set_bit(0, changed); |
| 751 | } |
| 752 | |
| 753 | list_for_each_entry(p, &br->port_list, list) { |
| 754 | /* Update default_pvid config only if we do not conflict with |
| 755 | * user configuration. |
| 756 | */ |
| 757 | if ((old_pvid && |
Nikolay Aleksandrov | 77751ee | 2015-09-30 20:16:53 +0200 | [diff] [blame] | 758 | !vlan_default_pvid(p->vlgrp, old_pvid)) || |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 759 | br_vlan_find(p->vlgrp, pvid)) |
Vlad Yasevich | 5be5a2d | 2014-10-03 11:29:18 -0400 | [diff] [blame] | 760 | continue; |
| 761 | |
| 762 | err = nbp_vlan_add(p, pvid, |
| 763 | BRIDGE_VLAN_INFO_PVID | |
| 764 | BRIDGE_VLAN_INFO_UNTAGGED); |
| 765 | if (err) |
| 766 | goto err_port; |
| 767 | nbp_vlan_delete(p, old_pvid); |
| 768 | set_bit(p->port_no, changed); |
| 769 | } |
| 770 | |
| 771 | br->default_pvid = pvid; |
| 772 | |
| 773 | out: |
| 774 | kfree(changed); |
| 775 | return err; |
| 776 | |
| 777 | err_port: |
| 778 | list_for_each_entry_continue_reverse(p, &br->port_list, list) { |
| 779 | if (!test_bit(p->port_no, changed)) |
| 780 | continue; |
| 781 | |
| 782 | if (old_pvid) |
| 783 | nbp_vlan_add(p, old_pvid, |
| 784 | BRIDGE_VLAN_INFO_PVID | |
| 785 | BRIDGE_VLAN_INFO_UNTAGGED); |
| 786 | nbp_vlan_delete(p, pvid); |
| 787 | } |
| 788 | |
| 789 | if (test_bit(0, changed)) { |
| 790 | if (old_pvid) |
| 791 | br_vlan_add(br, old_pvid, |
| 792 | BRIDGE_VLAN_INFO_PVID | |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 793 | BRIDGE_VLAN_INFO_UNTAGGED | |
| 794 | BRIDGE_VLAN_INFO_BRENTRY); |
Vlad Yasevich | 5be5a2d | 2014-10-03 11:29:18 -0400 | [diff] [blame] | 795 | br_vlan_delete(br, pvid); |
| 796 | } |
| 797 | goto out; |
| 798 | } |
| 799 | |
Vlad Yasevich | 96a20d9 | 2014-10-03 11:29:16 -0400 | [diff] [blame] | 800 | int br_vlan_set_default_pvid(struct net_bridge *br, unsigned long val) |
| 801 | { |
| 802 | u16 pvid = val; |
| 803 | int err = 0; |
| 804 | |
Vlad Yasevich | 5be5a2d | 2014-10-03 11:29:18 -0400 | [diff] [blame] | 805 | if (val >= VLAN_VID_MASK) |
Vlad Yasevich | 96a20d9 | 2014-10-03 11:29:16 -0400 | [diff] [blame] | 806 | return -EINVAL; |
| 807 | |
| 808 | if (!rtnl_trylock()) |
| 809 | return restart_syscall(); |
| 810 | |
| 811 | if (pvid == br->default_pvid) |
| 812 | goto unlock; |
| 813 | |
| 814 | /* Only allow default pvid change when filtering is disabled */ |
| 815 | if (br->vlan_enabled) { |
| 816 | pr_info_once("Please disable vlan filtering to change default_pvid\n"); |
| 817 | err = -EPERM; |
| 818 | goto unlock; |
| 819 | } |
Nikolay Aleksandrov | 0f963b7 | 2015-10-04 14:23:47 +0200 | [diff] [blame] | 820 | err = __br_vlan_set_default_pvid(br, pvid); |
Vlad Yasevich | 96a20d9 | 2014-10-03 11:29:16 -0400 | [diff] [blame] | 821 | unlock: |
| 822 | rtnl_unlock(); |
| 823 | return err; |
| 824 | } |
| 825 | |
Vlad Yasevich | 5be5a2d | 2014-10-03 11:29:18 -0400 | [diff] [blame] | 826 | int br_vlan_init(struct net_bridge *br) |
Toshiaki Makita | 8580e21 | 2014-06-10 20:59:23 +0900 | [diff] [blame] | 827 | { |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 828 | int ret = -ENOMEM; |
| 829 | |
| 830 | br->vlgrp = kzalloc(sizeof(struct net_bridge_vlan_group), GFP_KERNEL); |
| 831 | if (!br->vlgrp) |
| 832 | goto out; |
| 833 | ret = rhashtable_init(&br->vlgrp->vlan_hash, &br_vlan_rht_params); |
| 834 | if (ret) |
| 835 | goto err_rhtbl; |
| 836 | INIT_LIST_HEAD(&br->vlgrp->vlan_list); |
Toshiaki Makita | 8580e21 | 2014-06-10 20:59:23 +0900 | [diff] [blame] | 837 | br->vlan_proto = htons(ETH_P_8021Q); |
Vlad Yasevich | 96a20d9 | 2014-10-03 11:29:16 -0400 | [diff] [blame] | 838 | br->default_pvid = 1; |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 839 | ret = br_vlan_add(br, 1, |
| 840 | BRIDGE_VLAN_INFO_PVID | BRIDGE_VLAN_INFO_UNTAGGED | |
| 841 | BRIDGE_VLAN_INFO_BRENTRY); |
| 842 | if (ret) |
| 843 | goto err_vlan_add; |
| 844 | |
| 845 | out: |
| 846 | return ret; |
| 847 | |
| 848 | err_vlan_add: |
| 849 | rhashtable_destroy(&br->vlgrp->vlan_hash); |
| 850 | err_rhtbl: |
| 851 | kfree(br->vlgrp); |
| 852 | |
| 853 | goto out; |
| 854 | } |
| 855 | |
| 856 | int nbp_vlan_init(struct net_bridge_port *p) |
| 857 | { |
Nikolay Aleksandrov | 263344e | 2015-09-30 20:16:54 +0200 | [diff] [blame] | 858 | struct net_bridge_vlan_group *vg; |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 859 | int ret = -ENOMEM; |
| 860 | |
Nikolay Aleksandrov | 263344e | 2015-09-30 20:16:54 +0200 | [diff] [blame] | 861 | vg = kzalloc(sizeof(struct net_bridge_vlan_group), GFP_KERNEL); |
| 862 | if (!vg) |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 863 | goto out; |
| 864 | |
Nikolay Aleksandrov | 263344e | 2015-09-30 20:16:54 +0200 | [diff] [blame] | 865 | ret = rhashtable_init(&vg->vlan_hash, &br_vlan_rht_params); |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 866 | if (ret) |
| 867 | goto err_rhtbl; |
Nikolay Aleksandrov | 263344e | 2015-09-30 20:16:54 +0200 | [diff] [blame] | 868 | INIT_LIST_HEAD(&vg->vlan_list); |
| 869 | /* Make sure everything's committed before publishing vg */ |
| 870 | smp_wmb(); |
| 871 | p->vlgrp = vg; |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 872 | if (p->br->default_pvid) { |
| 873 | ret = nbp_vlan_add(p, p->br->default_pvid, |
| 874 | BRIDGE_VLAN_INFO_PVID | |
| 875 | BRIDGE_VLAN_INFO_UNTAGGED); |
| 876 | if (ret) |
| 877 | goto err_vlan_add; |
| 878 | } |
| 879 | out: |
| 880 | return ret; |
| 881 | |
| 882 | err_vlan_add: |
Nikolay Aleksandrov | 263344e | 2015-09-30 20:16:54 +0200 | [diff] [blame] | 883 | rhashtable_destroy(&vg->vlan_hash); |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 884 | err_rhtbl: |
Nikolay Aleksandrov | 263344e | 2015-09-30 20:16:54 +0200 | [diff] [blame] | 885 | kfree(vg); |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 886 | |
| 887 | goto out; |
Toshiaki Makita | 8580e21 | 2014-06-10 20:59:23 +0900 | [diff] [blame] | 888 | } |
| 889 | |
Toshiaki Makita | 8adff41 | 2013-10-16 17:07:13 +0900 | [diff] [blame] | 890 | /* Must be protected by RTNL. |
| 891 | * Must be called with vid in range from 1 to 4094 inclusive. |
| 892 | */ |
Vlad Yasevich | 552406c | 2013-02-13 12:00:15 +0000 | [diff] [blame] | 893 | int nbp_vlan_add(struct net_bridge_port *port, u16 vid, u16 flags) |
Vlad Yasevich | 243a2e6 | 2013-02-13 12:00:09 +0000 | [diff] [blame] | 894 | { |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 895 | struct net_bridge_vlan *vlan; |
| 896 | int ret; |
Vlad Yasevich | 243a2e6 | 2013-02-13 12:00:09 +0000 | [diff] [blame] | 897 | |
| 898 | ASSERT_RTNL(); |
| 899 | |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 900 | vlan = br_vlan_find(port->vlgrp, vid); |
| 901 | if (vlan) { |
| 902 | __vlan_add_flags(vlan, flags); |
| 903 | return 0; |
Vlad Yasevich | 243a2e6 | 2013-02-13 12:00:09 +0000 | [diff] [blame] | 904 | } |
| 905 | |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 906 | vlan = kzalloc(sizeof(*vlan), GFP_KERNEL); |
| 907 | if (!vlan) |
| 908 | return -ENOMEM; |
Vlad Yasevich | 243a2e6 | 2013-02-13 12:00:09 +0000 | [diff] [blame] | 909 | |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 910 | vlan->vid = vid; |
| 911 | vlan->port = port; |
| 912 | ret = __vlan_add(vlan, flags); |
| 913 | if (ret) |
| 914 | kfree(vlan); |
Vlad Yasevich | 243a2e6 | 2013-02-13 12:00:09 +0000 | [diff] [blame] | 915 | |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 916 | return ret; |
Vlad Yasevich | 243a2e6 | 2013-02-13 12:00:09 +0000 | [diff] [blame] | 917 | } |
| 918 | |
Toshiaki Makita | 8adff41 | 2013-10-16 17:07:13 +0900 | [diff] [blame] | 919 | /* Must be protected by RTNL. |
| 920 | * Must be called with vid in range from 1 to 4094 inclusive. |
| 921 | */ |
Vlad Yasevich | 243a2e6 | 2013-02-13 12:00:09 +0000 | [diff] [blame] | 922 | int nbp_vlan_delete(struct net_bridge_port *port, u16 vid) |
| 923 | { |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 924 | struct net_bridge_vlan *v; |
Vlad Yasevich | 243a2e6 | 2013-02-13 12:00:09 +0000 | [diff] [blame] | 925 | |
| 926 | ASSERT_RTNL(); |
| 927 | |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 928 | v = br_vlan_find(port->vlgrp, vid); |
| 929 | if (!v) |
| 930 | return -ENOENT; |
Toshiaki Makita | 424bb9c | 2014-02-07 16:48:25 +0900 | [diff] [blame] | 931 | br_fdb_find_delete_local(port->br, port, port->dev->dev_addr, vid); |
Nikolay Aleksandrov | 1ea2d02 | 2015-06-23 05:28:16 -0700 | [diff] [blame] | 932 | br_fdb_delete_by_port(port->br, port, vid, 0); |
Vlad Yasevich | bc9a25d | 2013-02-13 12:00:19 +0000 | [diff] [blame] | 933 | |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 934 | return __vlan_del(v); |
Vlad Yasevich | 243a2e6 | 2013-02-13 12:00:09 +0000 | [diff] [blame] | 935 | } |
| 936 | |
| 937 | void nbp_vlan_flush(struct net_bridge_port *port) |
| 938 | { |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 939 | struct net_bridge_vlan *vlan; |
Vlad Yasevich | 243a2e6 | 2013-02-13 12:00:09 +0000 | [diff] [blame] | 940 | |
| 941 | ASSERT_RTNL(); |
| 942 | |
Nikolay Aleksandrov | 2594e906 | 2015-09-25 19:00:11 +0200 | [diff] [blame] | 943 | list_for_each_entry(vlan, &port->vlgrp->vlan_list, vlist) |
| 944 | vlan_vid_del(port->dev, port->br->vlan_proto, vlan->vid); |
Vlad Yasevich | 243a2e6 | 2013-02-13 12:00:09 +0000 | [diff] [blame] | 945 | |
Nikolay Aleksandrov | 77751ee | 2015-09-30 20:16:53 +0200 | [diff] [blame] | 946 | __vlan_flush(nbp_vlan_group(port)); |
Vlad Yasevich | 5be5a2d | 2014-10-03 11:29:18 -0400 | [diff] [blame] | 947 | } |