[dpdk-dev] [PATCH v2 30/60] common/sfc_efx/base: free Rx queue structure in generic code

Andrew Rybchenko arybchenko at solarflare.com
Tue Sep 22 11:34:18 CEST 2020


Rx queue structure is allocated in generic code, but was freed in NIC
family specific callbacks. Move free to generic function makes NIC
family specific callbacks shorter and reduces code duplication.

Signed-off-by: Andrew Rybchenko <arybchenko at solarflare.com>
Reviewed-by: Andy Moreton <amoreton at xilinx.com>
---
 drivers/common/sfc_efx/base/ef10_rx.c | 3 ---
 drivers/common/sfc_efx/base/efx_rx.c  | 6 +++---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/common/sfc_efx/base/ef10_rx.c b/drivers/common/sfc_efx/base/ef10_rx.c
index 7004ab2aca..58152be768 100644
--- a/drivers/common/sfc_efx/base/ef10_rx.c
+++ b/drivers/common/sfc_efx/base/ef10_rx.c
@@ -1015,13 +1015,10 @@ ef10_rx_qcreate(
 ef10_rx_qdestroy(
 	__in	efx_rxq_t *erp)
 {
-	efx_nic_t *enp = erp->er_enp;
 	efx_evq_t *eep = erp->er_eep;
 	unsigned int label = erp->er_label;
 
 	ef10_ev_rxlabel_fini(eep, label);
-
-	EFSYS_KMEM_FREE(enp->en_esip, sizeof (efx_rxq_t), erp);
 }
 
 		void
diff --git a/drivers/common/sfc_efx/base/efx_rx.c b/drivers/common/sfc_efx/base/efx_rx.c
index a361112849..d208c2292e 100644
--- a/drivers/common/sfc_efx/base/efx_rx.c
+++ b/drivers/common/sfc_efx/base/efx_rx.c
@@ -981,6 +981,9 @@ efx_rx_qdestroy(
 	--enp->en_rx_qcount;
 
 	erxop->erxo_qdestroy(erp);
+
+	/* Free the RXQ object */
+	EFSYS_KMEM_FREE(enp->en_esip, sizeof (efx_rxq_t), erp);
 }
 
 	__checkReturn	efx_rc_t
@@ -1706,9 +1709,6 @@ siena_rx_qdestroy(
 
 	EFX_BAR_TBL_WRITEO(enp, FR_AZ_RX_DESC_PTR_TBL,
 			    erp->er_index, &oword, B_TRUE);
-
-	/* Free the RXQ object */
-	EFSYS_KMEM_FREE(enp->en_esip, sizeof (efx_rxq_t), erp);
 }
 
 static		void
-- 
2.17.1



More information about the dev mailing list