[PATCH] net/iavf: fix duplicate reset done check with large VF

[PATCH] net/iavf: fix duplicate reset done check with large VF

[Zhichao Zeng]

This patch fixes duplicate VF reset done check in dev_reset with large VF,
which cause some errors when starting testpmd with large VF.

Fixes: 7a93cd3575eb ("net/iavf: add VF reset check")
Signed-off-by: Zhichao Zeng <zhichaox.zeng@intel.com>
---
 drivers/net/iavf/iavf_ethdev.c | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c
index 00b963128b..d32f4f826f 100644
--- a/drivers/net/iavf/iavf_ethdev.c
+++ b/drivers/net/iavf/iavf_ethdev.c
@@ -2859,15 +2859,17 @@ iavf_dev_reset(struct rte_eth_dev *dev)
 	int ret;
 	struct iavf_hw *hw = IAVF_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 
-	/*
-	 * Check whether the VF reset has been done and inform application,
-	 * to avoid calling the virtual channel command, which may cause
-	 * the device to be abnormal.
-	 */
-	ret = iavf_check_vf_reset_done(hw);
-	if (ret) {
-		PMD_DRV_LOG(ERR, "Wait too long for reset done!\n");
-		return ret;
+	if (dev->data->nb_rx_queues <= IAVF_MAX_NUM_QUEUES_DFLT) {
+		/*
+		 * Check whether the VF reset has been done and inform application,
+		 * to avoid calling the virtual channel command, which may cause
+		 * the device to be abnormal.
+		 */
+		ret = iavf_check_vf_reset_done(hw);
+		if (ret) {
+			PMD_DRV_LOG(ERR, "Wait too long for reset done!\n");
+			return ret;
+		}
 	}
 
 	PMD_DRV_LOG(DEBUG, "Start dev_reset ...\n");
-- 
2.34.1

[PATCH v2] net/iavf: fix duplicate reset done check with large VF

[Zhichao Zeng]

When starting with large vf, need to reset VF to request queues, the reset
process will execute VIRTCHNL commands to clean up resource.

VF reset done check and reset watchdog read the same global register,
resulting in the NIC not responding to the VIRTCHNL command.

This patch turns off the watchdog when request queues to avoid
the VIRTCHNL command timeout error when starting with large VF.

Fixes: af801b0374e3 ("net/iavf: add devargs to control watchdog")
Fixes: 7a93cd3575eb ("net/iavf: add VF reset check")
Signed-off-by: Zhichao Zeng <zhichaox.zeng@intel.com>
---
 drivers/net/iavf/iavf_ethdev.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c
index 00b963128b..ac7154d720 100644
--- a/drivers/net/iavf/iavf_ethdev.c
+++ b/drivers/net/iavf/iavf_ethdev.c
@@ -577,6 +577,7 @@ iavf_queues_req_reset(struct rte_eth_dev *dev, uint16_t num)
 	PMD_DRV_LOG(INFO, "change queue pairs from %u to %u",
 			vf->vsi_res->num_queue_pairs, num);
 
+	iavf_dev_watchdog_disable(ad);
 	ret = iavf_dev_reset(dev);
 	if (ret) {
 		PMD_DRV_LOG(ERR, "vf reset failed");
-- 
2.34.1

RE: [PATCH v2] net/iavf: fix duplicate reset done check with large VF

[Zhang, Qi Z]

> -----Original Message-----
> From: Zeng, ZhichaoX <zhichaox.zeng@intel.com>
> Sent: Friday, June 30, 2023 2:06 PM
> To: dev@dpdk.org
> Cc: Zhang, Qi Z <qi.z.zhang@intel.com>; Jiale, SongX <songx.jiale@intel.com>;
> Zeng, ZhichaoX <zhichaox.zeng@intel.com>; Wu, Jingjing
> <jingjing.wu@intel.com>; Xing, Beilei <beilei.xing@intel.com>
> Subject: [PATCH v2] net/iavf: fix duplicate reset done check with large VF
> 
> When starting with large vf, need to reset VF to request queues, the reset
> process will execute VIRTCHNL commands to clean up resource.
> 
> VF reset done check and reset watchdog read the same global register,
> resulting in the NIC not responding to the VIRTCHNL command.
> 
> This patch turns off the watchdog when request queues to avoid the VIRTCHNL
> command timeout error when starting with large VF.
> 
> Fixes: af801b0374e3 ("net/iavf: add devargs to control watchdog")
> Fixes: 7a93cd3575eb ("net/iavf: add VF reset check")
> Signed-off-by: Zhichao Zeng <zhichaox.zeng@intel.com>

Acked-by: Qi Zhang <qi.z.zhang@intel.com>

Applied to dpdk-next-net-intel.

Thanks
Qi