net/hsr: Added support for HSR v1 (ee1c2797) · Commits · 戴 / test

include/uapi/linux/if_ether.h

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -92,6 +92,7 @@
	#define ETH_P_TDLS 0x890D /* TDLS */		#define ETH_P_TDLS 0x890D /* TDLS */
	#define ETH_P_FIP 0x8914 /* FCoE Initialization Protocol */		#define ETH_P_FIP 0x8914 /* FCoE Initialization Protocol */
	#define ETH_P_80221 0x8917 /* IEEE 802.21 Media Independent Handover Protocol */		#define ETH_P_80221 0x8917 /* IEEE 802.21 Media Independent Handover Protocol */
			#define ETH_P_HSR 0x892F /* IEC 62439-3 HSRv1 */
	#define ETH_P_LOOPBACK 0x9000 /* Ethernet loopback packet, per IEEE 802.3 */		#define ETH_P_LOOPBACK 0x9000 /* Ethernet loopback packet, per IEEE 802.3 */
	#define ETH_P_QINQ1 0x9100 /* deprecated QinQ VLAN [ NOT AN OFFICIALLY REGISTERED ID ] */		#define ETH_P_QINQ1 0x9100 /* deprecated QinQ VLAN [ NOT AN OFFICIALLY REGISTERED ID ] */
	#define ETH_P_QINQ2 0x9200 /* deprecated QinQ VLAN [ NOT AN OFFICIALLY REGISTERED ID ] */		#define ETH_P_QINQ2 0x9200 /* deprecated QinQ VLAN [ NOT AN OFFICIALLY REGISTERED ID ] */

