diff mbox series

[v2,24/37] net/ice/base: remove local VSIG allocations

Message ID	20190307125841.14247-25-qi.z.zhang@intel.com (mailing list archive)
State	Superseded, archived
Delegated to:	Qi Zhang
Headers	From: Qi Zhang <qi.z.zhang@intel.com> To: wenzhuo.lu@intel.com, qiming.yang@intel.com Cc: dev@dpdk.org, paul.m.stillwell.jr@intel.com, ferruh.yigit@intel.com, Qi Zhang <qi.z.zhang@intel.com>, Vignesh Sridhar <vignesh.sridhar@intel.com> Date: Thu, 7 Mar 2019 20:58:28 +0800 Message-Id: <20190307125841.14247-25-qi.z.zhang@intel.com> In-Reply-To: <20190307125841.14247-1-qi.z.zhang@intel.com> References: <20190228055650.25237-1-qi.z.zhang@intel.com> <20190307125841.14247-1-qi.z.zhang@intel.com> Subject: [dpdk-dev] [PATCH v2 24/37] net/ice/base: remove local VSIG allocations Precedence: list Errors-To: dev-bounces@dpdk.org Sender: "dev" <dev-bounces@dpdk.org>
Series	ice share code update. \| [v2,00/37] ice share code update. [v2,01/37] net/ice/base: add switch resource allocation and free [v2,02/37] net/ice/base: improve comments [v2,03/37] net/ice/base: add two helper functions [v2,04/37] net/ice/base: add helper macros [v2,05/37] net/ice/base: allow package copy to be used after resets [v2,06/37] net/ice/base: code clean [v2,07/37] net/ice/base: declare functions as external [v2,08/37] net/ice/base: add more APIs in switch module [v2,09/37] net/ice/base: add VSI queue context framework [v2,10/37] net/ice/base: add APIs to add remove ethertype filter [v2,11/37] net/ice/base: add APIs to get allocated resources [v2,12/37] net/ice/base: add APIs to alloc/free resource counter [v2,13/37] net/ice/base: add APIs to get VSI promiscuous mode [v2,14/37] net/ice/base: add MAC filter with marker and counter [v2,15/37] net/ice/base: add two helper functions for flow management [v2,16/37] net/ice/base: minor fix [v2,17/37] net/ice/base: update macros [v2,18/37] net/ice/base: code clean [v2,19/37] net/ice/base: enable VSI queue context [v2,20/37] net/ice/base: ensure only valid bits are set [v2,21/37] net/ice/base: enhance get link status command [v2,22/37] net/ice/base: add RSS key related macro and structures [v2,23/37] net/ice/base: do not write TCAM entries back [v2,24/37] net/ice/base: remove local VSIG allocations [v2,25/37] net/ice/base: minor fix [v2,26/37] net/ice/base: update copyright time [v2,27/37] net/ice/base: fix static analysis reported issues [v2,28/37] net/ice/base: return config error without queue to disable [v2,29/37] net/ice/base: add function to check FW recovery mode [v2,30/37] net/ice/base: change profile id reference counting [v2,31/37] net/ice/base: add DCB support [v2,32/37] net/ice/base: add FDIR support [v2,33/37] net/ice/base: change profile priority for RSS reply [v2,34/37] net/ice/base: fix duplicate resource allocations [v2,35/37] net/ice/base: minor fix [v2,36/37] net/ice/base: increase prototol offset size [v2,37/37] net/ice/base: revert the workaround for resource allocation

Checks

Context	Check	Description
ci/checkpatch	success	coding style OK
ci/Intel-compilation	success	Compilation OK

Commit Message

Qi Zhang March 7, 2019, 12:58 p.m. UTC

  If allocating a VSI to a VSIG fails the local allocations made for VSIG
profiles and change-lists will not be removed. Adding calls to free these
entries on error in VSIG management calls.

Signed-off-by: Vignesh Sridhar <vignesh.sridhar@intel.com>
Signed-off-by: Paul M Stillwell Jr <paul.m.stillwell.jr@intel.com>
Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
---
 drivers/net/ice/base/ice_flex_pipe.c | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff mbox series

Patch

diff --git a/drivers/net/ice/base/ice_flex_pipe.c b/drivers/net/ice/base/ice_flex_pipe.c
index 900a19387..887609204 100644
--- a/drivers/net/ice/base/ice_flex_pipe.c
+++ b/drivers/net/ice/base/ice_flex_pipe.c
@@ -4523,8 +4523,10 @@  ice_add_prof_id_vsig(struct ice_hw *hw, enum ice_block blk, u16 vsig, u64 hdl,
 
 		/* allocate the TCAM entry index */
 		status = ice_alloc_tcam_ent(hw, blk, &tcam_idx);
-		if (status)
+		if (status) {
+			ice_free(hw, p);
 			goto err_ice_add_prof_id_vsig;
+		}
 
 		t->tcam[i].ptg = ptg;
 		t->tcam[i].prof_id = map->prof_id;
@@ -4563,6 +4565,7 @@  ice_add_prof_id_vsig(struct ice_hw *hw, enum ice_block blk, u16 vsig, u64 hdl,
 
 err_ice_add_prof_id_vsig:
 	/* let caller clean up the change list */
+	ice_free(hw, t);
 	return ICE_ERR_NO_MEMORY;
 }
 
@@ -4587,16 +4590,18 @@  ice_create_prof_id_vsig(struct ice_hw *hw, enum ice_block blk, u16 vsi, u64 hdl,
 		return ICE_ERR_NO_MEMORY;
 
 	new_vsig = ice_vsig_alloc(hw, blk);
-	if (!new_vsig)
-		return ICE_ERR_HW_TABLE;
+	if (!new_vsig) {
+		status = ICE_ERR_HW_TABLE;
+		goto err_ice_create_prof_id_vsig;
+	}
 
 	status = ice_move_vsi(hw, blk, vsi, new_vsig, chg);
 	if (status)
-		return status;
+		goto err_ice_create_prof_id_vsig;
 
 	status = ice_add_prof_id_vsig(hw, blk, new_vsig, hdl, chg);
 	if (status)
-		return status;
+		goto err_ice_create_prof_id_vsig;
 
 	p->type = ICE_VSIG_ADD;
 	p->vsi = vsi;
@@ -4606,6 +4611,11 @@  ice_create_prof_id_vsig(struct ice_hw *hw, enum ice_block blk, u16 vsi, u64 hdl,
 	LIST_ADD(&p->list_entry, chg);
 
 	return ICE_SUCCESS;
+
+err_ice_create_prof_id_vsig:
+	/* let caller clean up the change list */
+	ice_free(hw, p);
+	return status;
 }
 
 /**