[v3] net/ice: drain out DCF AdminQ command queue

Message ID 20210121173137.108599-1-haiyue.wang@intel.com (mailing list archive)
State Accepted, archived
Delegated to: Qi Zhang
Headers
Series [v3] net/ice: drain out DCF AdminQ command queue |

Checks

Context Check Description
ci/checkpatch warning coding style issues
ci/Intel-compilation success Compilation OK
ci/intel-Testing success Testing PASS
ci/iol-broadcom-Performance success Performance Testing PASS
ci/iol-mellanox-Performance success Performance Testing PASS
ci/iol-broadcom-Functional success Functional Testing PASS
ci/iol-intel-Performance success Performance Testing PASS
ci/iol-intel-Functional success Functional Testing PASS
ci/iol-mellanox-Functional success Functional Testing PASS
ci/iol-testing warning Testing issues

Commit Message

Wang, Haiyue Jan. 21, 2021, 5:31 p.m. UTC
  The virtchnl message is handled one by one by checking opcode to match
the response for the request.

The DCF AdminQ command with buffer needs two virtchnl commands, one is
to handle the AdminQ descriptor, the other is to the handle AdminQ
buffer. If both of them are sent to PF successfully, it needs to wait
two responses from PF, even if the AdminQ descriptor command gets the
failure response. Since PF will handle them one by one, and send back
the response for each.

If not wait for the buffer message response until timeout to drain out
the virtchnl command queue, it will cause the next AdminQ command with
buffer to get the stall buffer response from previous.

Fixes: daa714d55c72 ("net/ice: handle AdminQ command by DCF")
Cc: stable@dpdk.org

Signed-off-by: Haiyue Wang <haiyue.wang@intel.com>
---
v3: Reword the commit message, and remove the no needed checking.
v2: Fix the commit message typo : 'matchiing' should be 'matching'
---
 drivers/net/ice/ice_dcf.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
  

Comments

Qi Zhang Jan. 22, 2021, 2:38 a.m. UTC | #1
> -----Original Message-----
> From: Wang, Haiyue <haiyue.wang@intel.com>
> Sent: Friday, January 22, 2021 1:32 AM
> To: dev@dpdk.org
> Cc: Yang, Qiming <qiming.yang@intel.com>; Zhang, Qi Z
> <qi.z.zhang@intel.com>; Fu, Qi <qi.fu@intel.com>; Wang, Haiyue
> <haiyue.wang@intel.com>; stable@dpdk.org
> Subject: [PATCH v3] net/ice: drain out DCF AdminQ command queue
> 
> The virtchnl message is handled one by one by checking opcode to match the
> response for the request.
> 
> The DCF AdminQ command with buffer needs two virtchnl commands, one is to
> handle the AdminQ descriptor, the other is to the handle AdminQ buffer. If both
> of them are sent to PF successfully, it needs to wait two responses from PF,
> even if the AdminQ descriptor command gets the failure response. Since PF will
> handle them one by one, and send back the response for each.
> 
> If not wait for the buffer message response until timeout to drain out the
> virtchnl command queue, it will cause the next AdminQ command with buffer to
> get the stall buffer response from previous.
> 
> Fixes: daa714d55c72 ("net/ice: handle AdminQ command by DCF")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Haiyue Wang <haiyue.wang@intel.com>

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

Applied to dpdk-next-net-intel.

Thanks
Qi
  

Patch

diff --git a/drivers/net/ice/ice_dcf.c b/drivers/net/ice/ice_dcf.c
index 4a9af3292c..d947d02c5b 100644
--- a/drivers/net/ice/ice_dcf.c
+++ b/drivers/net/ice/ice_dcf.c
@@ -505,9 +505,7 @@  ice_dcf_send_aq_cmd(void *dcf_hw, struct ice_aq_desc *desc,
 	}
 
 	do {
-		if ((!desc_cmd.pending && !buff_cmd.pending) ||
-		    (!desc_cmd.pending && desc_cmd.v_ret != IAVF_SUCCESS) ||
-		    (!buff_cmd.pending && buff_cmd.v_ret != IAVF_SUCCESS))
+		if (!desc_cmd.pending && !buff_cmd.pending)
 			break;
 
 		rte_delay_ms(ICE_DCF_ARQ_CHECK_TIME);