Skip to contentSkip to conversation

net/i40e: enable i40e outer VLAN strip in QinQ

PATCH Applied Wei Zhao 3 participants 4 messages Jul 24, 2020 – Jul 25, 2020 Network drivers

lore
Share & tools
lore

Wei Zhao

author
#0 lore raw

PATCH 1/1 net/i40e: enable i40e outer VLAN strip in QinQ

This patch enable i40e outer vlan strip on and off in QinQ mode with mask bit of DEV_RX_OFFLOAD_QINQ_STRIP, users can use "vlan set qinq_strip on 0" to enable or "vlan set qinq_strip on 0" to disable i40e outer vlan strip when try with testpmd app.

Fixes 4861cde46116 (i40e: new poll mode driver)
---
 drivers/net/i40e/i40e_ethdev.c | 45 +++++++++++++++++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)
drivers/net/i40e/i40e_ethdev.c +44 -1
index 05d5f2861..f5be6606c 100644
@@ -48,6 +48,8 @@
 #define ETH_I40E_VF_MSG_CFG		"vf_msg_cfg"
 
 #define I40E_CLEAR_PXE_WAIT_MS     200
+#define I40E_VSI_TSR_QINQ_STRIP		0x4010
+#define I40E_VSI_TSR(_i)	(0x00050800 + ((_i) * 4))
 
 /* Maximun number of capability elements */
 #define I40E_MAX_CAP_ELE_NUM       128
@@ -3968,6 +3970,39 @@ i40e_vlan_tpid_set(struct rte_eth_dev *dev,
 	return ret;
 }
 
+/* Configure outer vlan stripping on or off in QinQ mode */
+static int
+i40e_vsi_config_outer_vlan_stripping(struct i40e_vsi *vsi, bool on)
+{
+	struct i40e_hw *hw = I40E_VSI_TO_HW(vsi);
+	int ret = I40E_SUCCESS;
+	uint32_t reg;
+
+	if (vsi->vsi_id >= I40E_MAX_NUM_VSIS) {
+		PMD_DRV_LOG(ERR, "VSI ID exceeds the maximum");
+		return -EINVAL;
+	}
+
+	/* Configure for outer VLAN RX stripping */
+	reg = I40E_READ_REG(hw, I40E_VSI_TSR(vsi->vsi_id));
+
+	if (on)
+		reg |= I40E_VSI_TSR_QINQ_STRIP;
+	else
+		reg &= ~I40E_VSI_TSR_QINQ_STRIP;
+
+	ret = i40e_aq_debug_write_register(hw,
+						   I40E_VSI_TSR(vsi->vsi_id),
+						   reg, NULL);
+	if (ret < 0) {
+		PMD_DRV_LOG(ERR, "Failed to update VSI_TSR[%d]",
+				    vsi->vsi_id);
+		return I40E_ERR_CONFIG;
+	}
+
+	return ret;
+}
+
 static int
 i40e_vlan_offload_set(struct rte_eth_dev *dev, int mask)
 {
@@ -4004,6 +4039,14 @@ i40e_vlan_offload_set(struct rte_eth_dev *dev, int mask)
 			i40e_vsi_config_double_vlan(vsi, FALSE);
 	}
 
+	if (mask & ETH_QINQ_STRIP_MASK) {
+		/* Enable or disable outer VLAN stripping */
+		if (rxmode->offloads & DEV_RX_OFFLOAD_QINQ_STRIP)
+			i40e_vsi_config_outer_vlan_stripping(vsi, TRUE);
+		else
+			i40e_vsi_config_outer_vlan_stripping(vsi, FALSE);
+	}
+
 	return 0;
 }
 
@@ -6178,6 +6221,7 @@ i40e_dev_init_vlan(struct rte_eth_dev *dev)
 
 	/* Apply vlan offload setting */
 	mask = ETH_VLAN_STRIP_MASK |
+	       ETH_QINQ_STRIP_MASK |
 	       ETH_VLAN_FILTER_MASK |
 	       ETH_VLAN_EXTEND_MASK;
 	ret = i40e_vlan_offload_set(dev, mask);
@@ -10872,7 +10916,6 @@ i40e_configure_registers(struct i40e_hw *hw)
 	}
 }
 
-#define I40E_VSI_TSR(_i)            (0x00050800 + ((_i) * 4))
 #define I40E_VSI_TSR_QINQ_CONFIG    0xc030
 #define I40E_VSI_L2TAGSTXVALID(_i)  (0x00042800 + ((_i) * 4))
 #define I40E_VSI_L2TAGSTXVALID_QINQ 0xab
Signature · 1 line
2.19.1
author
#1 lore raw

Add maintainers.

Quoted 103 lines

