Skip to contentSkip to conversation

enetc: add support Credit Based Shaper(CBS) for hardware offload

net-next Applied Po Liu 3 participants 6 messages Nov 22, 2019 – Nov 25, 2019

Subsystems (3)
lore
Share & tools
lore

Po Liu

author
#0 lore raw

The ENETC hardware support the Credit Based Shaper(CBS) which part of the IEEE-802.1Qav. The CBS driver was loaded by the sch_cbs interface when set in the QOS in the kernel.

Here is an example command to set 20Mbits bandwidth in 1Gbits port for taffic class 7:

tc qdisc add dev eth0 root handle 1: mqprio \

	   num_tc 8 map 0 1 2 3 4 5 6 7 hw 1

tc qdisc replace dev eth0 parent 1:8 cbs \

	   locredit -1470 hicredit 30 \
	   sendslope -980000 idleslope 20000 offload 1
---
 drivers/net/ethernet/freescale/enetc/Kconfig  |   4 +-
 drivers/net/ethernet/freescale/enetc/enetc.c  |   2 +
 drivers/net/ethernet/freescale/enetc/enetc.h  |   2 +
 .../net/ethernet/freescale/enetc/enetc_hw.h   |   4 +
 .../net/ethernet/freescale/enetc/enetc_qos.c  | 126 ++++++++++++++++++
 5 files changed, 136 insertions(+), 2 deletions(-)
drivers/net/ethernet/freescale/enetc/Kconfig +2 -2
index 491659fe3e35..edad4ca46327 100644
@@ -53,10 +53,10 @@ config FSL_ENETC_HW_TIMESTAMPING
 
 config FSL_ENETC_QOS
 	bool "ENETC hardware Time-sensitive Network support"
-	depends on (FSL_ENETC || FSL_ENETC_VF) && NET_SCH_TAPRIO
+	depends on (FSL_ENETC || FSL_ENETC_VF) && (NET_SCH_TAPRIO || NET_SCH_CBS)
 	help
 	  There are Time-Sensitive Network(TSN) capabilities(802.1Qbv/802.1Qci
 	  /802.1Qbu etc.) supported by ENETC. These TSN capabilities can be set
 	  enable/disable from user space via Qos commands(tc). In the kernel
 	  side, it can be loaded by Qos driver. Currently, it is only support
-	  taprio(802.1Qbv).
+	  taprio(802.1Qbv) and Credit Based Shaper(802.1Qbu).
drivers/net/ethernet/freescale/enetc/enetc.c +2 -0
index 27f6fd1708f0..9db1b96ed9b9 100644
@@ -1496,6 +1496,8 @@ int enetc_setup_tc(struct net_device *ndev, enum tc_setup_type type,
 		return enetc_setup_tc_mqprio(ndev, type_data);
 	case TC_SETUP_QDISC_TAPRIO:
 		return enetc_setup_tc_taprio(ndev, type_data);
+	case TC_SETUP_QDISC_CBS:
+		return enetc_setup_tc_cbs(ndev, type_data);
 	default:
 		return -EOPNOTSUPP;
 	}
drivers/net/ethernet/freescale/enetc/enetc.h +2 -0
index 89f23156f330..7ee0da6d0015 100644
@@ -255,7 +255,9 @@ int enetc_send_cmd(struct enetc_si *si, struct enetc_cbd *cbd);
 #ifdef CONFIG_FSL_ENETC_QOS
 int enetc_setup_tc_taprio(struct net_device *ndev, void *type_data);
 void enetc_sched_speed_set(struct net_device *ndev);
+int enetc_setup_tc_cbs(struct net_device *ndev, void *type_data);
 #else
 #define enetc_setup_tc_taprio(ndev, type_data) -EOPNOTSUPP
 #define enetc_sched_speed_set(ndev) (void)0
+#define enetc_setup_tc_cbs(ndev, type_data) -EOPNOTSUPP
 #endif
drivers/net/ethernet/freescale/enetc/enetc_hw.h +4 -0
index 924ddb6d358a..51f543ef37a8 100644
@@ -185,6 +185,8 @@ enum enetc_bdr_type {TX, RX};
 #define ENETC_PSICFGR0_SIVC(bmp)	(((bmp) & 0xff) << 24) /* VLAN_TYPE */
 
 #define ENETC_PTCCBSR0(n)	(0x1110 + (n) * 8) /* n = 0 to 7*/
+#define ENETC_CBSE		BIT(31)
+#define ENETC_CBS_BW_MASK	GENMASK(6, 0)
 #define ENETC_PTCCBSR1(n)	(0x1114 + (n) * 8) /* n = 0 to 7*/
 #define ENETC_RSSHASH_KEY_SIZE	40
 #define ENETC_PRSSK(n)		(0x1410 + (n) * 4) /* n = [0..9] */
