Skip to contentSkip to conversation

net/ice: fix FDIR programming status check issue

PATCH Applied Yahui Cao 4 participants 8 messages Nov 13, 2019 – Nov 19, 2019 Network drivers

lore
Share & tools
lore

Yahui Cao

author
#0 lore raw

PATCH 1/1 net/ice: fix FDIR programming status check issue

To make sure if FDIR programming succeed or fail, legacy programming status descriptor WB format is enabled and FDIR queue irq is opened.

Fixes 84dc7a95a2d3 ("net/ice: enable flow director engine")
---
 drivers/net/ice/ice_ethdev.c |  1 +
 drivers/net/ice/ice_rxtx.c   | 93 +++++++++++++++++++++++++++++++++---
 2 files changed, 88 insertions(+), 6 deletions(-)
drivers/net/ice/ice_ethdev.c +1 -0
index 3b20ea423..27b0fbc83 100644
@@ -2726,6 +2726,7 @@ ice_rxq_intr_setup(struct rte_eth_dev *dev)
 
 	/* Enable FDIR MSIX interrupt */
 	if (pf->fdir.fdir_vsi) {
+		pf->fdir.fdir_vsi->nb_used_qps = 1;
 		ice_vsi_queues_bind_intr(pf->fdir.fdir_vsi);
 		ice_vsi_enable_queues_intr(pf->fdir.fdir_vsi);
 	}
drivers/net/ice/ice_rxtx.c +87 -6

134 lines not on this page · raw message

Signature · 1 line
2.17.1
Acked-by on v1 1/1 Applied
#1 lore raw
Quoted 172 lines · Yahui Cao

To make sure if FDIR programming succeed or fail, legacy programming status descriptor WB format is enabled and FDIR queue irq is opened.

Fixes 84dc7a95a2d3 ("net/ice: enable flow director engine")

---
drivers/net/ice/ice_ethdev.c | 1 +
drivers/net/ice/ice_rxtx.c | 93 +++++++++++++++++++++++++++++++++---

2 files changed, 88 insertions(+), 6 deletions(-)
drivers/net/ice/ice_ethdev.c +1 -0
index 3b20ea423..27b0fbc83 100644
@@ -2726,6 +2726,7 @@ ice_rxq_intr_setup(struct rte_eth_dev *dev)
 
 	/* Enable FDIR MSIX interrupt */
 	if (pf->fdir.fdir_vsi) {
+		pf->fdir.fdir_vsi->nb_used_qps = 1;
 		ice_vsi_queues_bind_intr(pf->fdir.fdir_vsi);
 		ice_vsi_enable_queues_intr(pf->fdir.fdir_vsi);
 	}
drivers/net/ice/ice_rxtx.c +71 -5
index 18c02979e..2db174456 100644
@@ -535,7 +535,7 @@ ice_fdir_program_hw_rx_queue(struct ice_rx_queue *rxq)
 {
 	struct ice_vsi *vsi = rxq->vsi;
 	struct ice_hw *hw = ICE_VSI_TO_HW(vsi);
-	uint32_t rxdid = ICE_RXDID_COMMS_GENERIC;
+	uint32_t rxdid = ICE_RXDID_LEGACY_1;
 	struct ice_rlan_ctx rx_ctx;
 	enum ice_status err;
 	uint32_t regval;
@@ -550,9 +550,7 @@ ice_fdir_program_hw_rx_queue(struct ice_rx_queue *rxq)
 	rx_ctx.dbuf = rxq->rx_buf_len >> ICE_RLAN_CTX_DBUF_S;
 	rx_ctx.hbuf = rxq->rx_hdr_len >> ICE_RLAN_CTX_HBUF_S;
 	rx_ctx.dtype = 0; /* No Header Split mode */
-#ifndef RTE_LIBRTE_ICE_16BYTE_RX_DESC
 	rx_ctx.dsize = 1; /* 32B descriptors */
-#endif
 	rx_ctx.rxmax = RTE_ETHER_MAX_LEN;
 	/* TPH: Transaction Layer Packet (TLP) processing hints */
 	rx_ctx.tphrdesc_ena = 1;
@@ -2077,7 +2075,7 @@ ice_fdir_setup_rx_resources(struct ice_pf *pf)
 	}
 
 	/* Allocate RX hardware ring descriptors. */
