1 From: Felix Fietkau <nbd@openwrt.org>
2 Subject: [PATCH] bridge: port isolate
4 Isolating individual bridge ports
6 --- a/include/linux/if_bridge.h
7 +++ b/include/linux/if_bridge.h
8 @@ -45,6 +45,7 @@ struct br_ip_list {
9 #define BR_PROXYARP BIT(8)
10 #define BR_LEARNING_SYNC BIT(9)
11 #define BR_PROXYARP_WIFI BIT(10)
12 +#define BR_ISOLATE_MODE BIT(11)
14 extern void brioctl_set(int (*ioctl_hook)(struct net *, unsigned int, void __user *));
16 --- a/net/bridge/br_sysfs_if.c
17 +++ b/net/bridge/br_sysfs_if.c
18 @@ -173,6 +173,22 @@ BRPORT_ATTR_FLAG(unicast_flood, BR_FLOOD
19 BRPORT_ATTR_FLAG(proxyarp, BR_PROXYARP);
20 BRPORT_ATTR_FLAG(proxyarp_wifi, BR_PROXYARP_WIFI);
22 +static ssize_t show_isolate_mode(struct net_bridge_port *p, char *buf)
24 + int isolate_mode = (p->flags & BR_ISOLATE_MODE) ? 1 : 0;
25 + return sprintf(buf, "%d\n", isolate_mode);
27 +static ssize_t store_isolate_mode(struct net_bridge_port *p, unsigned long v)
30 + p->flags |= BR_ISOLATE_MODE;
32 + p->flags &= ~BR_ISOLATE_MODE;
35 +static BRPORT_ATTR(isolate_mode, S_IRUGO | S_IWUSR,
36 + show_isolate_mode, store_isolate_mode);
38 #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
39 static ssize_t show_multicast_router(struct net_bridge_port *p, char *buf)
41 @@ -217,6 +233,7 @@ static const struct brport_attribute *br
43 &brport_attr_proxyarp,
44 &brport_attr_proxyarp_wifi,
45 + &brport_attr_isolate_mode,
49 --- a/net/bridge/br_input.c
50 +++ b/net/bridge/br_input.c
51 @@ -185,8 +185,8 @@ int br_handle_frame_finish(struct sock *
54 br->dev->stats.multicast++;
55 - } else if ((dst = __br_fdb_get(br, dest, vid)) &&
57 + } else if ((p->flags & BR_ISOLATE_MODE) ||
58 + ((dst = __br_fdb_get(br, dest, vid)) && dst->is_local)) {
60 /* Do not forward the packet since it's local. */
62 --- a/net/bridge/br_forward.c
63 +++ b/net/bridge/br_forward.c
64 @@ -118,7 +118,7 @@ EXPORT_SYMBOL_GPL(br_deliver);
65 /* called with rcu_read_lock */
66 void br_forward(const struct net_bridge_port *to, struct sk_buff *skb, struct sk_buff *skb0)
68 - if (should_deliver(to, skb)) {
69 + if (should_deliver(to, skb) && !(to->flags & BR_ISOLATE_MODE)) {
71 deliver_clone(to, skb, __br_forward);
73 @@ -174,7 +174,7 @@ static void br_flood(struct net_bridge *
75 void (*__packet_hook)(const struct net_bridge_port *p,
78 + bool unicast, bool forward)
80 struct net_bridge_port *p;
81 struct net_bridge_port *prev;
82 @@ -182,6 +182,8 @@ static void br_flood(struct net_bridge *
85 list_for_each_entry_rcu(p, &br->port_list, list) {
86 + if (forward && (p->flags & BR_ISOLATE_MODE))
88 /* Do not flood unicast traffic to ports that turn it off */
89 if (unicast && !(p->flags & BR_FLOOD))
91 @@ -216,14 +218,14 @@ out:
92 /* called with rcu_read_lock */
93 void br_flood_deliver(struct net_bridge *br, struct sk_buff *skb, bool unicast)
95 - br_flood(br, skb, NULL, __br_deliver, unicast);
96 + br_flood(br, skb, NULL, __br_deliver, unicast, false);
99 /* called under bridge lock */
100 void br_flood_forward(struct net_bridge *br, struct sk_buff *skb,
101 struct sk_buff *skb2, bool unicast)
103 - br_flood(br, skb, skb2, __br_forward, unicast);
104 + br_flood(br, skb, skb2, __br_forward, unicast, true);
107 #ifdef CONFIG_BRIDGE_IGMP_SNOOPING