Commit 5055cccf authored by Lukasz Majewski's avatar Lukasz Majewski Committed by Paolo Abeni
Browse files

net: hsr: Provide RedBox support (HSR-SAN) 

Introduce RedBox support (HSR-SAN to be more precise) for HSR networks.
Following traffic reduction optimizations have been implemented:
- Do not send HSR supervisory frames to Port C (interlink)
- Do not forward to HSR ring frames addressed to Port C
- Do not forward to Port C frames from HSR ring
- Do not send duplicate HSR frame to HSR ring when destination is Port C

The corresponding patch to modify iptable2 sources has already been sent:
https://lore.kernel.org/netdev/20240308145729.490863-1-lukma@denx.de/T/



Testing procedure (veth and netns):
-----------------------------------
One shall run:
linux-vanila/tools/testing/selftests/net/hsr/hsr_redbox.sh
(Detailed description of the setup one can find in the test
script file).

Testing procedure (real hardware):
----------------------------------
The EVB-KSZ9477 has been used for testing on net-next branch
(SHA1: 5fc68320).

Ports 4/5 were used for SW managed HSR (hsr1) as first hsr0 for ports 1/2
(with HW offloading for ksz9477) was created. Port 3 has been used as
interlink port (single USB-ETH dongle).

Configuration - RedBox (EVB-KSZ9477):
if link set lan1 down;ip link set lan2 down
ip link add name hsr0 type hsr slave1 lan1 slave2 lan2 supervision 45 version 1
ip link add name hsr1 type hsr slave1 lan4 slave2 lan5 interlink lan3 supervision 45 version 1
ip link set lan4 up;ip link set lan5 up
ip link set lan3 up
ip addr add 192.168.0.11/24 dev hsr1
ip link set hsr1 up

Configuration - DAN-H (EVB-KSZ9477):

ip link set lan1 down;ip link set lan2 down
ip link add name hsr0 type hsr slave1 lan1 slave2 lan2 supervision 45 version 1
ip link add name hsr1 type hsr slave1 lan4 slave2 lan5 supervision 45 version 1
ip link set lan4 up;ip link set lan5 up
ip addr add 192.168.0.12/24 dev hsr1
ip link set hsr1 up

This approach uses only SW based HSR devices (hsr1).

--------------          -----------------       ------------
DAN-H  Port5 | <------> | Port5         |       |
       Port4 | <------> | Port4   Port3 | <---> | PC
             |          | (RedBox)      |       | (USB-ETH)
EVB-KSZ9477  |          | EVB-KSZ9477   |       |
--------------          -----------------       ------------

Signed-off-by: default avatarLukasz Majewski <lukma@denx.de>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent af0cb3fa

include/uapi/linux/if_link.h

+1 −0
Original line number Diff line number Diff line
@@ -1771,6 +1771,7 @@ enum { 
	IFLA_HSR_PROTOCOL,		/* Indicate different protocol than

					 * HSR. For example PRP.

					 */

	IFLA_HSR_INTERLINK,		/* HSR interlink network device */

	__IFLA_HSR_MAX,

};

net/hsr/hsr_device.c

+34 −2
Original line number Diff line number Diff line
@@ -146,6 +146,9 @@ static int hsr_dev_open(struct net_device *dev) 
		case HSR_PT_SLAVE_B:

			designation = "Slave B";

			break;

		case HSR_PT_INTERLINK:

			designation = "Interlink";

			break;

		default:

			designation = "Unknown";

		}