-	ring_size = sizeof(union ice_rx_flex_desc) * ICE_FDIR_NUM_RX_DESC;
+	ring_size = sizeof(union ice_32byte_rx_desc) * ICE_FDIR_NUM_RX_DESC;
 	ring_size = RTE_ALIGN(ring_size, ICE_DMA_MEM_ALIGN);
 
 	rz = rte_eth_dma_zone_reserve(dev, "fdir_rx_ring",
@@ -2096,7 +2094,7 @@ ice_fdir_setup_rx_resources(struct ice_pf *pf)
 
 	rxq->rx_ring_dma = rz->iova;
 	memset(rz->addr, 0, ICE_FDIR_NUM_RX_DESC *
-	       sizeof(union ice_rx_flex_desc));
+	       sizeof(union ice_32byte_rx_desc));
 	rxq->rx_ring = (union ice_rx_flex_desc *)rz->addr;
 
 	/*
@@ -3607,12 +3605,81 @@ ice_set_default_ptype_table(struct rte_eth_dev *dev)
 		ad->ptype_tbl[i] = ice_get_default_pkt_type(i);
 }
 
+#define ICE_RX_PROG_STATUS_DESC_WB_QW1_PROGID_S	1
+#define ICE_RX_PROG_STATUS_DESC_WB_QW1_PROGID_M	\
+			(0x3UL << ICE_RX_PROG_STATUS_DESC_WB_QW1_PROGID_S)
+#define ICE_RX_PROG_STATUS_DESC_WB_QW1_PROG_ADD 0
+#define ICE_RX_PROG_STATUS_DESC_WB_QW1_PROG_DEL 0x1
+
+#define ICE_RX_PROG_STATUS_DESC_WB_QW1_FAIL_S	4
+#define ICE_RX_PROG_STATUS_DESC_WB_QW1_FAIL_M	\
+	(1 << ICE_RX_PROG_STATUS_DESC_WB_QW1_FAIL_S)
+#define ICE_RX_PROG_STATUS_DESC_WB_QW1_FAIL_PROF_S	5
+#define ICE_RX_PROG_STATUS_DESC_WB_QW1_FAIL_PROF_M	\
+	(1 << ICE_RX_PROG_STATUS_DESC_WB_QW1_FAIL_PROF_S)
+
+/*
+ * check the programming status descriptor in rx queue.
+ * done after Programming Flow Director is programmed on
+ * tx queue
+ */
+static inline int
+ice_check_fdir_programming_status(struct ice_rx_queue *rxq)
+{
+	volatile union ice_32byte_rx_desc *rxdp;
+	uint64_t qword1;
+	uint32_t rx_status;
+	uint32_t error;
+	uint32_t id;
+	int ret = -EAGAIN;
+
+	rxdp = (volatile union ice_32byte_rx_desc *)
+		(&rxq->rx_ring[rxq->rx_tail]);
+	qword1 = rte_le_to_cpu_64(rxdp->wb.qword1.status_error_len);
+	rx_status = (qword1 & ICE_RXD_QW1_STATUS_M)
+			>> ICE_RXD_QW1_STATUS_S;
+
+	if (rx_status & (1 << ICE_RX_DESC_STATUS_DD_S)) {
+		ret = 0;
+		error = (qword1 & ICE_RX_PROG_STATUS_DESC_WB_QW1_FAIL_M) >>
+			ICE_RX_PROG_STATUS_DESC_WB_QW1_FAIL_S;
+		id = (qword1 & ICE_RX_PROG_STATUS_DESC_WB_QW1_PROGID_M) >>
+			ICE_RX_PROG_STATUS_DESC_WB_QW1_PROGID_S;
+		if (error) {
+			if (id == ICE_RX_PROG_STATUS_DESC_WB_QW1_PROG_ADD)
+				PMD_DRV_LOG(ERR, "Failed to add FDIR rule.");
+			else if (id == ICE_RX_PROG_STATUS_DESC_WB_QW1_PROG_DEL)
+				PMD_DRV_LOG(ERR, "Failed to remove FDIR rule.");
+			ret = -EINVAL;
+			goto err;
+		}
+		error = (qword1 & ICE_RX_PROG_STATUS_DESC_WB_QW1_FAIL_PROF_M) >>
+			ICE_RX_PROG_STATUS_DESC_WB_QW1_FAIL_PROF_S;
+		if (error) {
+			PMD_DRV_LOG(ERR, "Failed to create FDIR profile.");
+			ret = -EINVAL;
+		}
+err:
+		rxdp->wb.qword1.status_error_len = 0;
+		rxq->rx_tail++;
+		if (unlikely(rxq->rx_tail == rxq->nb_rx_desc))
+			rxq->rx_tail = 0;
+		if (rxq->rx_tail == 0)
+			ICE_PCI_REG_WRITE(rxq->qrx_tail, rxq->nb_rx_desc - 1);
+		else
+			ICE_PCI_REG_WRITE(rxq->qrx_tail, rxq->rx_tail - 1);
+	}
+
+	return ret;
+}
+
 #define ICE_FDIR_MAX_WAIT_US 10000
 

