RE: [RFC PATCH v2 00/26] add meson config options for queues per port
> From: Bruce Richardson [mailto:bruce.richa...@intel.com] > > There are a number of issues with the current RTE_MAX_QUEUES_PER_PORT > setting in DPDK that are addressed by this patchset: > > * The name does not make it clear that this is intended as an > ethdev-only setting > * A number of other libraries are using this define rather than having > more relevant defines for the particular usecase. > * The define is hard-coded in DPDK source code and is not adjustable via > a build-time/meson option > * Because of the lack of configurability, the max is therefore set to a > conservatively-high value, wasting memory. > * There is an assumption that the number of Rx queues and Tx queues > should have the same maximum value. Depending on application, it may > be desirable to have fan-in with multiple Rx queues e.g. for > classification/filtering, feed a single Tx queue, or the opposite > where, e.g. for QoS Tx scheduling, a few Rx queues feeds a very large > number of Tx queues. > > This patchset therefore addresses these by: > > * replacing the single define for max queues with independent defines > for Rx and Tx queues. > * adjusts the name to ensure that it is clear the defines are for > ethports only. [ethports being used in the RTE_MAX_ETHPORTS setting]. > * replaces occurances of RTE_MAX_QUEUES_PER_PORT with appropriate > defines for non-ethdev use cases > * replaces all other internal occurances of the define with the new > per-Rx and per-Tx definitions. > * adds meson config options to allow build-time configuration of the max > Rx and Tx queue values. > > Naming Note: > * The new meson config options are called "max_ethport_rx_queues" and > "max_ethport_tx_queues" so that in the meson options list they appear > alphabetically beside the existing "max_ethports" option. > * For naming consistency, the new C defines are therefore > RTE_MAX_ETHPORT_RX_QUEUES and RTE_MAX_ETHPORT_TX_QUEUES. > > V2: > * What was a single patch with "3 insertions(+), 1 deletion(-)" has now > become a 26-patch set! :-) > * Created separate Rx and Tx defines > * Ensured that the name makes it clear that the define is for ethdev > * When updating internal use, created one patch per component for easier > maintainer review. In most cases it was obvious whether Rx or Tx > define should be used, but a few cases were less clear. > * Added documentation updates for the changes (release notes and > deprecation notice), spread across 3 of the patches. Thanks. For the series, Acked-by: Morten Brørup
[PATCH v2] net/bnxt: fix issue reading sff8436 sfp eeproms
From: Peter Morrow
If a SFP which supports SFF-8436 is present then
currently the DDM information present in the eeprom
is not read. Furthermore bnxt_get_module_eeprom()
will return -EINVAL for these eeproms since the
length of these eeproms is 512 bytes but we are
only ever selecting 2 pages (256 bytes) to read.
Signed-off-by: Peter Morrow
---
Corrected sob email address.
drivers/net/bnxt/bnxt_ethdev.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index e63febe782..8c4608a1b9 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -4130,7 +4130,6 @@ static int bnxt_get_module_eeprom(struct rte_eth_dev *dev,
switch (module_info[0]) {
case SFF_MODULE_ID_SFP:
- module_info[SFF_DIAG_SUPPORT_OFFSET] = 0;
if (module_info[SFF_DIAG_SUPPORT_OFFSET]) {
pg_addr[2] = I2C_DEV_ADDR_A2;
pg_addr[3] = I2C_DEV_ADDR_A2;
--
2.39.2
[RFC PATCH v2 00/26] add meson config options for queues per port
There are a number of issues with the current RTE_MAX_QUEUES_PER_PORT setting in DPDK that are addressed by this patchset: * The name does not make it clear that this is intended as an ethdev-only setting * A number of other libraries are using this define rather than having more relevant defines for the particular usecase. * The define is hard-coded in DPDK source code and is not adjustable via a build-time/meson option * Because of the lack of configurability, the max is therefore set to a conservatively-high value, wasting memory. * There is an assumption that the number of Rx queues and Tx queues should have the same maximum value. Depending on application, it may be desirable to have fan-in with multiple Rx queues e.g. for classification/filtering, feed a single Tx queue, or the opposite where, e.g. for QoS Tx scheduling, a few Rx queues feeds a very large number of Tx queues. This patchset therefore addresses these by: * replacing the single define for max queues with independent defines for Rx and Tx queues. * adjusts the name to ensure that it is clear the defines are for ethports only. [ethports being used in the RTE_MAX_ETHPORTS setting]. * replaces occurances of RTE_MAX_QUEUES_PER_PORT with appropriate defines for non-ethdev use cases * replaces all other internal occurances of the define with the new per-Rx and per-Tx definitions. * adds meson config options to allow build-time configuration of the max Rx and Tx queue values. Naming Note: * The new meson config options are called "max_ethport_rx_queues" and "max_ethport_tx_queues" so that in the meson options list they appear alphabetically beside the existing "max_ethports" option. * For naming consistency, the new C defines are therefore RTE_MAX_ETHPORT_RX_QUEUES and RTE_MAX_ETHPORT_TX_QUEUES. V2: * What was a single patch with "3 insertions(+), 1 deletion(-)" has now become a 26-patch set! :-) * Created separate Rx and Tx defines * Ensured that the name makes it clear that the define is for ethdev * When updating internal use, created one patch per component for easier maintainer review. In most cases it was obvious whether Rx or Tx define should be used, but a few cases were less clear. * Added documentation updates for the changes (release notes and deprecation notice), spread across 3 of the patches. Bruce Richardson (26): cryptodev: remove use of ethdev max queues definition eventdev: remove use of ethev queues define app/test-bbdev: remove use of ethdev queue count value config: add separate defines for max Rx and Tx queues ethdev: use separate Rx and Tx queue limits bpf: use separate Rx and Tx queue limits latencystats: use separate Rx and Tx queue limits pdump: use separate Rx and Tx queue limits power: use separate Rx and Tx queue limits net/af_xdp: use separate Rx and Tx queue limits net/cnxk: use separate Rx and Tx queue limits net/failsafe: use separate Rx and Tx queue limits net/hns3: use separate Rx and Tx queue limits net/mlx5: use separate Rx and Tx queue limits net/null: use separate Rx and Tx queue limits net/sfc: use separate Rx and Tx queue limits net/thunderx: use separate Rx and Tx queue limits net/vhost: use separate Rx and Tx queue limits app/dumpcap: use separate Rx and Tx queue limits app/test-pmd: use separate Rx and Tx queue limits examples/ipsec-secgw: use separate Rx and Tx queue limits examples/l3fwd-power: use separate Rx and Tx queue limits examples/l3fwd: use separate Rx and Tx queue limits examples/vhost: use separate Rx and Tx queue limits config: make queues per port a meson config option config: add computed max queues define for compatibility app/dumpcap/main.c | 2 +- app/test-bbdev/test_bbdev.c| 4 ++-- app/test-pmd/testpmd.c | 7 --- app/test-pmd/testpmd.h | 16 config/meson.build | 10 ++ config/rte_config.h| 2 +- doc/guides/rel_notes/deprecation.rst | 11 +++ doc/guides/rel_notes/release_24_11.rst | 21 + drivers/net/af_xdp/rte_eth_af_xdp.c| 2 +- drivers/net/cnxk/cnxk_ethdev_ops.c | 4 ++-- drivers/net/failsafe/failsafe_ops.c| 4 ++-- drivers/net/hns3/hns3_tm.c | 2 +- drivers/net/mlx5/mlx5_flow.c | 2 +- drivers/net/mlx5/mlx5_flow_hw.c| 2 +- drivers/net/null/rte_eth_null.c| 4 ++-- drivers/net/sfc/sfc_sw_stats.c | 6 -- drivers/net/thunderx/nicvf_ethdev.c| 2 +- drivers/net/vhost/rte_eth_vhost.c | 7 --- examples/ipsec-secgw/ipsec-secgw.c | 2 +- examples/ipsec-secgw/ipsec.c | 2 +- examples/l3fwd-power/main.c| 2 +- examples/l3fwd-power/perf_core.c | 2 +- examples/l3fwd/main.c | 2 +- examples/vhost/main.c | 2 +- examples/vhost/main.h | 2 +- lib/bpf/bpf_pk
[RFC PATCH v2 01/26] cryptodev: remove use of ethdev max queues definition
The number of queue pairs supported by cryptodev should not be dependent
on the number of ethdev Rx or Tx queues, so add a new define for
cryptodev specifically.
Signed-off-by: Bruce Richardson
---
config/rte_config.h | 1 +
lib/cryptodev/cryptodev_pmd.c | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/config/rte_config.h b/config/rte_config.h
index dd7bb0d35b..d67ff77c71 100644
--- a/config/rte_config.h
+++ b/config/rte_config.h
@@ -71,6 +71,7 @@
/* cryptodev defines */
#define RTE_CRYPTO_MAX_DEVS 64
+#define RTE_CRYPTO_MAX_QPS_PER_DEV 256
#define RTE_CRYPTODEV_NAME_LEN 64
#define RTE_CRYPTO_CALLBACKS 1
diff --git a/lib/cryptodev/cryptodev_pmd.c b/lib/cryptodev/cryptodev_pmd.c
index 87ced122b4..d3263bd907 100644
--- a/lib/cryptodev/cryptodev_pmd.c
+++ b/lib/cryptodev/cryptodev_pmd.c
@@ -212,8 +212,8 @@ dummy_crypto_dequeue_burst(__rte_unused void *qp,
void
cryptodev_fp_ops_reset(struct rte_crypto_fp_ops *fp_ops)
{
- static struct rte_cryptodev_cb_rcu dummy_cb[RTE_MAX_QUEUES_PER_PORT];
- static void *dummy_data[RTE_MAX_QUEUES_PER_PORT];
+ static struct rte_cryptodev_cb_rcu dummy_cb[RTE_CRYPTO_MAX_QPS_PER_DEV];
+ static void *dummy_data[RTE_CRYPTO_MAX_QPS_PER_DEV];
static const struct rte_crypto_fp_ops dummy = {
.enqueue_burst = dummy_crypto_enqueue_burst,
.dequeue_burst = dummy_crypto_dequeue_burst,
--
2.43.0
[RFC PATCH v2 02/26] eventdev: remove use of ethev queues define
The max queues per port definition is intended for use for ethdevs, so
it's use for a dummy array in eventdev is likely wrong. Since the array
is intended to be for eventdev ports, use RTE_EVENT_MAX_PORTS_PER_DEV
define instead.
Signed-off-by: Bruce Richardson
---
lib/eventdev/eventdev_private.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/eventdev/eventdev_private.c b/lib/eventdev/eventdev_private.c
index 017f97ccab..a84d0a46ac 100644
--- a/lib/eventdev/eventdev_private.c
+++ b/lib/eventdev/eventdev_private.c
@@ -99,7 +99,7 @@ dummy_event_port_profile_switch(__rte_unused void *port,
__rte_unused uint8_t pr
void
event_dev_fp_ops_reset(struct rte_event_fp_ops *fp_op)
{
- static void *dummy_data[RTE_MAX_QUEUES_PER_PORT];
+ static void *dummy_data[RTE_EVENT_MAX_PORTS_PER_DEV];
static const struct rte_event_fp_ops dummy = {
.enqueue = dummy_event_enqueue,
.enqueue_burst = dummy_event_enqueue_burst,
--
2.43.0
[RFC PATCH v2 03/26] app/test-bbdev: remove use of ethdev queue count value
Replace the use of RTE_MAX_QUEUES_PER_PORT, which is intended as an ethdev define, with the limit from the bbdev library. Signed-off-by: Bruce Richardson --- app/test-bbdev/test_bbdev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/test-bbdev/test_bbdev.c b/app/test-bbdev/test_bbdev.c index 0bbce6ca92..2e626efd74 100644 --- a/app/test-bbdev/test_bbdev.c +++ b/app/test-bbdev/test_bbdev.c @@ -297,7 +297,7 @@ test_bbdev_configure_stop_queue(void) "Failed test for rte_bbdev_queue_stop " "invalid dev_id "); - TEST_ASSERT_FAIL(rte_bbdev_queue_stop(dev_id, RTE_MAX_QUEUES_PER_PORT), + TEST_ASSERT_FAIL(rte_bbdev_queue_stop(dev_id, RTE_BBDEV_DEFAULT_MAX_NB_QUEUES), "Failed test for rte_bbdev_queue_stop " "invalid queue_id "); @@ -1176,7 +1176,7 @@ test_bbdev_invalid_driver(void) "invalid dev_id "); TEST_ASSERT_FAIL(rte_bbdev_queue_info_get(dev_id, - RTE_MAX_QUEUES_PER_PORT, &qinfo), + RTE_BBDEV_DEFAULT_MAX_NB_QUEUES, &qinfo), "Failed test for rte_bbdev_info_get: " "invalid queue_id "); -- 2.43.0
[RFC PATCH v2 04/26] config: add separate defines for max Rx and Tx queues
Rather than having a single define for maximum queues per ethernet port, we can set the max values for Rx queues and Tx queue independently. This allows future memory saving for apps which only need large numbers of Rx queues or only large numbers of Tx queues. Signed-off-by: Bruce Richardson --- config/rte_config.h| 2 ++ doc/guides/rel_notes/release_24_11.rst | 6 ++ 2 files changed, 8 insertions(+) diff --git a/config/rte_config.h b/config/rte_config.h index d67ff77c71..2c11b4eeec 100644 --- a/config/rte_config.h +++ b/config/rte_config.h @@ -65,6 +65,8 @@ /* ether defines */ #define RTE_MAX_QUEUES_PER_PORT 1024 +#define RTE_MAX_ETHPORT_RX_QUEUES 1024 +#define RTE_MAX_ETHPORT_TX_QUEUES 1024 #define RTE_ETHDEV_QUEUE_STAT_CNTRS 16 /* max 256 */ #define RTE_ETHDEV_RXTX_CALLBACKS 1 #define RTE_MAX_MULTI_HOST_CTRLS 4 diff --git a/doc/guides/rel_notes/release_24_11.rst b/doc/guides/rel_notes/release_24_11.rst index 0ff70d9057..3725c056ba 100644 --- a/doc/guides/rel_notes/release_24_11.rst +++ b/doc/guides/rel_notes/release_24_11.rst @@ -55,6 +55,12 @@ New Features Also, make sure to start the actual text at the margin. === +* **New configuration settings for Rx and Tx Ethernet Queues.** + + New defines have been added to DPDK to allow independent tracking of the maximum number of Rx and Tx queues. + These defines as ``RTE_MAX_ETHPORT_RX_QUEUES`` and ``RTE_MAX_ETHPORT_TX_QUEUES``, + and should be used in place of the older macro ``RTE_MAX_QUEUES_PER_PORT``. + Removed Items - -- 2.43.0
[RFC PATCH v2 05/26] ethdev: use separate Rx and Tx queue limits
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
---
lib/ethdev/ethdev_driver.h | 8
lib/ethdev/ethdev_private.c | 24 ++--
lib/ethdev/rte_ethdev.c | 16 +++-
lib/ethdev/rte_ethdev.h | 18 +-
4 files changed, 34 insertions(+), 32 deletions(-)
diff --git a/lib/ethdev/ethdev_driver.h b/lib/ethdev/ethdev_driver.h
index 883e59a927..51ec8e8395 100644
--- a/lib/ethdev/ethdev_driver.h
+++ b/lib/ethdev/ethdev_driver.h
@@ -84,12 +84,12 @@ struct __rte_cache_aligned rte_eth_dev {
* User-supplied functions called from rx_burst to post-process
* received packets before passing them to the user
*/
- RTE_ATOMIC(struct rte_eth_rxtx_callback *)
post_rx_burst_cbs[RTE_MAX_QUEUES_PER_PORT];
+ RTE_ATOMIC(struct rte_eth_rxtx_callback *)
post_rx_burst_cbs[RTE_MAX_ETHPORT_RX_QUEUES];
/**
* User-supplied functions called from tx_burst to pre-process
* received packets before passing them to the driver for transmission
*/
- RTE_ATOMIC(struct rte_eth_rxtx_callback *)
pre_tx_burst_cbs[RTE_MAX_QUEUES_PER_PORT];
+ RTE_ATOMIC(struct rte_eth_rxtx_callback *)
pre_tx_burst_cbs[RTE_MAX_ETHPORT_TX_QUEUES];
enum rte_eth_dev_state state; /**< Flag indicating the port state */
void *security_ctx; /**< Context for security ops */
@@ -165,9 +165,9 @@ struct __rte_cache_aligned rte_eth_dev_data {
flow_configured : 1;
/** Queues state: HAIRPIN(2) / STARTED(1) / STOPPED(0) */
- uint8_t rx_queue_state[RTE_MAX_QUEUES_PER_PORT];
+ uint8_t rx_queue_state[RTE_MAX_ETHPORT_RX_QUEUES];
/** Queues state: HAIRPIN(2) / STARTED(1) / STOPPED(0) */
- uint8_t tx_queue_state[RTE_MAX_QUEUES_PER_PORT];
+ uint8_t tx_queue_state[RTE_MAX_ETHPORT_TX_QUEUES];
uint32_t dev_flags; /**< Capabilities */
int numa_node; /**< NUMA node connection */
diff --git a/lib/ethdev/ethdev_private.c b/lib/ethdev/ethdev_private.c
index 626524558a..e00530f370 100644
--- a/lib/ethdev/ethdev_private.c
+++ b/lib/ethdev/ethdev_private.c
@@ -190,7 +190,8 @@ struct dummy_queue {
bool rx_warn_once;
bool tx_warn_once;
};
-static struct dummy_queue
*dummy_queues_array[RTE_MAX_ETHPORTS][RTE_MAX_QUEUES_PER_PORT];
+static struct dummy_queue
*dummy_rxq_array[RTE_MAX_ETHPORTS][RTE_MAX_ETHPORT_RX_QUEUES];
+static struct dummy_queue
*dummy_txq_array[RTE_MAX_ETHPORTS][RTE_MAX_ETHPORT_TX_QUEUES];
static struct dummy_queue per_port_queues[RTE_MAX_ETHPORTS];
RTE_INIT(dummy_queue_init)
{
@@ -199,8 +200,10 @@ RTE_INIT(dummy_queue_init)
for (port_id = 0; port_id < RTE_DIM(per_port_queues); port_id++) {
unsigned int q;
- for (q = 0; q < RTE_DIM(dummy_queues_array[port_id]); q++)
- dummy_queues_array[port_id][q] =
&per_port_queues[port_id];
+ for (q = 0; q < RTE_DIM(dummy_rxq_array[port_id]); q++)
+ dummy_rxq_array[port_id][q] = &per_port_queues[port_id];
+ for (q = 0; q < RTE_DIM(dummy_txq_array[port_id]); q++)
+ dummy_txq_array[port_id][q] = &per_port_queues[port_id];
}
}
@@ -245,7 +248,8 @@ dummy_eth_tx_burst(void *txq,
void
eth_dev_fp_ops_reset(struct rte_eth_fp_ops *fpo)
{
- static RTE_ATOMIC(void *) dummy_data[RTE_MAX_QUEUES_PER_PORT];
+ static RTE_ATOMIC(void *) dummy_rx_data[RTE_MAX_ETHPORT_RX_QUEUES];
+ static RTE_ATOMIC(void *) dummy_tx_data[RTE_MAX_ETHPORT_TX_QUEUES];
uintptr_t port_id = fpo - rte_eth_fp_ops;
per_port_queues[port_id].rx_warn_once = false;
@@ -254,12 +258,12 @@ eth_dev_fp_ops_reset(struct rte_eth_fp_ops *fpo)
.rx_pkt_burst = dummy_eth_rx_burst,
.tx_pkt_burst = dummy_eth_tx_burst,
.rxq = {
- .data = (void **)&dummy_queues_array[port_id],
- .clbk = dummy_data,
+ .data = (void **)&dummy_rxq_array[port_id],
+ .clbk = dummy_rx_data,
},
.txq = {
- .data = (void **)&dummy_queues_array[port_id],
- .clbk = dummy_data,
+ .data = (void **)&dummy_txq_array[port_id],
+ .clbk = dummy_tx_data,
},
};
}
@@ -420,7 +424,7 @@ eth_dev_rx_queue_config(struct rte_eth_dev *dev, uint16_t
nb_queues)
if (dev->data->rx_queues == NULL && nb_queues != 0) { /* first time
configuration */
dev->data->rx_queues = rte_zmalloc("ethdev->rx_queues",
sizeof(dev->data->rx_queues[0]) *
- RTE_MAX_QUEUES_PER_PORT,
+ RTE_MAX_ETHPO
[RFC PATCH v2 06/26] bpf: use separate Rx and Tx queue limits
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 --- lib/bpf/bpf_pkt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/bpf/bpf_pkt.c b/lib/bpf/bpf_pkt.c index aaca935f2d..2c6b0e18f7 100644 --- a/lib/bpf/bpf_pkt.c +++ b/lib/bpf/bpf_pkt.c @@ -503,7 +503,8 @@ bpf_eth_elf_load(struct bpf_eth_cbh *cbh, uint16_t port, uint16_t queue, ftx = NULL; if (prm == NULL || rte_eth_dev_is_valid_port(port) == 0 || - queue >= RTE_MAX_QUEUES_PER_PORT) + queue >= (cbh->type == BPF_ETH_RX ? + RTE_MAX_ETHPORT_RX_QUEUES : RTE_MAX_ETHPORT_TX_QUEUES)) return -EINVAL; if (cbh->type == BPF_ETH_RX) -- 2.43.0
[RFC PATCH v2 07/26] latencystats: use separate Rx and Tx queue limits
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
---
lib/latencystats/rte_latencystats.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/latencystats/rte_latencystats.c
b/lib/latencystats/rte_latencystats.c
index 6a261309f9..696bbab3a4 100644
--- a/lib/latencystats/rte_latencystats.c
+++ b/lib/latencystats/rte_latencystats.c
@@ -60,8 +60,8 @@ struct rxtx_cbs {
const struct rte_eth_rxtx_callback *cb;
};
-static struct rxtx_cbs rx_cbs[RTE_MAX_ETHPORTS][RTE_MAX_QUEUES_PER_PORT];
-static struct rxtx_cbs tx_cbs[RTE_MAX_ETHPORTS][RTE_MAX_QUEUES_PER_PORT];
+static struct rxtx_cbs rx_cbs[RTE_MAX_ETHPORTS][RTE_MAX_ETHPORT_RX_QUEUES];
+static struct rxtx_cbs tx_cbs[RTE_MAX_ETHPORTS][RTE_MAX_ETHPORT_TX_QUEUES];
struct latency_stats_nameoff {
char name[RTE_ETH_XSTATS_NAME_SIZE];
--
2.43.0
[RFC PATCH v2 08/26] pdump: use separate Rx and Tx queue limits
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
---
lib/pdump/rte_pdump.c | 18 +-
1 file changed, 9 insertions(+), 9 deletions(-)
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;
}
--
2.43.0
[RFC PATCH v2 09/26] power: use separate Rx and Tx queue limits
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
---
lib/power/rte_power_pmd_mgmt.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/power/rte_power_pmd_mgmt.c b/lib/power/rte_power_pmd_mgmt.c
index b1c18a5f56..7fc87b22c1 100644
--- a/lib/power/rte_power_pmd_mgmt.c
+++ b/lib/power/rte_power_pmd_mgmt.c
@@ -494,7 +494,7 @@ rte_power_ethdev_pmgmt_queue_enable(unsigned int lcore_id,
uint16_t port_id,
RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -EINVAL);
- if (queue_id >= RTE_MAX_QUEUES_PER_PORT || lcore_id >= RTE_MAX_LCORE) {
+ if (queue_id >= RTE_MAX_ETHPORT_RX_QUEUES || lcore_id >= RTE_MAX_LCORE)
{
ret = -EINVAL;
goto end;
}
@@ -608,7 +608,7 @@ rte_power_ethdev_pmgmt_queue_disable(unsigned int lcore_id,
RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -EINVAL);
- if (lcore_id >= RTE_MAX_LCORE || queue_id >= RTE_MAX_QUEUES_PER_PORT)
+ if (lcore_id >= RTE_MAX_LCORE || queue_id >= RTE_MAX_ETHPORT_RX_QUEUES)
return -EINVAL;
/* check if the queue is stopped */
--
2.43.0
[RFC PATCH v2 11/26] net/cnxk: use separate Rx and Tx queue limits
Update driver 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 --- drivers/net/cnxk/cnxk_ethdev_ops.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/cnxk/cnxk_ethdev_ops.c b/drivers/net/cnxk/cnxk_ethdev_ops.c index b1093dd584..b587e32e24 100644 --- a/drivers/net/cnxk/cnxk_ethdev_ops.c +++ b/drivers/net/cnxk/cnxk_ethdev_ops.c @@ -16,8 +16,8 @@ cnxk_nix_info_get(struct rte_eth_dev *eth_dev, struct rte_eth_dev_info *devinfo) devinfo->min_rx_bufsize = NIX_MIN_HW_FRS + RTE_ETHER_CRC_LEN; devinfo->max_rx_pktlen = max_rx_pktlen; - devinfo->max_rx_queues = RTE_MAX_QUEUES_PER_PORT; - devinfo->max_tx_queues = RTE_MAX_QUEUES_PER_PORT; + devinfo->max_rx_queues = RTE_MAX_ETHPORT_RX_QUEUES; + devinfo->max_tx_queues = RTE_MAX_ETHPORT_TX_QUEUES; devinfo->max_mac_addrs = dev->max_mac_entries; devinfo->max_vfs = pci_dev->max_vfs; devinfo->max_mtu = devinfo->max_rx_pktlen - CNXK_NIX_L2_OVERHEAD; -- 2.43.0
[RFC PATCH v2 10/26] net/af_xdp: use separate Rx and Tx queue limits
Update driver 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
---
drivers/net/af_xdp/rte_eth_af_xdp.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/af_xdp/rte_eth_af_xdp.c
b/drivers/net/af_xdp/rte_eth_af_xdp.c
index 0bc0d9a55a..1cc8b40acc 100644
--- a/drivers/net/af_xdp/rte_eth_af_xdp.c
+++ b/drivers/net/af_xdp/rte_eth_af_xdp.c
@@ -185,7 +185,7 @@ struct pmd_internals {
};
struct pmd_process_private {
- int rxq_xsk_fds[RTE_MAX_QUEUES_PER_PORT];
+ int rxq_xsk_fds[RTE_MAX_ETHPORT_RX_QUEUES];
};
#define ETH_AF_XDP_IFACE_ARG "iface"
--
2.43.0
[RFC PATCH v2 12/26] net/failsafe: use separate Rx and Tx queue limits
Update driver 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 --- drivers/net/failsafe/failsafe_ops.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/failsafe/failsafe_ops.c b/drivers/net/failsafe/failsafe_ops.c index 9c013e0419..12a01f5543 100644 --- a/drivers/net/failsafe/failsafe_ops.c +++ b/drivers/net/failsafe/failsafe_ops.c @@ -1205,8 +1205,8 @@ fs_dev_infos_get(struct rte_eth_dev *dev, infos->min_mtu = RTE_ETHER_MIN_MTU; infos->max_mtu = UINT16_MAX; infos->max_rx_pktlen = UINT32_MAX; - infos->max_rx_queues = RTE_MAX_QUEUES_PER_PORT; - infos->max_tx_queues = RTE_MAX_QUEUES_PER_PORT; + infos->max_rx_queues = RTE_MAX_ETHPORT_RX_QUEUES; + infos->max_tx_queues = RTE_MAX_ETHPORT_TX_QUEUES; infos->max_mac_addrs = FAILSAFE_MAX_ETHADDR; infos->max_hash_mac_addrs = UINT32_MAX; infos->max_vfs = UINT16_MAX; -- 2.43.0
[RFC PATCH v2 13/26] net/hns3: use separate Rx and Tx queue limits
Update driver 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 --- drivers/net/hns3/hns3_tm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/hns3/hns3_tm.c b/drivers/net/hns3/hns3_tm.c index 92a668538f..713635afd0 100644 --- a/drivers/net/hns3/hns3_tm.c +++ b/drivers/net/hns3/hns3_tm.c @@ -21,7 +21,7 @@ hns3_tm_max_tx_queues_get(struct rte_eth_dev *dev) memset(&dev_info, 0, sizeof(dev_info)); (void)hns3_dev_infos_get(dev, &dev_info); - return RTE_MIN(dev_info.max_tx_queues, RTE_MAX_QUEUES_PER_PORT); + return RTE_MIN(dev_info.max_tx_queues, RTE_MAX_ETHPORT_TX_QUEUES); } void -- 2.43.0
[RFC PATCH v2 15/26] net/null: use separate Rx and Tx queue limits
Update driver 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
---
drivers/net/null/rte_eth_null.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/null/rte_eth_null.c b/drivers/net/null/rte_eth_null.c
index f4ed3b8a7f..30185e417a 100644
--- a/drivers/net/null/rte_eth_null.c
+++ b/drivers/net/null/rte_eth_null.c
@@ -53,8 +53,8 @@ struct pmd_internals {
unsigned int no_rx;
uint16_t port_id;
- struct null_queue rx_null_queues[RTE_MAX_QUEUES_PER_PORT];
- struct null_queue tx_null_queues[RTE_MAX_QUEUES_PER_PORT];
+ struct null_queue rx_null_queues[RTE_MAX_ETHPORT_RX_QUEUES];
+ struct null_queue tx_null_queues[RTE_MAX_ETHPORT_TX_QUEUES];
struct rte_ether_addr eth_addr;
/** Bit mask of RSS offloads, the bit offset also means flow type */
--
2.43.0
[RFC PATCH v2 14/26] net/mlx5: use separate Rx and Tx queue limits
Update driver 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
---
drivers/net/mlx5/mlx5_flow.c| 2 +-
drivers/net/mlx5/mlx5_flow_hw.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index 72fb3a55ba..3eaea66920 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -7344,7 +7344,7 @@ flow_legacy_list_create(struct rte_eth_dev *dev, enum
mlx5_flow_type type,
struct rte_flow_item items[MLX5_MAX_SPLIT_ITEMS];
uint8_t buffer[2048];
} items_tx;
- struct mlx5_rte_flow_item_sq sq_specs[RTE_MAX_QUEUES_PER_PORT];
+ struct mlx5_rte_flow_item_sq sq_specs[RTE_MAX_ETHPORT_RX_QUEUES];
struct mlx5_flow_expand_rss *buf = &expand_buffer.buf;
struct mlx5_flow_rss_desc *rss_desc;
const struct rte_flow_action *p_actions_rx;
diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c
index d243b59b71..f9514ddd4f 100644
--- a/drivers/net/mlx5/mlx5_flow_hw.c
+++ b/drivers/net/mlx5/mlx5_flow_hw.c
@@ -10978,7 +10978,7 @@ flow_hw_create_ctrl_rx_rss_template(struct rte_eth_dev
*dev,
struct rte_flow_actions_template_attr attr = {
.ingress = 1,
};
- uint16_t queue[RTE_MAX_QUEUES_PER_PORT];
+ uint16_t queue[RTE_MAX_ETHPORT_RX_QUEUES];
struct rte_flow_action_rss rss_conf = {
.func = RTE_ETH_HASH_FUNCTION_DEFAULT,
.level = 0,
--
2.43.0
[RFC PATCH v2 16/26] net/sfc: use separate Rx and Tx queue limits
Update driver 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
---
drivers/net/sfc/sfc_sw_stats.c | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/net/sfc/sfc_sw_stats.c b/drivers/net/sfc/sfc_sw_stats.c
index 3ae5023b6f..27892e7d4f 100644
--- a/drivers/net/sfc/sfc_sw_stats.c
+++ b/drivers/net/sfc/sfc_sw_stats.c
@@ -825,9 +825,11 @@ sfc_sw_xstats_alloc_queues_bitmap(struct sfc_adapter *sa)
struct rte_bitmap **queues_bitmap = &sa->sw_stats.queues_bitmap;
void **queues_bitmap_mem = &sa->sw_stats.queues_bitmap_mem;
uint32_t bmp_size;
+ uint32_t max_queues = RTE_MAX(RTE_MAX_ETHPORT_RX_QUEUES,
+ RTE_MAX_ETHPORT_TX_QUEUES);
int rc;
- bmp_size = rte_bitmap_get_memory_footprint(RTE_MAX_QUEUES_PER_PORT);
+ bmp_size = rte_bitmap_get_memory_footprint(max_queues);
*queues_bitmap_mem = NULL;
*queues_bitmap = NULL;
@@ -836,7 +838,7 @@ sfc_sw_xstats_alloc_queues_bitmap(struct sfc_adapter *sa)
if (*queues_bitmap_mem == NULL)
return ENOMEM;
- *queues_bitmap = rte_bitmap_init(RTE_MAX_QUEUES_PER_PORT,
+ *queues_bitmap = rte_bitmap_init(max_queues,
*queues_bitmap_mem, bmp_size);
if (*queues_bitmap == NULL) {
rc = EINVAL;
--
2.43.0
[RFC PATCH v2 17/26] net/thunderx: use separate Rx and Tx queue limits
Update driver 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
---
drivers/net/thunderx/nicvf_ethdev.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/thunderx/nicvf_ethdev.c
b/drivers/net/thunderx/nicvf_ethdev.c
index 609d95dcfa..8c8bec885f 100644
--- a/drivers/net/thunderx/nicvf_ethdev.c
+++ b/drivers/net/thunderx/nicvf_ethdev.c
@@ -907,7 +907,7 @@ nicvf_configure_rss_reta(struct rte_eth_dev *dev)
{
struct nicvf *nic = nicvf_pmd_priv(dev);
unsigned int idx, qmap_size;
- uint8_t qmap[RTE_MAX_QUEUES_PER_PORT];
+ uint8_t qmap[RTE_MAX_ETHPORT_RX_QUEUES];
uint8_t default_reta[NIC_MAX_RSS_IDR_TBL_SIZE];
if (nic->cpi_alg != CPI_ALG_NONE)
--
2.43.0
[RFC PATCH v2 18/26] net/vhost: use separate Rx and Tx queue limits
Update driver 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
---
drivers/net/vhost/rte_eth_vhost.c | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/net/vhost/rte_eth_vhost.c
b/drivers/net/vhost/rte_eth_vhost.c
index 21bbb008e0..78bc755109 100644
--- a/drivers/net/vhost/rte_eth_vhost.c
+++ b/drivers/net/vhost/rte_eth_vhost.c
@@ -117,8 +117,8 @@ static struct rte_eth_link pmd_link = {
struct rte_vhost_vring_state {
rte_spinlock_t lock;
- bool cur[RTE_MAX_QUEUES_PER_PORT * 2];
- bool seen[RTE_MAX_QUEUES_PER_PORT * 2];
+ bool cur[RTE_MAX_ETHPORT_RX_QUEUES + RTE_MAX_ETHPORT_TX_QUEUES];
+ bool seen[RTE_MAX_ETHPORT_RX_QUEUES + RTE_MAX_ETHPORT_TX_QUEUES];
unsigned int index;
unsigned int max_vring;
};
@@ -1648,7 +1648,8 @@ rte_pmd_vhost_probe(struct rte_vdev_device *dev)
if (rte_kvargs_count(kvlist, ETH_VHOST_QUEUES_ARG) == 1) {
ret = rte_kvargs_process(kvlist, ETH_VHOST_QUEUES_ARG,
&open_int, &queues);
- if (ret < 0 || queues > RTE_MAX_QUEUES_PER_PORT)
+ if (ret < 0 || queues > RTE_MAX_ETHPORT_RX_QUEUES
+ || queues > RTE_MAX_ETHPORT_TX_QUEUES)
goto out_free;
} else
--
2.43.0
[RFC PATCH v2 20/26] app/test-pmd: use separate Rx and Tx queue limits
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
---
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_tnb_rx_desc[RTE_MAX_QUEUES_PER_PORT+1]; /**< per
queue rx desc number */
- uint16_tnb_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_tnb_rx_desc[RTE_MAX_ETHPORT_RX_QUEUES+1]; /**<
per queue rx desc number */
+ uint16_tnb_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_tmc_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_ttx_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_tmbuf_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
[RFC PATCH v2 19/26] app/dumpcap: use separate Rx and Tx queue limits
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
---
app/dumpcap/main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/dumpcap/main.c b/app/dumpcap/main.c
index 6feb8f5672..fbaaa4fe3f 100644
--- a/app/dumpcap/main.c
+++ b/app/dumpcap/main.c
@@ -95,7 +95,7 @@ struct interface {
struct rte_bpf_prm *bpf_prm;
char name[RTE_ETH_NAME_MAX_LEN];
- struct rte_rxtx_callback *rx_cb[RTE_MAX_QUEUES_PER_PORT];
+ struct rte_rxtx_callback *rx_cb[RTE_MAX_ETHPORT_RX_QUEUES];
const char *ifname;
const char *ifdescr;
};
--
2.43.0
[RFC PATCH v2 21/26] examples/ipsec-secgw: use separate Rx and Tx queue limits
Update example 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
---
examples/ipsec-secgw/ipsec-secgw.c | 2 +-
examples/ipsec-secgw/ipsec.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/examples/ipsec-secgw/ipsec-secgw.c
b/examples/ipsec-secgw/ipsec-secgw.c
index e98ad2572e..fc72e10037 100644
--- a/examples/ipsec-secgw/ipsec-secgw.c
+++ b/examples/ipsec-secgw/ipsec-secgw.c
@@ -1050,7 +1050,7 @@ parse_config(const char *q_arg)
uint32_t size;
uint32_t max_fld[_NUM_FLD] = {
RTE_MAX_ETHPORTS,
- RTE_MAX_QUEUES_PER_PORT,
+ RTE_MAX_ETHPORT_RX_QUEUES,
RTE_MAX_LCORE
};
diff --git a/examples/ipsec-secgw/ipsec.c b/examples/ipsec-secgw/ipsec.c
index b52b0ffc3d..ff65c1c919 100644
--- a/examples/ipsec-secgw/ipsec.c
+++ b/examples/ipsec-secgw/ipsec.c
@@ -584,7 +584,7 @@ create_inline_session(struct socket_ctx *skt_ctx, struct
ipsec_sa *sa,
.rss_key_len = sizeof(rss_key),
};
struct rte_eth_dev_info dev_info;
- uint16_t queue[RTE_MAX_QUEUES_PER_PORT];
+ uint16_t queue[RTE_MAX_ETHPORT_RX_QUEUES];
struct rte_flow_action_rss action_rss;
unsigned int i;
unsigned int j;
--
2.43.0
[RFC PATCH v2 22/26] examples/l3fwd-power: use separate Rx and Tx queue limits
Update example 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
---
examples/l3fwd-power/main.c | 2 +-
examples/l3fwd-power/perf_core.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/examples/l3fwd-power/main.c b/examples/l3fwd-power/main.c
index 2bb6b092c3..bf95cdc487 100644
--- a/examples/l3fwd-power/main.c
+++ b/examples/l3fwd-power/main.c
@@ -1660,7 +1660,7 @@ parse_config(const char *q_arg)
unsigned size;
unsigned int max_fld[_NUM_FLD] = {
RTE_MAX_ETHPORTS,
- RTE_MAX_QUEUES_PER_PORT,
+ RTE_MAX_ETHPORT_RX_QUEUES,
RTE_MAX_LCORE
};
diff --git a/examples/l3fwd-power/perf_core.c b/examples/l3fwd-power/perf_core.c
index 6c0f7ea213..479626ffb9 100644
--- a/examples/l3fwd-power/perf_core.c
+++ b/examples/l3fwd-power/perf_core.c
@@ -134,7 +134,7 @@ parse_perf_config(const char *q_arg)
unsigned int size;
unsigned int max_fld[_NUM_FLD] = {
RTE_MAX_ETHPORTS,
- RTE_MAX_QUEUES_PER_PORT,
+ RTE_MAX_ETHPORT_RX_QUEUES,
255,
RTE_MAX_LCORE
};
--
2.43.0
[RFC PATCH v2 23/26] examples/l3fwd: use separate Rx and Tx queue limits
Update example 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
---
examples/l3fwd/main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/examples/l3fwd/main.c b/examples/l3fwd/main.c
index 01b763e5ba..0d711dec3e 100644
--- a/examples/l3fwd/main.c
+++ b/examples/l3fwd/main.c
@@ -502,7 +502,7 @@ parse_config(const char *q_arg)
unsigned size;
uint16_t max_fld[_NUM_FLD] = {
RTE_MAX_ETHPORTS,
- RTE_MAX_QUEUES_PER_PORT,
+ RTE_MAX_ETHPORT_RX_QUEUES,
RTE_MAX_LCORE
};
--
2.43.0
[RFC PATCH v2 25/26] config: make queues per port a meson config option
From: Bruce Richardson
The default number of ethernet queues per port is currently set to
1k which is more than enough for most applications, but still is lower
than the total number of queues which may be available on modern NICs.
Rather than increasing the max queues further, which will increase
the memory footprint (since the value is used in array dimensioning),
we can instead make the value a meson tunable option - and reduce the
default value to 256 in the process. This means that:
* most apps which don't need hundreds of queues will see lower mem use.
* apps which do need to use thousands of queues can configure DPDK to
allow this, without having to modify DPDK files (i.e. rte_config.h)
Signed-off-by: Bruce Richardson
---
config/meson.build | 2 ++
config/rte_config.h| 3 ---
doc/guides/rel_notes/release_24_11.rst | 13 +++--
meson_options.txt | 4
4 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/config/meson.build b/config/meson.build
index 8c8b019c25..fc41354c53 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -352,6 +352,8 @@ endforeach
# set other values pulled from the build options
dpdk_conf.set('RTE_MAX_ETHPORTS', get_option('max_ethports'))
+dpdk_conf.set('RTE_MAX_ETHPORT_RX_QUEUES', get_option('max_ethport_rx_queues'))
+dpdk_conf.set('RTE_MAX_ETHPORT_TX_QUEUES', get_option('max_ethport_tx_queues'))
dpdk_conf.set('RTE_LIBEAL_USE_HPET', get_option('use_hpet'))
dpdk_conf.set('RTE_ENABLE_STDATOMIC', get_option('enable_stdatomic'))
dpdk_conf.set('RTE_ENABLE_TRACE_FP', get_option('enable_trace_fp'))
diff --git a/config/rte_config.h b/config/rte_config.h
index 2c11b4eeec..7450e0d648 100644
--- a/config/rte_config.h
+++ b/config/rte_config.h
@@ -64,9 +64,6 @@
#define RTE_MBUF_DEFAULT_MEMPOOL_OPS "ring_mp_mc"
/* ether defines */
-#define RTE_MAX_QUEUES_PER_PORT 1024
-#define RTE_MAX_ETHPORT_RX_QUEUES 1024
-#define RTE_MAX_ETHPORT_TX_QUEUES 1024
#define RTE_ETHDEV_QUEUE_STAT_CNTRS 16 /* max 256 */
#define RTE_ETHDEV_RXTX_CALLBACKS 1
#define RTE_MAX_MULTI_HOST_CTRLS 4
diff --git a/doc/guides/rel_notes/release_24_11.rst
b/doc/guides/rel_notes/release_24_11.rst
index 3725c056ba..825cc0fad9 100644
--- a/doc/guides/rel_notes/release_24_11.rst
+++ b/doc/guides/rel_notes/release_24_11.rst
@@ -58,8 +58,17 @@ New Features
* **New configuration settings for Rx and Tx Ethernet Queues.**
New defines have been added to DPDK to allow independent tracking of the
maximum number of Rx and Tx queues.
- These defines as ``RTE_MAX_ETHPORT_RX_QUEUES`` and
``RTE_MAX_ETHPORT_TX_QUEUES``,
- and should be used in place of the older macro ``RTE_MAX_QUEUES_PER_PORT``.
+ These defines are ``RTE_MAX_ETHPORT_RX_QUEUES`` and
``RTE_MAX_ETHPORT_TX_QUEUES``,
+ and these new defines should be used in place of the older define
``RTE_MAX_QUEUES_PER_PORT``.
+ Unlike the older define, these new defines are build-time configurable via
meson options:
+ ``max_ethport_rx_queues`` and ``max_ethport_tx_queues``.
+
+.. note::
+
+ The default max values for Rx and Tx queue limits are reduced from 1024, in
previous releases,
+ to 256 in this release.
+ For application that require large numbers of queues,
+ these defaults can be changed via the meson configuration options described
above.
Removed Items
diff --git a/meson_options.txt b/meson_options.txt
index e49b2fc089..a9a7052ba6 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -40,6 +40,10 @@ option('machine', type: 'string', value: 'auto', description:
'Alias of cpu_instruction_set.')
option('max_ethports', type: 'integer', value: 32, description:
'maximum number of Ethernet devices')
+option('max_ethport_rx_queues', type: 'integer', value: 256, description:
+ 'maximum number of Rx queues on an Ethernet device')
+option('max_ethport_tx_queues', type: 'integer', value: 256, description:
+ 'maximum number of Tx queues on an Ethernet device')
option('max_lcores', type: 'string', value: 'default', description:
'Set maximum number of cores/threads supported by EAL; "default" is
different per-arch, "detect" detects the number of cores on the build machine.')
option('max_numa_nodes', type: 'string', value: 'default', description:
--
2.43.0
[RFC PATCH v2 24/26] examples/vhost: use separate Rx and Tx queue limits
Update example 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
---
examples/vhost/main.c | 2 +-
examples/vhost/main.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/examples/vhost/main.c b/examples/vhost/main.c
index 4391d88c3d..9c2f3a02eb 100644
--- a/examples/vhost/main.c
+++ b/examples/vhost/main.c
@@ -1891,7 +1891,7 @@ reset_dma(void)
for (i = 0; i < RTE_MAX_VHOST_DEVICE; i++) {
int j;
- for (j = 0; j < RTE_MAX_QUEUES_PER_PORT * 2; j++) {
+ for (j = 0; j < RTE_MAX_ETHPORT_RX_QUEUES +
RTE_MAX_ETHPORT_TX_QUEUES; j++) {
dma_bind[i].dmas[j].dev_id = INVALID_DMA_ID;
dma_bind[i].dmas[j].async_enabled = false;
}
diff --git a/examples/vhost/main.h b/examples/vhost/main.h
index c986cbc5a9..374ba30ec6 100644
--- a/examples/vhost/main.h
+++ b/examples/vhost/main.h
@@ -99,7 +99,7 @@ struct dma_info {
};
struct dma_for_vhost {
- struct dma_info dmas[RTE_MAX_QUEUES_PER_PORT * 2];
+ struct dma_info dmas[RTE_MAX_ETHPORT_RX_QUEUES +
RTE_MAX_ETHPORT_TX_QUEUES];
uint32_t async_flag;
};
--
2.43.0
[RFC PATCH v2 26/26] config: add computed max queues define for compatibility
End applications may use the RTE_MAX_QUEUES_PER_PORT define in their
structure definitions, so keep a define present in DPDK for backward
compatibility. Rather than having a hard-coded value, we can use the
maximum of the Rx and Tx values as the overall max value. Rather than
using a macro which does the MAX() calculation inside it, we can compute
the actual value at configuration time and write it using meson.
Signed-off-by: Bruce Richardson
---
config/meson.build | 8
doc/guides/rel_notes/deprecation.rst | 11 +++
doc/guides/rel_notes/release_24_11.rst | 8 +++-
3 files changed, 26 insertions(+), 1 deletion(-)
diff --git a/config/meson.build b/config/meson.build
index fc41354c53..9677636754 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -372,6 +372,14 @@ if get_option('mbuf_refcnt_atomic')
endif
dpdk_conf.set10('RTE_IOVA_IN_MBUF', get_option('enable_iova_as_pa'))
+# set old MAX_QUEUES_PER_PORT option for compatibility. Compute
+# value as max of Rx and Tx counts
+if get_option('max_ethport_rx_queues') > get_option('max_ethport_tx_queues')
+dpdk_conf.set('RTE_MAX_QUEUES_PER_PORT',
get_option('max_ethport_rx_queues'))
+else
+dpdk_conf.set('RTE_MAX_QUEUES_PER_PORT',
get_option('max_ethport_tx_queues'))
+endif
+
compile_time_cpuflags = []
subdir(arch_subdir)
dpdk_conf.set('RTE_COMPILE_TIME_CPUFLAGS', ','.join(compile_time_cpuflags))
diff --git a/doc/guides/rel_notes/deprecation.rst
b/doc/guides/rel_notes/deprecation.rst
index 211f59fdc9..e4ba00040f 100644
--- a/doc/guides/rel_notes/deprecation.rst
+++ b/doc/guides/rel_notes/deprecation.rst
@@ -17,6 +17,17 @@ Other API and ABI deprecation notices are to be posted below.
Deprecation Notices
---
+* config: The define ``RTE_MAX_QUEUES_PER_PORT`` should be considered
deprecated
+ and may be removed in a future release.
+ Its use in apps should be replaced by ``RTE_MAX_ETHPORT_RX_QUEUES`` or
``RTE_MAX_ETHPORT_TX_QUEUES``,
+ as appropriate.
+
+* config: The ``RTE_MAX_QUEUES_PER_PORT`` value is no longer hard-coded to
1024.
+ Its value is now computed at configuration time to be the maximum of the
configured max Rx and Tx queue values,
+ given by the meson options ``max_ethport_rx_queues`` and
``max_ethport_tx_queues``.
+ If these are unmodified from the defaults,
+ the value of ``RTE_MAX_QUEUES_PER_PORT`` will be 256.
+
* build: The ``enable_kmods`` option is deprecated and will be removed in a
future release.
Setting/clearing the option has no impact on the build.
Instead, kernel modules will be always built for OS's where out-of-tree
kernel modules
diff --git a/doc/guides/rel_notes/release_24_11.rst
b/doc/guides/rel_notes/release_24_11.rst
index 825cc0fad9..130564d38e 100644
--- a/doc/guides/rel_notes/release_24_11.rst
+++ b/doc/guides/rel_notes/release_24_11.rst
@@ -67,9 +67,15 @@ New Features
The default max values for Rx and Tx queue limits are reduced from 1024, in
previous releases,
to 256 in this release.
- For application that require large numbers of queues,
+ For applications that require large numbers of queues,
these defaults can be changed via the meson configuration options described
above.
+.. note::
+
+ The define ``RTE_MAX_QUEUES_PER_PORT`` is kept for backward compatibility.
+ Its value is no longer hard-coded,
+ but is set, at configuration time, to the maximum of the configured max Rx
and Tx queue values.
+
Removed Items
-
--
2.43.0
RE: [RFC PATCH v2 00/26] add meson config options for queues per port
> From: Bruce Richardson [mailto:bruce.richa...@intel.com] > > There are a number of issues with the current RTE_MAX_QUEUES_PER_PORT > setting in DPDK that are addressed by this patchset: > > * The name does not make it clear that this is intended as an > ethdev-only setting > * A number of other libraries are using this define rather than having > more relevant defines for the particular usecase. > * The define is hard-coded in DPDK source code and is not adjustable via > a build-time/meson option > * Because of the lack of configurability, the max is therefore set to a > conservatively-high value, wasting memory. > * There is an assumption that the number of Rx queues and Tx queues > should have the same maximum value. Depending on application, it may > be desirable to have fan-in with multiple Rx queues e.g. for > classification/filtering, feed a single Tx queue, or the opposite > where, e.g. for QoS Tx scheduling, a few Rx queues feeds a very large > number of Tx queues. > > This patchset therefore addresses these by: > > * replacing the single define for max queues with independent defines > for Rx and Tx queues. > * adjusts the name to ensure that it is clear the defines are for > ethports only. [ethports being used in the RTE_MAX_ETHPORTS setting]. > * replaces occurances of RTE_MAX_QUEUES_PER_PORT with appropriate > defines for non-ethdev use cases > * replaces all other internal occurances of the define with the new > per-Rx and per-Tx definitions. > * adds meson config options to allow build-time configuration of the max > Rx and Tx queue values. > > Naming Note: > * The new meson config options are called "max_ethport_rx_queues" and > "max_ethport_tx_queues" so that in the meson options list they appear > alphabetically beside the existing "max_ethports" option. > * For naming consistency, the new C defines are therefore > RTE_MAX_ETHPORT_RX_QUEUES and RTE_MAX_ETHPORT_TX_QUEUES. > > V2: > * What was a single patch with "3 insertions(+), 1 deletion(-)" has now > become a 26-patch set! :-) > * Created separate Rx and Tx defines > * Ensured that the name makes it clear that the define is for ethdev > * When updating internal use, created one patch per component for easier > maintainer review. In most cases it was obvious whether Rx or Tx > define should be used, but a few cases were less clear. > * Added documentation updates for the changes (release notes and > deprecation notice), spread across 3 of the patches. Thanks. For the series, Acked-by: Morten Brørup @Bruce: There's something wrong with your "From" email address; bruce.richards@ bounces. So I resent this reply to your bruce.richardson@ address.
test anonymous send mail
0001-net-r8169-add-PMD-driver-skeleton.patch Description: Binary data
Re: [RFC PATCH v2 00/26] add meson config options for queues per port
On Wed, Aug 14, 2024 at 09:48:46AM +0200, Morten Brørup wrote: > > From: Bruce Richardson [mailto:bruce.richa...@intel.com] > > > > There are a number of issues with the current RTE_MAX_QUEUES_PER_PORT > > setting in DPDK that are addressed by this patchset: > > > > * The name does not make it clear that this is intended as an > > ethdev-only setting > > * A number of other libraries are using this define rather than having > > more relevant defines for the particular usecase. > > * The define is hard-coded in DPDK source code and is not adjustable via > > a build-time/meson option > > * Because of the lack of configurability, the max is therefore set to a > > conservatively-high value, wasting memory. > > * There is an assumption that the number of Rx queues and Tx queues > > should have the same maximum value. Depending on application, it may > > be desirable to have fan-in with multiple Rx queues e.g. for > > classification/filtering, feed a single Tx queue, or the opposite > > where, e.g. for QoS Tx scheduling, a few Rx queues feeds a very large > > number of Tx queues. > > > > This patchset therefore addresses these by: > > > > * replacing the single define for max queues with independent defines > > for Rx and Tx queues. > > * adjusts the name to ensure that it is clear the defines are for > > ethports only. [ethports being used in the RTE_MAX_ETHPORTS setting]. > > * replaces occurances of RTE_MAX_QUEUES_PER_PORT with appropriate > > defines for non-ethdev use cases > > * replaces all other internal occurances of the define with the new > > per-Rx and per-Tx definitions. > > * adds meson config options to allow build-time configuration of the max > > Rx and Tx queue values. > > > > Naming Note: > > * The new meson config options are called "max_ethport_rx_queues" and > > "max_ethport_tx_queues" so that in the meson options list they appear > > alphabetically beside the existing "max_ethports" option. > > * For naming consistency, the new C defines are therefore > > RTE_MAX_ETHPORT_RX_QUEUES and RTE_MAX_ETHPORT_TX_QUEUES. > > > > V2: > > * What was a single patch with "3 insertions(+), 1 deletion(-)" has now > > become a 26-patch set! :-) > > * Created separate Rx and Tx defines > > * Ensured that the name makes it clear that the define is for ethdev > > * When updating internal use, created one patch per component for easier > > maintainer review. In most cases it was obvious whether Rx or Tx > > define should be used, but a few cases were less clear. > > * Added documentation updates for the changes (release notes and > > deprecation notice), spread across 3 of the patches. > > Thanks. > > For the series, > Acked-by: Morten Brørup > > @Bruce: There's something wrong with your "From" email address; > bruce.richards@ bounces. > So I resent this reply to your bruce.richardson@ address. > Yes, indeed. Something has indeed got messed up - probably in my git configuration here. I'll resend a v3 to try and correct it, so that others don't get any bounces. /Bruce
[no subject]
0001-net-r8169-add-PMD-driver-skeleton.patch Description: Binary data
[DPDK/other Bug 1522] RTE_LIBRTE_ prefix should be replaced by RTE_ prefix
https://bugs.dpdk.org/show_bug.cgi?id=1522 Bug ID: 1522 Summary: RTE_LIBRTE_ prefix should be replaced by RTE_ prefix Product: DPDK Version: 24.07 Hardware: All OS: All Status: UNCONFIRMED Severity: enhancement Priority: Normal Component: other Assignee: dev@dpdk.org Reporter: m...@smartsharesystems.com Target Milestone: --- The prefix of the following definitions should be updated: RTE_LIBRTE_82571_SUPPORT RTE_LIBRTE_ARK_MIN_TX_PKTLEN RTE_LIBRTE_AVP_DEBUG_BUFFERS RTE_LIBRTE_AVP_DEBUG_RX RTE_LIBRTE_AVP_DEBUG_TX RTE_LIBRTE_AXGBE_PMD_DEBUG RTE_LIBRTE_BBDEV_DEBUG RTE_LIBRTE_BBDEV_SKIP_VALIDATE RTE_LIBRTE_BNX2X_DEBUG_PERIODIC RTE_LIBRTE_BNX2X_DEBUG_RX RTE_LIBRTE_BNX2X_DEBUG_TX RTE_LIBRTE_BNX2X_MF_SUPPORT RTE_LIBRTE_BNXT_TRUFLOW_DEBUG RTE_LIBRTE_BOND_DEBUG_8023AD RTE_LIBRTE_BOND_DEBUG_ALB RTE_LIBRTE_BOND_DEBUG_ALB_L1 RTE_LIBRTE_BPF_ELF RTE_LIBRTE_CCP_DEBUG RTE_LIBRTE_CMDLINE_DEBUG RTE_LIBRTE_DPAA2_DEBUG_BUS RTE_LIBRTE_DPAA2_DEBUG_DRIVER RTE_LIBRTE_DPAA2_USE_PHYS_IOVA RTE_LIBRTE_DPAAX_DEBUG RTE_LIBRTE_DPAA_DEBUG_BUS RTE_LIBRTE_DPAA_DEBUG_DRIVER RTE_LIBRTE_DPAA_HWDEBUG RTE_LIBRTE_DPAA_MAX_CRYPTODEV RTE_LIBRTE_E1000_PF_DISABLE_STRIP_CRC RTE_LIBRTE_EAL_VMWARE_TSC_MAP_SUPPORT RTE_LIBRTE_ETHDEV_DEBUG RTE_LIBRTE_EVENTDEV_DEBUG RTE_LIBRTE_FIB_DEBUG RTE_LIBRTE_FM10K_RX_OLFLAGS_ENABLE RTE_LIBRTE_GRAPH_STATS RTE_LIBRTE_HASH_DEBUG RTE_LIBRTE_HNS3_MAX_TQP_NUM_PER_PF RTE_LIBRTE_I40E_16BYTE_RX_DESC RTE_LIBRTE_I40E_QUEUE_NUM_PER_PF RTE_LIBRTE_I40E_QUEUE_NUM_PER_VF RTE_LIBRTE_I40E_QUEUE_NUM_PER_VM RTE_LIBRTE_I40E_RX_ALLOW_BULK_ALLOC RTE_LIBRTE_IAVF_16BYTE_RX_DESC RTE_LIBRTE_IAVF_DEBUG_DUMP_DESC RTE_LIBRTE_ICE_16BYTE_RX_DESC RTE_LIBRTE_IDPF_DEBUG_RX RTE_LIBRTE_IDPF_DEBUG_TX RTE_LIBRTE_IEEE1588 RTE_LIBRTE_IONIC_PMD_BARRIER_ERRATA RTE_LIBRTE_IONIC_PMD_EMBEDDED RTE_LIBRTE_IP_FRAG_DEBUG RTE_LIBRTE_IP_FRAG_MAX_FRAG RTE_LIBRTE_IP_FRAG_TBL_STAT RTE_LIBRTE_IXGBE_BYPASS RTE_LIBRTE_IXGBE_PF_DISABLE_STRIP_CRC RTE_LIBRTE_LPM_DEBUG RTE_LIBRTE_MBUF_DEBUG RTE_LIBRTE_MEMPOOL_DEBUG RTE_LIBRTE_MEMPOOL_STATS RTE_LIBRTE_MLX4_DEBUG RTE_LIBRTE_MLX5_DEBUG RTE_LIBRTE_ML_DEV_DEBUG RTE_LIBRTE_NETVSC_DEBUG_DUMP RTE_LIBRTE_NETVSC_DEBUG_RX RTE_LIBRTE_NETVSC_DEBUG_TX RTE_LIBRTE_NGBE_TM RTE_LIBRTE_PFE_SW_PARSE RTE_LIBRTE_PMD_AESNI_GCM_DEBUG RTE_LIBRTE_PMD_AESNI_MB_DEBUG RTE_LIBRTE_PMD_CAAM_JR_BE RTE_LIBRTE_PMD_CAAM_JR_DEBUG RTE_LIBRTE_PMD_DLB2_QUELL_STATS RTE_LIBRTE_PMD_DLB_QUELL_STATS RTE_LIBRTE_PMD_SKELETON_EVENTDEV_DEBUG RTE_LIBRTE_PMD_SNOW3G_DEBUG RTE_LIBRTE_PMD_ZUC_DEBUG RTE_LIBRTE_POWER_DEBUG RTE_LIBRTE_QEDE_DEBUG_RX RTE_LIBRTE_QEDE_DEBUG_TX RTE_LIBRTE_QEDE_FW RTE_LIBRTE_RCU_DEBUG RTE_LIBRTE_REGEXDEV_DEBUG RTE_LIBRTE_SFC_EFX_DEBUG RTE_LIBRTE_SFC_VDPA_DEBUG RTE_LIBRTE_THUNDERX_NICVF_DEBUG_RX RTE_LIBRTE_THUNDERX_NICVF_DEBUG_TX RTE_LIBRTE_TIMER_DEBUG RTE_LIBRTE_TXGBE_DEBUG_RX RTE_LIBRTE_TXGBE_DEBUG_TX RTE_LIBRTE_TXGBE_DEBUG_TX_FREE RTE_LIBRTE_TXGBE_PF_DISABLE_STRIP_CRC RTE_LIBRTE_TXGBE_TM RTE_LIBRTE_VHOST_DEBUG RTE_LIBRTE_VHOST_NUMA RTE_LIBRTE_VHOST_POSTCOPY RTE_LIBRTE_VIRTIO_DEBUG_DUMP RTE_LIBRTE_VIRTIO_DEBUG_RX RTE_LIBRTE_VIRTIO_DEBUG_TX RTE_LIBRTE_VMXNET3_DEBUG_DRIVER_NOT_USED RTE_LIBRTE_VMXNET3_DEBUG_RX RTE_LIBRTE_VMXNET3_DEBUG_TX RTE_LIBRTE_VMXNET3_DEBUG_TX_FREE -- You are receiving this mail because: You are the assignee for the bug.
DPDK configuration options
DPDK has many configuration options. There are four levels of visibility: 1. Some are changed by passing command line options to meson. 2. Some are changed by modifying their values in config/rte_config.h. 3. Some are changed by adding them to config/rte_config.h, but you have to magically know of their existence; e.g. RTE_ENABLE_ASSERT, RTE_MALLOC_DEBUG and RTE_LIBRTE_MBUF_DEBUG. 4. Some are hidden away in drivers, typically driver specific options. And many of the configuration options are not even documented anywhere in the code; they are just used by the code. It seems the level of visibility is currently determined by how "exotic" the option is considered to be. I think this is the wrong criteria. There's also a expectation that a person building DPDK doesn't have to modify config/rte_config.h. I think this is a false expectation; if you are qualified to build DPDK and tweak it along the way, you certainly understand how to modify a header file, and there is no good reason to pass simple configuration values (e.g. max_ethports, mbuf_refcnt_atomic and pkt_mbuf_headroom) 1:1 through meson. Furthermore, configuration options should not be hidden away or spread all over the place. It makes them difficult to find and modify. Optimally, we would have the same way of configuring DPDK as the Linux kernel. But I don't see that happening anytime soon. So, in the interim, we could use one big configuration file, as follows: Options that are not candidates for automatic detection at build time should not be level 1, but level 2. (Automatic detection makes sense for e.g. max_lcores, so that should remain at level 1.) All level 3 options should be moved to level 2. If there's a configuration option, it should be presented (and documented), not hidden away. Similarly, level 4 options should be moved to level 2; perhaps except options in drivers' "base" directories (code shared by DPDK, Linux and/or other systems). Each option should have a comment briefly describing what it does. Med venlig hilsen / Kind regards, -Morten Brørup
答复: Inquiry Regarding Sending Patches to DPDK
Dear Stephen,
Now I have a better understanding of the anonymous sending suggested by the
company's IT department. Since the second-factor authentication for the email
account is Microsoft's Okta, which seems not straightforward to configure with
an account and password, they have enabled anonymous sending for me. Here's how
it works approximately: When I send emails, I don't need to input an account or
password. Instead, I just need to configure the server and port number, and I
can send emails. Attached below is the script I've written. However, it seems
there are some issues, and perhaps I need to conduct further research.
test result: https://mails.dpdk.org/archives/dev/2024-August/299466.html
python:
#!/usr/bin/env python3
import smtplib
from email.mime.multipart import MIMEMultipart
from email.mime.text import MIMEText
from email.mime.base import MIMEBase
from email import encoders
smtp_server = 'smtpsrv.realsil.com.cn'
smtp_port = 25
from_addr = 'howard_w...@realsil.com.cn'
to_addr = 'dev@dpdk.org'
msg = MIMEMultipart()
msg['From'] = from_addr
msg['To'] = to_addr
#msg['Subject'] = 'test anonymous send mail'
filename = '0001-net-r8169-add-PMD-driver-skeleton.patch'
with open(filename, 'rb') as attachment:
part = MIMEBase('application', 'octet-stream')
part.set_payload(attachment.read())
encoders.encode_base64(part)
part.add_header('Content-Disposition', f"attachment; filename= {filename}")
msg.attach(part)
try:
server = smtplib.SMTP(smtp_server, smtp_port)
server.sendmail(from_addr, [to_addr], msg.as_string())
server.quit()
print('Mail sent successfully!')
except Exception as e:
print(f'Failed to send mail: {e}')
Thanks!
Howard Wang
-邮件原件-
发件人: Stephen Hemminger
发送时间: 2024年8月12日 22:56
收件人: 王颢
抄送: dev@dpdk.org
主题: Re: Inquiry Regarding Sending Patches to DPDK
External mail.
On Mon, 12 Aug 2024 07:52:39 +
王颢 wrote:
> Dear all,
>
> I hope this message finds you well.
>
> I would like to seek your advice on an issue I've encountered. Our company
> has recently enabled two-factor authentication (2FA) for our email accounts.
> The IT department has suggested that I abandon using the "git send-email"
> method, as configured through git config, to send patches to DPDK. Instead,
> they have recommended using "Exchange anonymous send mail." However, I
> believe this approach might not be feasible.
>
> I wanted to confirm this with you and see if you could provide any guidance
> on the matter. I look forward to your response.
>
> Thank you very much for your time and assistance.
>
> Best regards,
> Howard Wang
There are two issues here:
Using git send-email is not required. You can generate patch files and put them
in your email.
BUT Microsoft Exchange does not preserve text formatting in messages. Any
patches sent that way are usually corrupted.
At Microsoft, we ended up using a special server (not Exchange) to send Linux
and DPDK patches. Or using non-corporate accounts.
Re: [PATCH v2] doc: add new driver guidelines
On Wed, Aug 14, 2024 at 4:36 AM Stephen Hemminger wrote: > > From: Nandini Persad > > This document was created to assist contributors in creating DPDK drivers > and provides suggestions and guidelines on how to upstream effectively. > > Signed-off-by: Nandini Persad > --- > v2 - text should be i file not patch > > doc/guides/contributing/index.rst | 1 + > doc/guides/contributing/new_driver.rst | 198 + > 2 files changed, 199 insertions(+) > create mode 100644 doc/guides/contributing/new_driver.rst > > diff --git a/doc/guides/contributing/index.rst > b/doc/guides/contributing/index.rst > index dcb9b1fbf0..7fc6511361 100644 > --- a/doc/guides/contributing/index.rst > +++ b/doc/guides/contributing/index.rst > @@ -15,6 +15,7 @@ Contributor's Guidelines > documentation > unit_test > new_library > +new_driver > patches > vulnerability > stable > diff --git a/doc/guides/contributing/new_driver.rst > b/doc/guides/contributing/new_driver.rst > new file mode 100644 > index 00..037b64bd24 > --- /dev/null > +++ b/doc/guides/contributing/new_driver.rst > @@ -0,0 +1,198 @@ > +.. SPDX-License-Identifier: BSD-3-Clause > + Copyright 2024 The DPDK contributors > + > + > +Upstreaming New DPDK Drivers Guide > +== > + > +The DPDK project continuously grows its ecosystem by adding support for new > +devices. There is no need to break lines at 80 columns, prefer splitting at punctuation marks. > +This document is designed to assist contributors in creating DPDK > +drivers, also known as Poll Mode Drivers (PMD's). > + > +By having public support for a device, we can ensure accessibility across > various > +operating systems and guarantee community maintenance in future releases. > +If a new device is similar to a device already supported by an existing > driver, > +it is more efficient to update the existing driver. > + > +Here are our best practice recommendations for creating a new driver. > + > + > +Early Engagement with the Community > +--- > + > +When creating a new driver, we highly recommend engaging with the DPDK > +community early instead of waiting the work to mature. > + > +These public discussions help align development of your driver with DPDK > expectations. > +You may submit a roadmap before the release to inform the community of > +your plans. Additionally, sending a Request for Comments (RFC) early in > +the release cycle, or even during the prior release, is advisable. > + > +DPDK is mainly consumed via Long Term Support (LTS) releases. > +It is common to target a new PMD to a LTS release. For this, it is > +suggested to start upstreaming at least one release before a LTS release. > + > + > +Progressive Work > + > + > +To continually progress your work, we recommend planning for incremental > +upstreaming across multiple patch series or releases. > + > +It's important to prioritize quality of the driver over upstreaming > +in a single release or single patch series. > + > + > +Finalizing > +-- > + > +Once the driver has been upstreamed, the author has > +a responsibility to the community to maintain it. > + > +This includes the public test report. Authors must send a public > +test report after the first upstreaming of the PMD. The same > +public test procedure may be reproduced regularly per release. > + > +After the PMD is upstreamed, the author should send a patch > +to update the website with the name of the new PMD and supported devices > +via the DPDK mailing list.. > + > +For more information about the role of maintainers, see :doc:`patches.rst`. I think it should be :doc:`patches`. > + > + > + > +Splitting into Patches > +-- > + > +We recommend that drivers are split into patches, so that each patch > represents > +a single feature. If the driver code is already developed, it may be > challenging > +to split. However, there are many benefits to doing so. > + > +Splitting patches makes it easier to understand a feature and clarifies the > +list of components/files that compose that specific feature. > + > +It also enables the ability to track from the source code to the feature > +it is enabled for and helps users to understand the reasoning and intention > +of implementation. This kind of tracing is regularly required > +for defect resolution and refactoring. > + > +Another benefit of splitting the codebase per feature is that it highlights > +unnecessary or irrelevant code, as any code not belonging to any specific > +feature becomes obvious. > + > +Git bisect is also more useful if patches are split per patch. > + > +The split should focus on logical features > +rather than file-based divisions. > + > +Each patch in the series must compile without errors > +and should maintain functionality. > + > +Enable the build as early as possible within the series > +to facilitate continuous integration and testin
RE: Inquiry Regarding Sending Patches to DPDK
Howard,
I'm using.gitconfig to configure my git send-email options. Try this in your
.gitconfig:
[user]
name = Howard Wang
email = howard_w...@realsil.com.cn
[sendemail]
from = Howard Wang
envelopeSender = howard_w...@realsil.com.cn
smtpServer = smtpsrv.realsil.com.cn
Med venlig hilsen / Kind regards,
-Morten Brørup
> -Original Message-
> From: 王颢 [mailto:howard_w...@realsil.com.cn]
> Sent: Wednesday, 14 August 2024 11.52
> To: Stephen Hemminger
> Cc: dev@dpdk.org
> Subject: 答复: Inquiry Regarding Sending Patches to DPDK
>
> Dear Stephen,
>
> Now I have a better understanding of the anonymous sending suggested by the
> company's IT department. Since the second-factor authentication for the email
> account is Microsoft's Okta, which seems not straightforward to configure with
> an account and password, they have enabled anonymous sending for me. Here's
> how it works approximately: When I send emails, I don't need to input an
> account or password. Instead, I just need to configure the server and port
> number, and I can send emails. Attached below is the script I've written.
> However, it seems there are some issues, and perhaps I need to conduct further
> research.
>
> test result: https://mails.dpdk.org/archives/dev/2024-August/299466.html
> python:
> #!/usr/bin/env python3
> import smtplib
> from email.mime.multipart import MIMEMultipart
> from email.mime.text import MIMEText
> from email.mime.base import MIMEBase
> from email import encoders
>
> smtp_server = 'smtpsrv.realsil.com.cn'
> smtp_port = 25
>
> from_addr = 'howard_w...@realsil.com.cn'
> to_addr = 'dev@dpdk.org'
>
> msg = MIMEMultipart()
> msg['From'] = from_addr
> msg['To'] = to_addr
> #msg['Subject'] = 'test anonymous send mail'
>
> filename = '0001-net-r8169-add-PMD-driver-skeleton.patch'
> with open(filename, 'rb') as attachment:
> part = MIMEBase('application', 'octet-stream')
> part.set_payload(attachment.read())
> encoders.encode_base64(part)
> part.add_header('Content-Disposition', f"attachment; filename=
> {filename}")
> msg.attach(part)
>
> try:
> server = smtplib.SMTP(smtp_server, smtp_port)
> server.sendmail(from_addr, [to_addr], msg.as_string())
> server.quit()
> print('Mail sent successfully!')
> except Exception as e:
> print(f'Failed to send mail: {e}')
>
> Thanks!
> Howard Wang
>
> -邮件原件-
> 发件人: Stephen Hemminger
> 发送时间: 2024年8月12日 22:56
> 收件人: 王颢
> 抄送: dev@dpdk.org
> 主题: Re: Inquiry Regarding Sending Patches to DPDK
>
>
> External mail.
>
>
>
> On Mon, 12 Aug 2024 07:52:39 +
> 王颢 wrote:
>
> > Dear all,
> >
> > I hope this message finds you well.
> >
> > I would like to seek your advice on an issue I've encountered. Our company
> has recently enabled two-factor authentication (2FA) for our email accounts.
> The IT department has suggested that I abandon using the "git send-email"
> method, as configured through git config, to send patches to DPDK. Instead,
> they have recommended using "Exchange anonymous send mail." However, I believe
> this approach might not be feasible.
> >
> > I wanted to confirm this with you and see if you could provide any guidance
> on the matter. I look forward to your response.
> >
> > Thank you very much for your time and assistance.
> >
> > Best regards,
> > Howard Wang
>
> There are two issues here:
> Using git send-email is not required. You can generate patch files and put
> them in your email.
> BUT Microsoft Exchange does not preserve text formatting in messages. Any
> patches sent that way are usually corrupted.
>
> At Microsoft, we ended up using a special server (not Exchange) to send Linux
> and DPDK patches. Or using non-corporate accounts.
Re: Linux kernel version for DPDK 24.11
On Tue, Aug 13, 2024 at 11:43:32PM +0200, Morten Brørup wrote: > Do we want to be conservative and stick with 4.19 and RHEL/CentOS 7? AFAIK We have dropped support for Centos 7 some time back, due to lack of a conformant compiler, I believe. We should definitely update the doc in that regards. /Buce
[PATCH v3 00/26] add meson config options for queues per port
There are a number of issues with the current RTE_MAX_QUEUES_PER_PORT setting in DPDK that are addressed by this patchset: * The name does not make it clear that this is intended as an ethdev-only setting * A number of other libraries are using this define rather than having more relevant defines for the particular usecase. * The define is hard-coded in DPDK source code and is not adjustable via a build-time/meson option * Because of the lack of configurability, the max is therefore set to a conservatively-high value, wasting memory. * There is an assumption that the number of Rx queues and Tx queues should have the same maximum value. Depending on application, it may be desirable to have fan-in with multiple Rx queues e.g. for classification/filtering, feed a single Tx queue, or the opposite where, e.g. for QoS Tx scheduling, a few Rx queues feeds a very large number of Tx queues. This patchset therefore addresses these by: * replacing the single define for max queues with independent defines for Rx and Tx queues. * adjusts the name to ensure that it is clear the defines are for ethports only. [ethports being used in the RTE_MAX_ETHPORTS setting]. * replaces occurances of RTE_MAX_QUEUES_PER_PORT with appropriate defines for non-ethdev use cases * replaces all other internal occurances of the define with the new per-Rx and per-Tx definitions. * adds meson config options to allow build-time configuration of the max Rx and Tx queue values. Naming Note: * The new meson config options are called "max_ethport_rx_queues" and "max_ethport_tx_queues" so that in the meson options list they appear alphabetically beside the existing "max_ethports" option. * For naming consistency, the new C defines are therefore RTE_MAX_ETHPORT_RX_QUEUES and RTE_MAX_ETHPORT_TX_QUEUES. V3: * Resend of v2 with correct author email, to avoid reply bounces * drop "rfc" prefix from patches V2: * What was a single patch with "3 insertions(+), 1 deletion(-)" has now become a 26-patch set! :-) * Created separate Rx and Tx defines * Ensured that the name makes it clear that the define is for ethdev * When updating internal use, created one patch per component for easier maintainer review. In most cases it was obvious whether Rx or Tx define should be used, but a few cases were less clear. * Added documentation updates for the changes (release notes and deprecation notice), spread across 3 of the patches. Bruce Richardson (26): cryptodev: remove use of ethdev max queues definition eventdev: remove use of ethev queues define app/test-bbdev: remove use of ethdev queue count value config: add separate defines for max Rx and Tx queues ethdev: use separate Rx and Tx queue limits bpf: use separate Rx and Tx queue limits latencystats: use separate Rx and Tx queue limits pdump: use separate Rx and Tx queue limits power: use separate Rx and Tx queue limits net/af_xdp: use separate Rx and Tx queue limits net/cnxk: use separate Rx and Tx queue limits net/failsafe: use separate Rx and Tx queue limits net/hns3: use separate Rx and Tx queue limits net/mlx5: use separate Rx and Tx queue limits net/null: use separate Rx and Tx queue limits net/sfc: use separate Rx and Tx queue limits net/thunderx: use separate Rx and Tx queue limits net/vhost: use separate Rx and Tx queue limits app/dumpcap: use separate Rx and Tx queue limits app/test-pmd: use separate Rx and Tx queue limits examples/ipsec-secgw: use separate Rx and Tx queue limits examples/l3fwd-power: use separate Rx and Tx queue limits examples/l3fwd: use separate Rx and Tx queue limits examples/vhost: use separate Rx and Tx queue limits config: make queues per port a meson config option config: add computed max queues define for compatibility app/dumpcap/main.c | 2 +- app/test-bbdev/test_bbdev.c| 4 ++-- app/test-pmd/testpmd.c | 7 --- app/test-pmd/testpmd.h | 16 config/meson.build | 10 ++ config/rte_config.h| 2 +- doc/guides/rel_notes/deprecation.rst | 11 +++ doc/guides/rel_notes/release_24_11.rst | 21 + drivers/net/af_xdp/rte_eth_af_xdp.c| 2 +- drivers/net/cnxk/cnxk_ethdev_ops.c | 4 ++-- drivers/net/failsafe/failsafe_ops.c| 4 ++-- drivers/net/hns3/hns3_tm.c | 2 +- drivers/net/mlx5/mlx5_flow.c | 2 +- drivers/net/mlx5/mlx5_flow_hw.c| 2 +- drivers/net/null/rte_eth_null.c| 4 ++-- drivers/net/sfc/sfc_sw_stats.c | 6 -- drivers/net/thunderx/nicvf_ethdev.c| 2 +- drivers/net/vhost/rte_eth_vhost.c | 7 --- examples/ipsec-secgw/ipsec-secgw.c | 2 +- examples/ipsec-secgw/ipsec.c | 2 +- examples/l3fwd-power/main.c| 2 +- examples/l3fwd-power/perf_core.c | 2 +- examples/l3fwd/main.c | 2 +- example
[PATCH v3 01/26] cryptodev: remove use of ethdev max queues definition
The number of queue pairs supported by cryptodev should not be dependent
on the number of ethdev Rx or Tx queues, so add a new define for
cryptodev specifically.
Signed-off-by: Bruce Richardson
Acked-by: Morten Brørup
---
config/rte_config.h | 1 +
lib/cryptodev/cryptodev_pmd.c | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/config/rte_config.h b/config/rte_config.h
index dd7bb0d35b..d67ff77c71 100644
--- a/config/rte_config.h
+++ b/config/rte_config.h
@@ -71,6 +71,7 @@
/* cryptodev defines */
#define RTE_CRYPTO_MAX_DEVS 64
+#define RTE_CRYPTO_MAX_QPS_PER_DEV 256
#define RTE_CRYPTODEV_NAME_LEN 64
#define RTE_CRYPTO_CALLBACKS 1
diff --git a/lib/cryptodev/cryptodev_pmd.c b/lib/cryptodev/cryptodev_pmd.c
index 87ced122b4..d3263bd907 100644
--- a/lib/cryptodev/cryptodev_pmd.c
+++ b/lib/cryptodev/cryptodev_pmd.c
@@ -212,8 +212,8 @@ dummy_crypto_dequeue_burst(__rte_unused void *qp,
void
cryptodev_fp_ops_reset(struct rte_crypto_fp_ops *fp_ops)
{
- static struct rte_cryptodev_cb_rcu dummy_cb[RTE_MAX_QUEUES_PER_PORT];
- static void *dummy_data[RTE_MAX_QUEUES_PER_PORT];
+ static struct rte_cryptodev_cb_rcu dummy_cb[RTE_CRYPTO_MAX_QPS_PER_DEV];
+ static void *dummy_data[RTE_CRYPTO_MAX_QPS_PER_DEV];
static const struct rte_crypto_fp_ops dummy = {
.enqueue_burst = dummy_crypto_enqueue_burst,
.dequeue_burst = dummy_crypto_dequeue_burst,
--
2.43.0
[PATCH v3 02/26] eventdev: remove use of ethev queues define
The max queues per port definition is intended for use for ethdevs, so
it's use for a dummy array in eventdev is likely wrong. Since the array
is intended to be for eventdev ports, use RTE_EVENT_MAX_PORTS_PER_DEV
define instead.
Signed-off-by: Bruce Richardson
Acked-by: Morten Brørup
---
lib/eventdev/eventdev_private.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/eventdev/eventdev_private.c b/lib/eventdev/eventdev_private.c
index 017f97ccab..a84d0a46ac 100644
--- a/lib/eventdev/eventdev_private.c
+++ b/lib/eventdev/eventdev_private.c
@@ -99,7 +99,7 @@ dummy_event_port_profile_switch(__rte_unused void *port,
__rte_unused uint8_t pr
void
event_dev_fp_ops_reset(struct rte_event_fp_ops *fp_op)
{
- static void *dummy_data[RTE_MAX_QUEUES_PER_PORT];
+ static void *dummy_data[RTE_EVENT_MAX_PORTS_PER_DEV];
static const struct rte_event_fp_ops dummy = {
.enqueue = dummy_event_enqueue,
.enqueue_burst = dummy_event_enqueue_burst,
--
2.43.0
[PATCH v3 03/26] app/test-bbdev: remove use of ethdev queue count value
Replace the use of RTE_MAX_QUEUES_PER_PORT, which is intended as an ethdev define, with the limit from the bbdev library. Signed-off-by: Bruce Richardson Acked-by: Morten Brørup --- app/test-bbdev/test_bbdev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/test-bbdev/test_bbdev.c b/app/test-bbdev/test_bbdev.c index 0bbce6ca92..2e626efd74 100644 --- a/app/test-bbdev/test_bbdev.c +++ b/app/test-bbdev/test_bbdev.c @@ -297,7 +297,7 @@ test_bbdev_configure_stop_queue(void) "Failed test for rte_bbdev_queue_stop " "invalid dev_id "); - TEST_ASSERT_FAIL(rte_bbdev_queue_stop(dev_id, RTE_MAX_QUEUES_PER_PORT), + TEST_ASSERT_FAIL(rte_bbdev_queue_stop(dev_id, RTE_BBDEV_DEFAULT_MAX_NB_QUEUES), "Failed test for rte_bbdev_queue_stop " "invalid queue_id "); @@ -1176,7 +1176,7 @@ test_bbdev_invalid_driver(void) "invalid dev_id "); TEST_ASSERT_FAIL(rte_bbdev_queue_info_get(dev_id, - RTE_MAX_QUEUES_PER_PORT, &qinfo), + RTE_BBDEV_DEFAULT_MAX_NB_QUEUES, &qinfo), "Failed test for rte_bbdev_info_get: " "invalid queue_id "); -- 2.43.0
[PATCH v3 04/26] config: add separate defines for max Rx and Tx queues
Rather than having a single define for maximum queues per ethernet port, we can set the max values for Rx queues and Tx queue independently. This allows future memory saving for apps which only need large numbers of Rx queues or only large numbers of Tx queues. Signed-off-by: Bruce Richardson Acked-by: Morten Brørup --- config/rte_config.h| 2 ++ doc/guides/rel_notes/release_24_11.rst | 6 ++ 2 files changed, 8 insertions(+) diff --git a/config/rte_config.h b/config/rte_config.h index d67ff77c71..2c11b4eeec 100644 --- a/config/rte_config.h +++ b/config/rte_config.h @@ -65,6 +65,8 @@ /* ether defines */ #define RTE_MAX_QUEUES_PER_PORT 1024 +#define RTE_MAX_ETHPORT_RX_QUEUES 1024 +#define RTE_MAX_ETHPORT_TX_QUEUES 1024 #define RTE_ETHDEV_QUEUE_STAT_CNTRS 16 /* max 256 */ #define RTE_ETHDEV_RXTX_CALLBACKS 1 #define RTE_MAX_MULTI_HOST_CTRLS 4 diff --git a/doc/guides/rel_notes/release_24_11.rst b/doc/guides/rel_notes/release_24_11.rst index 0ff70d9057..3725c056ba 100644 --- a/doc/guides/rel_notes/release_24_11.rst +++ b/doc/guides/rel_notes/release_24_11.rst @@ -55,6 +55,12 @@ New Features Also, make sure to start the actual text at the margin. === +* **New configuration settings for Rx and Tx Ethernet Queues.** + + New defines have been added to DPDK to allow independent tracking of the maximum number of Rx and Tx queues. + These defines as ``RTE_MAX_ETHPORT_RX_QUEUES`` and ``RTE_MAX_ETHPORT_TX_QUEUES``, + and should be used in place of the older macro ``RTE_MAX_QUEUES_PER_PORT``. + Removed Items - -- 2.43.0
[PATCH v3 05/26] ethdev: use separate Rx and Tx queue limits
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
Acked-by: Morten Brørup
---
lib/ethdev/ethdev_driver.h | 8
lib/ethdev/ethdev_private.c | 24 ++--
lib/ethdev/rte_ethdev.c | 16 +++-
lib/ethdev/rte_ethdev.h | 18 +-
4 files changed, 34 insertions(+), 32 deletions(-)
diff --git a/lib/ethdev/ethdev_driver.h b/lib/ethdev/ethdev_driver.h
index 883e59a927..51ec8e8395 100644
--- a/lib/ethdev/ethdev_driver.h
+++ b/lib/ethdev/ethdev_driver.h
@@ -84,12 +84,12 @@ struct __rte_cache_aligned rte_eth_dev {
* User-supplied functions called from rx_burst to post-process
* received packets before passing them to the user
*/
- RTE_ATOMIC(struct rte_eth_rxtx_callback *)
post_rx_burst_cbs[RTE_MAX_QUEUES_PER_PORT];
+ RTE_ATOMIC(struct rte_eth_rxtx_callback *)
post_rx_burst_cbs[RTE_MAX_ETHPORT_RX_QUEUES];
/**
* User-supplied functions called from tx_burst to pre-process
* received packets before passing them to the driver for transmission
*/
- RTE_ATOMIC(struct rte_eth_rxtx_callback *)
pre_tx_burst_cbs[RTE_MAX_QUEUES_PER_PORT];
+ RTE_ATOMIC(struct rte_eth_rxtx_callback *)
pre_tx_burst_cbs[RTE_MAX_ETHPORT_TX_QUEUES];
enum rte_eth_dev_state state; /**< Flag indicating the port state */
void *security_ctx; /**< Context for security ops */
@@ -165,9 +165,9 @@ struct __rte_cache_aligned rte_eth_dev_data {
flow_configured : 1;
/** Queues state: HAIRPIN(2) / STARTED(1) / STOPPED(0) */
- uint8_t rx_queue_state[RTE_MAX_QUEUES_PER_PORT];
+ uint8_t rx_queue_state[RTE_MAX_ETHPORT_RX_QUEUES];
/** Queues state: HAIRPIN(2) / STARTED(1) / STOPPED(0) */
- uint8_t tx_queue_state[RTE_MAX_QUEUES_PER_PORT];
+ uint8_t tx_queue_state[RTE_MAX_ETHPORT_TX_QUEUES];
uint32_t dev_flags; /**< Capabilities */
int numa_node; /**< NUMA node connection */
diff --git a/lib/ethdev/ethdev_private.c b/lib/ethdev/ethdev_private.c
index 626524558a..e00530f370 100644
--- a/lib/ethdev/ethdev_private.c
+++ b/lib/ethdev/ethdev_private.c
@@ -190,7 +190,8 @@ struct dummy_queue {
bool rx_warn_once;
bool tx_warn_once;
};
-static struct dummy_queue
*dummy_queues_array[RTE_MAX_ETHPORTS][RTE_MAX_QUEUES_PER_PORT];
+static struct dummy_queue
*dummy_rxq_array[RTE_MAX_ETHPORTS][RTE_MAX_ETHPORT_RX_QUEUES];
+static struct dummy_queue
*dummy_txq_array[RTE_MAX_ETHPORTS][RTE_MAX_ETHPORT_TX_QUEUES];
static struct dummy_queue per_port_queues[RTE_MAX_ETHPORTS];
RTE_INIT(dummy_queue_init)
{
@@ -199,8 +200,10 @@ RTE_INIT(dummy_queue_init)
for (port_id = 0; port_id < RTE_DIM(per_port_queues); port_id++) {
unsigned int q;
- for (q = 0; q < RTE_DIM(dummy_queues_array[port_id]); q++)
- dummy_queues_array[port_id][q] =
&per_port_queues[port_id];
+ for (q = 0; q < RTE_DIM(dummy_rxq_array[port_id]); q++)
+ dummy_rxq_array[port_id][q] = &per_port_queues[port_id];
+ for (q = 0; q < RTE_DIM(dummy_txq_array[port_id]); q++)
+ dummy_txq_array[port_id][q] = &per_port_queues[port_id];
}
}
@@ -245,7 +248,8 @@ dummy_eth_tx_burst(void *txq,
void
eth_dev_fp_ops_reset(struct rte_eth_fp_ops *fpo)
{
- static RTE_ATOMIC(void *) dummy_data[RTE_MAX_QUEUES_PER_PORT];
+ static RTE_ATOMIC(void *) dummy_rx_data[RTE_MAX_ETHPORT_RX_QUEUES];
+ static RTE_ATOMIC(void *) dummy_tx_data[RTE_MAX_ETHPORT_TX_QUEUES];
uintptr_t port_id = fpo - rte_eth_fp_ops;
per_port_queues[port_id].rx_warn_once = false;
@@ -254,12 +258,12 @@ eth_dev_fp_ops_reset(struct rte_eth_fp_ops *fpo)
.rx_pkt_burst = dummy_eth_rx_burst,
.tx_pkt_burst = dummy_eth_tx_burst,
.rxq = {
- .data = (void **)&dummy_queues_array[port_id],
- .clbk = dummy_data,
+ .data = (void **)&dummy_rxq_array[port_id],
+ .clbk = dummy_rx_data,
},
.txq = {
- .data = (void **)&dummy_queues_array[port_id],
- .clbk = dummy_data,
+ .data = (void **)&dummy_txq_array[port_id],
+ .clbk = dummy_tx_data,
},
};
}
@@ -420,7 +424,7 @@ eth_dev_rx_queue_config(struct rte_eth_dev *dev, uint16_t
nb_queues)
if (dev->data->rx_queues == NULL && nb_queues != 0) { /* first time
configuration */
dev->data->rx_queues = rte_zmalloc("ethdev->rx_queues",
sizeof(dev->data->rx_queues[0]) *
- RTE_MAX_QUEUES_PER_PORT,
+
[PATCH v3 06/26] bpf: use separate Rx and Tx queue limits
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 Acked-by: Morten Brørup --- lib/bpf/bpf_pkt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/bpf/bpf_pkt.c b/lib/bpf/bpf_pkt.c index aaca935f2d..2c6b0e18f7 100644 --- a/lib/bpf/bpf_pkt.c +++ b/lib/bpf/bpf_pkt.c @@ -503,7 +503,8 @@ bpf_eth_elf_load(struct bpf_eth_cbh *cbh, uint16_t port, uint16_t queue, ftx = NULL; if (prm == NULL || rte_eth_dev_is_valid_port(port) == 0 || - queue >= RTE_MAX_QUEUES_PER_PORT) + queue >= (cbh->type == BPF_ETH_RX ? + RTE_MAX_ETHPORT_RX_QUEUES : RTE_MAX_ETHPORT_TX_QUEUES)) return -EINVAL; if (cbh->type == BPF_ETH_RX) -- 2.43.0
[PATCH v3 07/26] latencystats: use separate Rx and Tx queue limits
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
Acked-by: Morten Brørup
---
lib/latencystats/rte_latencystats.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/latencystats/rte_latencystats.c
b/lib/latencystats/rte_latencystats.c
index 6a261309f9..696bbab3a4 100644
--- a/lib/latencystats/rte_latencystats.c
+++ b/lib/latencystats/rte_latencystats.c
@@ -60,8 +60,8 @@ struct rxtx_cbs {
const struct rte_eth_rxtx_callback *cb;
};
-static struct rxtx_cbs rx_cbs[RTE_MAX_ETHPORTS][RTE_MAX_QUEUES_PER_PORT];
-static struct rxtx_cbs tx_cbs[RTE_MAX_ETHPORTS][RTE_MAX_QUEUES_PER_PORT];
+static struct rxtx_cbs rx_cbs[RTE_MAX_ETHPORTS][RTE_MAX_ETHPORT_RX_QUEUES];
+static struct rxtx_cbs tx_cbs[RTE_MAX_ETHPORTS][RTE_MAX_ETHPORT_TX_QUEUES];
struct latency_stats_nameoff {
char name[RTE_ETH_XSTATS_NAME_SIZE];
--
2.43.0
[PATCH v3 08/26] pdump: use separate Rx and Tx queue limits
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
Acked-by: Morten Brørup
---
lib/pdump/rte_pdump.c | 18 +-
1 file changed, 9 insertions(+), 9 deletions(-)
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;
}
--
2.43.0
[PATCH v3 09/26] power: use separate Rx and Tx queue limits
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
Acked-by: Morten Brørup
---
lib/power/rte_power_pmd_mgmt.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/power/rte_power_pmd_mgmt.c b/lib/power/rte_power_pmd_mgmt.c
index b1c18a5f56..7fc87b22c1 100644
--- a/lib/power/rte_power_pmd_mgmt.c
+++ b/lib/power/rte_power_pmd_mgmt.c
@@ -494,7 +494,7 @@ rte_power_ethdev_pmgmt_queue_enable(unsigned int lcore_id,
uint16_t port_id,
RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -EINVAL);
- if (queue_id >= RTE_MAX_QUEUES_PER_PORT || lcore_id >= RTE_MAX_LCORE) {
+ if (queue_id >= RTE_MAX_ETHPORT_RX_QUEUES || lcore_id >= RTE_MAX_LCORE)
{
ret = -EINVAL;
goto end;
}
@@ -608,7 +608,7 @@ rte_power_ethdev_pmgmt_queue_disable(unsigned int lcore_id,
RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -EINVAL);
- if (lcore_id >= RTE_MAX_LCORE || queue_id >= RTE_MAX_QUEUES_PER_PORT)
+ if (lcore_id >= RTE_MAX_LCORE || queue_id >= RTE_MAX_ETHPORT_RX_QUEUES)
return -EINVAL;
/* check if the queue is stopped */
--
2.43.0
[PATCH v3 10/26] net/af_xdp: use separate Rx and Tx queue limits
Update driver 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
Acked-by: Morten Brørup
---
drivers/net/af_xdp/rte_eth_af_xdp.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/af_xdp/rte_eth_af_xdp.c
b/drivers/net/af_xdp/rte_eth_af_xdp.c
index 0bc0d9a55a..1cc8b40acc 100644
--- a/drivers/net/af_xdp/rte_eth_af_xdp.c
+++ b/drivers/net/af_xdp/rte_eth_af_xdp.c
@@ -185,7 +185,7 @@ struct pmd_internals {
};
struct pmd_process_private {
- int rxq_xsk_fds[RTE_MAX_QUEUES_PER_PORT];
+ int rxq_xsk_fds[RTE_MAX_ETHPORT_RX_QUEUES];
};
#define ETH_AF_XDP_IFACE_ARG "iface"
--
2.43.0
[PATCH v3 11/26] net/cnxk: use separate Rx and Tx queue limits
Update driver 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 Acked-by: Morten Brørup --- drivers/net/cnxk/cnxk_ethdev_ops.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/cnxk/cnxk_ethdev_ops.c b/drivers/net/cnxk/cnxk_ethdev_ops.c index b1093dd584..b587e32e24 100644 --- a/drivers/net/cnxk/cnxk_ethdev_ops.c +++ b/drivers/net/cnxk/cnxk_ethdev_ops.c @@ -16,8 +16,8 @@ cnxk_nix_info_get(struct rte_eth_dev *eth_dev, struct rte_eth_dev_info *devinfo) devinfo->min_rx_bufsize = NIX_MIN_HW_FRS + RTE_ETHER_CRC_LEN; devinfo->max_rx_pktlen = max_rx_pktlen; - devinfo->max_rx_queues = RTE_MAX_QUEUES_PER_PORT; - devinfo->max_tx_queues = RTE_MAX_QUEUES_PER_PORT; + devinfo->max_rx_queues = RTE_MAX_ETHPORT_RX_QUEUES; + devinfo->max_tx_queues = RTE_MAX_ETHPORT_TX_QUEUES; devinfo->max_mac_addrs = dev->max_mac_entries; devinfo->max_vfs = pci_dev->max_vfs; devinfo->max_mtu = devinfo->max_rx_pktlen - CNXK_NIX_L2_OVERHEAD; -- 2.43.0
[PATCH v3 12/26] net/failsafe: use separate Rx and Tx queue limits
Update driver 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 Acked-by: Morten Brørup --- drivers/net/failsafe/failsafe_ops.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/failsafe/failsafe_ops.c b/drivers/net/failsafe/failsafe_ops.c index 9c013e0419..12a01f5543 100644 --- a/drivers/net/failsafe/failsafe_ops.c +++ b/drivers/net/failsafe/failsafe_ops.c @@ -1205,8 +1205,8 @@ fs_dev_infos_get(struct rte_eth_dev *dev, infos->min_mtu = RTE_ETHER_MIN_MTU; infos->max_mtu = UINT16_MAX; infos->max_rx_pktlen = UINT32_MAX; - infos->max_rx_queues = RTE_MAX_QUEUES_PER_PORT; - infos->max_tx_queues = RTE_MAX_QUEUES_PER_PORT; + infos->max_rx_queues = RTE_MAX_ETHPORT_RX_QUEUES; + infos->max_tx_queues = RTE_MAX_ETHPORT_TX_QUEUES; infos->max_mac_addrs = FAILSAFE_MAX_ETHADDR; infos->max_hash_mac_addrs = UINT32_MAX; infos->max_vfs = UINT16_MAX; -- 2.43.0
[PATCH v3 13/26] net/hns3: use separate Rx and Tx queue limits
Update driver 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 Acked-by: Morten Brørup --- drivers/net/hns3/hns3_tm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/hns3/hns3_tm.c b/drivers/net/hns3/hns3_tm.c index 92a668538f..713635afd0 100644 --- a/drivers/net/hns3/hns3_tm.c +++ b/drivers/net/hns3/hns3_tm.c @@ -21,7 +21,7 @@ hns3_tm_max_tx_queues_get(struct rte_eth_dev *dev) memset(&dev_info, 0, sizeof(dev_info)); (void)hns3_dev_infos_get(dev, &dev_info); - return RTE_MIN(dev_info.max_tx_queues, RTE_MAX_QUEUES_PER_PORT); + return RTE_MIN(dev_info.max_tx_queues, RTE_MAX_ETHPORT_TX_QUEUES); } void -- 2.43.0
[PATCH v3 15/26] net/null: use separate Rx and Tx queue limits
Update driver 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
Acked-by: Morten Brørup
---
drivers/net/null/rte_eth_null.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/null/rte_eth_null.c b/drivers/net/null/rte_eth_null.c
index f4ed3b8a7f..30185e417a 100644
--- a/drivers/net/null/rte_eth_null.c
+++ b/drivers/net/null/rte_eth_null.c
@@ -53,8 +53,8 @@ struct pmd_internals {
unsigned int no_rx;
uint16_t port_id;
- struct null_queue rx_null_queues[RTE_MAX_QUEUES_PER_PORT];
- struct null_queue tx_null_queues[RTE_MAX_QUEUES_PER_PORT];
+ struct null_queue rx_null_queues[RTE_MAX_ETHPORT_RX_QUEUES];
+ struct null_queue tx_null_queues[RTE_MAX_ETHPORT_TX_QUEUES];
struct rte_ether_addr eth_addr;
/** Bit mask of RSS offloads, the bit offset also means flow type */
--
2.43.0
[PATCH v3 14/26] net/mlx5: use separate Rx and Tx queue limits
Update driver 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
Acked-by: Morten Brørup
---
drivers/net/mlx5/mlx5_flow.c| 2 +-
drivers/net/mlx5/mlx5_flow_hw.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index 72fb3a55ba..3eaea66920 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -7344,7 +7344,7 @@ flow_legacy_list_create(struct rte_eth_dev *dev, enum
mlx5_flow_type type,
struct rte_flow_item items[MLX5_MAX_SPLIT_ITEMS];
uint8_t buffer[2048];
} items_tx;
- struct mlx5_rte_flow_item_sq sq_specs[RTE_MAX_QUEUES_PER_PORT];
+ struct mlx5_rte_flow_item_sq sq_specs[RTE_MAX_ETHPORT_RX_QUEUES];
struct mlx5_flow_expand_rss *buf = &expand_buffer.buf;
struct mlx5_flow_rss_desc *rss_desc;
const struct rte_flow_action *p_actions_rx;
diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c
index d243b59b71..f9514ddd4f 100644
--- a/drivers/net/mlx5/mlx5_flow_hw.c
+++ b/drivers/net/mlx5/mlx5_flow_hw.c
@@ -10978,7 +10978,7 @@ flow_hw_create_ctrl_rx_rss_template(struct rte_eth_dev
*dev,
struct rte_flow_actions_template_attr attr = {
.ingress = 1,
};
- uint16_t queue[RTE_MAX_QUEUES_PER_PORT];
+ uint16_t queue[RTE_MAX_ETHPORT_RX_QUEUES];
struct rte_flow_action_rss rss_conf = {
.func = RTE_ETH_HASH_FUNCTION_DEFAULT,
.level = 0,
--
2.43.0
[PATCH v3 16/26] net/sfc: use separate Rx and Tx queue limits
Update driver 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
Acked-by: Morten Brørup
---
drivers/net/sfc/sfc_sw_stats.c | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/net/sfc/sfc_sw_stats.c b/drivers/net/sfc/sfc_sw_stats.c
index 3ae5023b6f..27892e7d4f 100644
--- a/drivers/net/sfc/sfc_sw_stats.c
+++ b/drivers/net/sfc/sfc_sw_stats.c
@@ -825,9 +825,11 @@ sfc_sw_xstats_alloc_queues_bitmap(struct sfc_adapter *sa)
struct rte_bitmap **queues_bitmap = &sa->sw_stats.queues_bitmap;
void **queues_bitmap_mem = &sa->sw_stats.queues_bitmap_mem;
uint32_t bmp_size;
+ uint32_t max_queues = RTE_MAX(RTE_MAX_ETHPORT_RX_QUEUES,
+ RTE_MAX_ETHPORT_TX_QUEUES);
int rc;
- bmp_size = rte_bitmap_get_memory_footprint(RTE_MAX_QUEUES_PER_PORT);
+ bmp_size = rte_bitmap_get_memory_footprint(max_queues);
*queues_bitmap_mem = NULL;
*queues_bitmap = NULL;
@@ -836,7 +838,7 @@ sfc_sw_xstats_alloc_queues_bitmap(struct sfc_adapter *sa)
if (*queues_bitmap_mem == NULL)
return ENOMEM;
- *queues_bitmap = rte_bitmap_init(RTE_MAX_QUEUES_PER_PORT,
+ *queues_bitmap = rte_bitmap_init(max_queues,
*queues_bitmap_mem, bmp_size);
if (*queues_bitmap == NULL) {
rc = EINVAL;
--
2.43.0
[PATCH v3 17/26] net/thunderx: use separate Rx and Tx queue limits
Update driver 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
Acked-by: Morten Brørup
---
drivers/net/thunderx/nicvf_ethdev.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/thunderx/nicvf_ethdev.c
b/drivers/net/thunderx/nicvf_ethdev.c
index 609d95dcfa..8c8bec885f 100644
--- a/drivers/net/thunderx/nicvf_ethdev.c
+++ b/drivers/net/thunderx/nicvf_ethdev.c
@@ -907,7 +907,7 @@ nicvf_configure_rss_reta(struct rte_eth_dev *dev)
{
struct nicvf *nic = nicvf_pmd_priv(dev);
unsigned int idx, qmap_size;
- uint8_t qmap[RTE_MAX_QUEUES_PER_PORT];
+ uint8_t qmap[RTE_MAX_ETHPORT_RX_QUEUES];
uint8_t default_reta[NIC_MAX_RSS_IDR_TBL_SIZE];
if (nic->cpi_alg != CPI_ALG_NONE)
--
2.43.0
[PATCH v3 18/26] net/vhost: use separate Rx and Tx queue limits
Update driver 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
Acked-by: Morten Brørup
---
drivers/net/vhost/rte_eth_vhost.c | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/net/vhost/rte_eth_vhost.c
b/drivers/net/vhost/rte_eth_vhost.c
index 21bbb008e0..78bc755109 100644
--- a/drivers/net/vhost/rte_eth_vhost.c
+++ b/drivers/net/vhost/rte_eth_vhost.c
@@ -117,8 +117,8 @@ static struct rte_eth_link pmd_link = {
struct rte_vhost_vring_state {
rte_spinlock_t lock;
- bool cur[RTE_MAX_QUEUES_PER_PORT * 2];
- bool seen[RTE_MAX_QUEUES_PER_PORT * 2];
+ bool cur[RTE_MAX_ETHPORT_RX_QUEUES + RTE_MAX_ETHPORT_TX_QUEUES];
+ bool seen[RTE_MAX_ETHPORT_RX_QUEUES + RTE_MAX_ETHPORT_TX_QUEUES];
unsigned int index;
unsigned int max_vring;
};
@@ -1648,7 +1648,8 @@ rte_pmd_vhost_probe(struct rte_vdev_device *dev)
if (rte_kvargs_count(kvlist, ETH_VHOST_QUEUES_ARG) == 1) {
ret = rte_kvargs_process(kvlist, ETH_VHOST_QUEUES_ARG,
&open_int, &queues);
- if (ret < 0 || queues > RTE_MAX_QUEUES_PER_PORT)
+ if (ret < 0 || queues > RTE_MAX_ETHPORT_RX_QUEUES
+ || queues > RTE_MAX_ETHPORT_TX_QUEUES)
goto out_free;
} else
--
2.43.0
[PATCH v3 19/26] app/dumpcap: use separate Rx and Tx queue limits
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
Acked-by: Morten Brørup
---
app/dumpcap/main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/dumpcap/main.c b/app/dumpcap/main.c
index 6feb8f5672..fbaaa4fe3f 100644
--- a/app/dumpcap/main.c
+++ b/app/dumpcap/main.c
@@ -95,7 +95,7 @@ struct interface {
struct rte_bpf_prm *bpf_prm;
char name[RTE_ETH_NAME_MAX_LEN];
- struct rte_rxtx_callback *rx_cb[RTE_MAX_QUEUES_PER_PORT];
+ struct rte_rxtx_callback *rx_cb[RTE_MAX_ETHPORT_RX_QUEUES];
const char *ifname;
const char *ifdescr;
};
--
2.43.0
[PATCH v3 20/26] app/test-pmd: use separate Rx and Tx queue limits
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
Acked-by: Morten Brørup
---
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_tnb_rx_desc[RTE_MAX_QUEUES_PER_PORT+1]; /**< per
queue rx desc number */
- uint16_tnb_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_tnb_rx_desc[RTE_MAX_ETHPORT_RX_QUEUES+1]; /**<
per queue rx desc number */
+ uint16_tnb_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_tmc_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_ttx_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_tmbuf_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
[PATCH v3 21/26] examples/ipsec-secgw: use separate Rx and Tx queue limits
Update example 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
Acked-by: Morten Brørup
---
examples/ipsec-secgw/ipsec-secgw.c | 2 +-
examples/ipsec-secgw/ipsec.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/examples/ipsec-secgw/ipsec-secgw.c
b/examples/ipsec-secgw/ipsec-secgw.c
index e98ad2572e..fc72e10037 100644
--- a/examples/ipsec-secgw/ipsec-secgw.c
+++ b/examples/ipsec-secgw/ipsec-secgw.c
@@ -1050,7 +1050,7 @@ parse_config(const char *q_arg)
uint32_t size;
uint32_t max_fld[_NUM_FLD] = {
RTE_MAX_ETHPORTS,
- RTE_MAX_QUEUES_PER_PORT,
+ RTE_MAX_ETHPORT_RX_QUEUES,
RTE_MAX_LCORE
};
diff --git a/examples/ipsec-secgw/ipsec.c b/examples/ipsec-secgw/ipsec.c
index b52b0ffc3d..ff65c1c919 100644
--- a/examples/ipsec-secgw/ipsec.c
+++ b/examples/ipsec-secgw/ipsec.c
@@ -584,7 +584,7 @@ create_inline_session(struct socket_ctx *skt_ctx, struct
ipsec_sa *sa,
.rss_key_len = sizeof(rss_key),
};
struct rte_eth_dev_info dev_info;
- uint16_t queue[RTE_MAX_QUEUES_PER_PORT];
+ uint16_t queue[RTE_MAX_ETHPORT_RX_QUEUES];
struct rte_flow_action_rss action_rss;
unsigned int i;
unsigned int j;
--
2.43.0
[PATCH v3 22/26] examples/l3fwd-power: use separate Rx and Tx queue limits
Update example 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
Acked-by: Morten Brørup
---
examples/l3fwd-power/main.c | 2 +-
examples/l3fwd-power/perf_core.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/examples/l3fwd-power/main.c b/examples/l3fwd-power/main.c
index 2bb6b092c3..bf95cdc487 100644
--- a/examples/l3fwd-power/main.c
+++ b/examples/l3fwd-power/main.c
@@ -1660,7 +1660,7 @@ parse_config(const char *q_arg)
unsigned size;
unsigned int max_fld[_NUM_FLD] = {
RTE_MAX_ETHPORTS,
- RTE_MAX_QUEUES_PER_PORT,
+ RTE_MAX_ETHPORT_RX_QUEUES,
RTE_MAX_LCORE
};
diff --git a/examples/l3fwd-power/perf_core.c b/examples/l3fwd-power/perf_core.c
index 6c0f7ea213..479626ffb9 100644
--- a/examples/l3fwd-power/perf_core.c
+++ b/examples/l3fwd-power/perf_core.c
@@ -134,7 +134,7 @@ parse_perf_config(const char *q_arg)
unsigned int size;
unsigned int max_fld[_NUM_FLD] = {
RTE_MAX_ETHPORTS,
- RTE_MAX_QUEUES_PER_PORT,
+ RTE_MAX_ETHPORT_RX_QUEUES,
255,
RTE_MAX_LCORE
};
--
2.43.0
[PATCH v3 23/26] examples/l3fwd: use separate Rx and Tx queue limits
Update example 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
Acked-by: Morten Brørup
---
examples/l3fwd/main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/examples/l3fwd/main.c b/examples/l3fwd/main.c
index 01b763e5ba..0d711dec3e 100644
--- a/examples/l3fwd/main.c
+++ b/examples/l3fwd/main.c
@@ -502,7 +502,7 @@ parse_config(const char *q_arg)
unsigned size;
uint16_t max_fld[_NUM_FLD] = {
RTE_MAX_ETHPORTS,
- RTE_MAX_QUEUES_PER_PORT,
+ RTE_MAX_ETHPORT_RX_QUEUES,
RTE_MAX_LCORE
};
--
2.43.0
[PATCH v3 24/26] examples/vhost: use separate Rx and Tx queue limits
Update example 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
Acked-by: Morten Brørup
---
examples/vhost/main.c | 2 +-
examples/vhost/main.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/examples/vhost/main.c b/examples/vhost/main.c
index 4391d88c3d..9c2f3a02eb 100644
--- a/examples/vhost/main.c
+++ b/examples/vhost/main.c
@@ -1891,7 +1891,7 @@ reset_dma(void)
for (i = 0; i < RTE_MAX_VHOST_DEVICE; i++) {
int j;
- for (j = 0; j < RTE_MAX_QUEUES_PER_PORT * 2; j++) {
+ for (j = 0; j < RTE_MAX_ETHPORT_RX_QUEUES +
RTE_MAX_ETHPORT_TX_QUEUES; j++) {
dma_bind[i].dmas[j].dev_id = INVALID_DMA_ID;
dma_bind[i].dmas[j].async_enabled = false;
}
diff --git a/examples/vhost/main.h b/examples/vhost/main.h
index c986cbc5a9..374ba30ec6 100644
--- a/examples/vhost/main.h
+++ b/examples/vhost/main.h
@@ -99,7 +99,7 @@ struct dma_info {
};
struct dma_for_vhost {
- struct dma_info dmas[RTE_MAX_QUEUES_PER_PORT * 2];
+ struct dma_info dmas[RTE_MAX_ETHPORT_RX_QUEUES +
RTE_MAX_ETHPORT_TX_QUEUES];
uint32_t async_flag;
};
--
2.43.0
[PATCH v3 25/26] config: make queues per port a meson config option
The default number of ethernet queues per port is currently set to
1k which is more than enough for most applications, but still is lower
than the total number of queues which may be available on modern NICs.
Rather than increasing the max queues further, which will increase
the memory footprint (since the value is used in array dimensioning),
we can instead make the value a meson tunable option - and reduce the
default value to 256 in the process. This means that:
* most apps which don't need hundreds of queues will see lower mem use.
* apps which do need to use thousands of queues can configure DPDK to
allow this, without having to modify DPDK files (i.e. rte_config.h)
Signed-off-by: Bruce Richardson
Acked-by: Morten Brørup
---
config/meson.build | 2 ++
config/rte_config.h| 3 ---
doc/guides/rel_notes/release_24_11.rst | 13 +++--
meson_options.txt | 4
4 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/config/meson.build b/config/meson.build
index 8c8b019c25..fc41354c53 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -352,6 +352,8 @@ endforeach
# set other values pulled from the build options
dpdk_conf.set('RTE_MAX_ETHPORTS', get_option('max_ethports'))
+dpdk_conf.set('RTE_MAX_ETHPORT_RX_QUEUES', get_option('max_ethport_rx_queues'))
+dpdk_conf.set('RTE_MAX_ETHPORT_TX_QUEUES', get_option('max_ethport_tx_queues'))
dpdk_conf.set('RTE_LIBEAL_USE_HPET', get_option('use_hpet'))
dpdk_conf.set('RTE_ENABLE_STDATOMIC', get_option('enable_stdatomic'))
dpdk_conf.set('RTE_ENABLE_TRACE_FP', get_option('enable_trace_fp'))
diff --git a/config/rte_config.h b/config/rte_config.h
index 2c11b4eeec..7450e0d648 100644
--- a/config/rte_config.h
+++ b/config/rte_config.h
@@ -64,9 +64,6 @@
#define RTE_MBUF_DEFAULT_MEMPOOL_OPS "ring_mp_mc"
/* ether defines */
-#define RTE_MAX_QUEUES_PER_PORT 1024
-#define RTE_MAX_ETHPORT_RX_QUEUES 1024
-#define RTE_MAX_ETHPORT_TX_QUEUES 1024
#define RTE_ETHDEV_QUEUE_STAT_CNTRS 16 /* max 256 */
#define RTE_ETHDEV_RXTX_CALLBACKS 1
#define RTE_MAX_MULTI_HOST_CTRLS 4
diff --git a/doc/guides/rel_notes/release_24_11.rst
b/doc/guides/rel_notes/release_24_11.rst
index 3725c056ba..825cc0fad9 100644
--- a/doc/guides/rel_notes/release_24_11.rst
+++ b/doc/guides/rel_notes/release_24_11.rst
@@ -58,8 +58,17 @@ New Features
* **New configuration settings for Rx and Tx Ethernet Queues.**
New defines have been added to DPDK to allow independent tracking of the
maximum number of Rx and Tx queues.
- These defines as ``RTE_MAX_ETHPORT_RX_QUEUES`` and
``RTE_MAX_ETHPORT_TX_QUEUES``,
- and should be used in place of the older macro ``RTE_MAX_QUEUES_PER_PORT``.
+ These defines are ``RTE_MAX_ETHPORT_RX_QUEUES`` and
``RTE_MAX_ETHPORT_TX_QUEUES``,
+ and these new defines should be used in place of the older define
``RTE_MAX_QUEUES_PER_PORT``.
+ Unlike the older define, these new defines are build-time configurable via
meson options:
+ ``max_ethport_rx_queues`` and ``max_ethport_tx_queues``.
+
+.. note::
+
+ The default max values for Rx and Tx queue limits are reduced from 1024, in
previous releases,
+ to 256 in this release.
+ For application that require large numbers of queues,
+ these defaults can be changed via the meson configuration options described
above.
Removed Items
diff --git a/meson_options.txt b/meson_options.txt
index e49b2fc089..a9a7052ba6 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -40,6 +40,10 @@ option('machine', type: 'string', value: 'auto', description:
'Alias of cpu_instruction_set.')
option('max_ethports', type: 'integer', value: 32, description:
'maximum number of Ethernet devices')
+option('max_ethport_rx_queues', type: 'integer', value: 256, description:
+ 'maximum number of Rx queues on an Ethernet device')
+option('max_ethport_tx_queues', type: 'integer', value: 256, description:
+ 'maximum number of Tx queues on an Ethernet device')
option('max_lcores', type: 'string', value: 'default', description:
'Set maximum number of cores/threads supported by EAL; "default" is
different per-arch, "detect" detects the number of cores on the build machine.')
option('max_numa_nodes', type: 'string', value: 'default', description:
--
2.43.0
[PATCH v3 26/26] config: add computed max queues define for compatibility
End applications may use the RTE_MAX_QUEUES_PER_PORT define in their
structure definitions, so keep a define present in DPDK for backward
compatibility. Rather than having a hard-coded value, we can use the
maximum of the Rx and Tx values as the overall max value. Rather than
using a macro which does the MAX() calculation inside it, we can compute
the actual value at configuration time and write it using meson.
Signed-off-by: Bruce Richardson
Acked-by: Morten Brørup
---
config/meson.build | 8
doc/guides/rel_notes/deprecation.rst | 11 +++
doc/guides/rel_notes/release_24_11.rst | 8 +++-
3 files changed, 26 insertions(+), 1 deletion(-)
diff --git a/config/meson.build b/config/meson.build
index fc41354c53..9677636754 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -372,6 +372,14 @@ if get_option('mbuf_refcnt_atomic')
endif
dpdk_conf.set10('RTE_IOVA_IN_MBUF', get_option('enable_iova_as_pa'))
+# set old MAX_QUEUES_PER_PORT option for compatibility. Compute
+# value as max of Rx and Tx counts
+if get_option('max_ethport_rx_queues') > get_option('max_ethport_tx_queues')
+dpdk_conf.set('RTE_MAX_QUEUES_PER_PORT',
get_option('max_ethport_rx_queues'))
+else
+dpdk_conf.set('RTE_MAX_QUEUES_PER_PORT',
get_option('max_ethport_tx_queues'))
+endif
+
compile_time_cpuflags = []
subdir(arch_subdir)
dpdk_conf.set('RTE_COMPILE_TIME_CPUFLAGS', ','.join(compile_time_cpuflags))
diff --git a/doc/guides/rel_notes/deprecation.rst
b/doc/guides/rel_notes/deprecation.rst
index 211f59fdc9..e4ba00040f 100644
--- a/doc/guides/rel_notes/deprecation.rst
+++ b/doc/guides/rel_notes/deprecation.rst
@@ -17,6 +17,17 @@ Other API and ABI deprecation notices are to be posted below.
Deprecation Notices
---
+* config: The define ``RTE_MAX_QUEUES_PER_PORT`` should be considered
deprecated
+ and may be removed in a future release.
+ Its use in apps should be replaced by ``RTE_MAX_ETHPORT_RX_QUEUES`` or
``RTE_MAX_ETHPORT_TX_QUEUES``,
+ as appropriate.
+
+* config: The ``RTE_MAX_QUEUES_PER_PORT`` value is no longer hard-coded to
1024.
+ Its value is now computed at configuration time to be the maximum of the
configured max Rx and Tx queue values,
+ given by the meson options ``max_ethport_rx_queues`` and
``max_ethport_tx_queues``.
+ If these are unmodified from the defaults,
+ the value of ``RTE_MAX_QUEUES_PER_PORT`` will be 256.
+
* build: The ``enable_kmods`` option is deprecated and will be removed in a
future release.
Setting/clearing the option has no impact on the build.
Instead, kernel modules will be always built for OS's where out-of-tree
kernel modules
diff --git a/doc/guides/rel_notes/release_24_11.rst
b/doc/guides/rel_notes/release_24_11.rst
index 825cc0fad9..130564d38e 100644
--- a/doc/guides/rel_notes/release_24_11.rst
+++ b/doc/guides/rel_notes/release_24_11.rst
@@ -67,9 +67,15 @@ New Features
The default max values for Rx and Tx queue limits are reduced from 1024, in
previous releases,
to 256 in this release.
- For application that require large numbers of queues,
+ For applications that require large numbers of queues,
these defaults can be changed via the meson configuration options described
above.
+.. note::
+
+ The define ``RTE_MAX_QUEUES_PER_PORT`` is kept for backward compatibility.
+ Its value is no longer hard-coded,
+ but is set, at configuration time, to the maximum of the configured max Rx
and Tx queue values.
+
Removed Items
-
--
2.43.0
[PATCH v1 1/2] usertools/cpu_layout: update coding style
Update coding style:
- make it PEP-484 compliant
- address all flake8, mypy etc. warnings
- use f-strings in place of old-style string interpolation
- refactor printing to make the code more readable
Signed-off-by: Anatoly Burakov
---
usertools/cpu_layout.py | 162 ++--
1 file changed, 104 insertions(+), 58 deletions(-)
diff --git a/usertools/cpu_layout.py b/usertools/cpu_layout.py
index 891b9238fa..843b29a134 100755
--- a/usertools/cpu_layout.py
+++ b/usertools/cpu_layout.py
@@ -3,62 +3,108 @@
# Copyright(c) 2010-2014 Intel Corporation
# Copyright(c) 2017 Cavium, Inc. All rights reserved.
-sockets = []
-cores = []
-core_map = {}
-base_path = "/sys/devices/system/cpu"
-fd = open("{}/kernel_max".format(base_path))
-max_cpus = int(fd.read())
-fd.close()
-for cpu in range(max_cpus + 1):
-try:
-fd = open("{}/cpu{}/topology/core_id".format(base_path, cpu))
-except IOError:
-continue
-core = int(fd.read())
-fd.close()
-fd = open("{}/cpu{}/topology/physical_package_id".format(base_path, cpu))
-socket = int(fd.read())
-fd.close()
-if core not in cores:
-cores.append(core)
-if socket not in sockets:
-sockets.append(socket)
-key = (socket, core)
-if key not in core_map:
-core_map[key] = []
-core_map[key].append(cpu)
-
-print(format("=" * (47 + len(base_path
-print("Core and Socket Information (as reported by '{}')".format(base_path))
-print("{}\n".format("=" * (47 + len(base_path
-print("cores = ", cores)
-print("sockets = ", sockets)
-print("")
-
-max_processor_len = len(str(len(cores) * len(sockets) * 2 - 1))
-max_thread_count = len(list(core_map.values())[0])
-max_core_map_len = (max_processor_len * max_thread_count) \
- + len(", ") * (max_thread_count - 1) \
- + len('[]') + len('Socket ')
-max_core_id_len = len(str(max(cores)))
-
-output = " ".ljust(max_core_id_len + len('Core '))
-for s in sockets:
-output += " Socket %s" % str(s).ljust(max_core_map_len - len('Socket '))
-print(output)
-
-output = " ".ljust(max_core_id_len + len('Core '))
-for s in sockets:
-output += " ".ljust(max_core_map_len)
-output += " "
-print(output)
-
-for c in cores:
-output = "Core %s" % str(c).ljust(max_core_id_len)
-for s in sockets:
-if (s, c) in core_map:
-output += " " + str(core_map[(s, c)]).ljust(max_core_map_len)
+from typing import List, Set, Dict, Tuple
+
+
+def _range_expand(rstr: str) -> List[int]:
+"""Expand a range string into a list of integers."""
+# 0,1-3 => [0, 1-3]
+ranges = rstr.split(",")
+valset: List[int] = []
+for r in ranges:
+# 1-3 => [1, 2, 3]
+if "-" in r:
+start, end = r.split("-")
+valset.extend(range(int(start), int(end) + 1))
else:
-output += " " * (max_core_map_len + 1)
-print(output)
+valset.append(int(r))
+return valset
+
+
+def _read_sysfs(path: str) -> str:
+with open(path) as fd:
+return fd.read().strip()
+
+
+def _print_row(row: Tuple[str, ...], col_widths: List[int]) -> None:
+first, *rest = row
+w_first, *w_rest = col_widths
+first_end = " " * 4
+rest_end = " " * 10
+
+print(first.ljust(w_first), end=first_end)
+for cell, width in zip(rest, w_rest):
+print(cell.rjust(width), end=rest_end)
+print()
+
+
+def _print_section(heading: str) -> None:
+sep = "=" * len(heading)
+print(sep)
+print(heading)
+print(sep)
+print()
+
+
+def _main() -> None:
+sockets_s: Set[int] = set()
+cores_s: Set[int] = set()
+core_map: Dict[Tuple[int, int], List[int]] = {}
+base_path = "/sys/devices/system/cpu"
+
+cpus = _range_expand(_read_sysfs(f"{base_path}/online"))
+
+for cpu in cpus:
+lcore_base = f"{base_path}/cpu{cpu}"
+core = int(_read_sysfs(f"{lcore_base}/topology/core_id"))
+socket = int(_read_sysfs(f"{lcore_base}/topology/physical_package_id"))
+
+cores_s.add(core)
+sockets_s.add(socket)
+key = (socket, core)
+core_map.setdefault(key, [])
+core_map[key].append(cpu)
+
+cores = sorted(cores_s)
+sockets = sorted(sockets_s)
+
+_print_section("Core and Socket Information "
+ f"(as reported by '{base_path}')")
+
+print("cores = ", cores)
+print("sockets = ", sockets)
+print()
+
+# Core, [Socket, Socket, ...]
+heading_strs = "", *[f"Socket {s}" for s in sockets]
+sep_strs = tuple("-" * len(hstr) for hstr in heading_strs)
+rows: List[Tuple[str, ...]] = []
+
+for c in cores:
+# Core,
+row: Tuple[str, ...] = (f"Core {c}",)
+
+# [lcores, lcores, ...]
+for s in sockets:
+try:
+lcores = core_map[(s, c)]
+row += (f"{lcores}",)
+except KeyError:
+row += ("",)
+rows += [row]
[PATCH v1 2/2] usertools/cpu_layout: print out NUMA nodes
In traditional NUMA case, NUMA nodes and physical sockets were used
interchangeably, but there are cases where there can be multiple NUMA
nodes per socket, as well as all CPU's being assigned NUMA node 0 even in
cases of multiple sockets. Use sysfs to print out NUMA information.
Signed-off-by: Anatoly Burakov
---
usertools/cpu_layout.py | 35 ++-
1 file changed, 30 insertions(+), 5 deletions(-)
diff --git a/usertools/cpu_layout.py b/usertools/cpu_layout.py
index 843b29a134..be89909464 100755
--- a/usertools/cpu_layout.py
+++ b/usertools/cpu_layout.py
@@ -4,6 +4,7 @@
# Copyright(c) 2017 Cavium, Inc. All rights reserved.
from typing import List, Set, Dict, Tuple
+import glob
def _range_expand(rstr: str) -> List[int]:
@@ -26,11 +27,19 @@ def _read_sysfs(path: str) -> str:
return fd.read().strip()
+def _read_numa_node(base: str) -> int:
+node_glob = f"{base}/node*"
+node_dirs = glob.glob(node_glob)
+if not node_dirs:
+return 0 # default to node 0
+return int(node_dirs[0].split("node")[1])
+
+
def _print_row(row: Tuple[str, ...], col_widths: List[int]) -> None:
first, *rest = row
w_first, *w_rest = col_widths
first_end = " " * 4
-rest_end = " " * 10
+rest_end = " " * 4
print(first.ljust(w_first), end=first_end)
for cell, width in zip(rest, w_rest):
@@ -50,6 +59,7 @@ def _main() -> None:
sockets_s: Set[int] = set()
cores_s: Set[int] = set()
core_map: Dict[Tuple[int, int], List[int]] = {}
+numa_map: Dict[int, int] = {}
base_path = "/sys/devices/system/cpu"
cpus = _range_expand(_read_sysfs(f"{base_path}/online"))
@@ -58,12 +68,14 @@ def _main() -> None:
lcore_base = f"{base_path}/cpu{cpu}"
core = int(_read_sysfs(f"{lcore_base}/topology/core_id"))
socket = int(_read_sysfs(f"{lcore_base}/topology/physical_package_id"))
+node = _read_numa_node(lcore_base)
cores_s.add(core)
sockets_s.add(socket)
key = (socket, core)
core_map.setdefault(key, [])
core_map[key].append(cpu)
+numa_map[cpu] = node
cores = sorted(cores_s)
sockets = sorted(sockets_s)
@@ -73,24 +85,37 @@ def _main() -> None:
print("cores = ", cores)
print("sockets = ", sockets)
+print("numa = ", sorted(set(numa_map.values(
print()
-# Core, [Socket, Socket, ...]
-heading_strs = "", *[f"Socket {s}" for s in sockets]
+# Core, [NUMA, Socket, NUMA, Socket, ...]
+heading_strs = "", *[v for s in sockets for v in ("", f"Socket {s}")]
sep_strs = tuple("-" * len(hstr) for hstr in heading_strs)
rows: List[Tuple[str, ...]] = []
+prev_numa = None
for c in cores:
# Core,
row: Tuple[str, ...] = (f"Core {c}",)
-# [lcores, lcores, ...]
+# assume NUMA changes symmetrically
+first_lcore = core_map[(0, c)][0]
+cur_numa = numa_map[first_lcore]
+numa_changed = prev_numa != cur_numa
+prev_numa = cur_numa
+
+# [NUMA, lcores, NUMA, lcores, ...]
for s in sockets:
try:
lcores = core_map[(s, c)]
+numa = numa_map[lcores[0]]
+if numa_changed:
+row += (f"NUMA {numa}",)
+else:
+row += ("",)
row += (f"{lcores}",)
except KeyError:
-row += ("",)
+row += ("", "")
rows += [row]
# find max widths for each column, including header and rows
--
2.43.5
Re: DPDK configuration options
On Wed, Aug 14, 2024 at 11:27:58AM +0200, Morten Brørup wrote: > DPDK has many configuration options. > > There are four levels of visibility: > > 1. Some are changed by passing command line options to meson. > 2. Some are changed by modifying their values in config/rte_config.h. > 3. Some are changed by adding them to config/rte_config.h, but you have to > magically know of their existence; e.g. RTE_ENABLE_ASSERT, RTE_MALLOC_DEBUG > and RTE_LIBRTE_MBUF_DEBUG. > 4. Some are hidden away in drivers, typically driver specific options. > > And many of the configuration options are not even documented anywhere in the > code; they are just used by the code. > > It seems the level of visibility is currently determined by how "exotic" the > option is considered to be. I think this is the wrong criteria. > > There's also a expectation that a person building DPDK doesn't have to modify > config/rte_config.h. I think this is a false expectation; if you are > qualified to build DPDK and tweak it along the way, you certainly understand > how to modify a header file, and there is no good reason to pass simple > configuration values (e.g. max_ethports, mbuf_refcnt_atomic and > pkt_mbuf_headroom) 1:1 through meson. > > Furthermore, configuration options should not be hidden away or spread all > over the place. It makes them difficult to find and modify. > > Optimally, we would have the same way of configuring DPDK as the Linux kernel. > But I don't see that happening anytime soon. > So, in the interim, we could use one big configuration file, as follows: > > Options that are not candidates for automatic detection at build time should > not be level 1, but level 2. (Automatic detection makes sense for e.g. > max_lcores, so that should remain at level 1.) > > All level 3 options should be moved to level 2. If there's a configuration > option, it should be presented (and documented), not hidden away. Agreed on this. > > Similarly, level 4 options should be moved to level 2; perhaps except options > in drivers' "base" directories (code shared by DPDK, Linux and/or other > systems). I'm not sure how visible these need to be. If they are driver specific, having them just documented in the specific driver docs is probably good enough. > > Each option should have a comment briefly describing what it does. > Agreed. Taking a step back from the specifics of what options go where, we do need to decide overall how we want to manage build options. For example: * In the past, we had loads of build options in a flag config file, but this turned out to have major issues around validation and didn't seem well liked. * Back when the build system was changed from make to meson/ninja, the general consensus was that we wanted to - as far as possible - move away from build options, because it was impossible to validate all build combinations, and it was very easy to have broken code inside ifdefs that was never even compile-tested. Also, build options didn't work for distro targets, where one build was all that was done. * Since then, though, even though we have had more runtime configurability - we have seen a constant increase in build options too. * Within build options, not all options are equal. For example, numeric values which just affect e.g. array sizes such as number ethdevs, are probably pretty harmless from a testing viewpoint, and may need to be treated differently from build options, e.g. debug ones, which enable/disable code blocks and can therefore introduce subtle issues or hide problems in disabled code. * Within the mechanisms of build options, the main issue I have with using rte_config.h is that it is a file shipped with dpdk and included in the repository. That means that any local changes to it get overwritten with any new DPDK release or update. If we want to have such a file-based approach, I think we need to change things so that we have support for e.g. an rte_config_local.h file which, if present, is used to provide local overrides for the rte_config settings. The exact mechanism by which such a scheme might work I'm not too clear on yet, though! Just my 2c. at this point. /Bruce
Re: [RFC PATCH v2 26/26] config: add computed max queues define for compatibility
On Tue, 13 Aug 2024 17:00:03 +0100 Bruce Richardson wrote: > +.. note:: > + > + The define ``RTE_MAX_QUEUES_PER_PORT`` is kept for backward compatibility. > + Its value is no longer hard-coded, > + but is set, at configuration time, to the maximum of the configured max > Rx and Tx queue values. Would rather it just be marked __rte_deprecated because a runtime calculation is going to break code that uses this to size arrays at compile time.
RE: DPDK configuration options
> From: Bruce Richardson [mailto:bruce.richard...@intel.com] > > On Wed, Aug 14, 2024 at 11:27:58AM +0200, Morten Brørup wrote: > > DPDK has many configuration options. > > > > There are four levels of visibility: > > > > 1. Some are changed by passing command line options to meson. > > 2. Some are changed by modifying their values in config/rte_config.h. > > 3. Some are changed by adding them to config/rte_config.h, but you have to > magically know of their existence; e.g. RTE_ENABLE_ASSERT, RTE_MALLOC_DEBUG > and RTE_LIBRTE_MBUF_DEBUG. > > 4. Some are hidden away in drivers, typically driver specific options. > > > > And many of the configuration options are not even documented anywhere in > the code; they are just used by the code. > > > > It seems the level of visibility is currently determined by how "exotic" the > option is considered to be. I think this is the wrong criteria. > > > > There's also a expectation that a person building DPDK doesn't have to > modify config/rte_config.h. I think this is a false expectation; if you are > qualified to build DPDK and tweak it along the way, you certainly understand > how to modify a header file, and there is no good reason to pass simple > configuration values (e.g. max_ethports, mbuf_refcnt_atomic and > pkt_mbuf_headroom) 1:1 through meson. > > > > Furthermore, configuration options should not be hidden away or spread all > over the place. It makes them difficult to find and modify. > > > > Optimally, we would have the same way of configuring DPDK as the Linux > kernel. > > But I don't see that happening anytime soon. > > So, in the interim, we could use one big configuration file, as follows: > > > > Options that are not candidates for automatic detection at build time should > not be level 1, but level 2. (Automatic detection makes sense for e.g. > max_lcores, so that should remain at level 1.) > > > > All level 3 options should be moved to level 2. If there's a configuration > option, it should be presented (and documented), not hidden away. > > Agreed on this. > > > > > Similarly, level 4 options should be moved to level 2; perhaps except > options in drivers' "base" directories (code shared by DPDK, Linux and/or > other systems). > > I'm not sure how visible these need to be. If they are driver specific, > having them just documented in the specific driver docs is probably good > enough. Many drivers have "driver specific" (in the driver developer's mind) configuration parameters. E.g. the VirtIO driver has VIRTIO_MBUF_BURST_SZ (64) [1] as the max burst returned by rte_eth_rx_burst(), which violates the ethdev API when more than 64 packets are ready in the queue and rte_eth_rx_burst() is called with nb_pkts > 64. [1]: https://elixir.bootlin.com/dpdk/v24.07/source/drivers/net/virtio/virtqueue.h#L26 Such parameters are very difficult to notice, unless you go bug hunting in each specific driver. (Other drivers are likely to have similar issues; I know some of them have been fixed already. I only picked the VirtIO driver because it was fresh in my mind, having looked at it recently.) If those parameters were public and easily visible, we might notice that some parameters are repeated for multiple drivers, and might even benefit from being consolidated into a shared parameter. Some parameters are truly driver specific, e.g. using 16 or 32 byte NIC descriptors. However, if the parameters are there to be tweaked for exotic use cases (except development of the driver itself), I prefer having them visible and easy to locate, rather than hidden away. Rte_common.h does have a section for driver defines, so let's use it. > > > > > Each option should have a comment briefly describing what it does. > > > Agreed. > > Taking a step back from the specifics of what options go where, we do need > to decide overall how we want to manage build options. For example: > > * In the past, we had loads of build options in a flag config file, but > this turned out to have major issues around validation and didn't seem > well liked. > * Back when the build system was changed from make to meson/ninja, the > general consensus was that we wanted to - as far as possible - move away > from build options, because it was impossible to validate all build > combinations, and it was very easy to have broken code inside ifdefs that > was never even compile-tested. Also, build options didn't work for distro > targets, where one build was all that was done. Yes, I remember the discussions regarding the two bullet points above. It was decided to try to reduce the number of build time configuration options in favor of runtime configuration options. I'm not asking to change that decision in any way. > * Since then, though, even though we have had more runtime configurability > - we have seen a constant increase in build options too. Yes, reality kicked in! Some things just don't make sense being runtime configurable. I'm arguing that: - Hiding bu
Re:
On Wed, 14 Aug 2024 16:03:41 +0800 wrote: > iff --git a/drivers/net/r8169/r8169_base.h b/drivers/net/r8169/r8169_base.h > new file mode 100644 > index 00..5d219a7966 > --- /dev/null > +++ b/drivers/net/r8169/r8169_base.h > @@ -0,0 +1,15 @@ > +/* SPDX-License-Identifier: BSD-3-Clause > + * Copyright(c) 2024 Realtek Corporation. All rights reserved > + */ > + > +#ifndef _R8169_BASE_H_ > +#define _R8169_BASE_H_ > + > +typedef uint8_t u8; > +typedef uint16_t u16; > +typedef uint32_t u32; > +typedef uint64_t u64; > + > +#define PCI_VENDOR_ID_REALTEK 0x10EC > + > +#endif > \ No newline at end of file Fix you editor setup, all files should end with newline.
[PATCH v17 0/5] API docs generation
The generation is done with Sphinx, which DPDK already uses, with slightly modified configuration of the sidebar present in an if block. DTS dependencies do not need to be installed, but there is the option to install doc build dependencies with Poetry: poetry install --with docs The build itself may be run with: meson setup -Denable_docs=true ninja -C The above will do a full DPDK build with docs. To build just docs: meson setup ninja -C doc Python3.10 is required to build the DTS API docs. The patchset contains the .rst sources which Sphinx uses to generate the html pages. These were first generated with the sphinx-apidoc utility and modified to provide a better look. The documentation just doesn't look that good without the modifications and there isn't enough configuration options to achieve that without manual changes to the .rst files. This introduces extra maintenance which involves adding new .rst files when a new Python module is added or changing the .rst structure if the Python directory/file structure is changed (moved, renamed files). This small maintenance burden is outweighed by the flexibility afforded by the ability to make manual changes to the .rst files. v10: Fix dts doc generation issue: Only copy the custom rss file if it exists. v11: Added the config option autodoc_mock_imports, which eliminates the need for DTS dependencies. Added a script that find out which imports need to be added to autodoc_mock_imports. The script also check the required Python version for building DTS docs. Removed tags from the two affected patches which will need to be reviewed again. v12: Added paramiko to the required dependencies of get-dts-deps.py. v13: Fixed build error: TypeError: unsupported operand type(s) for |: 'NoneType' and 'Transport' v14: Fixed install error: ERROR: File 'dts/doc/html' could not be found This required me to put the built docs into dts/doc which is outside the DPDK API doc dir, resulting in linking between DPDK and DTS api docs not working properly. I addressed this by adding a symlink to the build dir. This way the link works after installing the docs and the symlink is just one extra file in the build dir. v15: Moved DTS API sources to doc/api/dts. This simplifies a lot of things in the build, but mainly makes a lot of sense. Now the source, build and install paths are the same so there isn't any need for any symlinks or other workarounds. Also added a symlink to the custom.css file so that it works with call-sphinx-build.py without any modifications. v16: Renamed the dependency python file to get-dts-runtime-deps.py a modified it to only get runtime dependencies. We don't need to check docs dependencies (Sphinx) as we don't need to mock those. Also moved all new Sphinx configuration into the DTS if branch to make sure it won't ever affect the DPDK doc build. v17: Removed the dts-doc build target to mirror the functionality of using -Denable_docs=true. Moved DTS-specific meson build code to doc/api/dts/meson.build. Added comments to get_missing_imports() and the top level docstring of get-dts-runtime-deps.py to explain the function is there to be imported. Juraj Linkeš (5): dts: update params and parser docstrings dts: replace the or operator in third party types dts: add doc generation dependencies dts: add API doc sources dts: add API doc generation buildtools/call-sphinx-build.py | 2 + buildtools/get-dts-runtime-deps.py| 84 +++ buildtools/meson.build| 1 + doc/api/doxy-api-index.md | 3 + doc/api/doxy-api.conf.in | 2 + doc/api/dts/conf_yaml_schema.json | 1 + doc/api/dts/custom.css| 1 + doc/api/dts/framework.config.rst | 12 + doc/api/dts/framework.config.types.rst| 6 + doc/api/dts/framework.exception.rst | 6 + doc/api/dts/framework.logger.rst | 6 + doc/api/dts/framework.params.eal.rst | 6 + doc/api/dts/framework.params.rst | 14 + doc/api/dts/framework.params.testpmd.rst | 6 + doc/api/dts/framework.params.types.rst| 6 + doc/api/dts/framework.parser.rst | 6 + .../framework.remote_session.dpdk_shell.rst | 6 + ...ote_session.interactive_remote_session.rst | 6 + ...ework.remote_session.interactive_shell.rst | 6 + .../framework.remote_session.python_shell.rst | 6 + ...ramework.remote_session.remote_session.rst | 6 + doc/api/dts/framework.remote_session.rst | 18 + .../framework.remote_session.ssh_session.rst | 6 + ...framework.remote_session.testpmd_shell.rst | 6 + doc/api/dts/framework.runner.rst | 6 + doc/api/dts/framework.settings.rst| 6 + doc/api/dts/framework.test_result.rst | 6 + doc/api/dts/framework.test_suite.rst | 6 + doc/api/dts/framework.testbed_model.cpu.rst | 6 + .../framework.testbed_model.li
[PATCH v17 1/5] dts: update params and parser docstrings
Address a few errors reported by Sphinx when generating documentation:
framework/params/__init__.py:docstring of framework.params.modify_str:3:
WARNING: Inline interpreted text or phrase reference start-string
without end-string.
framework/params/eal.py:docstring of framework.params.eal.EalParams:35:
WARNING: Definition list ends without a blank line; unexpected
unindent.
framework/params/types.py:docstring of framework.params.types:8:
WARNING: Inline strong start-string without end-string.
framework/params/types.py:docstring of framework.params.types:9:
WARNING: Inline strong start-string without end-string.
framework/parser.py:docstring of framework.parser.TextParser:33: ERROR:
Unexpected indentation.
framework/parser.py:docstring of framework.parser.TextParser:43: ERROR:
Unexpected indentation.
framework/parser.py:docstring of framework.parser.TextParser:49: ERROR:
Unexpected indentation.
framework/parser.py:docstring of framework.parser.TextParser.wrap:8:
ERROR: Unexpected indentation.
framework/parser.py:docstring of framework.parser.TextParser.wrap:9:
WARNING: Block quote ends without a blank line; unexpected unindent.
Fixes: 87ba4cdc0dbb ("dts: use Unpack for type checking and hinting")
Fixes: d70159cb62f5 ("dts: add params manipulation module")
Fixes: 967fc62b0a43 ("dts: refactor EAL parameters class")
Fixes: 818fe14e3422 ("dts: add parsing utility module")
Cc: luca.vizza...@arm.com
Signed-off-by: Juraj Linkeš
Reviewed-by: Luca Vizzarro
---
dts/framework/params/__init__.py | 4 ++--
dts/framework/params/eal.py | 7 +--
dts/framework/params/types.py| 3 ++-
dts/framework/parser.py | 4 ++--
4 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/dts/framework/params/__init__.py b/dts/framework/params/__init__.py
index 5a6fd93053..1ae227d7b4 100644
--- a/dts/framework/params/__init__.py
+++ b/dts/framework/params/__init__.py
@@ -53,9 +53,9 @@ def reduced_fn(value):
def modify_str(*funcs: FnPtr) -> Callable[[T], T]:
-"""Class decorator modifying the ``__str__`` method with a function
created from its arguments.
+r"""Class decorator modifying the ``__str__`` method with a function
created from its arguments.
-The :attr:`FnPtr`s fed to the decorator are executed from left to right in
the arguments list
+The :attr:`FnPtr`\s fed to the decorator are executed from left to right
in the arguments list
order.
Args:
diff --git a/dts/framework/params/eal.py b/dts/framework/params/eal.py
index 8d7766fefc..cf1594353a 100644
--- a/dts/framework/params/eal.py
+++ b/dts/framework/params/eal.py
@@ -26,13 +26,16 @@ class EalParams(Params):
prefix: Set the file prefix string with which to start DPDK, e.g.:
``prefix="vf"``.
no_pci: Switch to disable PCI bus, e.g.: ``no_pci=True``.
vdevs: Virtual devices, e.g.::
+
vdevs=[
VirtualDevice('net_ring0'),
VirtualDevice('net_ring1')
]
+
ports: The list of ports to allow.
-other_eal_param: user defined DPDK EAL parameters, e.g.:
-``other_eal_param='--single-file-segments'``
+other_eal_param: user defined DPDK EAL parameters, e.g.::
+
+``other_eal_param='--single-file-segments'``
"""
lcore_list: LogicalCoreList | None = field(default=None,
metadata=Params.short("l"))
diff --git a/dts/framework/params/types.py b/dts/framework/params/types.py
index e668f658d8..d77c4625fb 100644
--- a/dts/framework/params/types.py
+++ b/dts/framework/params/types.py
@@ -6,7 +6,8 @@
TypedDicts can be used in conjunction with Unpack and kwargs for type hinting
on function calls.
Example:
-..code:: python
+.. code:: python
+
def create_testpmd(**kwargs: Unpack[TestPmdParamsDict]):
params = TestPmdParams(**kwargs)
"""
diff --git a/dts/framework/parser.py b/dts/framework/parser.py
index 741dfff821..7254c75b71 100644
--- a/dts/framework/parser.py
+++ b/dts/framework/parser.py
@@ -46,7 +46,7 @@ class TextParser(ABC):
Example:
The following example makes use of and demonstrates every parser
function available:
-..code:: python
+.. code:: python
from dataclasses import dataclass, field
from enum import Enum
@@ -90,7 +90,7 @@ def wrap(parser_fn: ParserFn, wrapper_fn: Callable) ->
ParserFn:
"""Makes a wrapped parser function.
`parser_fn` is called and if a non-None value is returned,
`wrapper_function` is called with
-it. Otherwise the function returns early with None. In pseudo-code:
+it. Otherwise the function returns early with None. In pseudo-code::
intermediate_value := parser_fn(input)
if intermediary_value is None then
--
2.34.1
[PATCH v17 2/5] dts: replace the or operator in third party types
When the DTS dependencies are not installed when building DTS API documentation, the or operator produces errors when used with types from those libraries: autodoc: failed to import module 'remote_session' from module 'framework'; the following exception was raised: Traceback (most recent call last): ... TypeError: unsupported operand type(s) for |: 'Transport' and 'NoneType' The third part type here is Transport from the paramiko library. Signed-off-by: Juraj Linkeš --- dts/framework/remote_session/interactive_remote_session.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dts/framework/remote_session/interactive_remote_session.py b/dts/framework/remote_session/interactive_remote_session.py index 97194e6af8..4605ee14b4 100644 --- a/dts/framework/remote_session/interactive_remote_session.py +++ b/dts/framework/remote_session/interactive_remote_session.py @@ -5,6 +5,7 @@ import socket import traceback +from typing import Union from paramiko import AutoAddPolicy, SSHClient, Transport # type: ignore[import-untyped] from paramiko.ssh_exception import ( # type: ignore[import-untyped] @@ -52,7 +53,7 @@ class InteractiveRemoteSession: session: SSHClient _logger: DTSLogger _node_config: NodeConfiguration -_transport: Transport | None +_transport: Union[Transport, None] def __init__(self, node_config: NodeConfiguration, logger: DTSLogger) -> None: """Connect to the node during initialization. -- 2.34.1
[PATCH v17 3/5] dts: add doc generation dependencies
Sphinx imports every Python module (through the autodoc extension)
when generating documentation from docstrings, meaning all DTS
dependencies, including Python version, should be satisfied. This is not
a hard requirement, as imports from dependencies may be mocked in the
autodoc_mock_imports autodoc option.
In case DTS developers want to use a Sphinx installation from their
virtualenv, we provide an optional Poetry group for doc generation. The
pyelftools package is there so that meson picks up the correct Python
installation, as pyelftools is required by the build system.
Signed-off-by: Juraj Linkeš
---
dts/poetry.lock| 521 +++--
dts/pyproject.toml | 8 +
2 files changed, 517 insertions(+), 12 deletions(-)
diff --git a/dts/poetry.lock b/dts/poetry.lock
index 5f8fa03933..2dd8bad498 100644
--- a/dts/poetry.lock
+++ b/dts/poetry.lock
@@ -1,5 +1,16 @@
# This file is automatically @generated by Poetry 1.8.2 and should not be
changed by hand.
+[[package]]
+name = "alabaster"
+version = "0.7.13"
+description = "A configurable sidebar-enabled Sphinx theme"
+optional = false
+python-versions = ">=3.6"
+files = [
+{file = "alabaster-0.7.13-py3-none-any.whl", hash =
"sha256:1ee19aca801bbabb5ba3f5f258e4422dfa86f82f3e9cefb0859b283cdd7f62a3"},
+{file = "alabaster-0.7.13.tar.gz", hash =
"sha256:a27a4a084d5e690e16e01e03ad2b2e552c61a65469419b907243193de1a84ae2"},
+]
+
[[package]]
name = "attrs"
version = "23.1.0"
@@ -18,6 +29,23 @@ docs = ["furo", "myst-parser", "sphinx",
"sphinx-notfound-page", "sphinxcontrib-
tests = ["attrs[tests-no-zope]", "zope-interface"]
tests-no-zope = ["cloudpickle", "hypothesis", "mypy (>=1.1.1)", "pympler",
"pytest (>=4.3.0)", "pytest-mypy-plugins", "pytest-xdist[psutil]"]
+[[package]]
+name = "babel"
+version = "2.13.1"
+description = "Internationalization utilities"
+optional = false
+python-versions = ">=3.7"
+files = [
+{file = "Babel-2.13.1-py3-none-any.whl", hash =
"sha256:7077a4984b02b6727ac10f1f7294484f737443d7e2e66c5e4380e41a3ae0b4ed"},
+{file = "Babel-2.13.1.tar.gz", hash =
"sha256:33e0952d7dd6374af8dbf6768cc4ddf3ccfefc244f9986d4074704f2fbd18900"},
+]
+
+[package.dependencies]
+setuptools = {version = "*", markers = "python_version >= \"3.12\""}
+
+[package.extras]
+dev = ["freezegun (>=1.0,<2.0)", "pytest (>=6.0)", "pytest-cov"]
+
[[package]]
name = "bcrypt"
version = "4.0.1"
@@ -86,6 +114,17 @@ d = ["aiohttp (>=3.7.4)"]
jupyter = ["ipython (>=7.8.0)", "tokenize-rt (>=3.2.0)"]
uvloop = ["uvloop (>=0.15.2)"]
+[[package]]
+name = "certifi"
+version = "2023.7.22"
+description = "Python package for providing Mozilla's CA Bundle."
+optional = false
+python-versions = ">=3.6"
+files = [
+{file = "certifi-2023.7.22-py3-none-any.whl", hash =
"sha256:92d6037539857d8206b8f6ae472e8b77db8058fec5937a1ef3f54304089edbb9"},
+{file = "certifi-2023.7.22.tar.gz", hash =
"sha256:539cc1d13202e33ca466e88b2807e29f4c13049d6d87031a3c110744495cb082"},
+]
+
[[package]]
name = "cffi"
version = "1.15.1"
@@ -162,6 +201,105 @@ files = [
[package.dependencies]
pycparser = "*"
+[[package]]
+name = "charset-normalizer"
+version = "3.3.2"
+description = "The Real First Universal Charset Detector. Open, modern and
actively maintained alternative to Chardet."
+optional = false
+python-versions = ">=3.7.0"
+files = [
+{file = "charset-normalizer-3.3.2.tar.gz", hash =
"sha256:f30c3cb33b24454a82faecaf01b19c18562b1e89558fb6c56de4d9118a032fd5"},
+{file = "charset_normalizer-3.3.2-cp310-cp310-macosx_10_9_universal2.whl",
hash =
"sha256:25baf083bf6f6b341f4121c2f3c548875ee6f5339300e08be3f2b2ba1721cdd3"},
+{file = "charset_normalizer-3.3.2-cp310-cp310-macosx_10_9_x86_64.whl",
hash =
"sha256:06435b539f889b1f6f4ac1758871aae42dc3a8c0e24ac9e60c2384973ad73027"},
+{file = "charset_normalizer-3.3.2-cp310-cp310-macosx_11_0_arm64.whl", hash
= "sha256:9063e24fdb1e498ab71cb7419e24622516c4a04476b17a2dab57e8baa30d6e03"},
+{file =
"charset_normalizer-3.3.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl",
hash =
"sha256:6897af51655e3691ff853668779c7bad41579facacf5fd7253b0133308cf000d"},
+{file =
"charset_normalizer-3.3.2-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl",
hash =
"sha256:1d3193f4a680c64b4b6a9115943538edb896edc190f0b222e73761716519268e"},
+{file =
"charset_normalizer-3.3.2-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl",
hash =
"sha256:cd70574b12bb8a4d2aaa0094515df2463cb429d8536cfb6c7ce983246983e5a6"},
+{file =
"charset_normalizer-3.3.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl",
hash =
"sha256:8465322196c8b4d7ab6d1e049e4c5cb460d0394da4a27d23cc242fbf0034b6b5"},
+{file =
"charset_normalizer-3.3.2-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl",
hash =
"sha256:a9a8e9031d613fd2009c182b69c7b2c1ef8239a0efb1df3f7c8da66d5dd3d537"},
+{file = "charset_normalizer-3.3.2-cp310-cp
[PATCH v17 4/5] dts: add API doc sources
These sources could be generated with the sphinx-apidoc utility, but that doesn't give us enough flexibility, such as sorting the order of modules or changing the headers of the modules. The sources included in this patch were in fact generated by said utility, but modified to improve the look of the documentation. The improvements are mainly in toctree definitions and the titles of the modules/packages. These were made with specific Sphinx config options in mind. Signed-off-by: Juraj Linkeš Reviewed-by: Luca Vizzarro Reviewed-by: Jeremy Spewock Tested-by: Luca Vizzarro --- doc/api/dts/conf_yaml_schema.json | 1 + doc/api/dts/framework.config.rst | 12 ++ doc/api/dts/framework.config.types.rst| 6 +++ doc/api/dts/framework.exception.rst | 6 +++ doc/api/dts/framework.logger.rst | 6 +++ doc/api/dts/framework.params.eal.rst | 6 +++ doc/api/dts/framework.params.rst | 14 ++ doc/api/dts/framework.params.testpmd.rst | 6 +++ doc/api/dts/framework.params.types.rst| 6 +++ doc/api/dts/framework.parser.rst | 6 +++ .../framework.remote_session.dpdk_shell.rst | 6 +++ ...ote_session.interactive_remote_session.rst | 6 +++ ...ework.remote_session.interactive_shell.rst | 6 +++ .../framework.remote_session.python_shell.rst | 6 +++ ...ramework.remote_session.remote_session.rst | 6 +++ doc/api/dts/framework.remote_session.rst | 18 .../framework.remote_session.ssh_session.rst | 6 +++ ...framework.remote_session.testpmd_shell.rst | 6 +++ doc/api/dts/framework.runner.rst | 6 +++ doc/api/dts/framework.settings.rst| 6 +++ doc/api/dts/framework.test_result.rst | 6 +++ doc/api/dts/framework.test_suite.rst | 6 +++ doc/api/dts/framework.testbed_model.cpu.rst | 6 +++ .../framework.testbed_model.linux_session.rst | 6 +++ doc/api/dts/framework.testbed_model.node.rst | 6 +++ .../framework.testbed_model.os_session.rst| 6 +++ doc/api/dts/framework.testbed_model.port.rst | 6 +++ .../framework.testbed_model.posix_session.rst | 6 +++ doc/api/dts/framework.testbed_model.rst | 26 +++ .../dts/framework.testbed_model.sut_node.rst | 6 +++ .../dts/framework.testbed_model.tg_node.rst | 6 +++ ..._generator.capturing_traffic_generator.rst | 6 +++ ...mework.testbed_model.traffic_generator.rst | 14 ++ testbed_model.traffic_generator.scapy.rst | 6 +++ ...el.traffic_generator.traffic_generator.rst | 6 +++ ...framework.testbed_model.virtual_device.rst | 6 +++ doc/api/dts/framework.utils.rst | 6 +++ doc/api/dts/index.rst | 43 +++ 38 files changed, 314 insertions(+) create mode 12 doc/api/dts/conf_yaml_schema.json create mode 100644 doc/api/dts/framework.config.rst create mode 100644 doc/api/dts/framework.config.types.rst create mode 100644 doc/api/dts/framework.exception.rst create mode 100644 doc/api/dts/framework.logger.rst create mode 100644 doc/api/dts/framework.params.eal.rst create mode 100644 doc/api/dts/framework.params.rst create mode 100644 doc/api/dts/framework.params.testpmd.rst create mode 100644 doc/api/dts/framework.params.types.rst create mode 100644 doc/api/dts/framework.parser.rst create mode 100644 doc/api/dts/framework.remote_session.dpdk_shell.rst create mode 100644 doc/api/dts/framework.remote_session.interactive_remote_session.rst create mode 100644 doc/api/dts/framework.remote_session.interactive_shell.rst create mode 100644 doc/api/dts/framework.remote_session.python_shell.rst create mode 100644 doc/api/dts/framework.remote_session.remote_session.rst create mode 100644 doc/api/dts/framework.remote_session.rst create mode 100644 doc/api/dts/framework.remote_session.ssh_session.rst create mode 100644 doc/api/dts/framework.remote_session.testpmd_shell.rst create mode 100644 doc/api/dts/framework.runner.rst create mode 100644 doc/api/dts/framework.settings.rst create mode 100644 doc/api/dts/framework.test_result.rst create mode 100644 doc/api/dts/framework.test_suite.rst create mode 100644 doc/api/dts/framework.testbed_model.cpu.rst create mode 100644 doc/api/dts/framework.testbed_model.linux_session.rst create mode 100644 doc/api/dts/framework.testbed_model.node.rst create mode 100644 doc/api/dts/framework.testbed_model.os_session.rst create mode 100644 doc/api/dts/framework.testbed_model.port.rst create mode 100644 doc/api/dts/framework.testbed_model.posix_session.rst create mode 100644 doc/api/dts/framework.testbed_model.rst create mode 100644 doc/api/dts/framework.testbed_model.sut_node.rst create mode 100644 doc/api/dts/framework.testbed_model.tg_node.rst create mode 100644 doc/api/dts/framework.testbed_model.traffic_generator.capturing_traffic_generator.rst create mode 100644 doc/api/dts/framework.testbed_model.traffic_generator.rst create mode 100644 doc/api/dts/fra
[PATCH v17 5/5] dts: add API doc generation
The tool used to generate DTS API docs is Sphinx, which is already in
use in DPDK. The same configuration is used to preserve style with one
DTS-specific configuration (so that the DPDK docs are unchanged) that
modifies how the sidebar displays the content. There's other Sphinx
configuration related to Python docstrings which doesn't affect DPDK doc
build. All new configuration is in a conditional block, applied only
when DTS API docs are built to not interfere with DPDK doc build.
Sphinx generates the documentation from Python docstrings. The docstring
format is the Google format [0] which requires the sphinx.ext.napoleon
extension. The other extension, sphinx.ext.intersphinx, enables linking
to objects in external documentations, such as the Python documentation.
There is one requirement for building DTS docs - the same Python version
as DTS or higher, because Sphinx's autodoc extension imports the code.
The dependencies needed to import the code don't have to be satisfied,
as the autodoc extension allows us to mock the imports. The missing
packages are taken from the DTS pyproject.toml file.
And finally, the DTS API docs can be accessed from the DPDK API doxygen
page.
[0] https://google.github.io/styleguide/pyguide.html#38-comments-and-docstrings
Signed-off-by: Juraj Linkeš
---
buildtools/call-sphinx-build.py | 2 +
buildtools/get-dts-runtime-deps.py| 84 +++
buildtools/meson.build| 1 +
doc/api/doxy-api-index.md | 3 +
doc/api/doxy-api.conf.in | 2 +
doc/api/dts/custom.css| 1 +
doc/api/dts/meson.build | 31 +
doc/api/meson.build | 6 +-
doc/guides/conf.py| 44 +++-
doc/guides/contributing/documentation.rst | 2 +
doc/guides/contributing/patches.rst | 4 ++
doc/guides/tools/dts.rst | 39 ++-
doc/meson.build | 1 +
13 files changed, 217 insertions(+), 3 deletions(-)
create mode 100755 buildtools/get-dts-runtime-deps.py
create mode 12 doc/api/dts/custom.css
create mode 100644 doc/api/dts/meson.build
diff --git a/buildtools/call-sphinx-build.py b/buildtools/call-sphinx-build.py
index 623e7363ee..154e9f907b 100755
--- a/buildtools/call-sphinx-build.py
+++ b/buildtools/call-sphinx-build.py
@@ -15,6 +15,8 @@
# set the version in environment for sphinx to pick up
os.environ['DPDK_VERSION'] = version
+if 'dts' in src:
+os.environ['DTS_BUILD'] = "y"
sphinx_cmd = [sphinx] + extra_args
diff --git a/buildtools/get-dts-runtime-deps.py
b/buildtools/get-dts-runtime-deps.py
new file mode 100755
index 00..68244480a3
--- /dev/null
+++ b/buildtools/get-dts-runtime-deps.py
@@ -0,0 +1,84 @@
+#!/usr/bin/env python3
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2024 PANTHEON.tech s.r.o.
+#
+
+"""Utilities for DTS dependencies.
+
+The module can be used as an executable script,
+which verifies that the running Python version meets the version requirement
of DTS.
+The script exits with the standard exit codes in this mode (0 is success, 1 is
failure).
+
+The module also contains a function, get_missing_imports,
+which looks for runtime dependencies in the DTS pyproject.toml file
+and returns a list of module names used in an import statement (import
packages) that are missing.
+This function is not used when the module is run as a script and is available
to be imported.
+"""
+
+import configparser
+import importlib.metadata
+import importlib.util
+import os.path
+import platform
+
+from packaging.version import Version
+
+_VERSION_COMPARISON_CHARS = '^<>='
+_EXTRA_DEPS = {'invoke': '>=1.3', 'paramiko': '>=2.4'}
+_DPDK_ROOT = os.path.dirname(os.path.dirname(__file__))
+_DTS_DEP_FILE_PATH = os.path.join(_DPDK_ROOT, 'dts', 'pyproject.toml')
+
+
+def _get_dependencies(cfg_file_path):
+cfg = configparser.ConfigParser()
+with open(cfg_file_path) as f:
+dts_deps_file_str = f.read()
+dts_deps_file_str = dts_deps_file_str.replace("\n]", "]")
+cfg.read_string(dts_deps_file_str)
+
+deps_section = cfg['tool.poetry.dependencies']
+return {dep: deps_section[dep].strip('"\'') for dep in deps_section}
+
+
+def get_missing_imports():
+"""Get missing DTS import packages from third party libraries.
+
+Scan the DTS pyproject.toml file for dependencies and find those that are
not installed.
+The dependencies in pyproject.toml are listed by their distribution
package names,
+but the function finds the associated import packages - those used in
import statements.
+
+The function is not used when the module is run as a script. It should be
imported.
+
+Returns:
+A list of missing import packages.
+"""
+missing_imports = []
+req_deps = _get_dependencies(_DTS_DEP_FILE_PATH)
+req_deps.pop('python')
+
+for req_dep, req_ver in (req_deps | _EXTRA_DEPS).items
Re: [RFC PATCH v2 26/26] config: add computed max queues define for compatibility
On Wed, Aug 14, 2024 at 08:01:19AM -0700, Stephen Hemminger wrote: > On Tue, 13 Aug 2024 17:00:03 +0100 > Bruce Richardson wrote: > > > +.. note:: > > + > > + The define ``RTE_MAX_QUEUES_PER_PORT`` is kept for backward > > compatibility. > > + Its value is no longer hard-coded, > > + but is set, at configuration time, to the maximum of the configured max > > Rx and Tx queue values. > > Would rather it just be marked __rte_deprecated because a runtime calculation > is going to break > code that uses this to size arrays at compile time. "runtime calculation is going to break" -> yep, that's why it's computed at configuration time using meson, so all C code sees is a hard-coded value. See commit log message, which calls this out too. In terms of deprecating the old value, I'd really rather not do so, as I suspect that this value is likely used in many end-user applications. While I know according to our policy we could remove this, the cost of keeping around a backward-compatible version of this seems pretty small and may avoid breaking lots of end-applications. Then again, we may want to deprecate it for internal use in DPDK. /Bruce
[PATCH v1 0/2] dts: port over port_control testing suite
From: Jeremy Spewock This series ports over most of the test coverage provided from the port_control testing suite in the Old DTS framework. The only functionality that is missing is testing port functions in a VM through QEMU and testing the support of resetting ports. Since we have no method of handling virtual machines in the new framework and have yet to express interest in adding it, these test cases were omitted from this suite. Additionally the ability to reset a port is not something that is supported by all devices and devices do not seem to expose information regarding whether they support resetting ports through testpmd. Jeremy Spewock (2): dts: add methods for closing and restarting ports to testpmd dts: add port control testing suite dts/framework/config/conf_yaml_schema.json| 3 +- dts/framework/remote_session/testpmd_shell.py | 21 + dts/tests/TestSuite_port_control.py | 80 +++ 3 files changed, 103 insertions(+), 1 deletion(-) create mode 100644 dts/tests/TestSuite_port_control.py -- 2.45.2
[PATCH v1 1/2] dts: add methods for closing ports to testpmd
From: Jeremy Spewock
Closing ports is a standard configuration feature that is available in
testpmd but the framework lacks the ability to access this command
through the Testpmd API. This patch adds a method that performs this
action and verifies the results of sending the command to allow
developers to have more control over the state of the ports that
testpmd is aware of.
Depends-on: patch-142952 ("dts: add ability to start/stop testpmd
ports")
Signed-off-by: Jeremy Spewock
---
dts/framework/remote_session/testpmd_shell.py | 21 +++
1 file changed, 21 insertions(+)
diff --git a/dts/framework/remote_session/testpmd_shell.py
b/dts/framework/remote_session/testpmd_shell.py
index ca24b28070..51593c61f5 100644
--- a/dts/framework/remote_session/testpmd_shell.py
+++ b/dts/framework/remote_session/testpmd_shell.py
@@ -805,6 +805,27 @@ def start_all_ports(self, verify: bool = True) -> None:
self.ports_started = True
+@requires_stopped_ports
+def close_all_ports(self, verify: bool = True) -> None:
+"""Close all ports.
+
+Args:
+verify: If :data:`True` the output of the close command will be
scanned in an attempt
+to verify that all ports were stopped successfully. Defaults
to :data:`True`.
+
+Raises:
+InteractiveCommandExecutionError: If `verify` is :data:`True` and
at lease one port
+failed to close.
+"""
+port_close_output = self.send_command("port close all")
+if verify:
+if type(self._app_params.ports) is list:
+num_ports = len(self._app_params.ports)
+if not all(
+f"Port {p_id} is closed" in port_close_output for p_id in
range(num_ports)
+):
+raise InteractiveCommandExecutionError("Ports were not
closed successfully.")
+
def show_port_info_all(self) -> list[TestPmdPort]:
"""Returns the information of all the ports.
--
2.45.2
[PATCH v1 2/2] dts: add port control testing suite
From: Jeremy Spewock
This patch ports over the port_control test suite from the Old DTS
framework and adapts the functionality to fit with the current testing
framework. The test suite provides validation of basic port control
functions such as starting, stopping, and closing ports. It should
be noted that this test suite is not completely 1-to-1 with the one
from Old DTS as it does exclude test cases that use QEMU for testing as
this is not something we are looking to add to the framework in the
near future. It also excludes test cases for resetting ports as this
feature is something that is not supported by all devices and does not
expose a capability regarding if it is through testpmd.
Depends-on: patch-142949 ("dts: add ability to send/receive multiple
packets")
Signed-off-by: Jeremy Spewock
---
dts/framework/config/conf_yaml_schema.json | 3 +-
dts/tests/TestSuite_port_control.py| 80 ++
2 files changed, 82 insertions(+), 1 deletion(-)
create mode 100644 dts/tests/TestSuite_port_control.py
diff --git a/dts/framework/config/conf_yaml_schema.json
b/dts/framework/config/conf_yaml_schema.json
index f02a310bb5..78cbd17dad 100644
--- a/dts/framework/config/conf_yaml_schema.json
+++ b/dts/framework/config/conf_yaml_schema.json
@@ -187,7 +187,8 @@
"enum": [
"hello_world",
"os_udp",
-"pmd_buffer_scatter"
+"pmd_buffer_scatter",
+"port_control"
]
},
"test_target": {
diff --git a/dts/tests/TestSuite_port_control.py
b/dts/tests/TestSuite_port_control.py
new file mode 100644
index 00..9e843512ab
--- /dev/null
+++ b/dts/tests/TestSuite_port_control.py
@@ -0,0 +1,80 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2024 University of New Hampshire
+"""Port Control Testing Suite.
+
+This test suite serves to show that ports within testpmd support basic
configuration functions.
+Things such as starting a port, stopping a port, and closing a port should all
be supported by the
+device. Additionally, after each of these configuration steps (outside of
closing the port) it
+should still be possible to start the port again and verify that the port is
able to forward a
+large amount of packets (1000 are sent in the test cases).
+"""
+from scapy.layers.l2 import Ether # type: ignore[import-untyped]
+from scapy.packet import Packet, Raw # type: ignore[import-untyped]
+
+from framework.params.testpmd import SimpleForwardingModes
+from framework.remote_session.testpmd_shell import TestPmdShell
+from framework.test_suite import TestSuite
+
+
+class TestPortControl(TestSuite):
+"""DPDK Port Control Testing Suite."""
+
+def send_packets_and_verify(self) -> None:
+"""Send 1000 packets and verify that all packets were forwarded back.
+
+Packets sent are identical and are all ethernet frames with a payload
of 30 "X" characters.
+This payload is used to differentiate noise on the wire from packets
sent by this
+framework.
+"""
+payload = "X" * 30
+num_pakts = 1000
+send_p = Ether() / Raw(payload)
+recv_pakts: list[Packet] = []
+# The scapy sniffer can only handle a little under 200 packets per
1000 at a time, so this
+# is limited to 100 per burst.
+for _ in range(int(num_pakts / 100)):
+recv_pakts += self.send_packets_and_capture([send_p] * 100)
+recv_pakts += self.send_packets_and_capture([send_p] * (num_pakts %
100))
+recv_pakts = [
+p
+for p in recv_pakts
+if (
+# Remove padding from the bytes.
+hasattr(p, "load")
+and p.load.decode("utf-8").replace("\x00", "") == payload
+)
+]
+self.verify(
+len(recv_pakts) == num_pakts,
+f"Received {len(recv_pakts)} packets when {num_pakts} were
expected.",
+)
+
+def test_start_ports(self) -> None:
+"""Ensure that the port can receive traffic after explicitly being
started."""
+with TestPmdShell(self.sut_node,
forward_mode=SimpleForwardingModes.mac) as testpmd:
+testpmd.start_all_ports()
+testpmd.start()
+self.send_packets_and_verify()
+
+def test_stop_ports(self) -> None:
+"""Verify that the link goes down after stopping ports.
+
+This case also verifies that the port can be started again and
properly forward traffic
+after being stopped.
+"""
+with TestPmdShell(self.sut_node,
forward_mode=SimpleForwardingModes.mac) as testpmd:
+testpmd.stop_all_ports()
+self.verify(
+all(not p.is_link_up for p in testpmd.show_port_info_all()),
+"Failed to stop all ports.",
+)
+testpmd.start()
+self.send_packets_and_verify()
+
+def test_close_ports(self) -> None:
+"""Verify that ports can be closed and no
Re: [PATCH v17 1/5] dts: update params and parser docstrings
On Wed, Aug 14, 2024 at 11:05 AM Juraj Linkeš
wrote:
>
> Address a few errors reported by Sphinx when generating documentation:
> framework/params/__init__.py:docstring of framework.params.modify_str:3:
> WARNING: Inline interpreted text or phrase reference start-string
> without end-string.
> framework/params/eal.py:docstring of framework.params.eal.EalParams:35:
> WARNING: Definition list ends without a blank line; unexpected
> unindent.
> framework/params/types.py:docstring of framework.params.types:8:
> WARNING: Inline strong start-string without end-string.
> framework/params/types.py:docstring of framework.params.types:9:
> WARNING: Inline strong start-string without end-string.
> framework/parser.py:docstring of framework.parser.TextParser:33: ERROR:
> Unexpected indentation.
> framework/parser.py:docstring of framework.parser.TextParser:43: ERROR:
> Unexpected indentation.
> framework/parser.py:docstring of framework.parser.TextParser:49: ERROR:
> Unexpected indentation.
> framework/parser.py:docstring of framework.parser.TextParser.wrap:8:
> ERROR: Unexpected indentation.
> framework/parser.py:docstring of framework.parser.TextParser.wrap:9:
> WARNING: Block quote ends without a blank line; unexpected unindent.
>
> Fixes: 87ba4cdc0dbb ("dts: use Unpack for type checking and hinting")
> Fixes: d70159cb62f5 ("dts: add params manipulation module")
> Fixes: 967fc62b0a43 ("dts: refactor EAL parameters class")
> Fixes: 818fe14e3422 ("dts: add parsing utility module")
> Cc: luca.vizza...@arm.com
>
> Signed-off-by: Juraj Linkeš
> Reviewed-by: Luca Vizzarro
> ---
Reviewed-by: Jeremy Spewock
Re: [PATCH v17 2/5] dts: replace the or operator in third party types
On Wed, Aug 14, 2024 at 11:05 AM Juraj Linkeš wrote: > > When the DTS dependencies are not installed when building DTS API > documentation, the or operator produces errors when used with types from > those libraries: > autodoc: failed to import module 'remote_session' from module > 'framework'; the following exception was raised: > Traceback (most recent call last): > ... > TypeError: unsupported operand type(s) for |: 'Transport' and 'NoneType' > > The third part type here is Transport from the paramiko library. > > Signed-off-by: Juraj Linkeš > --- Reviewed-by: Jeremy Spewock
Re: [PATCH v17 3/5] dts: add doc generation dependencies
On Wed, Aug 14, 2024 at 11:05 AM Juraj Linkeš wrote: > > Sphinx imports every Python module (through the autodoc extension) > when generating documentation from docstrings, meaning all DTS > dependencies, including Python version, should be satisfied. This is not > a hard requirement, as imports from dependencies may be mocked in the > autodoc_mock_imports autodoc option. > In case DTS developers want to use a Sphinx installation from their > virtualenv, we provide an optional Poetry group for doc generation. The > pyelftools package is there so that meson picks up the correct Python > installation, as pyelftools is required by the build system. > > Signed-off-by: Juraj Linkeš Reviewed-by: Jeremy Spewock
Re: [PATCH v17 5/5] dts: add API doc generation
On Wed, Aug 14, 2024 at 11:05 AM Juraj Linkeš wrote: > > The tool used to generate DTS API docs is Sphinx, which is already in > use in DPDK. The same configuration is used to preserve style with one > DTS-specific configuration (so that the DPDK docs are unchanged) that > modifies how the sidebar displays the content. There's other Sphinx > configuration related to Python docstrings which doesn't affect DPDK doc > build. All new configuration is in a conditional block, applied only > when DTS API docs are built to not interfere with DPDK doc build. > > Sphinx generates the documentation from Python docstrings. The docstring > format is the Google format [0] which requires the sphinx.ext.napoleon > extension. The other extension, sphinx.ext.intersphinx, enables linking > to objects in external documentations, such as the Python documentation. > > There is one requirement for building DTS docs - the same Python version > as DTS or higher, because Sphinx's autodoc extension imports the code. > > The dependencies needed to import the code don't have to be satisfied, > as the autodoc extension allows us to mock the imports. The missing > packages are taken from the DTS pyproject.toml file. > > And finally, the DTS API docs can be accessed from the DPDK API doxygen > page. > > [0] > https://google.github.io/styleguide/pyguide.html#38-comments-and-docstrings > > Signed-off-by: Juraj Linkeš Reviewed-by: Jeremy Spewock
[PATCH v2] doc: add new driver guidelines
From: Nandini Persad This document was created to assist contributors in creating DPDK drivers and provides suggestions and guidelines on how to upstream effectively. Co-authored-by: Ferruh Yigit Co-authored-by: Thomas Monjalon Signed-off-by: Nandini Persad Reviewed-by: Stephen Hemminger --- v2 - review feedback - add co-author and reviewed-by doc/guides/contributing/index.rst | 1 + doc/guides/contributing/new_driver.rst | 202 + 2 files changed, 203 insertions(+) create mode 100644 doc/guides/contributing/new_driver.rst diff --git a/doc/guides/contributing/index.rst b/doc/guides/contributing/index.rst index dcb9b1fbf0..7fc6511361 100644 --- a/doc/guides/contributing/index.rst +++ b/doc/guides/contributing/index.rst @@ -15,6 +15,7 @@ Contributor's Guidelines documentation unit_test new_library +new_driver patches vulnerability stable diff --git a/doc/guides/contributing/new_driver.rst b/doc/guides/contributing/new_driver.rst new file mode 100644 index 00..4aa1fd1d05 --- /dev/null +++ b/doc/guides/contributing/new_driver.rst @@ -0,0 +1,202 @@ +.. SPDX-License-Identifier: BSD-3-Clause + Copyright 2024 The DPDK contributors + + +Upstreaming New DPDK Drivers Guide +== + +The DPDK project continuously grows its ecosystem by adding support for new devices. +This document is designed to assist contributors in creating DPDK +drivers, also known as Poll Mode Drivers (PMD's). + +By having public support for a device, we can ensure accessibility across various +operating systems and guarantee community maintenance in future releases. +If a new device is similar to a device already supported by an existing driver, +it is more efficient to update the existing driver. + +Here are our best practice recommendations for creating a new driver. + + +Early Engagement with the Community +--- + +When creating a new driver, we highly recommend engaging with the DPDK +community early instead of waiting the work to mature. + +These public discussions help align development of your driver with DPDK expectations. +You may submit a roadmap before the release to inform the community of +your plans. Additionally, sending a Request for Comments (RFC) early in +the release cycle, or even during the prior release, is advisable. + +DPDK is mainly consumed via Long Term Support (LTS) releases. +It is common to target a new PMD to a LTS release. For this, it is +suggested to start upstreaming at least one release before a LTS release. + + +Progressive Work + + +To continually progress your work, we recommend planning for incremental +upstreaming across multiple patch series or releases. + +It's important to prioritize quality of the driver over upstreaming +in a single release or single patch series. + + +Finalizing +-- + +Once the driver has been upstreamed, the author has +a responsibility to the community to maintain it. + +This includes the public test report. Authors must send a public +test report after the first upstreaming of the PMD. The same +public test procedure may be reproduced regularly per release. + +After the PMD is upstreamed, the author should send a patch +to update the website with the name of the new PMD and supported devices +via the DPDK mailing list.. + +For more information about the role of maintainers, see :doc:`patches`. + + + +Splitting into Patches +-- + +We recommend that drivers are split into patches, so that each patch represents +a single feature. If the driver code is already developed, it may be challenging +to split. However, there are many benefits to doing so. + +Splitting patches makes it easier to understand a feature and clarifies the +list of components/files that compose that specific feature. + +It also enables the ability to track from the source code to the feature +it is enabled for and helps users to understand the reasoning and intention +of implementation. This kind of tracing is regularly required +for defect resolution and refactoring. + +Another benefit of splitting the codebase per feature is that it highlights +unnecessary or irrelevant code, as any code not belonging to any specific +feature becomes obvious. + +Git bisect is also more useful if patches are split per patch. + +The split should focus on logical features +rather than file-based divisions. + +Each patch in the series must compile without errors +and should maintain functionality. + +Enable the build as early as possible within the series +to facilitate continuous integration and testing. +This approach ensures a clear and manageable development process. + +We suggest splitting patches following this approach: + +* Each patch should be organized logically as a new feature. +* Run test tools per patch (See :ref:`tool_list`:). +* Update relevant documentation and .ini file with each patch. + + +The following order in the
[PATCH] net/r8169: add PMD driver skeleton
Meson build infrastructure, r8169_ethdev minimal skeleton,
header with Realtek NIC device and vendor IDs.
Signed-off-by: Howard Wang
---
MAINTAINERS | 7 ++
drivers/net/meson.build | 1 +
drivers/net/r8169/meson.build| 7 ++
drivers/net/r8169/r8169_base.h | 16 +++
drivers/net/r8169/r8169_ethdev.c | 181 +++
drivers/net/r8169/r8169_ethdev.h | 41 +++
6 files changed, 253 insertions(+)
create mode 100644 drivers/net/r8169/meson.build
create mode 100644 drivers/net/r8169/r8169_base.h
create mode 100644 drivers/net/r8169/r8169_ethdev.c
create mode 100644 drivers/net/r8169/r8169_ethdev.h
diff --git a/MAINTAINERS b/MAINTAINERS
index c5a703b5c0..5f9eccc43f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1076,6 +1076,13 @@ F: drivers/net/memif/
F: doc/guides/nics/memif.rst
F: doc/guides/nics/features/memif.ini
+Realtek r8169
+M: Howard Wang
+M: ChunHao Lin
+M: Xing Wang
+M: Realtek NIC SW
+F: drivers/net/r8169
+
Crypto Drivers
--
diff --git a/drivers/net/meson.build b/drivers/net/meson.build
index fb6d34b782..fddcf39655 100644
--- a/drivers/net/meson.build
+++ b/drivers/net/meson.build
@@ -53,6 +53,7 @@ drivers = [
'pfe',
'qede',
'ring',
+'r8169',
'sfc',
'softnic',
'tap',
diff --git a/drivers/net/r8169/meson.build b/drivers/net/r8169/meson.build
new file mode 100644
index 00..e37b4fb237
--- /dev/null
+++ b/drivers/net/r8169/meson.build
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2024 Realtek Corporation. All rights reserved
+
+sources = files(
+ 'r8169_ethdev.c',
+)
+
diff --git a/drivers/net/r8169/r8169_base.h b/drivers/net/r8169/r8169_base.h
new file mode 100644
index 00..c3b0186daa
--- /dev/null
+++ b/drivers/net/r8169/r8169_base.h
@@ -0,0 +1,16 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2024 Realtek Corporation. All rights reserved
+ */
+
+#ifndef _R8169_BASE_H_
+#define _R8169_BASE_H_
+
+typedef uint8_t u8;
+typedef uint16_t u16;
+typedef uint32_t u32;
+typedef uint64_t u64;
+
+#define PCI_VENDOR_ID_REALTEK 0x10EC
+
+#endif
+
diff --git a/drivers/net/r8169/r8169_ethdev.c b/drivers/net/r8169/r8169_ethdev.c
new file mode 100644
index 00..b3db7fdaab
--- /dev/null
+++ b/drivers/net/r8169/r8169_ethdev.c
@@ -0,0 +1,181 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2024 Realtek Corporation. All rights reserved
+ */
+
+#include
+#include
+#include
+#include
+#include
+
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include "r8169_ethdev.h"
+#include "r8169_base.h"
+
+static int rtl_dev_configure(struct rte_eth_dev *dev __rte_unused);
+static int rtl_dev_start(struct rte_eth_dev *dev);
+static int rtl_dev_stop(struct rte_eth_dev *dev);
+static int rtl_dev_reset(struct rte_eth_dev *dev);
+static int rtl_dev_close(struct rte_eth_dev *dev);
+
+/*
+ * The set of PCI devices this driver supports
+ */
+static const struct rte_pci_id pci_id_r8169_map[] = {
+ { RTE_PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8125) },
+ { RTE_PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8162) },
+ { RTE_PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8126) },
+ { RTE_PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x5000) },
+ {.vendor_id = 0, /* sentinel */ },
+};
+
+static const struct eth_dev_ops rtl_eth_dev_ops = {
+ .dev_configure= rtl_dev_configure,
+ .dev_start= rtl_dev_start,
+ .dev_stop = rtl_dev_stop,
+ .dev_close= rtl_dev_close,
+ .dev_reset= rtl_dev_reset,
+};
+
+static int
+rtl_dev_configure(struct rte_eth_dev *dev __rte_unused)
+{
+ return 0;
+}
+
+/*
+ * Configure device link speed and setup link.
+ * It returns 0 on success.
+ */
+static int
+rtl_dev_start(struct rte_eth_dev *dev)
+{
+ struct rtl_adapter *adapter = RTL_DEV_PRIVATE(dev);
+ struct rtl_hw *hw = &adapter->hw;
+
+ hw->adapter_stopped = 0;
+
+ return 0;
+}
+
+/*
+ * Stop device: disable RX and TX functions to allow for reconfiguring.
+ */
+static int
+rtl_dev_stop(struct rte_eth_dev *dev)
+{
+ struct rtl_adapter *adapter = RTL_DEV_PRIVATE(dev);
+ struct rtl_hw *hw = &adapter->hw;
+
+ if (hw->adapter_stopped)
+ return 0;
+
+ hw->adapter_stopped = 1;
+ dev->data->dev_started = 0;
+
+ return 0;
+}
+
+/*
+ * Reset and stop device.
+ */
+static int
+rtl_dev_close(struct rte_eth_dev *dev)
+{
+ int ret_stp;
+
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return 0;
+
+ ret_stp = rtl_dev_stop(dev);
+
+ return ret_stp;
+}
+
+static int
+rtl_dev_init(struct rte_eth_dev *dev)
+{
+ struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev);
+ struct rte_intr_handle *intr_handle