-----Original Message-----
From: Zhao1, Wei <[email protected]>
Sent: Friday, July 24, 2020 3:02 PM
To: [email protected]
Cc: [email protected]; Zhang, Qi Z <[email protected]>; Zhao1, Wei <[email protected]>
Subject: [PATCH] net/i40e: enable i40e outer VLAN strip in QinQ

This patch enable i40e outer vlan strip on and off in QinQ mode with mask bit of DEV_RX_OFFLOAD_QINQ_STRIP, users can use "vlan set qinq_strip on 0" to enable or "vlan set qinq_strip on 0" to disable i40e outer vlan strip when try with testpmd app.

Fixes 4861cde46116 (i40e: new poll mode driver)
---
 drivers/net/i40e/i40e_ethdev.c | 45 +++++++++++++++++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)
drivers/net/i40e/i40e_ethdev.c +43 -0
index 05d5f2861..f5be6606c 100644
@@ -48,6 +48,8 @@
 #define ETH_I40E_VF_MSG_CFG		"vf_msg_cfg"
 
 #define I40E_CLEAR_PXE_WAIT_MS     200
+#define I40E_VSI_TSR_QINQ_STRIP		0x4010
+#define I40E_VSI_TSR(_i)	(0x00050800 + ((_i) * 4))
 
 /* Maximun number of capability elements */
 #define I40E_MAX_CAP_ELE_NUM       128
@@ -3968,6 +3970,39 @@ i40e_vlan_tpid_set(struct rte_eth_dev *dev,
 	return ret;
 }
 
+/* Configure outer vlan stripping on or off in QinQ mode */ static int
+i40e_vsi_config_outer_vlan_stripping(struct i40e_vsi *vsi, bool on) {
+	struct i40e_hw *hw = I40E_VSI_TO_HW(vsi);
+	int ret = I40E_SUCCESS;
+	uint32_t reg;
+
+	if (vsi->vsi_id >= I40E_MAX_NUM_VSIS) {
+		PMD_DRV_LOG(ERR, "VSI ID exceeds the maximum");
+		return -EINVAL;
+	}
+
+	/* Configure for outer VLAN RX stripping */
+	reg = I40E_READ_REG(hw, I40E_VSI_TSR(vsi->vsi_id));
+
+	if (on)
+		reg |= I40E_VSI_TSR_QINQ_STRIP;
+	else
+		reg &= ~I40E_VSI_TSR_QINQ_STRIP;
+
+	ret = i40e_aq_debug_write_register(hw,
+						   I40E_VSI_TSR(vsi->vsi_id),
+						   reg, NULL);
+	if (ret < 0) {
+		PMD_DRV_LOG(ERR, "Failed to update VSI_TSR[%d]",
+				    vsi->vsi_id);
+		return I40E_ERR_CONFIG;
+	}
+
+	return ret;
+}
+
 static int
 i40e_vlan_offload_set(struct rte_eth_dev *dev, int mask)  { @@ -4004,6
+4039,14 @@ i40e_vlan_offload_set(struct rte_eth_dev *dev, int mask)
 			i40e_vsi_config_double_vlan(vsi, FALSE);
 	}
 
+	if (mask & ETH_QINQ_STRIP_MASK) {
+		/* Enable or disable outer VLAN stripping */
+		if (rxmode->offloads & DEV_RX_OFFLOAD_QINQ_STRIP)
+			i40e_vsi_config_outer_vlan_stripping(vsi, TRUE);
+		else
+			i40e_vsi_config_outer_vlan_stripping(vsi, FALSE);
+	}
+
 	return 0;
 }
@@ -6178,6 +6221,7 @@ i40e_dev_init_vlan(struct rte_eth_dev *dev)
 
 	/* Apply vlan offload setting */
 	mask = ETH_VLAN_STRIP_MASK |
+	       ETH_QINQ_STRIP_MASK |
 	       ETH_VLAN_FILTER_MASK |
 	       ETH_VLAN_EXTEND_MASK;
 	ret = i40e_vlan_offload_set(dev, mask); @@ -10872,7 +10916,6 @@

i40e_configure_registers(struct i40e_hw *hw)

drivers/net/i40e/i40e_ethdev.c +0 -1
 	}
 }
 
-#define I40E_VSI_TSR(_i)            (0x00050800 + ((_i) * 4))
 #define I40E_VSI_TSR_QINQ_CONFIG    0xc030
 #define I40E_VSI_L2TAGSTXVALID(_i)  (0x00042800 + ((_i) * 4))  #define

I40E_VSI_L2TAGSTXVALID_QINQ 0xab
--
2.19.1

Reviewed-by on v1 1/1
#2 lore raw
In reply to Wei Zhao
Quoted 103 lines

-----Original Message-----
From: dev <[email protected]> On Behalf Of Wei Zhao
Sent: Friday, July 24, 2020 15:02
To: [email protected]
Cc: [email protected]; Zhang, Qi Z <[email protected]>; Zhao1, Wei <[email protected]>
Subject: [dpdk-dev] [PATCH] net/i40e: enable i40e outer VLAN strip in QinQ