include/uapi/linux/if_link.h

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -773,6 +773,7 @@ enum {
	IFLA_HSR_SLAVE1,		IFLA_HSR_SLAVE1,
	IFLA_HSR_SLAVE2,		IFLA_HSR_SLAVE2,
	IFLA_HSR_MULTICAST_SPEC, /* Last byte of supervision addr */		IFLA_HSR_MULTICAST_SPEC, /* Last byte of supervision addr */
			IFLA_HSR_VERSION, /* HSR version */
	IFLA_HSR_SUPERVISION_ADDR, /* Supervision frame multicast addr */		IFLA_HSR_SUPERVISION_ADDR, /* Supervision frame multicast addr */
	IFLA_HSR_SEQ_NR,		IFLA_HSR_SEQ_NR,
	__IFLA_HSR_MAX,		__IFLA_HSR_MAX,

net/hsr/Kconfig

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -18,8 +18,9 @@ config HSR
	earlier.		earlier.

	This code is a "best effort" to comply with the HSR standard as		This code is a "best effort" to comply with the HSR standard as
	described in IEC 62439-3:2010 (HSRv0), but no compliancy tests have		described in IEC 62439-3:2010 (HSRv0) and IEC 62439-3:2012 (HSRv1),
	been made.		but no compliancy tests have been made. Use iproute2 to select
			the version you desire.

	You need to perform any and all necessary tests yourself before		You need to perform any and all necessary tests yourself before
	relying on this code in a safety critical system!		relying on this code in a safety critical system!

net/hsr/hsr_device.c

+46 −34

Original line number	Original line	Diff line number	Diff line
	@@ -90,7 +90,8 @@ static void hsr_check_announce(struct net_device *hsr_dev,

	hsr = netdev_priv(hsr_dev);		hsr = netdev_priv(hsr_dev);

	if ((hsr_dev->operstate == IF_OPER_UP) && (old_operstate != IF_OPER_UP)) {		if ((hsr_dev->operstate == IF_OPER_UP)
			&& (old_operstate != IF_OPER_UP)) {
	/* Went up */		/* Went up */
	hsr->announce_count = 0;		hsr->announce_count = 0;
	hsr->announce_timer.expires = jiffies +		hsr->announce_timer.expires = jiffies +
	@@ -250,31 +251,22 @@ static const struct header_ops hsr_header_ops = {
	.parse = eth_header_parse,		.parse = eth_header_parse,
	};		};

			static void send_hsr_supervision_frame(struct hsr_port *master,
	/* HSR:2010 supervision frames should be padded so that the whole frame,		u8 type, u8 hsrVer)
	* including headers and FCS, is 64 bytes (without VLAN).
	*/
	static int hsr_pad(int size)
	{
	const int min_size = ETH_ZLEN - HSR_HLEN - ETH_HLEN;

	if (size >= min_size)
	return size;
	return min_size;
	}

	static void send_hsr_supervision_frame(struct hsr_port *master, u8 type)
	{		{
	struct sk_buff *skb;		struct sk_buff *skb;
	int hlen, tlen;		int hlen, tlen;
			struct hsr_tag *hsr_tag;
	struct hsr_sup_tag *hsr_stag;		struct hsr_sup_tag *hsr_stag;
	struct hsr_sup_payload *hsr_sp;		struct hsr_sup_payload *hsr_sp;
	unsigned long irqflags;		unsigned long irqflags;

	hlen = LL_RESERVED_SPACE(master->dev);		hlen = LL_RESERVED_SPACE(master->dev);
	tlen = master->dev->needed_tailroom;		tlen = master->dev->needed_tailroom;
	skb = alloc_skb(hsr_pad(sizeof(struct hsr_sup_payload)) + hlen + tlen,		skb = dev_alloc_skb(
	GFP_ATOMIC);		sizeof(struct hsr_tag) +
			sizeof(struct hsr_sup_tag) +
			sizeof(struct hsr_sup_payload) + hlen + tlen);

	if (skb == NULL)		if (skb == NULL)
	return;		return;
	@@ -282,32 +274,48 @@ static void send_hsr_supervision_frame(struct hsr_port *master, u8 type)
	skb_reserve(skb, hlen);		skb_reserve(skb, hlen);

	skb->dev = master->dev;		skb->dev = master->dev;
	skb->protocol = htons(ETH_P_PRP);		skb->protocol = htons(hsrVer ? ETH_P_HSR : ETH_P_PRP);
	skb->priority = TC_PRIO_CONTROL;		skb->priority = TC_PRIO_CONTROL;

	if (dev_hard_header(skb, skb->dev, ETH_P_PRP,		if (dev_hard_header(skb, skb->dev, (hsrVer ? ETH_P_HSR : ETH_P_PRP),
	master->hsr->sup_multicast_addr,		master->hsr->sup_multicast_addr,
	skb->dev->dev_addr, skb->len) <= 0)		skb->dev->dev_addr, skb->len) <= 0)
	goto out;		goto out;
	skb_reset_mac_header(skb);		skb_reset_mac_header(skb);

	hsr_stag = (typeof(hsr_stag)) skb_put(skb, sizeof(*hsr_stag));		if (hsrVer > 0) {
			hsr_tag = (typeof(hsr_tag)) skb_put(skb, sizeof(struct hsr_tag));
			hsr_tag->encap_proto = htons(ETH_P_PRP);
			set_hsr_tag_LSDU_size(hsr_tag, HSR_V1_SUP_LSDUSIZE);
			}

	set_hsr_stag_path(hsr_stag, 0xf);		hsr_stag = (typeof(hsr_stag)) skb_put(skb, sizeof(struct hsr_sup_tag));
	set_hsr_stag_HSR_Ver(hsr_stag, 0);		set_hsr_stag_path(hsr_stag, (hsrVer ? 0x0 : 0xf));
			set_hsr_stag_HSR_Ver(hsr_stag, hsrVer);

			/* From HSRv1 on we have separate supervision sequence numbers. */
	spin_lock_irqsave(&master->hsr->seqnr_lock, irqflags);		spin_lock_irqsave(&master->hsr->seqnr_lock, irqflags);
			if (hsrVer > 0) {
			hsr_stag->sequence_nr = htons(master->hsr->sup_sequence_nr);
			hsr_tag->sequence_nr = htons(master->hsr->sequence_nr);
			master->hsr->sup_sequence_nr++;
			master->hsr->sequence_nr++;
			} else {
	hsr_stag->sequence_nr = htons(master->hsr->sequence_nr);		hsr_stag->sequence_nr = htons(master->hsr->sequence_nr);
	master->hsr->sequence_nr++;		master->hsr->sequence_nr++;
			}
	spin_unlock_irqrestore(&master->hsr->seqnr_lock, irqflags);		spin_unlock_irqrestore(&master->hsr->seqnr_lock, irqflags);

	hsr_stag->HSR_TLV_Type = type;		hsr_stag->HSR_TLV_Type = type;
	hsr_stag->HSR_TLV_Length = 12;		/* TODO: Why 12 in HSRv0? */
			hsr_stag->HSR_TLV_Length = hsrVer ? sizeof(struct hsr_sup_payload) : 12;

	/* Payload: MacAddressA */		/* Payload: MacAddressA */
	hsr_sp = (typeof(hsr_sp)) skb_put(skb, sizeof(*hsr_sp));		hsr_sp = (typeof(hsr_sp)) skb_put(skb, sizeof(struct hsr_sup_payload));
	ether_addr_copy(hsr_sp->MacAddressA, master->dev->dev_addr);		ether_addr_copy(hsr_sp->MacAddressA, master->dev->dev_addr);

			skb_put_padto(skb, ETH_ZLEN + HSR_HLEN);

	hsr_forward_skb(skb, master);		hsr_forward_skb(skb, master);
	return;		return;

	@@ -329,19 +337,20 @@ static void hsr_announce(unsigned long data)
	rcu_read_lock();		rcu_read_lock();
	master = hsr_port_get_hsr(hsr, HSR_PT_MASTER);		master = hsr_port_get_hsr(hsr, HSR_PT_MASTER);

	if (hsr->announce_count < 3) {		if (hsr->announce_count < 3 && hsr->protVersion == 0) {
	send_hsr_supervision_frame(master, HSR_TLV_ANNOUNCE);		send_hsr_supervision_frame(master, HSR_TLV_ANNOUNCE,
			hsr->protVersion);
	hsr->announce_count++;		hsr->announce_count++;
	} else {
	send_hsr_supervision_frame(master, HSR_TLV_LIFE_CHECK);
	}

	if (hsr->announce_count < 3)
	hsr->announce_timer.expires = jiffies +		hsr->announce_timer.expires = jiffies +
	msecs_to_jiffies(HSR_ANNOUNCE_INTERVAL);		msecs_to_jiffies(HSR_ANNOUNCE_INTERVAL);
	else		} else {
			send_hsr_supervision_frame(master, HSR_TLV_LIFE_CHECK,
			hsr->protVersion);

	hsr->announce_timer.expires = jiffies +		hsr->announce_timer.expires = jiffies +
	msecs_to_jiffies(HSR_LIFE_CHECK_INTERVAL);		msecs_to_jiffies(HSR_LIFE_CHECK_INTERVAL);
			}

	if (is_admin_up(master->dev))		if (is_admin_up(master->dev))
	add_timer(&hsr->announce_timer);		add_timer(&hsr->announce_timer);
	@@ -428,7 +437,7 @@ 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],		int hsr_dev_finalize(struct net_device hsr_dev, struct net_device slave[2],
	unsigned char multicast_spec)		unsigned char multicast_spec, u8 protocol_version)
	{		{
	struct hsr_priv *hsr;		struct hsr_priv *hsr;
	struct hsr_port *port;		struct hsr_port *port;
	@@ -450,6 +459,7 @@ int hsr_dev_finalize(struct net_device hsr_dev, struct net_device slave[2],
	spin_lock_init(&hsr->seqnr_lock);		spin_lock_init(&hsr->seqnr_lock);
	/* Overflow soon to find bugs easier: */		/* Overflow soon to find bugs easier: */
	hsr->sequence_nr = HSR_SEQNR_START;		hsr->sequence_nr = HSR_SEQNR_START;
			hsr->sup_sequence_nr = HSR_SUP_SEQNR_START;

	init_timer(&hsr->announce_timer);		init_timer(&hsr->announce_timer);
	hsr->announce_timer.function = hsr_announce;		hsr->announce_timer.function = hsr_announce;
	@@ -462,6 +472,8 @@ int hsr_dev_finalize(struct net_device hsr_dev, struct net_device slave[2],
	ether_addr_copy(hsr->sup_multicast_addr, def_multicast_addr);		ether_addr_copy(hsr->sup_multicast_addr, def_multicast_addr);
	hsr->sup_multicast_addr[ETH_ALEN - 1] = multicast_spec;		hsr->sup_multicast_addr[ETH_ALEN - 1] = multicast_spec;

			hsr->protVersion = protocol_version;

	/* FIXME: should I modify the value of these?		/* FIXME: should I modify the value of these?
	*		*
	* - hsr_dev->flags - i.e.		* - hsr_dev->flags - i.e.

net/hsr/hsr_device.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -17,7 +17,7 @@

	void hsr_dev_setup(struct net_device *dev);		void hsr_dev_setup(struct net_device *dev);
	int hsr_dev_finalize(struct net_device hsr_dev, struct net_device slave[2],		int hsr_dev_finalize(struct net_device hsr_dev, struct net_device slave[2],
	unsigned char multicast_spec);		unsigned char multicast_spec, u8 protocol_version);
	void hsr_check_carrier_and_operstate(struct hsr_priv *hsr);		void hsr_check_carrier_and_operstate(struct hsr_priv *hsr);
	bool is_hsr_master(struct net_device *dev);		bool is_hsr_master(struct net_device *dev);
	int hsr_get_max_mtu(struct hsr_priv *hsr);		int hsr_get_max_mtu(struct hsr_priv *hsr);

Admin message