@@ -285,6 +288,7 @@ static void send_hsr_supervision_frame(struct hsr_port *master, 
	struct hsr_priv *hsr = master->hsr;

	__u8 type = HSR_TLV_LIFE_CHECK;

	struct hsr_sup_payload *hsr_sp;

	struct hsr_sup_tlv *hsr_stlv;

	struct hsr_sup_tag *hsr_stag;

	struct sk_buff *skb;
@@ -324,6 +328,16 @@ static void send_hsr_supervision_frame(struct hsr_port *master, 
	hsr_sp = skb_put(skb, sizeof(struct hsr_sup_payload));

	ether_addr_copy(hsr_sp->macaddress_A, master->dev->dev_addr);



	if (hsr->redbox) {

		hsr_stlv = skb_put(skb, sizeof(struct hsr_sup_tlv));

		hsr_stlv->HSR_TLV_type = PRP_TLV_REDBOX_MAC;

		hsr_stlv->HSR_TLV_length = sizeof(struct hsr_sup_payload);



		/* Payload: MacAddressRedBox */

		hsr_sp = skb_put(skb, sizeof(struct hsr_sup_payload));

		ether_addr_copy(hsr_sp->macaddress_A, hsr->macaddress_redbox);

	}



	if (skb_put_padto(skb, ETH_ZLEN)) {

		spin_unlock_bh(&hsr->seqnr_lock);

		return;
@@ -405,6 +419,10 @@ void hsr_del_ports(struct hsr_priv *hsr) 
	if (port)

		hsr_del_port(port);



	port = hsr_port_get_hsr(hsr, HSR_PT_INTERLINK);

	if (port)

		hsr_del_port(port);



	port = hsr_port_get_hsr(hsr, HSR_PT_MASTER);

	if (port)

		hsr_del_port(port);
@@ -534,8 +552,8 @@ static const unsigned char def_multicast_addr[ETH_ALEN] __aligned(2) = { 
};



int hsr_dev_finalize(struct net_device *hsr_dev, struct net_device *slave[2],

		     unsigned char multicast_spec, u8 protocol_version,

		     struct netlink_ext_ack *extack)

		     struct net_device *interlink, unsigned char multicast_spec,

		     u8 protocol_version, struct netlink_ext_ack *extack)

{

	bool unregister = false;

	struct hsr_priv *hsr;
@@ -544,6 +562,7 @@ int hsr_dev_finalize(struct net_device *hsr_dev, struct net_device *slave[2], 
	hsr = netdev_priv(hsr_dev);

	INIT_LIST_HEAD(&hsr->ports);

	INIT_LIST_HEAD(&hsr->node_db);

	INIT_LIST_HEAD(&hsr->proxy_node_db);

	spin_lock_init(&hsr->list_lock);



	eth_hw_addr_set(hsr_dev, slave[0]->dev_addr);
@@ -569,6 +588,7 @@ int hsr_dev_finalize(struct net_device *hsr_dev, struct net_device *slave[2], 
	/* Overflow soon to find bugs easier: */

	hsr->sequence_nr = HSR_SEQNR_START;

	hsr->sup_sequence_nr = HSR_SUP_SEQNR_START;

	hsr->interlink_sequence_nr = HSR_SEQNR_START;



	timer_setup(&hsr->announce_timer, hsr_announce, 0);

	timer_setup(&hsr->prune_timer, hsr_prune_nodes, 0);
@@ -604,6 +624,18 @@ int hsr_dev_finalize(struct net_device *hsr_dev, struct net_device *slave[2], 
	if (res)

		goto err_unregister;



	if (interlink) {

		res = hsr_add_port(hsr, interlink, HSR_PT_INTERLINK, extack);

		if (res)

			goto err_unregister;



		hsr->redbox = true;

		ether_addr_copy(hsr->macaddress_redbox, interlink->dev_addr);

		timer_setup(&hsr->prune_proxy_timer, hsr_prune_proxy_nodes, 0);

		mod_timer(&hsr->prune_proxy_timer,

			  jiffies + msecs_to_jiffies(PRUNE_PROXY_PERIOD));

	}



	hsr_debugfs_init(hsr, hsr_dev);

	mod_timer(&hsr->prune_timer, jiffies + msecs_to_jiffies(PRUNE_PERIOD));

net/hsr/hsr_device.h

+2 −2
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ 
void hsr_del_ports(struct hsr_priv *hsr);

void hsr_dev_setup(struct net_device *dev);

int hsr_dev_finalize(struct net_device *hsr_dev, struct net_device *slave[2],

		     unsigned char multicast_spec, u8 protocol_version,

		     struct netlink_ext_ack *extack);

		     struct net_device *interlink, unsigned char multicast_spec,

		     u8 protocol_version, struct netlink_ext_ack *extack);

void hsr_check_carrier_and_operstate(struct hsr_priv *hsr);

int hsr_get_max_mtu(struct hsr_priv *hsr);

#endif /* __HSR_DEVICE_H */

net/hsr/hsr_forward.c

+76 −9
Original line number Diff line number Diff line
@@ -377,6 +377,15 @@ static int hsr_xmit(struct sk_buff *skb, struct hsr_port *port, 
		 */

		ether_addr_copy(eth_hdr(skb)->h_source, port->dev->dev_addr);

	}



	/* When HSR node is used as RedBox - the frame received from HSR ring

	 * requires source MAC address (SA) replacement to one which can be

	 * recognized by SAN devices (otherwise, frames are dropped by switch)

	 */

	if (port->type == HSR_PT_INTERLINK)

		ether_addr_copy(eth_hdr(skb)->h_source,

				port->hsr->macaddress_redbox);



	return dev_queue_xmit(skb);

}
@@ -390,9 +399,57 @@ bool prp_drop_frame(struct hsr_frame_info *frame, struct hsr_port *port) 


bool hsr_drop_frame(struct hsr_frame_info *frame, struct hsr_port *port)

{

	struct sk_buff *skb;



	if (port->dev->features & NETIF_F_HW_HSR_FWD)

		return prp_drop_frame(frame, port);



	/* RedBox specific frames dropping policies

	 *

	 * Do not send HSR supervisory frames to SAN devices

	 */

	if (frame->is_supervision && port->type == HSR_PT_INTERLINK)

		return true;



	/* Do not forward to other HSR port (A or B) unicast frames which

	 * are addressed to interlink port (and are in the ProxyNodeTable).

	 */

	skb = frame->skb_hsr;

	if (skb && prp_drop_frame(frame, port) &&

	    is_unicast_ether_addr(eth_hdr(skb)->h_dest) &&

	    hsr_is_node_in_db(&port->hsr->proxy_node_db,

			      eth_hdr(skb)->h_dest)) {

		return true;

	}



	/* Do not forward to port C (Interlink) frames from nodes A and B

	 * if DA is in NodeTable.

	 */

	if ((frame->port_rcv->type == HSR_PT_SLAVE_A ||

	     frame->port_rcv->type == HSR_PT_SLAVE_B) &&

	    port->type == HSR_PT_INTERLINK) {

		skb = frame->skb_hsr;

		if (skb && is_unicast_ether_addr(eth_hdr(skb)->h_dest) &&

		    hsr_is_node_in_db(&port->hsr->node_db,

				      eth_hdr(skb)->h_dest)) {

			return true;

		}

	}



	/* Do not forward to port A and B unicast frames received on the

	 * interlink port if it is addressed to one of nodes registered in

	 * the ProxyNodeTable.

	 */

	if ((port->type == HSR_PT_SLAVE_A || port->type == HSR_PT_SLAVE_B) &&

	    frame->port_rcv->type == HSR_PT_INTERLINK) {

		skb = frame->skb_std;

		if (skb && is_unicast_ether_addr(eth_hdr(skb)->h_dest) &&

		    hsr_is_node_in_db(&port->hsr->proxy_node_db,

				      eth_hdr(skb)->h_dest)) {

			return true;

		}

	}



	return false;

}
@@ -448,13 +505,14 @@ static void hsr_forward_do(struct hsr_frame_info *frame) 
		}



		/* Check if frame is to be dropped. Eg. for PRP no forward

		 * between ports.

		 * between ports, or sending HSR supervision to RedBox.

		 */

		if (hsr->proto_ops->drop_frame &&

		    hsr->proto_ops->drop_frame(frame, port))

			continue;



		if (port->type != HSR_PT_MASTER)

		if (port->type == HSR_PT_SLAVE_A ||

		    port->type == HSR_PT_SLAVE_B)

			skb = hsr->proto_ops->create_tagged_frame(frame, port);

		else

			skb = hsr->proto_ops->get_untagged_frame(frame, port);
@@ -469,6 +527,8 @@ static void hsr_forward_do(struct hsr_frame_info *frame) 
			hsr_deliver_master(skb, port->dev, frame->node_src);

		} else {

			if (!hsr_xmit(skb, port, frame))

				if (port->type == HSR_PT_SLAVE_A ||

				    port->type == HSR_PT_SLAVE_B)

					sent = true;

		}

	}
@@ -503,10 +563,12 @@ static void handle_std_frame(struct sk_buff *skb, 
	frame->skb_prp = NULL;

	frame->skb_std = skb;



	if (port->type != HSR_PT_MASTER) {

	if (port->type != HSR_PT_MASTER)

		frame->is_from_san = true;

	} else {

		/* Sequence nr for the master node */



	if (port->type == HSR_PT_MASTER ||

	    port->type == HSR_PT_INTERLINK) {

		/* Sequence nr for the master/interlink node */

		lockdep_assert_held(&hsr->seqnr_lock);

		frame->sequence_nr = hsr->sequence_nr;

		hsr->sequence_nr++;
@@ -564,6 +626,7 @@ static int fill_frame_info(struct hsr_frame_info *frame, 
{

	struct hsr_priv *hsr = port->hsr;

	struct hsr_vlan_ethhdr *vlan_hdr;

	struct list_head *n_db;

	struct ethhdr *ethhdr;

	__be16 proto;

	int ret;
@@ -574,9 +637,13 @@ static int fill_frame_info(struct hsr_frame_info *frame, 


	memset(frame, 0, sizeof(*frame));

	frame->is_supervision = is_supervision_frame(port->hsr, skb);

	frame->node_src = hsr_get_node(port, &hsr->node_db, skb,

				       frame->is_supervision,

				       port->type);



	n_db = &hsr->node_db;

	if (port->type == HSR_PT_INTERLINK)

		n_db = &hsr->proxy_node_db;



	frame->node_src = hsr_get_node(port, n_db, skb,

				       frame->is_supervision, port->type);

	if (!frame->node_src)

		return -1; /* Unknown node and !is_supervision, or no mem */

net/hsr/hsr_framereg.c

+52 −0
Original line number Diff line number Diff line
@@ -71,6 +71,14 @@ static struct hsr_node *find_node_by_addr_A(struct list_head *node_db, 
	return NULL;

}



/* Check if node for a given MAC address is already present in data base

 */

bool hsr_is_node_in_db(struct list_head *node_db,

		       const unsigned char addr[ETH_ALEN])

{

	return !!find_node_by_addr_A(node_db, addr);

}



/* Helper for device init; the self_node is used in hsr_rcv() to recognize

 * frames from self that's been looped over the HSR ring.

 */
@@ -223,6 +231,15 @@ struct hsr_node *hsr_get_node(struct hsr_port *port, struct list_head *node_db, 
		}

	}



	/* Check if required node is not in proxy nodes table */

	list_for_each_entry_rcu(node, &hsr->proxy_node_db, mac_list) {

		if (ether_addr_equal(node->macaddress_A, ethhdr->h_source)) {

			if (hsr->proto_ops->update_san_info)

				hsr->proto_ops->update_san_info(node, is_sup);

			return node;

		}

	}



	/* Everyone may create a node entry, connected node to a HSR/PRP

	 * device.

	 */
@@ -418,6 +435,10 @@ void hsr_addr_subst_dest(struct hsr_node *node_src, struct sk_buff *skb, 


	node_dst = find_node_by_addr_A(&port->hsr->node_db,

				       eth_hdr(skb)->h_dest);

	if (!node_dst && port->hsr->redbox)

		node_dst = find_node_by_addr_A(&port->hsr->proxy_node_db,

					       eth_hdr(skb)->h_dest);



	if (!node_dst) {

		if (port->hsr->prot_version != PRP_V1 && net_ratelimit())

			netdev_err(skb->dev, "%s: Unknown node\n", __func__);
@@ -561,6 +582,37 @@ void hsr_prune_nodes(struct timer_list *t) 
		  jiffies + msecs_to_jiffies(PRUNE_PERIOD));

}



void hsr_prune_proxy_nodes(struct timer_list *t)

{

	struct hsr_priv *hsr = from_timer(hsr, t, prune_proxy_timer);

	unsigned long timestamp;

	struct hsr_node *node;

	struct hsr_node *tmp;



	spin_lock_bh(&hsr->list_lock);

	list_for_each_entry_safe(node, tmp, &hsr->proxy_node_db, mac_list) {

		timestamp = node->time_in[HSR_PT_INTERLINK];



		/* Prune old entries */

		if (time_is_before_jiffies(timestamp +

				msecs_to_jiffies(HSR_PROXY_NODE_FORGET_TIME))) {

			hsr_nl_nodedown(hsr, node->macaddress_A);

			if (!node->removed) {

				list_del_rcu(&node->mac_list);

				node->removed = true;

				/* Note that we need to free this entry later: */

				kfree_rcu(node, rcu_head);

			}

		}

	}



	spin_unlock_bh(&hsr->list_lock);



	/* Restart timer */

	mod_timer(&hsr->prune_proxy_timer,

		  jiffies + msecs_to_jiffies(PRUNE_PROXY_PERIOD));

}



void *hsr_get_next_node(struct hsr_priv *hsr, void *_pos,

			unsigned char addr[ETH_ALEN])

{