@@ -603,6 +605,8 @@ struct enetc_cbd {
 	u8 status_flags;
 };
 
+#define ENETC_CLK  400000000ULL
+
 /* port time gating control register */
 #define ENETC_QBV_PTGCR_OFFSET		0x11a00
 #define ENETC_QBV_TGE			BIT(31)
drivers/net/ethernet/freescale/enetc/enetc_qos.c +126 -0

129 lines not on this page · raw message

Signature · 1 line
2.17.1
#1 lore raw
Quoted 15 lines · Po Liu
drivers/net/ethernet/freescale/enetc/enetc_qos.c +15 -0
+	if (tc == prio_top) {
+		max_interference_size = port_frame_max_size * 8;
+	} else {
+		u32 m0, ma, r0, ra;
+
+		m0 = port_frame_max_size * 8;
+		ma = enetc_port_rd(&si->hw, ENETC_PTCMSDUR(prio_top)) * 8;
+		ra = enetc_get_cbs_bw(&si->hw, prio_top) *
+			port_transmit_rate * 10000ULL;
+		r0 = port_transmit_rate * 1000000ULL;
+		max_interference_size = m0 + ma + (u64)ra * m0 / (r0 - ra);
+	}
+
+	/* hiCredit bits calculate by:
+	 *

drivers/net/ethernet/freescale/enetc/enetc_qos.c int enetc_setup_tc_taprio(struct net_device *ndev, void *type_data) · line 290

Quoted 10 lines
drivers/net/ethernet/freescale/enetc/enetc_qos.c +10 -0
+	 * maxSizedFrame * (idleSlope/portTxRate)
+	 */
+	hi_credit_bit = max_interference_size * bw / 100;
+
+	/* hiCredit bits to hiCredit register need to calculated as:
+	 *
+	 * (enetClockFrequency / portTransmitRate) * 100
+	 */
+	hi_credit_reg = (ENETC_CLK * 100ULL) * hi_credit_bit
+			/ (port_transmit_rate * 1000000ULL);

Hi! The patch looks good to me, but I'm concerned about those 64bit divisions here. Don't these need to be div_u64() & co.? Otherwise we may see one of the:

ERROR: "__udivdi3" [drivers/net/ethernet/freescale/enetc/fsl-enetc.ko] undefined!

messages from the build bot..

I could be wrong, I haven't actually tested..

#2 lore raw
Quoted 31 lines · Jakub Kicinski
Quoted 15 lines · Po Liu
drivers/net/ethernet/freescale/enetc/enetc_qos.c +15 -0
+	if (tc == prio_top) {
+		max_interference_size = port_frame_max_size * 8;
+	} else {
+		u32 m0, ma, r0, ra;
+
+		m0 = port_frame_max_size * 8;
+		ma = enetc_port_rd(&si->hw, ENETC_PTCMSDUR(prio_top)) * 8;
+		ra = enetc_get_cbs_bw(&si->hw, prio_top) *
+			port_transmit_rate * 10000ULL;
+		r0 = port_transmit_rate * 1000000ULL;
+		max_interference_size = m0 + ma + (u64)ra * m0 / (r0 - ra);
+	}
+
+	/* hiCredit bits calculate by:
+	 *

drivers/net/ethernet/freescale/enetc/enetc_qos.c int enetc_setup_tc_taprio(struct net_device *ndev, void *type_data) · line 290

Quoted 10 lines
drivers/net/ethernet/freescale/enetc/enetc_qos.c +10 -0
+	 * maxSizedFrame * (idleSlope/portTxRate)
+	 */
+	hi_credit_bit = max_interference_size * bw / 100;
+
+	/* hiCredit bits to hiCredit register need to calculated as:
+	 *
+	 * (enetClockFrequency / portTransmitRate) * 100
+	 */
+	hi_credit_reg = (ENETC_CLK * 100ULL) * hi_credit_bit
+			/ (port_transmit_rate * 1000000ULL);  

Hi! The patch looks good to me, but I'm concerned about those 64bit divisions here. Don't these need to be div_u64() & co.? Otherwise we may see one of the:

Quoted 5 lines

ERROR: "__udivdi3" [drivers/net/ethernet/freescale/enetc/fsl-enetc.ko] undefined!

messages from the build bot..

I could be wrong, I haven't actually tested..

Yup:

