Skip to contentSkip to conversation

net/ice: enable VLAN filter offloads support

PATCH Superseded Wei Zhao 3 participants 6 messages Jan 28, 2019 – Feb 18, 2019 Network drivers

lore
Share & tools
lore

Wei Zhao

author
#0 lore raw

PATCH 1/1 net/ice: enable VLAN filter offloads support

There is need to check whether dev_conf.rxmode.offloads is set when start ice device, if one of the vlan related bits is set, for example DEV_RX_OFFLOAD_VLAN_FILTER and so on, sevice start process to enable this offloads request.

---
 drivers/net/ice/ice_ethdev.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/net/ice/ice_ethdev.c +9 -1
index b145d9c..94bdad3 100644
@@ -1711,7 +1711,7 @@ ice_dev_start(struct rte_eth_dev *dev)
 	struct ice_pf *pf = ICE_DEV_PRIVATE_TO_PF(dev->data->dev_private);
 	uint16_t nb_rxq = 0;
 	uint16_t nb_txq, i;
-	int ret;
+	int mask, ret;
 
 	/* program Tx queues' context in hardware */
 	for (nb_txq = 0; nb_txq < data->nb_tx_queues; nb_txq++) {
@@ -1739,6 +1739,14 @@ ice_dev_start(struct rte_eth_dev *dev)
 
 	ice_set_rx_function(dev);
 
+	mask = ETH_VLAN_STRIP_MASK | ETH_VLAN_FILTER_MASK |
+			ETH_VLAN_EXTEND_MASK;
+	ret = ice_vlan_offload_set(dev, mask);
+	if (ret) {
+		PMD_INIT_LOG(ERR, "Unable to set VLAN offload");
+		goto rx_err;
+	}
+
 	/* enable Rx interrput and mapping Rx queue to interrupt vector */
 	if (ice_rxq_intr_setup(dev))
 		return -EIO;
Signature · 1 line
2.7.5
author
#1 lore raw

PATCH v2 1/1 net/ice: enable VLAN filter offloads support

There is need to check whether dev_conf.rxmode.offloads is set when start ice device, if one of the vlan related bits is set, for example DEV_RX_OFFLOAD_VLAN_FILTER and so on, sevice start process to enable this offloads request.

---

v2:
-rework patch for compile error.

---
 drivers/net/avf/avf_ethdev.c |  2 +-
 drivers/net/ice/ice_ethdev.c | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)
drivers/net/avf/avf_ethdev.c +1 -1
index 13eec1b..797f505 100644
@@ -1159,7 +1159,7 @@ avf_enable_irq0(struct avf_hw *hw)
 	AVF_WRITE_REG(hw, AVFINT_ICR0_ENA1, AVFINT_ICR0_ENA1_ADMINQ_MASK);
 
 	AVF_WRITE_REG(hw, AVFINT_DYN_CTL01, AVFINT_DYN_CTL01_INTENA_MASK |
-					    AVFINT_DYN_CTL01_ITR_INDX_MASK);
+		AVFINT_DYN_CTL01_CLEARPBA_MASK | AVFINT_DYN_CTL01_ITR_INDX_MASK);
 
 	AVF_WRITE_FLUSH(hw);
 }
drivers/net/ice/ice_ethdev.c +9 -1
index 6ab66fa..5753d79 100644
@@ -1720,7 +1720,7 @@ ice_dev_start(struct rte_eth_dev *dev)
 	struct ice_vsi *vsi = pf->main_vsi;
 	uint16_t nb_rxq = 0;
 	uint16_t nb_txq, i;
