From patchwork Fri Sep 3 10:04:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yu, DapengX" X-Patchwork-Id: 97880 X-Patchwork-Delegate: qi.z.zhang@intel.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 1101EA0C53; Fri, 3 Sep 2021 12:04:23 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8B63840DF7; Fri, 3 Sep 2021 12:04:22 +0200 (CEST) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by mails.dpdk.org (Postfix) with ESMTP id 1C26940DF4; Fri, 3 Sep 2021 12:04:19 +0200 (CEST) X-IronPort-AV: E=McAfee;i="6200,9189,10095"; a="206502853" X-IronPort-AV: E=Sophos;i="5.85,265,1624345200"; d="scan'208";a="206502853" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Sep 2021 03:04:19 -0700 X-IronPort-AV: E=Sophos;i="5.85,265,1624345200"; d="scan'208";a="533950908" Received: from unknown (HELO localhost.localdomain) ([10.240.183.93]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Sep 2021 03:04:16 -0700 From: dapengx.yu@intel.com To: Qiming Yang , Qi Zhang Cc: dev@dpdk.org, simei.su@intel.com, Dapeng Yu , stable@dpdk.org Date: Fri, 3 Sep 2021 18:04:11 +0800 Message-Id: <20210903100411.1693789-1-dapengx.yu@intel.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH] net/ice: fix double free ACL flow entry X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Dapeng Yu If call ice_flow_rem_entry() directly without checking entry_id, may cause an ACL flow entry to be freed more than once. This patch tries to find entry_id first, then call ice_flow_rem_entry() to avoid the defect. Fixes: 40d466fa9f76 ("net/ice: support ACL filter in DCF") Cc: stable@dpdk.org Signed-off-by: Dapeng Yu Reviewed-by: Simei Su --- drivers/net/ice/ice_acl_filter.c | 33 +++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/drivers/net/ice/ice_acl_filter.c b/drivers/net/ice/ice_acl_filter.c index 0c15a7036c..f44ce5d77e 100644 --- a/drivers/net/ice/ice_acl_filter.c +++ b/drivers/net/ice/ice_acl_filter.c @@ -45,7 +45,7 @@ static struct ice_flow_parser ice_acl_parser; struct acl_rule { enum ice_fltr_ptype flow_type; - uint32_t entry_id[4]; + uint64_t entry_id[4]; }; static struct @@ -440,7 +440,7 @@ ice_acl_hw_set_conf(struct ice_pf *pf, struct ice_fdir_fltr *input, PMD_DRV_LOG(ERR, "Fail to add entry."); return ret; } - rule->entry_id[entry_idx] = slot_id; + rule->entry_id[entry_idx] = entry_id; pf->acl.hw_entry_id[slot_id] = hw_entry; } else { PMD_DRV_LOG(ERR, "Exceed the maximum entry number(%d)" @@ -451,18 +451,28 @@ ice_acl_hw_set_conf(struct ice_pf *pf, struct ice_fdir_fltr *input, return 0; } +static inline void +ice_acl_del_entry(struct ice_hw *hw, uint64_t entry_id) +{ + uint64_t hw_entry; + + hw_entry = ice_flow_find_entry(hw, ICE_BLK_ACL, entry_id); + ice_flow_rem_entry(hw, ICE_BLK_ACL, hw_entry); +} + static inline void ice_acl_hw_rem_conf(struct ice_pf *pf, struct acl_rule *rule, int32_t entry_idx) { uint32_t slot_id; int32_t i; + uint64_t entry_id; struct ice_hw *hw = ICE_PF_TO_HW(pf); for (i = 0; i < entry_idx; i++) { - slot_id = rule->entry_id[i]; + entry_id = rule->entry_id[i]; + slot_id = ICE_LO_DWORD(entry_id); rte_bitmap_set(pf->acl.slots, slot_id); - ice_flow_rem_entry(hw, ICE_BLK_ACL, - pf->acl.hw_entry_id[slot_id]); + ice_acl_del_entry(hw, entry_id); } } @@ -562,6 +572,7 @@ ice_acl_destroy_filter(struct ice_adapter *ad, { struct acl_rule *rule = (struct acl_rule *)flow->rule; uint32_t slot_id, i; + uint64_t entry_id; struct ice_pf *pf = &ad->pf; struct ice_hw *hw = ICE_PF_TO_HW(pf); int ret = 0; @@ -569,19 +580,19 @@ ice_acl_destroy_filter(struct ice_adapter *ad, switch (rule->flow_type) { case ICE_FLTR_PTYPE_NONF_IPV4_OTHER: for (i = 0; i < 4; i++) { - slot_id = rule->entry_id[i]; + entry_id = rule->entry_id[i]; + slot_id = ICE_LO_DWORD(entry_id); rte_bitmap_set(pf->acl.slots, slot_id); - ice_flow_rem_entry(hw, ICE_BLK_ACL, - pf->acl.hw_entry_id[slot_id]); + ice_acl_del_entry(hw, entry_id); } break; case ICE_FLTR_PTYPE_NONF_IPV4_UDP: case ICE_FLTR_PTYPE_NONF_IPV4_TCP: case ICE_FLTR_PTYPE_NONF_IPV4_SCTP: - slot_id = rule->entry_id[0]; + entry_id = rule->entry_id[0]; + slot_id = ICE_LO_DWORD(entry_id); rte_bitmap_set(pf->acl.slots, slot_id); - ice_flow_rem_entry(hw, ICE_BLK_ACL, - pf->acl.hw_entry_id[slot_id]); + ice_acl_del_entry(hw, entry_id); break; default: rte_flow_error_set(error, EINVAL,