Commit 65369933 authored by Horatiu Vultur's avatar Horatiu Vultur Committed by David S. Miller
Browse files

bridge: mrp: Integrate MRP into the bridge 



To integrate MRP into the bridge, the bridge needs to do the following:
- detect if the MRP frame was received on MRP ring port in that case it would be
  processed otherwise just forward it as usual.
- enable parsing of MRP
- before whenever the bridge was set up, it would set all the ports in
  forwarding state. Add an extra check to not set ports in forwarding state if
  the port is an MRP ring port. The reason of this change is that if the MRP
  instance initially sets the port in blocked state by setting the bridge up it
  would overwrite this setting.

Reviewed-by: default avatarNikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: default avatarHoratiu Vultur <horatiu.vultur@microchip.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4d02b8f0

net/bridge/br_device.c

+3 −0
Original line number Diff line number Diff line
@@ -463,6 +463,9 @@ void br_dev_setup(struct net_device *dev) 
	spin_lock_init(&br->lock);

	INIT_LIST_HEAD(&br->port_list);

	INIT_HLIST_HEAD(&br->fdb_list);

#if IS_ENABLED(CONFIG_BRIDGE_MRP)

	INIT_LIST_HEAD(&br->mrp_list);

#endif

	spin_lock_init(&br->hash_lock);



	br->bridge_id.prio[0] = 0x80;

net/bridge/br_if.c

+2 −0
Original line number Diff line number Diff line
@@ -333,6 +333,8 @@ static void del_nbp(struct net_bridge_port *p) 
	br_stp_disable_port(p);

	spin_unlock_bh(&br->lock);



	br_mrp_port_del(br, p);



	br_ifinfo_notify(RTM_DELLINK, NULL, p);



	list_del_rcu(&p->list);

net/bridge/br_input.c

+3 −0
Original line number Diff line number Diff line
@@ -342,6 +342,9 @@ rx_handler_result_t br_handle_frame(struct sk_buff **pskb) 
		}

	}



	if (unlikely(br_mrp_process(p, skb)))

		return RX_HANDLER_PASS;



forward:

	switch (p->state) {

	case BR_STATE_FORWARDING:

net/bridge/br_netlink.c

+5 −0
Original line number Diff line number Diff line
@@ -672,6 +672,11 @@ static int br_afspec(struct net_bridge *br, 
			if (err)

				return err;

			break;

		case IFLA_BRIDGE_MRP:

			err = br_mrp_parse(br, p, attr, cmd, extack);

			if (err)

				return err;

			break;

		}

	}

net/bridge/br_private.h

+31 −0
Original line number Diff line number Diff line
@@ -1308,6 +1308,37 @@ unsigned long br_timer_value(const struct timer_list *timer); 
extern int (*br_fdb_test_addr_hook)(struct net_device *dev, unsigned char *addr);

#endif



/* br_mrp.c */

#if IS_ENABLED(CONFIG_BRIDGE_MRP)

int br_mrp_parse(struct net_bridge *br, struct net_bridge_port *p,

		 struct nlattr *attr, int cmd, struct netlink_ext_ack *extack);

int br_mrp_process(struct net_bridge_port *p, struct sk_buff *skb);

bool br_mrp_enabled(struct net_bridge *br);

void br_mrp_port_del(struct net_bridge *br, struct net_bridge_port *p);

#else

static inline int br_mrp_parse(struct net_bridge *br, struct net_bridge_port *p,

			       struct nlattr *attr, int cmd,

			       struct netlink_ext_ack *extack)

{

	return -EOPNOTSUPP;

}



static inline int br_mrp_process(struct net_bridge_port *p, struct sk_buff *skb)

{

	return 0;

}



static inline bool br_mrp_enabled(struct net_bridge *br)

{

	return 0;

}



static inline void br_mrp_port_del(struct net_bridge *br,

				   struct net_bridge_port *p)

{

}

#endif



/* br_netlink.c */

extern struct rtnl_link_ops br_link_ops;

int br_netlink_init(void);

CRA Git | Maintained and supported by SUSTech CRA and CCSE