int
ice_fdir_programming(struct ice_pf *pf, struct ice_fltr_desc *fdir_desc)

{
	struct ice_tx_queue *txq = pf->fdir.txq;
drivers/net/ice/ice_rxtx.c +1 -0
+	struct ice_rx_queue *rxq = pf->fdir.rxq;
	volatile struct ice_fltr_desc *fdirdp;
	volatile struct ice_tx_desc *txdp;
	uint32_t td_cmd;
drivers/net/ice/ice_rxtx.c +15 -1
@@ -3650,5 +3717,19 @@ ice_fdir_programming(struct ice_pf *pf, struct ice_fltr_desc *fdir_desc)
 		return -ETIMEDOUT;
 	}
 
-	return 0;
+	for (; i < ICE_FDIR_MAX_WAIT_US; i++) {
+		int ret;
+
+		ret = ice_check_fdir_programming_status(rxq);
+		if (ret == -EAGAIN)
+			rte_delay_us(1);
+		else
+			return ret;
+	}
+
+	PMD_DRV_LOG(ERR,
+		    "Failed to program FDIR filter: programming status reported.");
+	return -ETIMEDOUT;
+
+
 }
Signature · 1 line
2.17.1

Applied to dpdk-next-net-intel, Thanks.

#2 lore raw
Quoted 176 lines · Ye Xiaolong
Quoted 172 lines · Yahui Cao

To make sure if FDIR programming succeed or fail, legacy programming status descriptor WB format is enabled and FDIR queue irq is opened.

Fixes 84dc7a95a2d3 ("net/ice: enable flow director engine")

---
drivers/net/ice/ice_ethdev.c | 1 +
drivers/net/ice/ice_rxtx.c | 93 +++++++++++++++++++++++++++++++++---

2 files changed, 88 insertions(+), 6 deletions(-)
drivers/net/ice/ice_ethdev.c +1 -0
index 3b20ea423..27b0fbc83 100644
@@ -2726,6 +2726,7 @@ ice_rxq_intr_setup(struct rte_eth_dev *dev)
 
 	/* Enable FDIR MSIX interrupt */
 	if (pf->fdir.fdir_vsi) {
+		pf->fdir.fdir_vsi->nb_used_qps = 1;
 		ice_vsi_queues_bind_intr(pf->fdir.fdir_vsi);
 		ice_vsi_enable_queues_intr(pf->fdir.fdir_vsi);
 	}
