From: Peng Zhang <peng1x.zh...@intel.com> The origin design is if error happen during the step 3 of given situation, it will return error directly without retry. While in current patch, it will retry at every interval time during certain time. If retry succeed, rule can be continuously created.
The given situation as following steps show: step 1. Kernel PF and DPDK DCF are ready at the beginning. step 2. A VF reset happen, kernel send an event to DCF and set STATE to pause. step 3. Before DCF receive the event, it is possible a rule creation is ongoing and virtual channel command from DCF to kernel PF is executing. step 4. Then result of command is failure, it will lead to error return to DCF. Error code will be set as EINVAL, not EAGAIN. Fixes: daa714d55c72 ("net/ice: handle AdminQ command by DCF") Cc: sta...@dpdk.org Signed-off-by: Peng Zhang <peng1x.zh...@intel.com> --- v5 changes: - Add retry mechanism for DCF if the result of sending virtual channel command is failure. v4 changes: - Add retry mechanism if the result of sending adminQ queue command is failure. v3 Changes: - Add the situation description, expected error code and incorrect error code in commit log. v2 Changes: - Modify DCF state checking mechanism. drivers/net/ice/ice_dcf.c | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/drivers/net/ice/ice_dcf.c b/drivers/net/ice/ice_dcf.c index 55ae68c456..008e7fbf27 100644 --- a/drivers/net/ice/ice_dcf.c +++ b/drivers/net/ice/ice_dcf.c @@ -474,7 +474,7 @@ ice_dcf_send_aq_cmd(void *dcf_hw, struct ice_aq_desc *desc, struct dcf_virtchnl_cmd desc_cmd, buff_cmd; struct ice_dcf_hw *hw = dcf_hw; int err = 0; - int i = 0; + int i, j = 0; if ((buf && !buf_size) || (!buf && buf_size) || buf_size > ICE_DCF_AQ_BUF_SZ) @@ -501,25 +501,33 @@ ice_dcf_send_aq_cmd(void *dcf_hw, struct ice_aq_desc *desc, ice_dcf_vc_cmd_set(hw, &desc_cmd); ice_dcf_vc_cmd_set(hw, &buff_cmd); - if (ice_dcf_vc_cmd_send(hw, &desc_cmd) || - ice_dcf_vc_cmd_send(hw, &buff_cmd)) { - err = -1; - PMD_DRV_LOG(ERR, "fail to send OP_DCF_CMD_DESC/BUFF"); - goto ret; - } - do { - if (!desc_cmd.pending && !buff_cmd.pending) + if (ice_dcf_vc_cmd_send(hw, &desc_cmd) || + ice_dcf_vc_cmd_send(hw, &buff_cmd)) { + err = -1; + PMD_DRV_LOG(ERR, "fail to send OP_DCF_CMD_DESC/BUFF"); + goto ret; + } + + i = 0; + do { + if (!desc_cmd.pending && !buff_cmd.pending) + break; + + rte_delay_ms(ICE_DCF_ARQ_CHECK_TIME); + } while (i++ < ICE_DCF_ARQ_MAX_RETRIES); + + if (desc_cmd.v_ret == IAVF_SUCCESS && buff_cmd.v_ret == IAVF_SUCCESS) break; rte_delay_ms(ICE_DCF_ARQ_CHECK_TIME); - } while (i++ < ICE_DCF_ARQ_MAX_RETRIES); - + } while (j++ < ICE_DCF_ARQ_MAX_RETRIES); + if (desc_cmd.v_ret != IAVF_SUCCESS || buff_cmd.v_ret != IAVF_SUCCESS) { err = -1; PMD_DRV_LOG(ERR, - "No response (%d times) or return failure (desc: %d / buff: %d)", - i, desc_cmd.v_ret, buff_cmd.v_ret); + "No response (%d times) or return failure (desc: %d / buff: %d)" + " after retry %d times cmd", i, desc_cmd.v_ret, buff_cmd.v_ret, j); } ret: -- 2.25.1