Commit dcf0cd1c authored by George McCollister's avatar George McCollister Committed by David S. Miller
Browse files

net: hsr: add offloading support 



Add support for offloading of HSR/PRP (IEC 62439-3) tag insertion
tag removal, duplicate generation and forwarding.

For HSR, insertion involves the switch adding a 6 byte HSR header after
the 14 byte Ethernet header. For PRP it adds a 6 byte trailer.

Tag removal involves automatically stripping the HSR/PRP header/trailer
in the switch. This is possible when the switch also performs auto
deduplication using the HSR/PRP header/trailer (making it no longer
required).

Forwarding involves automatically forwarding between redundant ports in
an HSR. This is crucial because delay is accumulated as a frame passes
through each node in the ring.

Duplication involves the switch automatically sending a single frame
from the CPU port to both redundant ports. This is required because the
inserted HSR/PRP header/trailer must contain the same sequence number
on the frames sent out both redundant ports.

Export is_hsr_master so DSA can tell them apart from other devices in
dsa_slave_changeupper.

Signed-off-by: default avatarGeorge McCollister <george.mccollister@gmail.com>
Reviewed-by: default avatarVladimir Oltean <olteanv@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 78be9217

Documentation/networking/netdev-features.rst

+21 −0
Original line number Diff line number Diff line
@@ -182,3 +182,24 @@ stricter than Hardware LRO. A packet stream merged by Hardware GRO must 
be re-segmentable by GSO or TSO back to the exact original packet stream.

Hardware GRO is dependent on RXCSUM since every packet successfully merged

by hardware must also have the checksum verified by hardware.



* hsr-tag-ins-offload



This should be set for devices which insert an HSR (High-availability Seamless

Redundancy) or PRP (Parallel Redundancy Protocol) tag automatically.



* hsr-tag-rm-offload



This should be set for devices which remove HSR (High-availability Seamless

Redundancy) or PRP (Parallel Redundancy Protocol) tags automatically.



* hsr-fwd-offload



This should be set for devices which forward HSR (High-availability Seamless

Redundancy) frames from one port to another in hardware.



* hsr-dup-offload



This should be set for devices which duplicate outgoing HSR (High-availability

Seamless Redundancy) or PRP (Parallel Redundancy Protocol) tags automatically

frames in hardware.

include/linux/if_hsr.h

0 → 100644
+27 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef _LINUX_IF_HSR_H_

#define _LINUX_IF_HSR_H_



/* used to differentiate various protocols */

enum hsr_version {

	HSR_V0 = 0,

	HSR_V1,

	PRP_V1,

};



#if IS_ENABLED(CONFIG_HSR)

extern bool is_hsr_master(struct net_device *dev);

extern int hsr_get_version(struct net_device *dev, enum hsr_version *ver);

#else

static inline bool is_hsr_master(struct net_device *dev)

{

	return false;

}

static inline int hsr_get_version(struct net_device *dev,

				  enum hsr_version *ver)

{

	return -EINVAL;

}

#endif /* CONFIG_HSR */



#endif /*_LINUX_IF_HSR_H_*/

include/linux/netdev_features.h

+9 −0
Original line number Diff line number Diff line
@@ -86,6 +86,11 @@ enum { 
	NETIF_F_HW_MACSEC_BIT,		/* Offload MACsec operations */

	NETIF_F_GRO_UDP_FWD_BIT,	/* Allow UDP GRO for forwarding */



	NETIF_F_HW_HSR_TAG_INS_BIT,	/* Offload HSR tag insertion */

	NETIF_F_HW_HSR_TAG_RM_BIT,	/* Offload HSR tag removal */

	NETIF_F_HW_HSR_FWD_BIT,		/* Offload HSR forwarding */

	NETIF_F_HW_HSR_DUP_BIT,		/* Offload HSR duplication */



	/*

	 * Add your fresh new feature above and remember to update

	 * netdev_features_strings[] in net/core/ethtool.c and maybe
@@ -159,6 +164,10 @@ enum { 
#define NETIF_F_GSO_FRAGLIST	__NETIF_F(GSO_FRAGLIST)

#define NETIF_F_HW_MACSEC	__NETIF_F(HW_MACSEC)

#define NETIF_F_GRO_UDP_FWD	__NETIF_F(GRO_UDP_FWD)

#define NETIF_F_HW_HSR_TAG_INS	__NETIF_F(HW_HSR_TAG_INS)

#define NETIF_F_HW_HSR_TAG_RM	__NETIF_F(HW_HSR_TAG_RM)

#define NETIF_F_HW_HSR_FWD	__NETIF_F(HW_HSR_FWD)

#define NETIF_F_HW_HSR_DUP	__NETIF_F(HW_HSR_DUP)



/* Finds the next feature with the highest number of the range of start till 0.

 */

net/ethtool/common.c

+4 −0
Original line number Diff line number Diff line
@@ -69,6 +69,10 @@ const char netdev_features_strings[NETDEV_FEATURE_COUNT][ETH_GSTRING_LEN] = { 
	[NETIF_F_GRO_FRAGLIST_BIT] =	 "rx-gro-list",

	[NETIF_F_HW_MACSEC_BIT] =	 "macsec-hw-offload",

	[NETIF_F_GRO_UDP_FWD_BIT] =	 "rx-udp-gro-forwarding",

	[NETIF_F_HW_HSR_TAG_INS_BIT] =	 "hsr-tag-ins-offload",

	[NETIF_F_HW_HSR_TAG_RM_BIT] =	 "hsr-tag-rm-offload",

	[NETIF_F_HW_HSR_FWD_BIT] =	 "hsr-fwd-offload",

	[NETIF_F_HW_HSR_DUP_BIT] =	 "hsr-dup-offload",

};



const char

net/hsr/hsr_device.c

+3 −11
Original line number Diff line number Diff line
@@ -417,6 +417,7 @@ static struct hsr_proto_ops hsr_ops = { 
	.send_sv_frame = send_hsr_supervision_frame,

	.create_tagged_frame = hsr_create_tagged_frame,

	.get_untagged_frame = hsr_get_untagged_frame,

	.drop_frame = hsr_drop_frame,

	.fill_frame_info = hsr_fill_frame_info,

	.invalid_dan_ingress_frame = hsr_invalid_dan_ingress_frame,

};
@@ -464,10 +465,11 @@ void hsr_dev_setup(struct net_device *dev) 


/* Return true if dev is a HSR master; return false otherwise.

 */

inline bool is_hsr_master(struct net_device *dev)

bool is_hsr_master(struct net_device *dev)

{

	return (dev->netdev_ops->ndo_start_xmit == hsr_dev_xmit);

}

EXPORT_SYMBOL(is_hsr_master);



/* Default multicast address for HSR Supervision frames */

static const unsigned char def_multicast_addr[ETH_ALEN] __aligned(2) = {
@@ -520,16 +522,6 @@ int hsr_dev_finalize(struct net_device *hsr_dev, struct net_device *slave[2], 


	hsr->prot_version = protocol_version;



	/* FIXME: should I modify the value of these?

	 *

	 * - hsr_dev->flags - i.e.

	 *			IFF_MASTER/SLAVE?

	 * - hsr_dev->priv_flags - i.e.

	 *			IFF_EBRIDGE?

	 *			IFF_TX_SKB_SHARING?

	 *			IFF_HSR_MASTER/SLAVE?

	 */



	/* Make sure the 1st call to netif_carrier_on() gets through */

	netif_carrier_off(hsr_dev);