drivers/net/ice/ice_rxtx.c +71 -5
index 18c02979e..2db174456 100644
@@ -535,7 +535,7 @@ ice_fdir_program_hw_rx_queue(struct ice_rx_queue *rxq)
 {
 	struct ice_vsi *vsi = rxq->vsi;
 	struct ice_hw *hw = ICE_VSI_TO_HW(vsi);
-	uint32_t rxdid = ICE_RXDID_COMMS_GENERIC;
+	uint32_t rxdid = ICE_RXDID_LEGACY_1;
 	struct ice_rlan_ctx rx_ctx;
 	enum ice_status err;
 	uint32_t regval;
@@ -550,9 +550,7 @@ ice_fdir_program_hw_rx_queue(struct ice_rx_queue *rxq)
 	rx_ctx.dbuf = rxq->rx_buf_len >> ICE_RLAN_CTX_DBUF_S;
 	rx_ctx.hbuf = rxq->rx_hdr_len >> ICE_RLAN_CTX_HBUF_S;
 	rx_ctx.dtype = 0; /* No Header Split mode */
-#ifndef RTE_LIBRTE_ICE_16BYTE_RX_DESC
 	rx_ctx.dsize = 1; /* 32B descriptors */
-#endif
 	rx_ctx.rxmax = RTE_ETHER_MAX_LEN;
 	/* TPH: Transaction Layer Packet (TLP) processing hints */
 	rx_ctx.tphrdesc_ena = 1;
@@ -2077,7 +2075,7 @@ ice_fdir_setup_rx_resources(struct ice_pf *pf)
 	}
 
 	/* Allocate RX hardware ring descriptors. */
-	ring_size = sizeof(union ice_rx_flex_desc) * ICE_FDIR_NUM_RX_DESC;
+	ring_size = sizeof(union ice_32byte_rx_desc) * ICE_FDIR_NUM_RX_DESC;
 	ring_size = RTE_ALIGN(ring_size, ICE_DMA_MEM_ALIGN);
 
 	rz = rte_eth_dma_zone_reserve(dev, "fdir_rx_ring",
@@ -2096,7 +2094,7 @@ ice_fdir_setup_rx_resources(struct ice_pf *pf)
 
 	rxq->rx_ring_dma = rz->iova;
 	memset(rz->addr, 0, ICE_FDIR_NUM_RX_DESC *
-	       sizeof(union ice_rx_flex_desc));
+	       sizeof(union ice_32byte_rx_desc));
 	rxq->rx_ring = (union ice_rx_flex_desc *)rz->addr;
 
 	/*
@@ -3607,12 +3605,81 @@ ice_set_default_ptype_table(struct rte_eth_dev *dev)
 		ad->ptype_tbl[i] = ice_get_default_pkt_type(i);
 }
 
+#define ICE_RX_PROG_STATUS_DESC_WB_QW1_PROGID_S	1
+#define ICE_RX_PROG_STATUS_DESC_WB_QW1_PROGID_M	\
+			(0x3UL << ICE_RX_PROG_STATUS_DESC_WB_QW1_PROGID_S)
+#define ICE_RX_PROG_STATUS_DESC_WB_QW1_PROG_ADD 0
+#define ICE_RX_PROG_STATUS_DESC_WB_QW1_PROG_DEL 0x1
+
+#define ICE_RX_PROG_STATUS_DESC_WB_QW1_FAIL_S	4
+#define ICE_RX_PROG_STATUS_DESC_WB_QW1_FAIL_M	\
+	(1 << ICE_RX_PROG_STATUS_DESC_WB_QW1_FAIL_S)
+#define ICE_RX_PROG_STATUS_DESC_WB_QW1_FAIL_PROF_S	5
+#define ICE_RX_PROG_STATUS_DESC_WB_QW1_FAIL_PROF_M	\
+	(1 << ICE_RX_PROG_STATUS_DESC_WB_QW1_FAIL_PROF_S)
+
+/*
+ * check the programming status descriptor in rx queue.
+ * done after Programming Flow Director is programmed on
+ * tx queue
+ */
+static inline int
+ice_check_fdir_programming_status(struct ice_rx_queue *rxq)
+{
+	volatile union ice_32byte_rx_desc *rxdp;
+	uint64_t qword1;
+	uint32_t rx_status;
+	uint32_t error;
+	uint32_t id;
+	int ret = -EAGAIN;
+
+	rxdp = (volatile union ice_32byte_rx_desc *)
+		(&rxq->rx_ring[rxq->rx_tail]);
+	qword1 = rte_le_to_cpu_64(rxdp->wb.qword1.status_error_len);
+	rx_status = (qword1 & ICE_RXD_QW1_STATUS_M)
+			>> ICE_RXD_QW1_STATUS_S;
+
+	if (rx_status & (1 << ICE_RX_DESC_STATUS_DD_S)) {
+		ret = 0;
+		error = (qword1 & ICE_RX_PROG_STATUS_DESC_WB_QW1_FAIL_M) >>
+			ICE_RX_PROG_STATUS_DESC_WB_QW1_FAIL_S;
+		id = (qword1 & ICE_RX_PROG_STATUS_DESC_WB_QW1_PROGID_M) >>
+			ICE_RX_PROG_STATUS_DESC_WB_QW1_PROGID_S;
+		if (error) {
+			if (id == ICE_RX_PROG_STATUS_DESC_WB_QW1_PROG_ADD)
+				PMD_DRV_LOG(ERR, "Failed to add FDIR rule.");
+			else if (id == ICE_RX_PROG_STATUS_DESC_WB_QW1_PROG_DEL)
+				PMD_DRV_LOG(ERR, "Failed to remove FDIR rule.");
+			ret = -EINVAL;
+			goto err;
+		}
+		error = (qword1 & ICE_RX_PROG_STATUS_DESC_WB_QW1_FAIL_PROF_M) >>
+			ICE_RX_PROG_STATUS_DESC_WB_QW1_FAIL_PROF_S;
+		if (error) {
+			PMD_DRV_LOG(ERR, "Failed to create FDIR profile.");
+			ret = -EINVAL;
+		}
+err:
+		rxdp->wb.qword1.status_error_len = 0;
+		rxq->rx_tail++;
+		if (unlikely(rxq->rx_tail == rxq->nb_rx_desc))
+			rxq->rx_tail = 0;
+		if (rxq->rx_tail == 0)
+			ICE_PCI_REG_WRITE(rxq->qrx_tail, rxq->nb_rx_desc - 1);
+		else
+			ICE_PCI_REG_WRITE(rxq->qrx_tail, rxq->rx_tail - 1);
+	}
+
+	return ret;
+}
+
 #define ICE_FDIR_MAX_WAIT_US 10000
 

