diff mbox series

[v3,08/26] pdump: use separate Rx and Tx queue limits

Message ID	20240814104933.14062-9-bruce.richardson@intel.com (mailing list archive)
State	New
Delegated to:	Thomas Monjalon
Headers	From: Bruce Richardson <bruce.richardson@intel.com> To: dev@dpdk.org Cc: ferruh.yigit@amd.com, thomas@monjalon.net, mb@smartsharesystems.com, Bruce Richardson <bruce.richardson@intel.com> Subject: [PATCH v3 08/26] pdump: use separate Rx and Tx queue limits Date: Wed, 14 Aug 2024 11:49:14 +0100 Message-ID: <20240814104933.14062-9-bruce.richardson@intel.com> In-Reply-To: <20240814104933.14062-1-bruce.richardson@intel.com> References: <20240812132910.162252-1-bruce.richardson@intel.com> <20240814104933.14062-1-bruce.richardson@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: list Errors-To: dev-bounces@dpdk.org
Series	add meson config options for queues per port \| [v3,00/26] add meson config options for queues per port [v3,01/26] cryptodev: remove use of ethdev max queues definition [v3,02/26] eventdev: remove use of ethev queues define [v3,03/26] app/test-bbdev: remove use of ethdev queue count value [v3,04/26] config: add separate defines for max Rx and Tx queues [v3,05/26] ethdev: use separate Rx and Tx queue limits [v3,06/26] bpf: use separate Rx and Tx queue limits [v3,07/26] latencystats: use separate Rx and Tx queue limits [v3,08/26] pdump: use separate Rx and Tx queue limits [v3,09/26] power: use separate Rx and Tx queue limits [v3,10/26] net/af_xdp: use separate Rx and Tx queue limits [v3,11/26] net/cnxk: use separate Rx and Tx queue limits [v3,12/26] net/failsafe: use separate Rx and Tx queue limits [v3,13/26] net/hns3: use separate Rx and Tx queue limits [v3,14/26] net/mlx5: use separate Rx and Tx queue limits [v3,15/26] net/null: use separate Rx and Tx queue limits [v3,16/26] net/sfc: use separate Rx and Tx queue limits [v3,17/26] net/thunderx: use separate Rx and Tx queue limits [v3,18/26] net/vhost: use separate Rx and Tx queue limits [v3,19/26] app/dumpcap: use separate Rx and Tx queue limits [v3,20/26] app/test-pmd: use separate Rx and Tx queue limits [v3,21/26] examples/ipsec-secgw: use separate Rx and Tx queue limits [v3,22/26] examples/l3fwd-power: use separate Rx and Tx queue limits [v3,23/26] examples/l3fwd: use separate Rx and Tx queue limits [v3,24/26] examples/vhost: use separate Rx and Tx queue limits [v3,25/26] config: make queues per port a meson config option [v3,26/26] config: add computed max queues define for compatibility

Checks

Context	Check	Description
ci/checkpatch	warning	coding style issues

Commit Message

Bruce Richardson Aug. 14, 2024, 10:49 a.m. UTC

Update library to use the new defines RTE_MAX_ETHPORT_TX_QUEUES and
RTE_MAX_ETHPORT_RX_QUEUES rather than the old define
RTE_MAX_QUEUES_PER_PORT.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: Morten Brørup <mb@smartsharesystems.com>
---
 lib/pdump/rte_pdump.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff mbox series

Patch

diff --git a/lib/pdump/rte_pdump.c b/lib/pdump/rte_pdump.c
index 679c3dd0b5..0e0f1088f5 100644
--- a/lib/pdump/rte_pdump.c
+++ b/lib/pdump/rte_pdump.c
@@ -61,8 +61,8 @@  static struct pdump_rxtx_cbs {
 	const struct rte_bpf *filter;
 	enum pdump_version ver;
 	uint32_t snaplen;
-} rx_cbs[RTE_MAX_ETHPORTS][RTE_MAX_QUEUES_PER_PORT],
-tx_cbs[RTE_MAX_ETHPORTS][RTE_MAX_QUEUES_PER_PORT];
+} rx_cbs[RTE_MAX_ETHPORTS][RTE_MAX_ETHPORT_RX_QUEUES],
+tx_cbs[RTE_MAX_ETHPORTS][RTE_MAX_ETHPORT_TX_QUEUES];
 
 
 /*
@@ -72,8 +72,8 @@  tx_cbs[RTE_MAX_ETHPORTS][RTE_MAX_QUEUES_PER_PORT];
  */
 static const char MZ_RTE_PDUMP_STATS[] = "rte_pdump_stats";
 static struct {
-	struct rte_pdump_stats rx[RTE_MAX_ETHPORTS][RTE_MAX_QUEUES_PER_PORT];
-	struct rte_pdump_stats tx[RTE_MAX_ETHPORTS][RTE_MAX_QUEUES_PER_PORT];
+	struct rte_pdump_stats rx[RTE_MAX_ETHPORTS][RTE_MAX_ETHPORT_RX_QUEUES];
+	struct rte_pdump_stats tx[RTE_MAX_ETHPORTS][RTE_MAX_ETHPORT_TX_QUEUES];
 	const struct rte_memzone *mz;
 } *pdump_stats;
 
@@ -708,8 +708,8 @@  rte_pdump_disable_by_deviceid(char *device_id, uint16_t queue,
 }
 
 static void
-pdump_sum_stats(uint16_t port, uint16_t nq,
-		struct rte_pdump_stats stats[RTE_MAX_ETHPORTS][RTE_MAX_QUEUES_PER_PORT],
+pdump_sum_stats(uint16_t nq,
+		struct rte_pdump_stats *stats,
 		struct rte_pdump_stats *total)
 {
 	uint64_t *sum = (uint64_t *)total;
@@ -718,7 +718,7 @@  pdump_sum_stats(uint16_t port, uint16_t nq,
 	uint16_t qid;
 
 	for (qid = 0; qid < nq; qid++) {
-		const RTE_ATOMIC(uint64_t) *perq = (const uint64_t __rte_atomic *)&stats[port][qid];
+		const RTE_ATOMIC(uint64_t) *perq = (const uint64_t __rte_atomic *)&stats[qid];
 
 		for (i = 0; i < sizeof(*total) / sizeof(uint64_t); i++) {
 			val = rte_atomic_load_explicit(&perq[i], rte_memory_order_relaxed);
@@ -762,7 +762,7 @@  rte_pdump_stats(uint16_t port, struct rte_pdump_stats *stats)
 		pdump_stats = mz->addr;
 	}
 
-	pdump_sum_stats(port, dev_info.nb_rx_queues, pdump_stats->rx, stats);
-	pdump_sum_stats(port, dev_info.nb_tx_queues, pdump_stats->tx, stats);
+	pdump_sum_stats(dev_info.nb_rx_queues, pdump_stats->rx[port], stats);
+	pdump_sum_stats(dev_info.nb_tx_queues, pdump_stats->tx[port], stats);
 	return 0;
 }