Commit 0ba218e2 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'bridge-vlan' 



Nikolay Aleksandrov says:

====================
net: bridge: mcast: add support for port/vlan router control

This small set adds control over port/vlan mcast router config.
Initially I had added host vlan entry router control via vlan's global
options but that is really unnecessary and we can use a single per-vlan
option to control it both for port/vlan and host/vlan entries. Since
it's all still in net-next we can convert BRIDGE_VLANDB_GOPTS_MCAST_ROUTER
to BRIDGE_VLANDB_ENTRY_MCAST_ROUTER and use it for both. That makes much
more sense and is easier for user-space. Patch 01 prepares the port
router function to be used with port mcast context instead of port and
then patch 02 converts the global vlan mcast router option to per-vlan
mcast router option which directly gives us both host/vlan and port/vlan
mcast router control without any additional changes.

This way we get the following coherent syntax:
 [ port/vlan mcast router]
 $ bridge vlan set vid 100 dev ens20 mcast_router 2

 [ bridge/vlan mcast router ]
 $ bridge vlan set vid 100 dev bridge mcast_router 2
instead of:
 $ bridge vlan set vid 100 dev bridge mcast_router 1 global

The mcast_router should not be regarded as a global option, it controls
the port/vlan and bridge/vlan mcast router behaviour.

This is the last set needed for the initial per-vlan mcast support.
Next patch-sets:
 - iproute2 support
 - selftests
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents a515e5b5 2796d846

include/uapi/linux/if_bridge.h

+1 −1
Original line number Diff line number Diff line
@@ -506,6 +506,7 @@ enum { 
	BRIDGE_VLANDB_ENTRY_STATE,

	BRIDGE_VLANDB_ENTRY_TUNNEL_INFO,

	BRIDGE_VLANDB_ENTRY_STATS,

	BRIDGE_VLANDB_ENTRY_MCAST_ROUTER,

	__BRIDGE_VLANDB_ENTRY_MAX,

};

#define BRIDGE_VLANDB_ENTRY_MAX (__BRIDGE_VLANDB_ENTRY_MAX - 1)
@@ -561,7 +562,6 @@ 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_MCAST_ROUTER_PORTS,

	BRIDGE_VLANDB_GOPTS_MCAST_QUERIER_STATE,

	__BRIDGE_VLANDB_GOPTS_MAX

net/bridge/br_multicast.c

+19 −5
Original line number Diff line number Diff line
@@ -4246,15 +4246,16 @@ br_multicast_rport_del_notify(struct net_bridge_mcast_port *pmctx, bool deleted) 
		pmctx->multicast_router = MDB_RTR_TYPE_TEMP_QUERY;

}



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

int br_multicast_set_port_router(struct net_bridge_mcast_port *pmctx,

				 unsigned long val)

{

	struct net_bridge_mcast *brmctx = &p->br->multicast_ctx;

	struct net_bridge_mcast_port *pmctx = &p->multicast_ctx;

	struct net_bridge_mcast *brmctx;

	unsigned long now = jiffies;

	int err = -EINVAL;

	bool del = false;



	spin_lock(&p->br->multicast_lock);

	brmctx = br_multicast_port_ctx_get_global(pmctx);

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

	if (pmctx->multicast_router == val) {

		/* Refresh the temp router port timer */

		if (pmctx->multicast_router == MDB_RTR_TYPE_TEMP) {
@@ -4304,7 +4305,20 @@ int br_multicast_set_port_router(struct net_bridge_port *p, unsigned long val) 
	}

	err = 0;

unlock:

	spin_unlock(&p->br->multicast_lock);

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



	return err;

}



int br_multicast_set_vlan_router(struct net_bridge_vlan *v, u8 mcast_router)

{

	int err;



	if (br_vlan_is_master(v))

		err = br_multicast_set_router(&v->br_mcast_ctx, mcast_router);

	else

		err = br_multicast_set_port_router(&v->port_mcast_ctx,

						   mcast_router);



	return err;

}

net/bridge/br_netlink.c

+2 −1
Original line number Diff line number Diff line
@@ -932,7 +932,8 @@ static int br_setport(struct net_bridge_port *p, struct nlattr *tb[], 
	if (tb[IFLA_BRPORT_MULTICAST_ROUTER]) {

		u8 mcast_router = nla_get_u8(tb[IFLA_BRPORT_MULTICAST_ROUTER]);



		err = br_multicast_set_port_router(p, mcast_router);

		err = br_multicast_set_port_router(&p->multicast_ctx,

						   mcast_router);

		if (err)

			return err;

	}

net/bridge/br_private.h

+17 −1
Original line number Diff line number Diff line
@@ -676,6 +676,20 @@ static inline bool br_vlan_valid_range(const struct bridge_vlan_info *cur, 
	return true;

}



static inline u8 br_vlan_multicast_router(const struct net_bridge_vlan *v)

{

	u8 mcast_router = MDB_RTR_TYPE_DISABLED;



#ifdef CONFIG_BRIDGE_IGMP_SNOOPING

	if (!br_vlan_is_master(v))

		mcast_router = v->port_mcast_ctx.multicast_router;

	else

		mcast_router = v->br_mcast_ctx.multicast_router;

#endif



	return mcast_router;

}



static inline int br_afspec_cmd_to_rtm(int cmd)

{

	switch (cmd) {
@@ -879,7 +893,9 @@ 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_mcast *brmctx, unsigned long val);

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

int br_multicast_set_port_router(struct net_bridge_mcast_port *pmctx,

				 unsigned long val);

int br_multicast_set_vlan_router(struct net_bridge_vlan *v, u8 mcast_router);

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

			struct netlink_ext_ack *extack);

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

net/bridge/br_sysfs_if.c

+1 −1
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ static ssize_t show_multicast_router(struct net_bridge_port *p, char *buf) 
static int store_multicast_router(struct net_bridge_port *p,

				      unsigned long v)

{

	return br_multicast_set_port_router(p, v);

	return br_multicast_set_port_router(&p->multicast_ctx, v);

}

static BRPORT_ATTR(multicast_router, 0644, show_multicast_router,

		   store_multicast_router);