int
ice_fdir_programming(struct ice_pf *pf, struct ice_fltr_desc *fdir_desc)

{
	struct ice_tx_queue *txq = pf->fdir.txq;
drivers/net/ice/ice_rxtx.c +1 -0
+	struct ice_rx_queue *rxq = pf->fdir.rxq;
	volatile struct ice_fltr_desc *fdirdp;
	volatile struct ice_tx_desc *txdp;
	uint32_t td_cmd;
drivers/net/ice/ice_rxtx.c +15 -1
@@ -3650,5 +3717,19 @@ ice_fdir_programming(struct ice_pf *pf, struct ice_fltr_desc *fdir_desc)
 		return -ETIMEDOUT;
 	}
 
-	return 0;
+	for (; i < ICE_FDIR_MAX_WAIT_US; i++) {
+		int ret;
+
+		ret = ice_check_fdir_programming_status(rxq);
+		if (ret == -EAGAIN)
+			rte_delay_us(1);
+		else
+			return ret;
+	}
+
+	PMD_DRV_LOG(ERR,
+		    "Failed to program FDIR filter: programming status reported.");
+	return -ETIMEDOUT;
+
+
 }
Signature · 1 line
2.17.1
Quoted 2 lines

Applied to dpdk-next-net-intel, Thanks.

Dropped in next-net.

author
#3 lore raw

v2 cover fix testpmd quit error after FDIR rule created

In reply to Yahui Cao

This patch series fixes FDIR error when immediately quit without flushing FDIR rule in testpmd.

- Patch 1 adds programming status check mechanism to monitor FDIR status.
- Patch 2 moves FDIR queue irq config out of device start/stop.

--
v2:
* Seperate FDIR/LAN queue irq config

Yahui Cao (2):
net/ice: fix FDIR programming status check issue net/ice: fix FDIR rule failure after device stop

 drivers/net/ice/ice_ethdev.c      | 15 +----
 drivers/net/ice/ice_ethdev.h      |  3 +
 drivers/net/ice/ice_fdir_filter.c |  7 +++
 drivers/net/ice/ice_rxtx.c        | 93 +++++++++++++++++++++++++++++--
 4 files changed, 100 insertions(+), 18 deletions(-)
Signature · 1 line
2.17.1
author
#4 lore raw

PATCH v2 1/2 net/ice: fix FDIR programming status check issue