This patch enable i40e outer vlan strip on and off in QinQ mode with mask bit of DEV_RX_OFFLOAD_QINQ_STRIP, users can use "vlan set qinq_strip on 0" to enable or "vlan set qinq_strip on 0" to disable i40e outer vlan strip when try with testpmd app.

Fixes 4861cde46116 (i40e: new poll mode driver)
---
 drivers/net/i40e/i40e_ethdev.c | 45
+++++++++++++++++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)
drivers/net/i40e/i40e_ethdev.c +43 -0
index 05d5f2861..f5be6606c 100644
@@ -48,6 +48,8 @@
 #define ETH_I40E_VF_MSG_CFG		"vf_msg_cfg"
 
 #define I40E_CLEAR_PXE_WAIT_MS     200
+#define I40E_VSI_TSR_QINQ_STRIP		0x4010
+#define I40E_VSI_TSR(_i)	(0x00050800 + ((_i) * 4))
 
 /* Maximun number of capability elements */
 #define I40E_MAX_CAP_ELE_NUM       128
@@ -3968,6 +3970,39 @@ i40e_vlan_tpid_set(struct rte_eth_dev *dev,
 	return ret;
 }
 
+/* Configure outer vlan stripping on or off in QinQ mode */ static int
+i40e_vsi_config_outer_vlan_stripping(struct i40e_vsi *vsi, bool on) {
+	struct i40e_hw *hw = I40E_VSI_TO_HW(vsi);
+	int ret = I40E_SUCCESS;
+	uint32_t reg;
+
+	if (vsi->vsi_id >= I40E_MAX_NUM_VSIS) {
+		PMD_DRV_LOG(ERR, "VSI ID exceeds the maximum");
+		return -EINVAL;
+	}
+
+	/* Configure for outer VLAN RX stripping */
+	reg = I40E_READ_REG(hw, I40E_VSI_TSR(vsi->vsi_id));
+
+	if (on)
+		reg |= I40E_VSI_TSR_QINQ_STRIP;
+	else
+		reg &= ~I40E_VSI_TSR_QINQ_STRIP;
+
+	ret = i40e_aq_debug_write_register(hw,
+						   I40E_VSI_TSR(vsi->vsi_id),
+						   reg, NULL);
+	if (ret < 0) {
+		PMD_DRV_LOG(ERR, "Failed to update VSI_TSR[%d]",
+				    vsi->vsi_id);
+		return I40E_ERR_CONFIG;
+	}
+
+	return ret;
+}
+
 static int
 i40e_vlan_offload_set(struct rte_eth_dev *dev, int mask)  { @@ -4004,6
+4039,14 @@ i40e_vlan_offload_set(struct rte_eth_dev *dev, int mask)
 			i40e_vsi_config_double_vlan(vsi, FALSE);
 	}
 
+	if (mask & ETH_QINQ_STRIP_MASK) {
+		/* Enable or disable outer VLAN stripping */
+		if (rxmode->offloads & DEV_RX_OFFLOAD_QINQ_STRIP)
+			i40e_vsi_config_outer_vlan_stripping(vsi, TRUE);
+		else
+			i40e_vsi_config_outer_vlan_stripping(vsi, FALSE);
+	}
+
 	return 0;
 }
@@ -6178,6 +6221,7 @@ i40e_dev_init_vlan(struct rte_eth_dev *dev)
 
 	/* Apply vlan offload setting */
 	mask = ETH_VLAN_STRIP_MASK |
+	       ETH_QINQ_STRIP_MASK |
 	       ETH_VLAN_FILTER_MASK |
 	       ETH_VLAN_EXTEND_MASK;
 	ret = i40e_vlan_offload_set(dev, mask); @@ -10872,7 +10916,6 @@

i40e_configure_registers(struct i40e_hw *hw)

drivers/net/i40e/i40e_ethdev.c +0 -1
 	}
 }
 
-#define I40E_VSI_TSR(_i)            (0x00050800 + ((_i) * 4))
 #define I40E_VSI_TSR_QINQ_CONFIG    0xc030
 #define I40E_VSI_L2TAGSTXVALID(_i)  (0x00042800 + ((_i) * 4))  #define
Quoted 3 lines

I40E_VSI_L2TAGSTXVALID_QINQ 0xab
--
2.19.1

Applied
#3 lore raw
Quoted 103 lines

-----Original Message-----
From: Yang, Qiming <[email protected]>
Sent: Friday, July 24, 2020 4:38 PM
To: Zhao1, Wei <[email protected]>; [email protected]
Cc: [email protected]; Zhang, Qi Z <[email protected]>; Zhao1, Wei <[email protected]>
Subject: RE: [dpdk-dev] [PATCH] net/i40e: enable i40e outer VLAN strip in QinQ

