| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107 |
- From: Felix Fietkau <nbd@nbd.name>
- Subject: [PATCH] bridge: port isolate
- Isolating individual bridge ports
- ---
- --- a/include/linux/if_bridge.h
- +++ b/include/linux/if_bridge.h
- @@ -45,6 +45,7 @@ struct br_ip_list {
- #define BR_PROXYARP BIT(8)
- #define BR_LEARNING_SYNC BIT(9)
- #define BR_PROXYARP_WIFI BIT(10)
- +#define BR_ISOLATE_MODE BIT(11)
-
- #define BR_DEFAULT_AGEING_TIME (300 * HZ)
-
- --- a/net/bridge/br_sysfs_if.c
- +++ b/net/bridge/br_sysfs_if.c
- @@ -173,6 +173,22 @@ BRPORT_ATTR_FLAG(unicast_flood, BR_FLOOD
- BRPORT_ATTR_FLAG(proxyarp, BR_PROXYARP);
- BRPORT_ATTR_FLAG(proxyarp_wifi, BR_PROXYARP_WIFI);
-
- +static ssize_t show_isolate_mode(struct net_bridge_port *p, char *buf)
- +{
- + int isolate_mode = (p->flags & BR_ISOLATE_MODE) ? 1 : 0;
- + return sprintf(buf, "%d\n", isolate_mode);
- +}
- +static int store_isolate_mode(struct net_bridge_port *p, unsigned long v)
- +{
- + if (v)
- + p->flags |= BR_ISOLATE_MODE;
- + else
- + p->flags &= ~BR_ISOLATE_MODE;
- + return 0;
- +}
- +static BRPORT_ATTR(isolate_mode, S_IRUGO | S_IWUSR,
- + show_isolate_mode, store_isolate_mode);
- +
- #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
- static ssize_t show_multicast_router(struct net_bridge_port *p, char *buf)
- {
- @@ -217,6 +233,7 @@ static const struct brport_attribute *br
- #endif
- &brport_attr_proxyarp,
- &brport_attr_proxyarp_wifi,
- + &brport_attr_isolate_mode,
- NULL
- };
-
- --- a/net/bridge/br_input.c
- +++ b/net/bridge/br_input.c
- @@ -192,8 +192,8 @@ int br_handle_frame_finish(struct net *n
-
- unicast = false;
- br->dev->stats.multicast++;
- - } else if ((dst = __br_fdb_get(br, dest, vid)) &&
- - dst->is_local) {
- + } else if ((p->flags & BR_ISOLATE_MODE) ||
- + ((dst = __br_fdb_get(br, dest, vid)) && dst->is_local)) {
- skb2 = skb;
- /* Do not forward the packet since it's local. */
- skb = NULL;
- --- a/net/bridge/br_forward.c
- +++ b/net/bridge/br_forward.c
- @@ -141,7 +141,7 @@ EXPORT_SYMBOL_GPL(br_deliver);
- /* called with rcu_read_lock */
- void br_forward(const struct net_bridge_port *to, struct sk_buff *skb, struct sk_buff *skb0)
- {
- - if (to && should_deliver(to, skb)) {
- + if (to && should_deliver(to, skb) && !(to->flags & BR_ISOLATE_MODE)) {
- if (skb0)
- deliver_clone(to, skb, __br_forward);
- else
- @@ -197,7 +197,7 @@ static void br_flood(struct net_bridge *
- struct sk_buff *skb0,
- void (*__packet_hook)(const struct net_bridge_port *p,
- struct sk_buff *skb),
- - bool unicast)
- + bool unicast, bool forward)
- {
- struct net_bridge_port *p;
- struct net_bridge_port *prev;
- @@ -205,6 +205,8 @@ static void br_flood(struct net_bridge *
- prev = NULL;
-
- list_for_each_entry_rcu(p, &br->port_list, list) {
- + if (forward && (p->flags & BR_ISOLATE_MODE))
- + continue;
- /* Do not flood unicast traffic to ports that turn it off */
- if (unicast && !(p->flags & BR_FLOOD))
- continue;
- @@ -239,14 +241,14 @@ out:
- /* called with rcu_read_lock */
- void br_flood_deliver(struct net_bridge *br, struct sk_buff *skb, bool unicast)
- {
- - br_flood(br, skb, NULL, __br_deliver, unicast);
- + br_flood(br, skb, NULL, __br_deliver, unicast, false);
- }
-
- /* called under bridge lock */
- void br_flood_forward(struct net_bridge *br, struct sk_buff *skb,
- struct sk_buff *skb2, bool unicast)
- {
- - br_flood(br, skb, skb2, __br_forward, unicast);
- + br_flood(br, skb, skb2, __br_forward, unicast, true);
- }
-
- #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
|