To make sure if FDIR programming succeed or fail, legacy programming status descriptor WB format is enabled and FDIR queue irq is opened.

Fixes 84dc7a95a2d3 ("net/ice: enable flow director engine")
---
 drivers/net/ice/ice_ethdev.c |  1 +
 drivers/net/ice/ice_rxtx.c   | 93 +++++++++++++++++++++++++++++++++---
 2 files changed, 88 insertions(+), 6 deletions(-)
drivers/net/ice/ice_ethdev.c +1 -0
index 837a26fd9..2e919c579 100644
@@ -2730,6 +2730,7 @@ ice_rxq_intr_setup(struct rte_eth_dev *dev)
 
 	/* Enable FDIR MSIX interrupt */
 	if (pf->fdir.fdir_vsi) {
+		pf->fdir.fdir_vsi->nb_used_qps = 1;
 		ice_vsi_queues_bind_intr(pf->fdir.fdir_vsi);
 		ice_vsi_enable_queues_intr(pf->fdir.fdir_vsi);
 	}
drivers/net/ice/ice_rxtx.c +87 -6

134 lines not on this page · raw message

Signature · 1 line
2.17.1
author
#5 lore raw

PATCH v2 2/2 net/ice: fix FDIR rule failure after device stop

In reply to Yahui Cao

By moving irq enable/disable from device start/stop to FDIR setup/teardown, FDIR queue irq config is independent of LAN queue irq config. So device stop will not cause FDIR rule failure.

Fixes 84dc7a95a2d3 ("net/ice: enable flow director engine")
---
 drivers/net/ice/ice_ethdev.c      | 16 +++-------------
 drivers/net/ice/ice_ethdev.h      |  3 +++
 drivers/net/ice/ice_fdir_filter.c |  7 +++++++
 3 files changed, 13 insertions(+), 13 deletions(-)
drivers/net/ice/ice_ethdev.c +3 -13
index 2e919c579..ecfc6c9e8 100644
@@ -2301,7 +2301,7 @@ ice_release_vsi(struct ice_vsi *vsi)
 	return 0;
 }
 
-static void
+void
 ice_vsi_disable_queues_intr(struct ice_vsi *vsi)
 {
 	struct rte_eth_dev *dev = vsi->adapter->eth_dev;
@@ -2354,9 +2354,6 @@ ice_dev_stop(struct rte_eth_dev *dev)
 	/* disable all queue interrupts */
 	ice_vsi_disable_queues_intr(main_vsi);
 
-	if (pf->fdir.fdir_vsi)
-		ice_vsi_disable_queues_intr(pf->fdir.fdir_vsi);
-
 	/* Clear all queues and release mbufs */
 	ice_clear_queues(dev);
 
@@ -2605,7 +2602,7 @@ __vsi_queues_bind_intr(struct ice_vsi *vsi, uint16_t msix_vect,
 	}
 }
 
-static void
+void
 ice_vsi_queues_bind_intr(struct ice_vsi *vsi)
 {
 	struct rte_eth_dev *dev = vsi->adapter->eth_dev;
@@ -2658,7 +2655,7 @@ ice_vsi_queues_bind_intr(struct ice_vsi *vsi)
 	}
 }
 
-static void
+void
 ice_vsi_enable_queues_intr(struct ice_vsi *vsi)
 {
 	struct rte_eth_dev *dev = vsi->adapter->eth_dev;
@@ -2728,13 +2725,6 @@ ice_rxq_intr_setup(struct rte_eth_dev *dev)
 	/* Enable interrupts for all the queues */
 	ice_vsi_enable_queues_intr(vsi);
 
-	/* Enable FDIR MSIX interrupt */
-	if (pf->fdir.fdir_vsi) {
-		pf->fdir.fdir_vsi->nb_used_qps = 1;
-		ice_vsi_queues_bind_intr(pf->fdir.fdir_vsi);
-		ice_vsi_enable_queues_intr(pf->fdir.fdir_vsi);
-	}
-
 	rte_intr_enable(intr_handle);
 
 	return 0;
drivers/net/ice/ice_ethdev.h +3 -0
index 4a0d37b32..510f6869d 100644
@@ -459,6 +459,9 @@ struct ice_vsi *
 ice_setup_vsi(struct ice_pf *pf, enum ice_vsi_type type);
 int
 ice_release_vsi(struct ice_vsi *vsi);
+void ice_vsi_enable_queues_intr(struct ice_vsi *vsi);
+void ice_vsi_disable_queues_intr(struct ice_vsi *vsi);
+void ice_vsi_queues_bind_intr(struct ice_vsi *vsi);
 
 static inline int
 ice_align_floor(int n)
drivers/net/ice/ice_fdir_filter.c +7 -0
index 7876f4bbc..013d1ef93 100644
@@ -491,6 +491,11 @@ ice_fdir_setup(struct ice_pf *pf)
 		goto fail_mem;
 	}
 
