Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d06b6d8 authored by Elad Raz's avatar Elad Raz Committed by David S. Miller
Browse files

bridge: mdb: Separate br_mdb_entry->state from net_bridge_port_group->state 



Change net_bridge_port_group 'state' member to 'flags' and define new set
of flags internal to the kernel.

Signed-off-by: default avatarElad Raz <eladr@mellanox.com>
Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 157ede67

net/bridge/br_mdb.c

+12 −4
Original line number Diff line number Diff line
@@ -41,6 +41,14 @@ static int br_rports_fill_info(struct sk_buff *skb, struct netlink_callback *cb, 
	return -EMSGSIZE;

}



static void __mdb_entry_fill_flags(struct br_mdb_entry *e, unsigned char flags)

{

	e->state = flags & MDB_PG_FLAGS_PERMANENT;

	e->flags = 0;

	if (flags & MDB_PG_FLAGS_OFFLOAD)

		e->flags |= MDB_FLAGS_OFFLOAD;

}



static int br_mdb_fill_info(struct sk_buff *skb, struct netlink_callback *cb,

			    struct net_device *dev)

{
@@ -85,8 +93,8 @@ static int br_mdb_fill_info(struct sk_buff *skb, struct netlink_callback *cb, 
					struct br_mdb_entry e;

					memset(&e, 0, sizeof(e));

					e.ifindex = port->dev->ifindex;

					e.state = p->state;

					e.vid = p->addr.vid;

					__mdb_entry_fill_flags(&e, p->flags);

					if (p->addr.proto == htons(ETH_P_IP))

						e.addr.u.ip4 = p->addr.u.ip4;

#if IS_ENABLED(CONFIG_IPV6)
@@ -254,7 +262,7 @@ static void __br_mdb_notify(struct net_device *dev, struct br_mdb_entry *entry, 
}



void br_mdb_notify(struct net_device *dev, struct net_bridge_port *port,

		   struct br_ip *group, int type, u8 state)

		   struct br_ip *group, int type, u8 flags)

{

	struct br_mdb_entry entry;
@@ -265,8 +273,8 @@ void br_mdb_notify(struct net_device *dev, struct net_bridge_port *port, 
#if IS_ENABLED(CONFIG_IPV6)

	entry.addr.u.ip6 = group->u.ip6;

#endif

	entry.state = state;

	entry.vid = group->vid;

	__mdb_entry_fill_flags(&entry, flags);

	__br_mdb_notify(dev, &entry, type);

}
@@ -568,7 +576,7 @@ static int __br_mdb_del(struct net_bridge *br, struct br_mdb_entry *entry) 
		if (p->port->state == BR_STATE_DISABLED)

			goto unlock;



		entry->state = p->state;

		__mdb_entry_fill_flags(entry, p->flags);

		rcu_assign_pointer(*pp, p->next);

		hlist_del_init(&p->mglist);

		del_timer(&p->timer);

net/bridge/br_multicast.c

+8 −8
Original line number Diff line number Diff line
@@ -284,7 +284,7 @@ static void br_multicast_del_pg(struct net_bridge *br, 
		hlist_del_init(&p->mglist);

		del_timer(&p->timer);

		br_mdb_notify(br->dev, p->port, &pg->addr, RTM_DELMDB,

			      p->state);

			      p->flags);

		call_rcu_bh(&p->rcu, br_multicast_free_pg);



		if (!mp->ports && !mp->mglist &&
@@ -304,7 +304,7 @@ static void br_multicast_port_group_expired(unsigned long data) 


	spin_lock(&br->multicast_lock);

	if (!netif_running(br->dev) || timer_pending(&pg->timer) ||

	    hlist_unhashed(&pg->mglist) || pg->state & MDB_PERMANENT)

	    hlist_unhashed(&pg->mglist) || pg->flags & MDB_PG_FLAGS_PERMANENT)

		goto out;



	br_multicast_del_pg(br, pg);
@@ -649,7 +649,7 @@ struct net_bridge_port_group *br_multicast_new_port_group( 
			struct net_bridge_port *port,

			struct br_ip *group,

			struct net_bridge_port_group __rcu *next,

			unsigned char state)

			unsigned char flags)

{

	struct net_bridge_port_group *p;
@@ -659,7 +659,7 @@ struct net_bridge_port_group *br_multicast_new_port_group( 


	p->addr = *group;

	p->port = port;

	p->state = state;

	p->flags = flags;

	rcu_assign_pointer(p->next, next);

	hlist_add_head(&p->mglist, &port->mglist);

	setup_timer(&p->timer, br_multicast_port_group_expired,
@@ -702,11 +702,11 @@ static int br_multicast_add_group(struct net_bridge *br, 
			break;

	}



	p = br_multicast_new_port_group(port, group, *pp, MDB_TEMPORARY);

	p = br_multicast_new_port_group(port, group, *pp, 0);

	if (unlikely(!p))

		goto err;

	rcu_assign_pointer(*pp, p);

	br_mdb_notify(br->dev, port, group, RTM_NEWMDB, MDB_TEMPORARY);

	br_mdb_notify(br->dev, port, group, RTM_NEWMDB, 0);



found:

	mod_timer(&p->timer, now + br->multicast_membership_interval);
@@ -975,7 +975,7 @@ void br_multicast_disable_port(struct net_bridge_port *port) 


	spin_lock(&br->multicast_lock);

	hlist_for_each_entry_safe(pg, n, &port->mglist, mglist)

		if (pg->state == MDB_TEMPORARY)

		if (!(pg->flags & MDB_PG_FLAGS_PERMANENT))

			br_multicast_del_pg(br, pg);



	if (!hlist_unhashed(&port->rlist)) {
@@ -1454,7 +1454,7 @@ br_multicast_leave_group(struct net_bridge *br, 
			del_timer(&p->timer);

			call_rcu_bh(&p->rcu, br_multicast_free_pg);

			br_mdb_notify(br->dev, port, group, RTM_DELMDB,

				      p->state);

				      p->flags);



			if (!mp->ports && !mp->mglist &&

			    netif_running(br->dev))

net/bridge/br_private.h

+6 −3
Original line number Diff line number Diff line
@@ -150,6 +150,9 @@ struct net_bridge_fdb_entry 
	struct rcu_head			rcu;

};



#define MDB_PG_FLAGS_PERMANENT	BIT(0)

#define MDB_PG_FLAGS_OFFLOAD	BIT(1)



struct net_bridge_port_group {

	struct net_bridge_port		*port;

	struct net_bridge_port_group __rcu *next;
@@ -157,7 +160,7 @@ struct net_bridge_port_group { 
	struct rcu_head			rcu;

	struct timer_list		timer;

	struct br_ip			addr;

	unsigned char			state;

	unsigned char			flags;

};



struct net_bridge_mdb_entry
@@ -554,11 +557,11 @@ void br_multicast_free_pg(struct rcu_head *head); 
struct net_bridge_port_group *

br_multicast_new_port_group(struct net_bridge_port *port, struct br_ip *group,

			    struct net_bridge_port_group __rcu *next,

			    unsigned char state);

			    unsigned char flags);

void br_mdb_init(void);

void br_mdb_uninit(void);

void br_mdb_notify(struct net_device *dev, struct net_bridge_port *port,

		   struct br_ip *group, int type, u8 state);

		   struct br_ip *group, int type, u8 flags);

void br_rtr_notify(struct net_device *dev, struct net_bridge_port *port,

		   int type);