-	int ret;
+	int mask, ret;
 
 	/* program Tx queues' context in hardware */
 	for (nb_txq = 0; nb_txq < data->nb_tx_queues; nb_txq++) {
@@ -1748,6 +1748,14 @@ ice_dev_start(struct rte_eth_dev *dev)
 
 	ice_set_rx_function(dev);
 
+	mask = ETH_VLAN_STRIP_MASK | ETH_VLAN_FILTER_MASK |
+			ETH_VLAN_EXTEND_MASK;
+	ret = ice_vlan_offload_set(dev, mask);
+	if (ret) {
+		PMD_INIT_LOG(ERR, "Unable to set VLAN offload");
+		goto rx_err;
+	}
+
 	/* enable Rx interrput and mapping Rx queue to interrupt vector */
 	if (ice_rxq_intr_setup(dev))
 		return -EIO;
Signature · 1 line
2.7.5
author
#2 lore raw

Error patch, please ignore it.

Quoted 71 lines

-----Original Message-----
From: Zhao1, Wei
Sent: Wednesday, February 13, 2019 11:30 AM
To: [email protected]
Cc: [email protected]; Zhang, Qi Z <[email protected]>; Zhao1, Wei <[email protected]>
Subject: [PATCH v2] net/ice: enable VLAN filter offloads support

There is need to check whether dev_conf.rxmode.offloads is set when start ice device, if one of the vlan related bits is set, for example DEV_RX_OFFLOAD_VLAN_FILTER and so on, sevice start process to enable this offloads request.

---

v2:

(quoted diff) +0 -2
-rework patch for compile error.
---
 drivers/net/avf/avf_ethdev.c |  2 +-
 drivers/net/ice/ice_ethdev.c | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)
drivers/net/avf/avf_ethdev.c +0 -0
index 13eec1b..797f505 100644
@@ -1159,7 +1159,7 @@ avf_enable_irq0(struct avf_hw *hw)
 	AVF_WRITE_REG(hw, AVFINT_ICR0_ENA1,
 AVFINT_ICR0_ENA1_ADMINQ_MASK);
 
 	AVF_WRITE_REG(hw, AVFINT_DYN_CTL01,

AVFINT_DYN_CTL01_INTENA_MASK |
-
AVFINT_DYN_CTL01_ITR_INDX_MASK);

drivers/net/avf/avf_ethdev.c +1 -0
+		AVFINT_DYN_CTL01_CLEARPBA_MASK |

AVFINT_DYN_CTL01_ITR_INDX_MASK);

drivers/net/avf/avf_ethdev.c +0 -0
 	AVF_WRITE_FLUSH(hw);
 }
drivers/net/ice/ice_ethdev.c +1 -1
index 6ab66fa..5753d79 100644
@@ -1720,7 +1720,7 @@ ice_dev_start(struct rte_eth_dev *dev)
 	struct ice_vsi *vsi = pf->main_vsi;
 	uint16_t nb_rxq = 0;
 	uint16_t nb_txq, i;