Quoted 11 lines

-----Original Message-----
From: dev <[email protected]> On Behalf Of Wei Zhao
Sent: Friday, July 24, 2020 15:02
To: [email protected]
Cc: [email protected]; Zhang, Qi Z <[email protected]>; Zhao1, Wei <[email protected]>
Subject: [dpdk-dev] [PATCH] net/i40e: enable i40e outer VLAN strip in QinQ

This patch enable i40e outer vlan strip on and off in QinQ mode with mask bit of DEV_RX_OFFLOAD_QINQ_STRIP, users can use "vlan set qinq_strip

on 0"

Quoted 79 lines

to enable or "vlan set qinq_strip on 0" to disable i40e outer vlan strip when try with testpmd app.

Fixes 4861cde46116 (i40e: new poll mode driver)
---
 drivers/net/i40e/i40e_ethdev.c | 45
+++++++++++++++++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)
(quoted diff) +0 -0

b/drivers/net/i40e/i40e_ethdev.c index 05d5f2861..f5be6606c 100644

drivers/net/i40e/i40e_ethdev.c +37 -1
@@ -48,6 +48,8 @@
 #define ETH_I40E_VF_MSG_CFG"vf_msg_cfg"
 
 #define I40E_CLEAR_PXE_WAIT_MS     200
+#define I40E_VSI_TSR_QINQ_STRIP0x4010 #define
+I40E_VSI_TSR(_i)(0x00050800 + ((_i) * 4))
 
 /* Maximun number of capability elements */
 #define I40E_MAX_CAP_ELE_NUM       128
@@ -3968,6 +3970,39 @@ i40e_vlan_tpid_set(struct rte_eth_dev *dev,
 return ret;  }
 
+/* Configure outer vlan stripping on or off in QinQ mode */ static
+int i40e_vsi_config_outer_vlan_stripping(struct i40e_vsi *vsi, bool
+on) { struct i40e_hw *hw = I40E_VSI_TO_HW(vsi); int ret =
+I40E_SUCCESS; uint32_t reg;
+
+if (vsi->vsi_id >= I40E_MAX_NUM_VSIS) { PMD_DRV_LOG(ERR, "VSI ID
+exceeds the maximum"); return -EINVAL; }
+
+/* Configure for outer VLAN RX stripping */ reg = I40E_READ_REG(hw,
+I40E_VSI_TSR(vsi->vsi_id));
+
+if (on)
+reg |= I40E_VSI_TSR_QINQ_STRIP;
+else
+reg &= ~I40E_VSI_TSR_QINQ_STRIP;
+
+ret = i40e_aq_debug_write_register(hw,
+   I40E_VSI_TSR(vsi->vsi_id),
+   reg, NULL);
+if (ret < 0) {
+PMD_DRV_LOG(ERR, "Failed to update VSI_TSR[%d]",
+    vsi->vsi_id);
+return I40E_ERR_CONFIG;
+}
+
+return ret;
+}
+
 static int
 i40e_vlan_offload_set(struct rte_eth_dev *dev, int mask)  { @@
-4004,6
+4039,14 @@ i40e_vlan_offload_set(struct rte_eth_dev *dev, int mask)
 i40e_vsi_config_double_vlan(vsi, FALSE);  }
 
+if (mask & ETH_QINQ_STRIP_MASK) {
+/* Enable or disable outer VLAN stripping */ if (rxmode->offloads &
+DEV_RX_OFFLOAD_QINQ_STRIP) i40e_vsi_config_outer_vlan_stripping(vsi,
+TRUE); else i40e_vsi_config_outer_vlan_stripping(vsi, FALSE); }
+
 return 0;
 }
@@ -6178,6 +6221,7 @@ i40e_dev_init_vlan(struct rte_eth_dev *dev)
 
 /* Apply vlan offload setting */
 mask = ETH_VLAN_STRIP_MASK |
+       ETH_QINQ_STRIP_MASK |
        ETH_VLAN_FILTER_MASK |
        ETH_VLAN_EXTEND_MASK;
 ret = i40e_vlan_offload_set(dev, mask); @@ -10872,7 +10916,6 @@

i40e_configure_registers(struct i40e_hw *hw) } }

Quoted 8 lines
Quoted 6 lines
-#define I40E_VSI_TSR(_i)            (0x00050800 + ((_i) * 4))
 #define I40E_VSI_TSR_QINQ_CONFIG    0xc030
 #define I40E_VSI_L2TAGSTXVALID(_i)  (0x00042800 + ((_i) * 4))

#define I40E_VSI_L2TAGSTXVALID_QINQ 0xab
--
2.19.1

Applied to dpdk-next-net-intel.

Thanks
Qi

Quoted 1 line