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 20/26] app/test-pmd: use separate Rx and Tx queue limits
Date: Wed, 14 Aug 2024 11:49:26 +0100 [thread overview]
Message-ID: <20240814104933.14062-21-bruce.richardson@intel.com> (raw)
In-Reply-To: <20240814104933.14062-1-bruce.richardson@intel.com>
Update app 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>
---
app/test-pmd/testpmd.c | 7 ++++---
app/test-pmd/testpmd.h | 16 ++++++++--------
2 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index b1401136e4..84da9a80f2 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -1305,7 +1305,7 @@ check_socket_id(const unsigned int socket_id)
queueid_t
get_allowed_max_nb_rxq(portid_t *pid)
{
- queueid_t allowed_max_rxq = RTE_MAX_QUEUES_PER_PORT;
+ queueid_t allowed_max_rxq = RTE_MAX_ETHPORT_RX_QUEUES;
bool max_rxq_valid = false;
portid_t pi;
struct rte_eth_dev_info dev_info;
@@ -1353,7 +1353,7 @@ check_nb_rxq(queueid_t rxq)
queueid_t
get_allowed_max_nb_txq(portid_t *pid)
{
- queueid_t allowed_max_txq = RTE_MAX_QUEUES_PER_PORT;
+ queueid_t allowed_max_txq = RTE_MAX_ETHPORT_TX_QUEUES;
bool max_txq_valid = false;
portid_t pi;
struct rte_eth_dev_info dev_info;
@@ -1564,7 +1564,8 @@ check_nb_txd(queueid_t txd)
queueid_t
get_allowed_max_nb_hairpinq(portid_t *pid)
{
- queueid_t allowed_max_hairpinq = RTE_MAX_QUEUES_PER_PORT;
+ queueid_t allowed_max_hairpinq = RTE_MIN(RTE_MAX_ETHPORT_RX_QUEUES,
+ RTE_MAX_ETHPORT_TX_QUEUES);
portid_t pi;
struct rte_eth_hairpin_cap cap;
diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h
index 9facd7f281..5e405775b1 100644
--- a/app/test-pmd/testpmd.h
+++ b/app/test-pmd/testpmd.h
@@ -332,10 +332,10 @@ struct rte_port {
uint8_t need_reconfig_queues; /**< need reconfiguring queues or not */
uint8_t rss_flag; /**< enable rss or not */
uint8_t dcb_flag; /**< enable dcb */
- uint16_t nb_rx_desc[RTE_MAX_QUEUES_PER_PORT+1]; /**< per queue rx desc number */
- uint16_t nb_tx_desc[RTE_MAX_QUEUES_PER_PORT+1]; /**< per queue tx desc number */
- struct port_rxqueue rxq[RTE_MAX_QUEUES_PER_PORT+1]; /**< per queue Rx config and state */
- struct port_txqueue txq[RTE_MAX_QUEUES_PER_PORT+1]; /**< per queue Tx config and state */
+ uint16_t nb_rx_desc[RTE_MAX_ETHPORT_RX_QUEUES+1]; /**< per queue rx desc number */
+ uint16_t nb_tx_desc[RTE_MAX_ETHPORT_TX_QUEUES+1]; /**< per queue tx desc number */
+ struct port_rxqueue rxq[RTE_MAX_ETHPORT_RX_QUEUES+1]; /**< per queue Rx config and state */
+ struct port_txqueue txq[RTE_MAX_ETHPORT_TX_QUEUES+1]; /**< per queue Tx config and state */
struct rte_ether_addr *mc_addr_pool; /**< pool of multicast addrs */
uint32_t mc_addr_nb; /**< nb. of addr. in mc_addr_pool */
queueid_t queue_nb; /**< nb. of queues for flow rules */
@@ -351,14 +351,14 @@ struct rte_port {
struct port_indirect_action *actions_list;
/**< Associated indirect actions. */
LIST_HEAD(, port_flow_tunnel) flow_tunnel_list;
- const struct rte_eth_rxtx_callback *rx_dump_cb[RTE_MAX_QUEUES_PER_PORT+1];
- const struct rte_eth_rxtx_callback *tx_dump_cb[RTE_MAX_QUEUES_PER_PORT+1];
+ const struct rte_eth_rxtx_callback *rx_dump_cb[RTE_MAX_ETHPORT_RX_QUEUES+1];
+ const struct rte_eth_rxtx_callback *tx_dump_cb[RTE_MAX_ETHPORT_TX_QUEUES+1];
/**< metadata value to insert in Tx packets. */
uint32_t tx_metadata;
- const struct rte_eth_rxtx_callback *tx_set_md_cb[RTE_MAX_QUEUES_PER_PORT+1];
+ const struct rte_eth_rxtx_callback *tx_set_md_cb[RTE_MAX_ETHPORT_TX_QUEUES+1];
/**< dynamic flags. */
uint64_t mbuf_dynf;
- const struct rte_eth_rxtx_callback *tx_set_dynf_cb[RTE_MAX_QUEUES_PER_PORT+1];
+ const struct rte_eth_rxtx_callback *tx_set_dynf_cb[RTE_MAX_ETHPORT_TX_QUEUES+1];
struct xstat_display_info xstats_info;
};
--
2.43.0
next prev parent reply other threads:[~2024-08-14 10:52 UTC|newest]
Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-12 13:29 [RFC PATCH] config: make queues per port a meson config option Bruce Richardson
2024-08-12 14:10 ` Morten Brørup
2024-08-12 14:18 ` Bruce Richardson
2024-08-12 15:02 ` Morten Brørup
2024-08-12 15:09 ` Bruce Richardson
2024-08-13 15:59 ` [RFC PATCH v2 00/26] add meson config options for queues per port Bruce Richardson
2024-08-13 15:59 ` [RFC PATCH v2 01/26] cryptodev: remove use of ethdev max queues definition Bruce Richardson
2024-08-13 15:59 ` [RFC PATCH v2 02/26] eventdev: remove use of ethev queues define Bruce Richardson
2024-08-13 15:59 ` [RFC PATCH v2 03/26] app/test-bbdev: remove use of ethdev queue count value Bruce Richardson
2024-08-13 15:59 ` [RFC PATCH v2 04/26] config: add separate defines for max Rx and Tx queues Bruce Richardson
2024-08-13 15:59 ` [RFC PATCH v2 05/26] ethdev: use separate Rx and Tx queue limits Bruce Richardson
2024-08-13 15:59 ` [RFC PATCH v2 06/26] bpf: " Bruce Richardson
2024-08-13 15:59 ` [RFC PATCH v2 07/26] latencystats: " Bruce Richardson
2024-08-13 15:59 ` [RFC PATCH v2 08/26] pdump: " Bruce Richardson
2024-08-13 15:59 ` [RFC PATCH v2 09/26] power: " Bruce Richardson
2024-08-13 15:59 ` [RFC PATCH v2 10/26] net/af_xdp: " Bruce Richardson
2024-08-13 15:59 ` [RFC PATCH v2 11/26] net/cnxk: " Bruce Richardson
2024-08-13 15:59 ` [RFC PATCH v2 12/26] net/failsafe: " Bruce Richardson
2024-08-13 15:59 ` [RFC PATCH v2 13/26] net/hns3: " Bruce Richardson
2024-08-13 15:59 ` [RFC PATCH v2 14/26] net/mlx5: " Bruce Richardson
2024-08-13 15:59 ` [RFC PATCH v2 15/26] net/null: " Bruce Richardson
2024-08-13 15:59 ` [RFC PATCH v2 16/26] net/sfc: " Bruce Richardson
2024-08-13 15:59 ` [RFC PATCH v2 17/26] net/thunderx: " Bruce Richardson
2024-08-13 15:59 ` [RFC PATCH v2 18/26] net/vhost: " Bruce Richardson
2024-08-13 15:59 ` [RFC PATCH v2 19/26] app/dumpcap: " Bruce Richardson
2024-08-13 15:59 ` [RFC PATCH v2 20/26] app/test-pmd: " Bruce Richardson
2024-08-13 15:59 ` [RFC PATCH v2 21/26] examples/ipsec-secgw: " Bruce Richardson
2024-08-13 15:59 ` [RFC PATCH v2 22/26] examples/l3fwd-power: " Bruce Richardson
2024-08-13 16:00 ` [RFC PATCH v2 23/26] examples/l3fwd: " Bruce Richardson
2024-08-13 16:00 ` [RFC PATCH v2 24/26] examples/vhost: " Bruce Richardson
2024-08-13 16:00 ` [RFC PATCH v2 25/26] config: make queues per port a meson config option Bruce Richardson
2024-08-13 16:00 ` [RFC PATCH v2 26/26] config: add computed max queues define for compatibility Bruce Richardson
2024-08-14 15:01 ` Stephen Hemminger
2024-08-14 15:12 ` Bruce Richardson
2024-08-14 7:43 ` [RFC PATCH v2 00/26] add meson config options for queues per port Morten Brørup
2024-08-14 7:48 ` Morten Brørup
2024-08-14 7:51 ` Bruce Richardson
2024-08-14 10:49 ` [PATCH v3 " Bruce Richardson
2024-08-14 10:49 ` [PATCH v3 01/26] cryptodev: remove use of ethdev max queues definition Bruce Richardson
2024-09-19 13:16 ` David Marchand
2024-08-14 10:49 ` [PATCH v3 02/26] eventdev: remove use of ethev queues define Bruce Richardson
2024-08-14 10:49 ` [PATCH v3 03/26] app/test-bbdev: remove use of ethdev queue count value Bruce Richardson
2024-09-19 13:36 ` David Marchand
2024-08-14 10:49 ` [PATCH v3 04/26] config: add separate defines for max Rx and Tx queues Bruce Richardson
2024-09-10 2:54 ` fengchengwen
2024-10-10 16:27 ` Stephen Hemminger
2024-10-10 16:32 ` Bruce Richardson
2024-08-14 10:49 ` [PATCH v3 05/26] ethdev: use separate Rx and Tx queue limits Bruce Richardson
2024-08-14 10:49 ` [PATCH v3 06/26] bpf: " Bruce Richardson
2024-08-14 10:49 ` [PATCH v3 07/26] latencystats: " Bruce Richardson
2024-08-14 10:49 ` [PATCH v3 08/26] pdump: " Bruce Richardson
2024-08-14 10:49 ` [PATCH v3 09/26] power: " Bruce Richardson
2024-08-14 10:49 ` [PATCH v3 10/26] net/af_xdp: " Bruce Richardson
2024-08-14 10:49 ` [PATCH v3 11/26] net/cnxk: " Bruce Richardson
2024-08-14 10:49 ` [PATCH v3 12/26] net/failsafe: " Bruce Richardson
2024-08-14 10:49 ` [PATCH v3 13/26] net/hns3: " Bruce Richardson
2024-08-14 10:49 ` [PATCH v3 14/26] net/mlx5: " Bruce Richardson
2024-08-14 10:49 ` [PATCH v3 15/26] net/null: " Bruce Richardson
2024-08-14 10:49 ` [PATCH v3 16/26] net/sfc: " Bruce Richardson
2024-08-14 10:49 ` [PATCH v3 17/26] net/thunderx: " Bruce Richardson
2024-08-14 10:49 ` [PATCH v3 18/26] net/vhost: " Bruce Richardson
2024-08-14 10:49 ` [PATCH v3 19/26] app/dumpcap: " Bruce Richardson
2024-10-03 23:38 ` Stephen Hemminger
2024-08-14 10:49 ` Bruce Richardson [this message]
2024-08-14 10:49 ` [PATCH v3 21/26] examples/ipsec-secgw: " Bruce Richardson
2024-08-14 10:49 ` [PATCH v3 22/26] examples/l3fwd-power: " Bruce Richardson
2024-08-14 10:49 ` [PATCH v3 23/26] examples/l3fwd: " Bruce Richardson
2024-08-14 10:49 ` [PATCH v3 24/26] examples/vhost: " Bruce Richardson
2024-08-14 10:49 ` [PATCH v3 25/26] config: make queues per port a meson config option Bruce Richardson
2024-08-14 10:49 ` [PATCH v3 26/26] config: add computed max queues define for compatibility Bruce Richardson
2024-09-19 14:14 ` [PATCH v3 00/26] add meson config options for queues per port David Marchand
2024-09-19 15:08 ` Bruce Richardson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240814104933.14062-21-bruce.richardson@intel.com \
--to=bruce.richardson@intel.com \
--cc=dev@dpdk.org \
--cc=ferruh.yigit@amd.com \
--cc=mb@smartsharesystems.com \
--cc=thomas@monjalon.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).