drivers/net/ethernet/freescale/enetc/enetc_qos.o: In function `enetc_setup_tc_cbs':
enetc_qos.c:(.text+0x5b4): undefined reference to __udivdi3' enetc_qos.c:(.text+0x608): undefined reference to __udivdi3' /home/jkicinski/devel/linux/Makefile:1077: recipe for target 'vmlinux' failed make[1]: *** [vmlinux] Error 1
make[1]: Leaving directory '/home/jkicinski/devel/linux/build_tmp2' Makefile:179: recipe for target 'sub-make' failed
make: *** [sub-make] Error 2

Please fix and repost.

author
#3 lore raw

Hi Jakub,

Thanks!

Br,
Po Liu

Quoted 67 lines

-----Original Message-----
From: Jakub Kicinski <[email protected]>
Sent: 2019年11月25日 7:35
To: Po Liu <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; Claudiu Manoil <[email protected]>; Vladimir Oltean <[email protected]>; Alexandru Marginean <[email protected]>; Xiaoliang Yang <[email protected]>; Roy Zang <[email protected]>; Mingkai Hu <[email protected]>; Jerry Huang <[email protected]>; Leo Li <[email protected]>
Subject: [EXT] Re: [net-next] enetc: add support Credit Based Shaper(CBS) for hardware offload

Caution: EXT Email

Quoted 31 lines · Jakub Kicinski
Quoted 15 lines · Po Liu
drivers/net/ethernet/freescale/enetc/enetc_qos.c +15 -0
+   if (tc == prio_top) {
+           max_interference_size = port_frame_max_size * 8;
+   } else {
+           u32 m0, ma, r0, ra;
+
+           m0 = port_frame_max_size * 8;
+           ma = enetc_port_rd(&si->hw, ENETC_PTCMSDUR(prio_top)) * 8;
+           ra = enetc_get_cbs_bw(&si->hw, prio_top) *
+                   port_transmit_rate * 10000ULL;
+           r0 = port_transmit_rate * 1000000ULL;
+           max_interference_size = m0 + ma + (u64)ra * m0 / (r0 - ra);
+   }
+
+   /* hiCredit bits calculate by:
+    *

drivers/net/ethernet/freescale/enetc/enetc_qos.c int enetc_setup_tc_taprio(struct net_device *ndev, void *type_data) · line 290

Quoted 10 lines
drivers/net/ethernet/freescale/enetc/enetc_qos.c +10 -0
+    * maxSizedFrame * (idleSlope/portTxRate)
+    */
+   hi_credit_bit = max_interference_size * bw / 100;
+
+   /* hiCredit bits to hiCredit register need to calculated as:
+    *
+    * (enetClockFrequency / portTransmitRate) * 100
+    */
+   hi_credit_reg = (ENETC_CLK * 100ULL) * hi_credit_bit
+                   / (port_transmit_rate * 1000000ULL);

Hi! The patch looks good to me, but I'm concerned about those 64bit divisions here. Don't these need to be div_u64() & co.? Otherwise we may see one of the:

Quoted 1 line

ERROR: "__udivdi3" [drivers/net/ethernet/freescale/enetc/fsl-enetc.ko]

undefined!

Quoted 4 lines

messages from the build bot..

I could be wrong, I haven't actually tested..

Yup:

drivers/net/ethernet/freescale/enetc/enetc_qos.o: In function `enetc_setup_tc_cbs':
enetc_qos.c:(.text+0x5b4): undefined reference to __udivdi3' enetc_qos.c:(.text+0x608): undefined reference to __udivdi3' /home/jkicinski/devel/linux/Makefile:1077: recipe for target 'vmlinux' failed make[1]: *** [vmlinux] Error 1
make[1]: Leaving directory '/home/jkicinski/devel/linux/build_tmp2' Makefile:179: recipe for target 'sub-make' failed
make: *** [sub-make] Error 2

Quoted 1 line

Please fix and repost.

Will update to div_u64().

author
#4 lore raw

PATCH v2 1/1 enetc: add support Credit Based Shaper(CBS) for hardware offload

In reply to Po Liu

The ENETC hardware support the Credit Based Shaper(CBS) which part of the IEEE-802.1Qav. The CBS driver was loaded by the sch_cbs interface when set in the QOS in the kernel.

Here is an example command to set 20Mbits bandwidth in 1Gbits port for taffic class 7:

tc qdisc add dev eth0 root handle 1: mqprio \

	   num_tc 8 map 0 1 2 3 4 5 6 7 hw 1

tc qdisc replace dev eth0 parent 1:8 cbs \

	   locredit -1470 hicredit 30 \
	   sendslope -980000 idleslope 20000 offload 1

---
changes:
v2:
- replace with div_u64() for division suggested by Jakub Kicinski.

 drivers/net/ethernet/freescale/enetc/Kconfig  |   4 +-
 drivers/net/ethernet/freescale/enetc/enetc.c  |   2 +
 drivers/net/ethernet/freescale/enetc/enetc.h  |   2 +
 .../net/ethernet/freescale/enetc/enetc_hw.h   |   4 +
 .../net/ethernet/freescale/enetc/enetc_qos.c  | 128 ++++++++++++++++++
 5 files changed, 138 insertions(+), 2 deletions(-)
