ACK
-----Original Message-----
From: Zhang, Qi Z <qi.z.zh...@intel.com>
Sent: Tuesday, June 2, 2020 7:40 PM
To: Yang, Qiming <qiming.y...@intel.com>
Cc: dev@dpdk.org; Ye, Xiaolong <xiaolong...@intel.com>; Zhang, Qi Z
<qi.z.zh...@intel.com>; Patil, Kiran <kiran.pa...@intel.com>; Stillwell Jr,
Paul M <paul.m.stillwell...@intel.com>
Subject: [PATCH 28/52] net/ice/base: return correct error code
Return ICE_ERR_DOES_NOT_EXIST return code if admin command error code is
ICE_AQ_RC_ENOENT (not exist). ice_aq_sw_rules is used when switch rule is
getting added/deleted/updated. In case of delete/update switch rule, admin
command can return ICE_AQ_RC_ENOENT error code if such rule does not exist,
hence return ICE_ERR_DOES_NOT_EXIST error code from ice_aq_sw_rule, so that
caller of this fucnction can decide how to handle ICE_ERR_DOES_NOT_EXIST.
Allow proper cleanup of internal data structures from ice_rem_adv_rule function
if ice_aq_sw_rules return error code ICE_ERR_DOES_NOT_EXIST otherwise per
recipe:rule list will never become empty.
Signed-off-by: Kiran Patil <kiran.pa...@intel.com>
Signed-off-by: Paul M. Stillwell Jr <paul.m.stillwell...@intel.com>
Signed-off-by: Qi Zhang <qi.z.zh...@intel.com>
---
drivers/net/ice/base/ice_switch.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ice/base/ice_switch.c
b/drivers/net/ice/base/ice_switch.c
index 6387f9b84..fa3a59e51 100644
--- a/drivers/net/ice/base/ice_switch.c
+++ b/drivers/net/ice/base/ice_switch.c
@@ -1868,6 +1868,7 @@ ice_aq_sw_rules(struct ice_hw *hw, void *rule_list, u16
rule_list_sz,
u8 num_rules, enum ice_adminq_opc opc, struct ice_sq_cd *cd) {
struct ice_aq_desc desc;
+ enum ice_status status;
ice_debug(hw, ICE_DBG_TRACE, "%s\n", __func__);
@@ -1881,7 +1882,12 @@ ice_aq_sw_rules(struct ice_hw *hw, void *rule_list, u16
rule_list_sz,
desc.flags |= CPU_TO_LE16(ICE_AQ_FLAG_RD);
desc.params.sw_rules.num_rules_fltr_entry_index =
CPU_TO_LE16(num_rules);
- return ice_aq_send_cmd(hw, &desc, rule_list, rule_list_sz, cd);
+ status = ice_aq_send_cmd(hw, &desc, rule_list, rule_list_sz, cd);
+ if (opc != ice_aqc_opc_add_sw_rules &&
+ hw->adminq.sq_last_status == ICE_AQ_RC_ENOENT)
+ status = ICE_ERR_DOES_NOT_EXIST;
+
+ return status;
}
/**
@@ -7354,7 +7360,7 @@ ice_rem_adv_rule(struct ice_hw *hw, struct
ice_adv_lkup_elem *lkups,
status = ice_aq_sw_rules(hw, (struct ice_aqc_sw_rules *)s_rule,
rule_buf_sz, 1,
ice_aqc_opc_remove_sw_rules, NULL);
- if (status == ICE_SUCCESS) {
+ if (status == ICE_SUCCESS || status == ICE_ERR_DOES_NOT_EXIST) {
ice_acquire_lock(rule_lock);
LIST_DEL(&list_elem->list_entry);
ice_free(hw, list_elem->lkups);
--
2.13.6
