mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-24 05:04:00 +08:00
net: bridge: vlan: add mcast snooping control
Add a new global vlan option which controls whether multicast snooping is enabled or disabled for a single vlan. It controls the vlan private flag: BR_VLFLAG_GLOBAL_MCAST_ENABLED. Signed-off-by: Nikolay Aleksandrov <nikolay@nvidia.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
9aba624d7c
commit
9dee572c38
@ -548,6 +548,7 @@ enum {
|
||||
BRIDGE_VLANDB_GOPTS_UNSPEC,
|
||||
BRIDGE_VLANDB_GOPTS_ID,
|
||||
BRIDGE_VLANDB_GOPTS_RANGE,
|
||||
BRIDGE_VLANDB_GOPTS_MCAST_SNOOPING,
|
||||
__BRIDGE_VLANDB_GOPTS_MAX
|
||||
};
|
||||
#define BRIDGE_VLANDB_GOPTS_MAX (__BRIDGE_VLANDB_GOPTS_MAX - 1)
|
||||
|
@ -3988,6 +3988,22 @@ int br_multicast_toggle_vlan_snooping(struct net_bridge *br, bool on,
|
||||
return 0;
|
||||
}
|
||||
|
||||
bool br_multicast_toggle_global_vlan(struct net_bridge_vlan *vlan, bool on)
|
||||
{
|
||||
ASSERT_RTNL();
|
||||
|
||||
/* BR_VLFLAG_GLOBAL_MCAST_ENABLED relies on eventual consistency and
|
||||
* requires only RTNL to change
|
||||
*/
|
||||
if (on == !!(vlan->priv_flags & BR_VLFLAG_GLOBAL_MCAST_ENABLED))
|
||||
return false;
|
||||
|
||||
vlan->priv_flags ^= BR_VLFLAG_GLOBAL_MCAST_ENABLED;
|
||||
br_multicast_toggle_vlan(vlan, on);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
void br_multicast_stop(struct net_bridge *br)
|
||||
{
|
||||
ASSERT_RTNL();
|
||||
|
@ -909,6 +909,7 @@ void br_multicast_toggle_one_vlan(struct net_bridge_vlan *vlan, bool on);
|
||||
void br_multicast_toggle_vlan(struct net_bridge_vlan *vlan, bool on);
|
||||
int br_multicast_toggle_vlan_snooping(struct net_bridge *br, bool on,
|
||||
struct netlink_ext_ack *extack);
|
||||
bool br_multicast_toggle_global_vlan(struct net_bridge_vlan *vlan, bool on);
|
||||
|
||||
static inline bool br_group_is_l2(const struct br_ip *group)
|
||||
{
|
||||
@ -1282,6 +1283,12 @@ static inline int br_multicast_toggle_vlan_snooping(struct net_bridge *br,
|
||||
{
|
||||
return -EOPNOTSUPP;
|
||||
}
|
||||
|
||||
static inline bool br_multicast_toggle_global_vlan(struct net_bridge_vlan *vlan,
|
||||
bool on)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
#endif
|
||||
|
||||
/* br_vlan.c */
|
||||
|
@ -262,7 +262,9 @@ int br_vlan_process_options(const struct net_bridge *br,
|
||||
bool br_vlan_global_opts_can_enter_range(const struct net_bridge_vlan *v_curr,
|
||||
const struct net_bridge_vlan *r_end)
|
||||
{
|
||||
return v_curr->vid - r_end->vid == 1;
|
||||
return v_curr->vid - r_end->vid == 1 &&
|
||||
((v_curr->priv_flags ^ r_end->priv_flags) &
|
||||
BR_VLFLAG_GLOBAL_MCAST_ENABLED) == 0;
|
||||
}
|
||||
|
||||
bool br_vlan_global_opts_fill(struct sk_buff *skb, u16 vid, u16 vid_range,
|
||||
@ -281,6 +283,12 @@ bool br_vlan_global_opts_fill(struct sk_buff *skb, u16 vid, u16 vid_range,
|
||||
nla_put_u16(skb, BRIDGE_VLANDB_GOPTS_RANGE, vid_range))
|
||||
goto out_err;
|
||||
|
||||
#ifdef CONFIG_BRIDGE_IGMP_SNOOPING
|
||||
if (nla_put_u8(skb, BRIDGE_VLANDB_GOPTS_MCAST_SNOOPING,
|
||||
!!(v_opts->priv_flags & BR_VLFLAG_GLOBAL_MCAST_ENABLED)))
|
||||
goto out_err;
|
||||
#endif
|
||||
|
||||
nla_nest_end(skb, nest);
|
||||
|
||||
return true;
|
||||
@ -295,6 +303,9 @@ static size_t rtnl_vlan_global_opts_nlmsg_size(void)
|
||||
return NLMSG_ALIGN(sizeof(struct br_vlan_msg))
|
||||
+ nla_total_size(0) /* BRIDGE_VLANDB_GLOBAL_OPTIONS */
|
||||
+ nla_total_size(sizeof(u16)) /* BRIDGE_VLANDB_GOPTS_ID */
|
||||
#ifdef CONFIG_BRIDGE_IGMP_SNOOPING
|
||||
+ nla_total_size(sizeof(u8)) /* BRIDGE_VLANDB_GOPTS_MCAST_SNOOPING */
|
||||
#endif
|
||||
+ nla_total_size(sizeof(u16)); /* BRIDGE_VLANDB_GOPTS_RANGE */
|
||||
}
|
||||
|
||||
@ -349,12 +360,23 @@ static int br_vlan_process_global_one_opts(const struct net_bridge *br,
|
||||
struct netlink_ext_ack *extack)
|
||||
{
|
||||
*changed = false;
|
||||
#ifdef CONFIG_BRIDGE_IGMP_SNOOPING
|
||||
if (tb[BRIDGE_VLANDB_GOPTS_MCAST_SNOOPING]) {
|
||||
u8 mc_snooping;
|
||||
|
||||
mc_snooping = nla_get_u8(tb[BRIDGE_VLANDB_GOPTS_MCAST_SNOOPING]);
|
||||
if (br_multicast_toggle_global_vlan(v, !!mc_snooping))
|
||||
*changed = true;
|
||||
}
|
||||
#endif
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct nla_policy br_vlan_db_gpol[BRIDGE_VLANDB_GOPTS_MAX + 1] = {
|
||||
[BRIDGE_VLANDB_GOPTS_ID] = { .type = NLA_U16 },
|
||||
[BRIDGE_VLANDB_GOPTS_RANGE] = { .type = NLA_U16 },
|
||||
[BRIDGE_VLANDB_GOPTS_MCAST_SNOOPING] = { .type = NLA_U8 },
|
||||
};
|
||||
|
||||
int br_vlan_rtm_process_global_options(struct net_device *dev,
|
||||
|
Loading…
Reference in New Issue
Block a user