Commit a97df080 authored by Nikolay Aleksandrov's avatar Nikolay Aleksandrov Committed by David S. Miller
Browse files

net: bridge: vlan: add support for mcast router global option 



Add support to change and retrieve global vlan multicast router state
which is used for the bridge itself. We just need to pass multicast context
to br_multicast_set_router instead of bridge device and the rest of the
logic remains the same.

Signed-off-by: default avatarNikolay Aleksandrov <nikolay@nvidia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 62938182

include/uapi/linux/if_bridge.h

+1 −0
Original line number Diff line number Diff line
@@ -561,6 +561,7 @@ enum { 
	BRIDGE_VLANDB_GOPTS_MCAST_QUERY_RESPONSE_INTVL,

	BRIDGE_VLANDB_GOPTS_MCAST_STARTUP_QUERY_INTVL,

	BRIDGE_VLANDB_GOPTS_MCAST_QUERIER,

	BRIDGE_VLANDB_GOPTS_MCAST_ROUTER,

	__BRIDGE_VLANDB_GOPTS_MAX

};

#define BRIDGE_VLANDB_GOPTS_MAX (__BRIDGE_VLANDB_GOPTS_MAX - 1)

net/bridge/br_multicast.c

+5 −6
Original line number Diff line number Diff line
@@ -4053,17 +4053,16 @@ void br_multicast_dev_del(struct net_bridge *br) 
	rcu_barrier();

}



int br_multicast_set_router(struct net_bridge *br, unsigned long val)

int br_multicast_set_router(struct net_bridge_mcast *brmctx, unsigned long val)

{

	struct net_bridge_mcast *brmctx = &br->multicast_ctx;

	int err = -EINVAL;



	spin_lock_bh(&br->multicast_lock);

	spin_lock_bh(&brmctx->br->multicast_lock);



	switch (val) {

	case MDB_RTR_TYPE_DISABLED:

	case MDB_RTR_TYPE_PERM:

		br_mc_router_state_change(br, val == MDB_RTR_TYPE_PERM);

		br_mc_router_state_change(brmctx->br, val == MDB_RTR_TYPE_PERM);

		del_timer(&brmctx->ip4_mc_router_timer);

#if IS_ENABLED(CONFIG_IPV6)

		del_timer(&brmctx->ip6_mc_router_timer);
@@ -4073,13 +4072,13 @@ int br_multicast_set_router(struct net_bridge *br, unsigned long val) 
		break;

	case MDB_RTR_TYPE_TEMP_QUERY:

		if (brmctx->multicast_router != MDB_RTR_TYPE_TEMP_QUERY)

			br_mc_router_state_change(br, false);

			br_mc_router_state_change(brmctx->br, false);

		brmctx->multicast_router = val;

		err = 0;

		break;

	}



	spin_unlock_bh(&br->multicast_lock);

	spin_unlock_bh(&brmctx->br->multicast_lock);



	return err;

}

net/bridge/br_netlink.c

+2 −1
Original line number Diff line number Diff line
@@ -1286,7 +1286,8 @@ static int br_changelink(struct net_device *brdev, struct nlattr *tb[], 
	if (data[IFLA_BR_MCAST_ROUTER]) {

		u8 multicast_router = nla_get_u8(data[IFLA_BR_MCAST_ROUTER]);



		err = br_multicast_set_router(br, multicast_router);

		err = br_multicast_set_router(&br->multicast_ctx,

					      multicast_router);

		if (err)

			return err;

	}

net/bridge/br_private.h

+2 −1
Original line number Diff line number Diff line
@@ -877,7 +877,7 @@ void br_multicast_dev_del(struct net_bridge *br); 
void br_multicast_flood(struct net_bridge_mdb_entry *mdst, struct sk_buff *skb,

			struct net_bridge_mcast *brmctx,

			bool local_rcv, bool local_orig);

int br_multicast_set_router(struct net_bridge *br, unsigned long val);

int br_multicast_set_router(struct net_bridge_mcast *brmctx, unsigned long val);

int br_multicast_set_port_router(struct net_bridge_port *p, unsigned long val);

int br_multicast_toggle(struct net_bridge *br, unsigned long val,

			struct netlink_ext_ack *extack);
@@ -1191,6 +1191,7 @@ br_multicast_ctx_options_equal(const struct net_bridge_mcast *brmctx1, 
	       brmctx1->multicast_startup_query_interval ==

	       brmctx2->multicast_startup_query_interval &&

	       brmctx1->multicast_querier == brmctx2->multicast_querier &&

	       brmctx1->multicast_router == brmctx2->multicast_router &&

#if IS_ENABLED(CONFIG_IPV6)

	       brmctx1->multicast_mld_version ==

	       brmctx2->multicast_mld_version &&

net/bridge/br_sysfs_br.c

+1 −1
Original line number Diff line number Diff line
@@ -390,7 +390,7 @@ static ssize_t multicast_router_show(struct device *d, 
static int set_multicast_router(struct net_bridge *br, unsigned long val,

				struct netlink_ext_ack *extack)

{

	return br_multicast_set_router(br, val);

	return br_multicast_set_router(&br->multicast_ctx, val);

}



static ssize_t multicast_router_store(struct device *d,