-	int ret;
+	int mask, ret;
 
 	/* program Tx queues' context in hardware */
 	for (nb_txq = 0; nb_txq < data->nb_tx_queues; nb_txq++) { @@ -

1748,6 +1748,14 @@ ice_dev_start(struct rte_eth_dev *dev)

drivers/net/ice/ice_ethdev.c +8 -1
 	ice_set_rx_function(dev);
 
+	mask = ETH_VLAN_STRIP_MASK | ETH_VLAN_FILTER_MASK |
+			ETH_VLAN_EXTEND_MASK;
+	ret = ice_vlan_offload_set(dev, mask);
+	if (ret) {
+		PMD_INIT_LOG(ERR, "Unable to set VLAN offload");
+		goto rx_err;
+	}
+
 	/* enable Rx interrput and mapping Rx queue to interrupt vector */
 	if (ice_rxq_intr_setup(dev))
 		return -EIO;
--

2.7.5

author
#3 lore raw

PATCH v2 1/1 net/ice: enable VLAN filter offloads support

In reply to Wei Zhao

There is need to check whether dev_conf.rxmode.offloads is set when start ice device, if one of the vlan related bits is set, for example DEV_RX_OFFLOAD_VLAN_FILTER and so on, sevice start process to enable this offloads request.

---

v2:
-rework patch for compile error.

---
 drivers/net/ice/ice_ethdev.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/net/ice/ice_ethdev.c +9 -1
index 6b0113b..a23c63a 100644
@@ -1714,7 +1714,7 @@ ice_dev_start(struct rte_eth_dev *dev)
 	struct ice_vsi *vsi = pf->main_vsi;
 	uint16_t nb_rxq = 0;
 	uint16_t nb_txq, i;
-	int ret;
+	int mask, ret;
 
 	/* program Tx queues' context in hardware */
 	for (nb_txq = 0; nb_txq < data->nb_tx_queues; nb_txq++) {
@@ -1742,6 +1742,14 @@ ice_dev_start(struct rte_eth_dev *dev)
 
 	ice_set_rx_function(dev);
 
+	mask = ETH_VLAN_STRIP_MASK | ETH_VLAN_FILTER_MASK |
+			ETH_VLAN_EXTEND_MASK;
+	ret = ice_vlan_offload_set(dev, mask);
+	if (ret) {
+		PMD_INIT_LOG(ERR, "Unable to set VLAN offload");
+		goto rx_err;
+	}
+
 	/* enable Rx interrput and mapping Rx queue to interrupt vector */
 	if (ice_rxq_intr_setup(dev))
 		return -EIO;
Signature · 1 line
2.7.5
#4 lore raw

Your patch description says we should be checking dev_conf.rxmode.offloads should be checked to enable VLAN, but I don't see the patch checking for that. What am I missing?

Paul

-----Original Message-----
From: dev [mailto:[email protected]] On Behalf Of Wei Zhao
Sent: Tuesday, February 12, 2019 7:50 PM
To: [email protected]
Cc: [email protected]; Zhang, Qi Z <[email protected]>; Zhao1, Wei <[email protected]>
Subject: [dpdk-dev] [PATCH v2] net/ice: enable VLAN filter offloads support

There is need to check whether dev_conf.rxmode.offloads is set when start ice device, if one of the vlan related bits is set, for example DEV_RX_OFFLOAD_VLAN_FILTER and so on, sevice start process to enable this offloads request.

---

v2:
-rework patch for compile error.

---
 drivers/net/ice/ice_ethdev.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/net/ice/ice_ethdev.c +1 -1
@@ -1714,7 +1714,7 @@ ice_dev_start(struct rte_eth_dev *dev)
 	struct ice_vsi *vsi = pf->main_vsi;
 	uint16_t nb_rxq = 0;
 	uint16_t nb_txq, i;
-	int ret;
+	int mask, ret;
 
 	/* program Tx queues' context in hardware */
 	for (nb_txq = 0; nb_txq < data->nb_tx_queues; nb_txq++) { @@ -1742,6 +1742,14 @@ ice_dev_start(struct rte_eth_dev *dev)

ice_set_rx_function(dev);

+ mask = ETH_VLAN_STRIP_MASK | ETH_VLAN_FILTER_MASK |
+ ETH_VLAN_EXTEND_MASK;
+ ret = ice_vlan_offload_set(dev, mask);
+ if (ret) {
+ PMD_INIT_LOG(ERR, "Unable to set VLAN offload");
+ goto rx_err;
+ }
+
/* enable Rx interrput and mapping Rx queue to interrupt vector */ if (ice_rxq_intr_setup(dev))
return -EIO;
--
2.7.5

Acked-by on v2 1/1 Applied
#5 lore raw
In reply to Wei Zhao
Quoted 9 lines

-----Original Message-----
From: Zhao1, Wei
Sent: Wednesday, February 13, 2019 11:50 AM
To: [email protected]
Cc: [email protected]; Zhang, Qi Z <[email protected]>; Zhao1, Wei <[email protected]>
Subject: [PATCH v2] net/ice: enable VLAN filter offloads support

I think this is a fix, since vlan filter is already be promised by ice_dev_info_get.

So add below fix line.

Fixes 690175ee51bf ("net/ice: support getting device information")
Quoted 5 lines

There is need to check whether dev_conf.rxmode.offloads is set when start ice device, if one of the vlan related bits is set, for example DEV_RX_OFFLOAD_VLAN_FILTER and so on, sevice start process to enable this offloads request.

Some typo, reword to

VLAN filter is required to be configured during dev_start according to dev_conf.rxmod.offloads
setting, so ice_vlan_offload_set is called to handle this.

Quoted 2 lines

Applied to dpdk-next-net-intel with above changes.

Thanks
Qi