diff mbox series

[v2,22/22] net/ixgbe: use common Tx backlog entry fn

Message ID	20241203164132.2686558-23-bruce.richardson@intel.com (mailing list archive)
State	Superseded
Delegated to:	Thomas Monjalon
Headers	From: Bruce Richardson <bruce.richardson@intel.com> To: dev@dpdk.org Cc: Bruce Richardson <bruce.richardson@intel.com>, Anatoly Burakov <anatoly.burakov@intel.com>, Vladimir Medvedkin <vladimir.medvedkin@intel.com>, Wathsala Vithanage <wathsala.vithanage@arm.com>, Konstantin Ananyev <konstantin.v.ananyev@yandex.ru> Subject: [PATCH v2 22/22] net/ixgbe: use common Tx backlog entry fn Date: Tue, 3 Dec 2024 16:41:28 +0000 Message-ID: <20241203164132.2686558-23-bruce.richardson@intel.com> In-Reply-To: <20241203164132.2686558-1-bruce.richardson@intel.com> References: <20241122125418.2857301-1-bruce.richardson@intel.com> <20241203164132.2686558-1-bruce.richardson@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: list Errors-To: dev-bounces@dpdk.org
Series	Reduce code duplication across Intel NIC drivers \| [v2,00/22] Reduce code duplication across Intel NIC drivers [v2,01/22] net/_common_intel: add pkt reassembly fn for intel drivers [v2,02/22] net/_common_intel: provide common Tx entry structures [v2,03/22] net/_common_intel: add Tx mbuf ring replenish fn [v2,04/22] drivers/net: align Tx queue struct field names [v2,05/22] drivers/net: add prefix for driver-specific structs [v2,06/22] net/_common_intel: merge ice and i40e Tx queue struct [v2,07/22] net/iavf: use common Tx queue structure [v2,08/22] net/ixgbe: convert Tx queue context cache field to ptr [v2,09/22] net/ixgbe: use common Tx queue structure [v2,10/22] net/_common_intel: pack Tx queue structure [v2,11/22] net/_common_intel: add post-Tx buffer free function [v2,12/22] net/_common_intel: add Tx buffer free fn for AVX-512 [v2,13/22] net/iavf: use common Tx free fn for AVX-512 [v2,14/22] net/ice: move Tx queue mbuf cleanup fn to common [v2,15/22] net/i40e: use common Tx queue mbuf cleanup fn [v2,16/22] net/ixgbe: use common Tx queue mbuf cleanup fn [v2,17/22] net/iavf: use common Tx queue mbuf cleanup fn [v2,18/22] net/ice: use vector SW ring for all vector paths [v2,19/22] net/i40e: use vector SW ring for all vector paths [v2,20/22] net/iavf: use vector SW ring for all vector paths [v2,21/22] net/_common_intel: remove unneeded code [v2,22/22] net/ixgbe: use common Tx backlog entry fn

Checks

Context	Check	Description
ci/checkpatch	success	coding style OK
ci/loongarch-compilation	success	Compilation OK
ci/loongarch-unit-testing	success	Unit Testing PASS
ci/Intel-compilation	success	Compilation OK
ci/intel-Testing	success	Testing PASS
ci/github-robot: build	success	github build: passed
ci/intel-Functional	success	Functional PASS
ci/iol-mellanox-Performance	success	Performance Testing PASS
ci/iol-unit-arm64-testing	success	Testing PASS
ci/iol-unit-amd64-testing	success	Testing PASS
ci/iol-compile-arm64-testing	success	Testing PASS
ci/iol-compile-amd64-testing	warning	Testing issues
ci/iol-intel-Functional	success	Functional Testing PASS
ci/iol-sample-apps-testing	success	Testing PASS
ci/iol-broadcom-Performance	success	Performance Testing PASS
ci/iol-intel-Performance	success	Performance Testing PASS
ci/iol-marvell-Functional	success	Functional Testing PASS

Commit Message

Bruce Richardson Dec. 3, 2024, 4:41 p.m. UTC

