From 9e6b36c34ce928d13a5182e8e76580058366bf7c Mon Sep 17 00:00:00 2001 From: David Marchand Date: Fri, 22 Nov 2019 11:43:23 +0100 Subject: [PATCH] app/testpmd: reduce memory consumption Following [1], testpmd memory consumption has skyrocketted. The rte_port structure has gotten quite fat. struct rte_port { [...] struct rte_eth_rxconf rx_conf[65536]; /* 266280 3145728 */ /* --- cacheline 53312 boundary (3411968 bytes) was 40 bytes ago --- */ struct rte_eth_txconf tx_conf[65536]; /* 3412008 3670016 */ /* --- cacheline 110656 boundary (7081984 bytes) was 40 bytes ago --- */ [...] /* size: 8654936, cachelines: 135234, members: 31 */ [...] testpmd handles RTE_MAX_ETHPORTS ports (32 by default) which means that it needs ~256MB just for this internal representation. The reason is that a testpmd rte_port (the name is quite confusing, as it is a local type) maintains configurations for all queues of a port. But where you would expect testpmd to use RTE_MAX_QUEUES_PER_PORT as the maximum queue count, the rte_port uses MAX_QUEUE_ID set to 64k. Prefer the ethdev maximum value. After this patch: struct rte_port { [...] struct rte_eth_rxconf rx_conf[1025]; /* 8240 49200 */ /* --- cacheline 897 boundary (57408 bytes) was 32 bytes ago --- */ struct rte_eth_txconf tx_conf[1025]; /* 57440 57400 */ /* --- cacheline 1794 boundary (114816 bytes) was 24 bytes ago --- */ [...] /* size: 139488, cachelines: 2180, members: 31 */ [...] With this, we can ask for less memory in test-null.sh. [1]: https://git.dpdk.org/dpdk/commit/?id=436b3a6b6e62 Signed-off-by: David Marchand Acked-by: Ferruh Yigit Acked-by: Thomas Monjalon --- app/test-pmd/testpmd.c | 6 +++--- app/test-pmd/testpmd.h | 16 +++++++--------- devtools/test-null.sh | 2 +- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index ac1b7b604c..b374682236 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -979,7 +979,7 @@ check_socket_id(const unsigned int socket_id) queueid_t get_allowed_max_nb_rxq(portid_t *pid) { - queueid_t allowed_max_rxq = MAX_QUEUE_ID; + queueid_t allowed_max_rxq = RTE_MAX_QUEUES_PER_PORT; bool max_rxq_valid = false; portid_t pi; struct rte_eth_dev_info dev_info; @@ -1029,7 +1029,7 @@ check_nb_rxq(queueid_t rxq) queueid_t get_allowed_max_nb_txq(portid_t *pid) { - queueid_t allowed_max_txq = MAX_QUEUE_ID; + queueid_t allowed_max_txq = RTE_MAX_QUEUES_PER_PORT; bool max_txq_valid = false; portid_t pi; struct rte_eth_dev_info dev_info; @@ -1079,7 +1079,7 @@ check_nb_txq(queueid_t txq) queueid_t get_allowed_max_nb_hairpinq(portid_t *pid) { - queueid_t allowed_max_hairpinq = MAX_QUEUE_ID; + queueid_t allowed_max_hairpinq = RTE_MAX_QUEUES_PER_PORT; portid_t pi; struct rte_eth_hairpin_cap cap; diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h index 90694a3309..217d577018 100644 --- a/app/test-pmd/testpmd.h +++ b/app/test-pmd/testpmd.h @@ -58,8 +58,6 @@ typedef uint16_t portid_t; typedef uint16_t queueid_t; typedef uint16_t streamid_t; -#define MAX_QUEUE_ID ((1 << (sizeof(queueid_t) * 8)) - 1) - #if defined RTE_LIBRTE_PMD_SOFTNIC #define SOFTNIC 1 #else @@ -179,22 +177,22 @@ struct rte_port { uint8_t need_reconfig_queues; /**< need reconfiguring queues or not */ uint8_t rss_flag; /**< enable rss or not */ uint8_t dcb_flag; /**< enable dcb */ - uint16_t nb_rx_desc[MAX_QUEUE_ID+1]; /**< per queue rx desc number */ - uint16_t nb_tx_desc[MAX_QUEUE_ID+1]; /**< per queue tx desc number */ - struct rte_eth_rxconf rx_conf[MAX_QUEUE_ID+1]; /**< per queue rx configuration */ - struct rte_eth_txconf tx_conf[MAX_QUEUE_ID+1]; /**< per queue tx configuration */ + uint16_t nb_rx_desc[RTE_MAX_QUEUES_PER_PORT+1]; /**< per queue rx desc number */ + uint16_t nb_tx_desc[RTE_MAX_QUEUES_PER_PORT+1]; /**< per queue tx desc number */ + struct rte_eth_rxconf rx_conf[RTE_MAX_QUEUES_PER_PORT+1]; /**< per queue rx configuration */ + struct rte_eth_txconf tx_conf[RTE_MAX_QUEUES_PER_PORT+1]; /**< per queue tx configuration */ struct rte_ether_addr *mc_addr_pool; /**< pool of multicast addrs */ uint32_t mc_addr_nb; /**< nb. of addr. in mc_addr_pool */ uint8_t slave_flag; /**< bonding slave port */ struct port_flow *flow_list; /**< Associated flows. */ - const struct rte_eth_rxtx_callback *rx_dump_cb[MAX_QUEUE_ID+1]; - const struct rte_eth_rxtx_callback *tx_dump_cb[MAX_QUEUE_ID+1]; + 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]; #ifdef SOFTNIC struct softnic_port softport; /**< softnic params */ #endif /**< metadata value to insert in Tx packets. */ uint32_t tx_metadata; - const struct rte_eth_rxtx_callback *tx_set_md_cb[MAX_QUEUE_ID+1]; + const struct rte_eth_rxtx_callback *tx_set_md_cb[RTE_MAX_QUEUES_PER_PORT+1]; }; /** diff --git a/devtools/test-null.sh b/devtools/test-null.sh index 72aa82b16f..f39af2c064 100755 --- a/devtools/test-null.sh +++ b/devtools/test-null.sh @@ -27,6 +27,6 @@ else fi (sleep 1 && echo stop) | -$testpmd -c $coremask --no-huge -m 150 \ +$testpmd -c $coremask --no-huge -m 20 \ $libs -w 0:0.0 --vdev net_null1 --vdev net_null2 $eal_options -- \ --no-mlockall --total-num-mbufs=2048 $testpmd_options -ia -- 2.20.1