| Message ID | 1472570588-32503-3-git-send-email-nikolay@cumulusnetworks.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
On Tue, Aug 30, 2016 at 05:23:08PM +0200, Nikolay Aleksandrov via Bridge wrote: > diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c > index 1da3221845f1..ed0dd3340084 100644 > --- a/net/bridge/br_if.c > +++ b/net/bridge/br_if.c > @@ -362,7 +362,7 @@ static struct net_bridge_port *new_nbp(struct net_bridge *br, > p->path_cost = port_cost(dev); > p->priority = 0x8000 >> BR_PORT_BITS; > p->port_no = index; > - p->flags = BR_LEARNING | BR_FLOOD; > + p->flags = BR_LEARNING | BR_FLOOD | BR_MCAST_FLOOD; I'm discontent with this new flag becoming the default. Could you elaborate a little more on your use-case, when/why do you want/need this flag?
On 31/08/16 03:37, Linus Lüssing wrote: > On Tue, Aug 30, 2016 at 05:23:08PM +0200, Nikolay Aleksandrov via Bridge wrote: >> diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c >> index 1da3221845f1..ed0dd3340084 100644 >> --- a/net/bridge/br_if.c >> +++ b/net/bridge/br_if.c >> @@ -362,7 +362,7 @@ static struct net_bridge_port *new_nbp(struct net_bridge *br, >> p->path_cost = port_cost(dev); >> p->priority = 0x8000 >> BR_PORT_BITS; >> p->port_no = index; >> - p->flags = BR_LEARNING | BR_FLOOD; >> + p->flags = BR_LEARNING | BR_FLOOD | BR_MCAST_FLOOD; > > I'm discontent with this new flag becoming the default. > > Could you elaborate a little more on your use-case, when/why do > you want/need this flag? > The use case is the current default behaviour if we don't make this flag on by default then we'll change user-visible default behaviour. Right now we flood unregistered mcast traffic by default (if there's no querier and router port, which continues to function as before). Also we have the port flags equal to BR_AUTO_MASK by default. Cheers, Nik
On 31/08/16 08:02, Nikolay Aleksandrov wrote: > On 31/08/16 03:37, Linus Lüssing wrote: >> On Tue, Aug 30, 2016 at 05:23:08PM +0200, Nikolay Aleksandrov via Bridge wrote: >>> diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c >>> index 1da3221845f1..ed0dd3340084 100644 >>> --- a/net/bridge/br_if.c >>> +++ b/net/bridge/br_if.c >>> @@ -362,7 +362,7 @@ static struct net_bridge_port *new_nbp(struct net_bridge *br, >>> p->path_cost = port_cost(dev); >>> p->priority = 0x8000 >> BR_PORT_BITS; >>> p->port_no = index; >>> - p->flags = BR_LEARNING | BR_FLOOD; >>> + p->flags = BR_LEARNING | BR_FLOOD | BR_MCAST_FLOOD; >> >> I'm discontent with this new flag becoming the default. >> >> Could you elaborate a little more on your use-case, when/why do >> you want/need this flag? >> > > The use case is the current default behaviour if we don't make this flag on by default > then we'll change user-visible default behaviour. Right now we flood unregistered mcast > traffic by default (if there's no querier and router port, which continues to function > as before). Also we have the port flags equal to BR_AUTO_MASK by default. > > Cheers, > Nik > Actually there is one potential issue with br_auto_mask. I shouldn't change it because that changes the requirement for a br_auto_port and it may change user-visible behaviour (e.g. having to disable both unicast flood and multicast flood to get the same config for auto ports). I will drop that part of the patch later in v3, will wait for feedback until then. Thanks
On Wed, Aug 31, 2016 at 08:02:22AM +0200, Nikolay Aleksandrov wrote: > On 31/08/16 03:37, Linus Lüssing wrote: > > On Tue, Aug 30, 2016 at 05:23:08PM +0200, Nikolay Aleksandrov via Bridge wrote: > >> diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c > >> index 1da3221845f1..ed0dd3340084 100644 > >> --- a/net/bridge/br_if.c > >> +++ b/net/bridge/br_if.c > >> @@ -362,7 +362,7 @@ static struct net_bridge_port *new_nbp(struct net_bridge *br, > >> p->path_cost = port_cost(dev); > >> p->priority = 0x8000 >> BR_PORT_BITS; > >> p->port_no = index; > >> - p->flags = BR_LEARNING | BR_FLOOD; > >> + p->flags = BR_LEARNING | BR_FLOOD | BR_MCAST_FLOOD; > > > > I'm discontent with this new flag becoming the default. > > > > Could you elaborate a little more on your use-case, when/why do > > you want/need this flag? > > > > The use case is the current default behaviour if we don't make this flag on by default > then we'll change user-visible default behaviour. Right now we flood unregistered mcast > traffic by default (if there's no querier and router port, which continues to function > as before). Also we have the port flags equal to BR_AUTO_MASK by default. Ok, you're right, the way you implemented it doesn't change the default behaviour (ignoring the BR_AUTO_MASK change you removed in v3). I guess the "similar to the unknown unicast flood flag" confused me a little and I was afraid that the "flood if there is no listener / MDB entry" behaviour, which was removed some years ago, would be reintroduced. (but yeah, looking at the code more closely, it doesn't do that) Thanks for the clarification! Regards, Linus
diff --git a/include/linux/if_bridge.h b/include/linux/if_bridge.h index dcb89e3515db..5b4fb39392ae 100644 --- a/include/linux/if_bridge.h +++ b/include/linux/if_bridge.h @@ -40,11 +40,12 @@ struct br_ip_list { #define BR_ADMIN_COST BIT(4) #define BR_LEARNING BIT(5) #define BR_FLOOD BIT(6) -#define BR_AUTO_MASK (BR_FLOOD | BR_LEARNING) #define BR_PROMISC BIT(7) #define BR_PROXYARP BIT(8) #define BR_LEARNING_SYNC BIT(9) #define BR_PROXYARP_WIFI BIT(10) +#define BR_MCAST_FLOOD BIT(11) +#define BR_AUTO_MASK (BR_FLOOD | BR_MCAST_FLOOD | BR_LEARNING) #define BR_DEFAULT_AGEING_TIME (300 * HZ) diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h index a1b5202c5f6b..9bf3aecfe05b 100644 --- a/include/uapi/linux/if_link.h +++ b/include/uapi/linux/if_link.h @@ -318,6 +318,7 @@ enum { IFLA_BRPORT_FLUSH, IFLA_BRPORT_MULTICAST_ROUTER, IFLA_BRPORT_PAD, + IFLA_BRPORT_MCAST_FLOOD, __IFLA_BRPORT_MAX }; #define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1) diff --git a/net/bridge/br_forward.c b/net/bridge/br_forward.c index 5de854ed3340..7cb41aee4c82 100644 --- a/net/bridge/br_forward.c +++ b/net/bridge/br_forward.c @@ -186,6 +186,9 @@ void br_flood(struct net_bridge *br, struct sk_buff *skb, /* Do not flood unicast traffic to ports that turn it off */ if (pkt_type == BR_PKT_UNICAST && !(p->flags & BR_FLOOD)) continue; + if (pkt_type == BR_PKT_MULTICAST && + !(p->flags & BR_MCAST_FLOOD)) + continue; /* Do not flood to ports that enable proxy ARP */ if (p->flags & BR_PROXYARP) diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c index 1da3221845f1..ed0dd3340084 100644 --- a/net/bridge/br_if.c +++ b/net/bridge/br_if.c @@ -362,7 +362,7 @@ static struct net_bridge_port *new_nbp(struct net_bridge *br, p->path_cost = port_cost(dev); p->priority = 0x8000 >> BR_PORT_BITS; p->port_no = index; - p->flags = BR_LEARNING | BR_FLOOD; + p->flags = BR_LEARNING | BR_FLOOD | BR_MCAST_FLOOD; br_init_port(p); br_set_state(p, BR_STATE_DISABLED); br_stp_port_timer_init(p); diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c index 190a5bc00f4a..e99037c6f7b7 100644 --- a/net/bridge/br_netlink.c +++ b/net/bridge/br_netlink.c @@ -169,10 +169,15 @@ static int br_port_fill_attrs(struct sk_buff *skb, nla_put_u32(skb, IFLA_BRPORT_COST, p->path_cost) || nla_put_u8(skb, IFLA_BRPORT_MODE, mode) || nla_put_u8(skb, IFLA_BRPORT_GUARD, !!(p->flags & BR_BPDU_GUARD)) || - nla_put_u8(skb, IFLA_BRPORT_PROTECT, !!(p->flags & BR_ROOT_BLOCK)) || - nla_put_u8(skb, IFLA_BRPORT_FAST_LEAVE, !!(p->flags & BR_MULTICAST_FAST_LEAVE)) || + nla_put_u8(skb, IFLA_BRPORT_PROTECT, + !!(p->flags & BR_ROOT_BLOCK)) || + nla_put_u8(skb, IFLA_BRPORT_FAST_LEAVE, + !!(p->flags & BR_MULTICAST_FAST_LEAVE)) || nla_put_u8(skb, IFLA_BRPORT_LEARNING, !!(p->flags & BR_LEARNING)) || - nla_put_u8(skb, IFLA_BRPORT_UNICAST_FLOOD, !!(p->flags & BR_FLOOD)) || + nla_put_u8(skb, IFLA_BRPORT_UNICAST_FLOOD, + !!(p->flags & BR_FLOOD)) || + nla_put_u8(skb, IFLA_BRPORT_MCAST_FLOOD, + !!(p->flags & BR_MCAST_FLOOD)) || nla_put_u8(skb, IFLA_BRPORT_PROXYARP, !!(p->flags & BR_PROXYARP)) || nla_put_u8(skb, IFLA_BRPORT_PROXYARP_WIFI, !!(p->flags & BR_PROXYARP_WIFI)) || @@ -630,6 +635,7 @@ static int br_setport(struct net_bridge_port *p, struct nlattr *tb[]) br_set_port_flag(p, tb, IFLA_BRPORT_PROTECT, BR_ROOT_BLOCK); br_set_port_flag(p, tb, IFLA_BRPORT_LEARNING, BR_LEARNING); br_set_port_flag(p, tb, IFLA_BRPORT_UNICAST_FLOOD, BR_FLOOD); + br_set_port_flag(p, tb, IFLA_BRPORT_MCAST_FLOOD, BR_MCAST_FLOOD); br_set_port_flag(p, tb, IFLA_BRPORT_PROXYARP, BR_PROXYARP); br_set_port_flag(p, tb, IFLA_BRPORT_PROXYARP_WIFI, BR_PROXYARP_WIFI); diff --git a/net/bridge/br_sysfs_if.c b/net/bridge/br_sysfs_if.c index 1e04d4d44273..e657258e1f2c 100644 --- a/net/bridge/br_sysfs_if.c +++ b/net/bridge/br_sysfs_if.c @@ -171,6 +171,7 @@ BRPORT_ATTR_FLAG(learning, BR_LEARNING); BRPORT_ATTR_FLAG(unicast_flood, BR_FLOOD); BRPORT_ATTR_FLAG(proxyarp, BR_PROXYARP); BRPORT_ATTR_FLAG(proxyarp_wifi, BR_PROXYARP_WIFI); +BRPORT_ATTR_FLAG(multicast_flood, BR_MCAST_FLOOD); #ifdef CONFIG_BRIDGE_IGMP_SNOOPING static ssize_t show_multicast_router(struct net_bridge_port *p, char *buf)
Add a per-port flag to control the unknown multicast flood, similar to the unknown unicast flood flag and break a few long lines in the netlink flag exports. Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com> --- v2: no change include/linux/if_bridge.h | 3 ++- include/uapi/linux/if_link.h | 1 + net/bridge/br_forward.c | 3 +++ net/bridge/br_if.c | 2 +- net/bridge/br_netlink.c | 12 +++++++++--- net/bridge/br_sysfs_if.c | 1 + 6 files changed, 17 insertions(+), 5 deletions(-)