drivers/net/ethernet/freescale/enetc/Kconfig +2 -2
index 491659fe3e35..edad4ca46327 100644
@@ -53,10 +53,10 @@ config FSL_ENETC_HW_TIMESTAMPING
 
 config FSL_ENETC_QOS
 	bool "ENETC hardware Time-sensitive Network support"
-	depends on (FSL_ENETC || FSL_ENETC_VF) && NET_SCH_TAPRIO
+	depends on (FSL_ENETC || FSL_ENETC_VF) && (NET_SCH_TAPRIO || NET_SCH_CBS)
 	help
 	  There are Time-Sensitive Network(TSN) capabilities(802.1Qbv/802.1Qci
 	  /802.1Qbu etc.) supported by ENETC. These TSN capabilities can be set
 	  enable/disable from user space via Qos commands(tc). In the kernel
 	  side, it can be loaded by Qos driver. Currently, it is only support
-	  taprio(802.1Qbv).
+	  taprio(802.1Qbv) and Credit Based Shaper(802.1Qbu).
drivers/net/ethernet/freescale/enetc/enetc.c +2 -0
index 27f6fd1708f0..9db1b96ed9b9 100644
@@ -1496,6 +1496,8 @@ int enetc_setup_tc(struct net_device *ndev, enum tc_setup_type type,
 		return enetc_setup_tc_mqprio(ndev, type_data);
 	case TC_SETUP_QDISC_TAPRIO:
 		return enetc_setup_tc_taprio(ndev, type_data);
+	case TC_SETUP_QDISC_CBS:
+		return enetc_setup_tc_cbs(ndev, type_data);
 	default:
 		return -EOPNOTSUPP;
 	}
drivers/net/ethernet/freescale/enetc/enetc.h +2 -0
index 89f23156f330..7ee0da6d0015 100644
@@ -255,7 +255,9 @@ int enetc_send_cmd(struct enetc_si *si, struct enetc_cbd *cbd);
 #ifdef CONFIG_FSL_ENETC_QOS
 int enetc_setup_tc_taprio(struct net_device *ndev, void *type_data);
 void enetc_sched_speed_set(struct net_device *ndev);
+int enetc_setup_tc_cbs(struct net_device *ndev, void *type_data);
 #else
 #define enetc_setup_tc_taprio(ndev, type_data) -EOPNOTSUPP
 #define enetc_sched_speed_set(ndev) (void)0
+#define enetc_setup_tc_cbs(ndev, type_data) -EOPNOTSUPP
 #endif
drivers/net/ethernet/freescale/enetc/enetc_hw.h +4 -0
index 924ddb6d358a..51f543ef37a8 100644
@@ -185,6 +185,8 @@ enum enetc_bdr_type {TX, RX};
 #define ENETC_PSICFGR0_SIVC(bmp)	(((bmp) & 0xff) << 24) /* VLAN_TYPE */
 
 #define ENETC_PTCCBSR0(n)	(0x1110 + (n) * 8) /* n = 0 to 7*/
+#define ENETC_CBSE		BIT(31)
+#define ENETC_CBS_BW_MASK	GENMASK(6, 0)
 #define ENETC_PTCCBSR1(n)	(0x1114 + (n) * 8) /* n = 0 to 7*/
 #define ENETC_RSSHASH_KEY_SIZE	40
 #define ENETC_PRSSK(n)		(0x1410 + (n) * 4) /* n = [0..9] */
@@ -603,6 +605,8 @@ struct enetc_cbd {
 	u8 status_flags;
 };
 
+#define ENETC_CLK  400000000ULL
+
 /* port time gating control register */
 #define ENETC_QBV_PTGCR_OFFSET		0x11a00
 #define ENETC_QBV_TGE			BIT(31)
drivers/net/ethernet/freescale/enetc/enetc_qos.c +128 -0

137 lines not on this page · raw message

Signature · 1 line
2.17.1
maintainer Applied
#5 lore raw

From: Po Liu <[email protected]>
Date: Mon, 25 Nov 2019 05:56:56 +0000

Quoted 10 lines

The ENETC hardware support the Credit Based Shaper(CBS) which part of the IEEE-802.1Qav. The CBS driver was loaded by the sch_cbs interface when set in the QOS in the kernel.

Here is an example command to set 20Mbits bandwidth in 1Gbits port for taffic class 7:

tc qdisc add dev eth0 root handle 1: mqprio \

	   num_tc 8 map 0 1 2 3 4 5 6 7 hw 1
Quoted 7 lines

tc qdisc replace dev eth0 parent 1:8 cbs \

	   locredit -1470 hicredit 30 \
	   sendslope -980000 idleslope 20000 offload 1

Applied, thanks.