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