+	/* Enable FDIR MSIX interrupt */
+	vsi->nb_used_qps = 1;
+	ice_vsi_queues_bind_intr(vsi);
+	ice_vsi_enable_queues_intr(vsi);
+
 	/* reserve memory for the fdir programming packet */
 	snprintf(z_name, sizeof(z_name), "ICE_%s_%d",
 		 ICE_FDIR_MZ_NAME,
@@ -615,6 +620,8 @@ ice_fdir_teardown(struct ice_pf *pf)
 	if (!vsi)
 		return;
 
+	ice_vsi_disable_queues_intr(vsi);
+
 	err = ice_fdir_tx_queue_stop(eth_dev, pf->fdir.txq->queue_id);
 	if (err)
 		PMD_DRV_LOG(ERR, "Failed to stop TX queue.");
Signature · 1 line
2.17.1
Tested-by Acked-by Qi Zhang on the v2 series
#6 lore raw

Re: [dpdk-dev] [PATCH v2 0/2] fix testpmd quit error after FDIR rule created

In reply to Yahui Cao
Quoted 26 lines

-----Original Message-----
From: Cao, Yahui <[email protected]>
Sent: Tuesday, November 19, 2019 6:24 AM
To: Yang, Qiming <[email protected]>; Lu, Wenzhuo <[email protected]>
Cc: [email protected]; Zhang, Qi Z <[email protected]>; Cao, Yahui <[email protected]>; Ye, Xiaolong <[email protected]>; Xing, Beilei <[email protected]>
Subject: [PATCH v2 0/2] fix testpmd quit error after FDIR rule created

This patch series fixes FDIR error when immediately quit without flushing FDIR rule in testpmd.

- Patch 1 adds programming status check mechanism to monitor FDIR status.
- Patch 2 moves FDIR queue irq config out of device start/stop.

--
v2:
* Seperate FDIR/LAN queue irq config

Yahui Cao (2):
net/ice: fix FDIR programming status check issue net/ice: fix FDIR rule failure after device stop

Quoted 8 lines
 drivers/net/ice/ice_ethdev.c      | 15 +----
 drivers/net/ice/ice_ethdev.h      |  3 +
 drivers/net/ice/ice_fdir_filter.c |  7 +++
 drivers/net/ice/ice_rxtx.c        | 93 +++++++++++++++++++++++++++++--
 4 files changed, 100 insertions(+), 18 deletions(-)

--
2.17.1

Applied
#7 lore raw

Re: [dpdk-dev] [PATCH v2 0/2] fix testpmd quit error after FDIR rule created

In reply to Yahui Cao
Quoted 14 lines · Yahui Cao

This patch series fixes FDIR error when immediately quit without flushing FDIR rule in testpmd.

- Patch 1 adds programming status check mechanism to monitor FDIR status.
- Patch 2 moves FDIR queue irq config out of device start/stop.

--
v2:
* Seperate FDIR/LAN queue irq config

Yahui Cao (2):
net/ice: fix FDIR programming status check issue
net/ice: fix FDIR rule failure after device stop

Quoted 9 lines
drivers/net/ice/ice_ethdev.c      | 15 +----
drivers/net/ice/ice_ethdev.h      |  3 +
drivers/net/ice/ice_fdir_filter.c |  7 +++
drivers/net/ice/ice_rxtx.c        | 93 +++++++++++++++++++++++++++++--
4 files changed, 100 insertions(+), 18 deletions(-)
Signature · 1 line
2.17.1

Applied to dpdk-next-net-intel, Thanks.