Remove the custom vector Tx backlog entry function and use the standard
intel_common one, now that all vector drivers are using the same,
smaller ring structure.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 drivers/net/ixgbe/ixgbe_rxtx_vec_common.h | 10 ----------
 drivers/net/ixgbe/ixgbe_rxtx_vec_neon.c   |  4 ++--
 drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c    |  4 ++--
 3 files changed, 4 insertions(+), 14 deletions(-)

diff mbox series

Patch

diff --git a/drivers/net/ixgbe/ixgbe_rxtx_vec_common.h b/drivers/net/ixgbe/ixgbe_rxtx_vec_common.h
index 3d4840c3b7..7316fc6c3b 100644
--- a/drivers/net/ixgbe/ixgbe_rxtx_vec_common.h
+++ b/drivers/net/ixgbe/ixgbe_rxtx_vec_common.h
@@ -68,16 +68,6 @@  ixgbe_tx_free_bufs(struct ci_tx_queue *txq)
 	return txq->tx_rs_thresh;
 }
 
-static __rte_always_inline void
-tx_backlog_entry(struct ci_tx_entry_vec *txep,
-		 struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
-{
-	int i;
-
-	for (i = 0; i < (int)nb_pkts; ++i)
-		txep[i].mbuf = tx_pkts[i];
-}
-
 static inline void
 _ixgbe_rx_queue_release_mbufs_vec(struct ixgbe_rx_queue *rxq)
 {
diff --git a/drivers/net/ixgbe/ixgbe_rxtx_vec_neon.c b/drivers/net/ixgbe/ixgbe_rxtx_vec_neon.c
index 2ccb399b64..f879f6fa9a 100644
--- a/drivers/net/ixgbe/ixgbe_rxtx_vec_neon.c
+++ b/drivers/net/ixgbe/ixgbe_rxtx_vec_neon.c
@@ -597,7 +597,7 @@  ixgbe_xmit_fixed_burst_vec(void *tx_queue, struct rte_mbuf **tx_pkts,
 
 	n = (uint16_t)(txq->nb_tx_desc - tx_id);
 	if (nb_commit >= n) {
-		tx_backlog_entry(txep, tx_pkts, n);
+		ci_tx_backlog_entry_vec(txep, tx_pkts, n);
 
 		for (i = 0; i < n - 1; ++i, ++tx_pkts, ++txdp)
 			vtx1(txdp, *tx_pkts, flags);
@@ -614,7 +614,7 @@  ixgbe_xmit_fixed_burst_vec(void *tx_queue, struct rte_mbuf **tx_pkts,
 		txep = &txq->sw_ring_vec[tx_id];
 	}
 
-	tx_backlog_entry(txep, tx_pkts, nb_commit);
+	ci_tx_backlog_entry_vec(txep, tx_pkts, nb_commit);
 
 	vtx(txdp, tx_pkts, nb_commit, flags);
 
diff --git a/drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c b/drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c
index fa26365f06..915358e16b 100644
--- a/drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c
+++ b/drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c
@@ -720,7 +720,7 @@  ixgbe_xmit_fixed_burst_vec(void *tx_queue, struct rte_mbuf **tx_pkts,
 	n = (uint16_t)(txq->nb_tx_desc - tx_id);
 	if (nb_commit >= n) {
 
-		tx_backlog_entry(txep, tx_pkts, n);
+		ci_tx_backlog_entry_vec(txep, tx_pkts, n);
 
 		for (i = 0; i < n - 1; ++i, ++tx_pkts, ++txdp)
 			vtx1(txdp, *tx_pkts, flags);
@@ -737,7 +737,7 @@  ixgbe_xmit_fixed_burst_vec(void *tx_queue, struct rte_mbuf **tx_pkts,
 		txep = &txq->sw_ring_vec[tx_id];
 	}
 
-	tx_backlog_entry(txep, tx_pkts, nb_commit);
+	ci_tx_backlog_entry_vec(txep, tx_pkts, nb_commit);
 
 	vtx(txdp, tx_pkts, nb_commit, flags);