From: Ophir Munk <ophirmu@nvidia.com>
To: <dev@dpdk.org>, Bruce Richardson <bruce.richardson@intel.com>,
"Devendra Singh Rawat" <dsinghrawat@marvell.com>,
Alok Prasad <palok@marvell.com>
Cc: Ophir Munk <ophirmu@mellanox.com>, Matan Azrad <matan@nvidia.com>,
"Thomas Monjalon" <thomas@monjalon.net>,
Lior Margalit <lmargalit@nvidia.com>
Subject: [RFC] lib: set/get max memzone segments
Date: Wed, 19 Apr 2023 11:36:34 +0300 [thread overview]
Message-ID: <20230419083634.2027689-1-ophirmu@nvidia.com> (raw)
In current DPDK the RTE_MAX_MEMZONE definition is unconditionally hard
coded as 2560. For applications requiring different values of this
parameter – it is more convenient to set the max value via an rte API -
rather than changing the dpdk source code per application. In many
organizations, the possibility to compile a private DPDK library for a
particular application does not exist at all. With this option there is
no need to recompile DPDK and it allows using an in-box packaged DPDK.
An example usage for updating the RTE_MAX_MEMZONE would be of an
application that uses the DPDK mempool library which is based on DPDK
memzone library. The application may need to create a number of
steering tables, each of which will require its own mempool allocation.
This commit is not about how to optimize the application usage of
mempool nor about how to improve the mempool implementation based on
memzone. It is about how to make the max memzone definition - run-time
customized.
This commit adds an API which must be called before rte_eal_init():
rte_memzone_max_set(int max). If not called, the default memzone
(RTE_MAX_MEMZONE) is used. There is also an API to query the effective
max memzone: rte_memzone_max_get().
Signed-off-by: Ophir Munk <ophirmu@nvidia.com>
---
app/test/test_func_reentrancy.c | 2 +-
app/test/test_malloc_perf.c | 2 +-
app/test/test_memzone.c | 2 +-
config/rte_config.h | 1 -
drivers/net/qede/base/bcm_osal.c | 26 +++++++++++++++++++++-----
drivers/net/qede/base/bcm_osal.h | 3 +++
drivers/net/qede/qede_main.c | 7 +++++++
lib/eal/common/eal_common_memzone.c | 28 +++++++++++++++++++++++++---
lib/eal/include/rte_memzone.h | 20 ++++++++++++++++++++
lib/eal/version.map | 4 ++++
10 files changed, 83 insertions(+), 12 deletions(-)
diff --git a/app/test/test_func_reentrancy.c b/app/test/test_func_reentrancy.c
index d1ed5d4..ae9de6f 100644
--- a/app/test/test_func_reentrancy.c
+++ b/app/test/test_func_reentrancy.c
@@ -51,7 +51,7 @@ typedef void (*case_clean_t)(unsigned lcore_id);
#define MEMPOOL_ELT_SIZE (sizeof(uint32_t))
#define MEMPOOL_SIZE (4)
-#define MAX_LCORES (RTE_MAX_MEMZONE / (MAX_ITER_MULTI * 4U))
+#define MAX_LCORES (rte_memzone_max_get() / (MAX_ITER_MULTI * 4U))
static uint32_t obj_count;
static uint32_t synchro;
diff --git a/app/test/test_malloc_perf.c b/app/test/test_malloc_perf.c
index ccec43a..9bd1662 100644
--- a/app/test/test_malloc_perf.c
+++ b/app/test/test_malloc_perf.c
@@ -165,7 +165,7 @@ test_malloc_perf(void)
return -1;
if (test_alloc_perf("rte_memzone_reserve", memzone_alloc, memzone_free,
- NULL, memset_us_gb, RTE_MAX_MEMZONE - 1) < 0)
+ NULL, memset_us_gb, rte_memzone_max_get() - 1) < 0)
return -1;
return 0;
diff --git a/app/test/test_memzone.c b/app/test/test_memzone.c
index c9255e5..a315826 100644
--- a/app/test/test_memzone.c
+++ b/app/test/test_memzone.c
@@ -871,7 +871,7 @@ test_memzone_bounded(void)
static int
test_memzone_free(void)
{
- const struct rte_memzone *mz[RTE_MAX_MEMZONE + 1];
+ const struct rte_memzone *mz[rte_memzone_max_get() + 1];
int i;
char name[20];
diff --git a/config/rte_config.h b/config/rte_config.h
index 7b8c85e..400e44e 100644
--- a/config/rte_config.h
+++ b/config/rte_config.h
@@ -34,7 +34,6 @@
#define RTE_MAX_MEM_MB_PER_LIST 32768
#define RTE_MAX_MEMSEG_PER_TYPE 32768
#define RTE_MAX_MEM_MB_PER_TYPE 65536
-#define RTE_MAX_MEMZONE 2560
#define RTE_MAX_TAILQ 32
#define RTE_LOG_DP_LEVEL RTE_LOG_INFO
#define RTE_MAX_VFIO_CONTAINERS 64
diff --git a/drivers/net/qede/base/bcm_osal.c b/drivers/net/qede/base/bcm_osal.c
index 2c59397..f195f2c 100644
--- a/drivers/net/qede/base/bcm_osal.c
+++ b/drivers/net/qede/base/bcm_osal.c
@@ -47,10 +47,26 @@ void osal_poll_mode_dpc(osal_int_ptr_t hwfn_cookie)
}
/* Array of memzone pointers */
-static const struct rte_memzone *ecore_mz_mapping[RTE_MAX_MEMZONE];
+static const struct rte_memzone **ecore_mz_mapping;
/* Counter to track current memzone allocated */
static uint16_t ecore_mz_count;
+int ecore_mz_mapping_alloc(void)
+{
+ ecore_mz_mapping = rte_malloc("ecore_mz_map", 0,
+ rte_memzone_max_get() * sizeof(struct rte_memzone *));
+
+ if (!ecore_mz_mapping)
+ return -ENOMEM;
+
+ return 0;
+}
+
+void ecore_mz_mapping_free(void)
+{
+ rte_free(ecore_mz_mapping);
+}
+
unsigned long qede_log2_align(unsigned long n)
{
unsigned long ret = n ? 1 : 0;
@@ -132,9 +148,9 @@ void *osal_dma_alloc_coherent(struct ecore_dev *p_dev,
uint32_t core_id = rte_lcore_id();
unsigned int socket_id;
- if (ecore_mz_count >= RTE_MAX_MEMZONE) {
+ if (ecore_mz_count >= rte_memzone_max_get()) {
DP_ERR(p_dev, "Memzone allocation count exceeds %u\n",
- RTE_MAX_MEMZONE);
+ rte_memzone_max_get());
*phys = 0;
return OSAL_NULL;
}
@@ -171,9 +187,9 @@ void *osal_dma_alloc_coherent_aligned(struct ecore_dev *p_dev,
uint32_t core_id = rte_lcore_id();
unsigned int socket_id;
- if (ecore_mz_count >= RTE_MAX_MEMZONE) {
+ if (ecore_mz_count >= rte_memzone_max_get()) {
DP_ERR(p_dev, "Memzone allocation count exceeds %u\n",
- RTE_MAX_MEMZONE);
+ rte_memzone_max_get());
*phys = 0;
return OSAL_NULL;
}
diff --git a/drivers/net/qede/base/bcm_osal.h b/drivers/net/qede/base/bcm_osal.h
index 67e7f75..97e261d 100644
--- a/drivers/net/qede/base/bcm_osal.h
+++ b/drivers/net/qede/base/bcm_osal.h
@@ -477,4 +477,7 @@ enum dbg_status qed_dbg_alloc_user_data(struct ecore_hwfn *p_hwfn,
qed_dbg_alloc_user_data(p_hwfn, user_data_ptr)
#define OSAL_DB_REC_OCCURRED(p_hwfn) nothing
+int ecore_mz_mapping_alloc(void);
+void ecore_mz_mapping_free(void);
+
#endif /* __BCM_OSAL_H */
diff --git a/drivers/net/qede/qede_main.c b/drivers/net/qede/qede_main.c
index 0303903..f116e86 100644
--- a/drivers/net/qede/qede_main.c
+++ b/drivers/net/qede/qede_main.c
@@ -78,6 +78,12 @@ qed_probe(struct ecore_dev *edev, struct rte_pci_device *pci_dev,
return rc;
}
+ rc = ecore_mz_mapping_alloc();
+ if (rc) {
+ DP_ERR(edev, "mem zones array allocation failed\n");
+ return rc;
+ }
+
return rc;
}
@@ -721,6 +727,7 @@ static void qed_remove(struct ecore_dev *edev)
if (!edev)
return;
+ ecore_mz_mapping_free();
ecore_hw_remove(edev);
}
diff --git a/lib/eal/common/eal_common_memzone.c b/lib/eal/common/eal_common_memzone.c
index a9cd91f..6c43b7f 100644
--- a/lib/eal/common/eal_common_memzone.c
+++ b/lib/eal/common/eal_common_memzone.c
@@ -22,6 +22,10 @@
#include "eal_private.h"
#include "eal_memcfg.h"
+#define RTE_DEFAULT_MAX_MEMZONE 2560
+
+static uint32_t memzone_max = RTE_DEFAULT_MAX_MEMZONE;
+
static inline const struct rte_memzone *
memzone_lookup_thread_unsafe(const char *name)
{
@@ -81,8 +85,9 @@ memzone_reserve_aligned_thread_unsafe(const char *name, size_t len,
/* no more room in config */
if (arr->count >= arr->len) {
RTE_LOG(ERR, EAL,
- "%s(): Number of requested memzone segments exceeds RTE_MAX_MEMZONE\n",
- __func__);
+ "%s(): Number of requested memzone segments exceeds max "
+ "memzone segments (%d >= %d)\n",
+ __func__, arr->count, arr->len);
rte_errno = ENOSPC;
return NULL;
}
@@ -396,7 +401,7 @@ rte_eal_memzone_init(void)
if (rte_eal_process_type() == RTE_PROC_PRIMARY &&
rte_fbarray_init(&mcfg->memzones, "memzone",
- RTE_MAX_MEMZONE, sizeof(struct rte_memzone))) {
+ rte_memzone_max_get(), sizeof(struct rte_memzone))) {
RTE_LOG(ERR, EAL, "Cannot allocate memzone list\n");
ret = -1;
} else if (rte_eal_process_type() == RTE_PROC_SECONDARY &&
@@ -430,3 +435,20 @@ void rte_memzone_walk(void (*func)(const struct rte_memzone *, void *),
}
rte_rwlock_read_unlock(&mcfg->mlock);
}
+
+int
+rte_memzone_max_set(uint32_t max)
+{
+ /* Setting max memzone must occur befaore calling rte_eal_init() */
+ if (eal_get_internal_configuration()->init_complete > 0)
+ return -1;
+
+ memzone_max = max;
+ return 0;
+}
+
+uint32_t
+rte_memzone_max_get(void)
+{
+ return memzone_max;
+}
diff --git a/lib/eal/include/rte_memzone.h b/lib/eal/include/rte_memzone.h
index 5302caa..ca60409 100644
--- a/lib/eal/include/rte_memzone.h
+++ b/lib/eal/include/rte_memzone.h
@@ -305,6 +305,26 @@ void rte_memzone_dump(FILE *f);
void rte_memzone_walk(void (*func)(const struct rte_memzone *, void *arg),
void *arg);
+/**
+ * Set max memzone value
+ *
+ * @param max
+ * Value of max memzone allocations
+ * @return
+ * 0 on success, -1 otherwise
+ */
+__rte_experimental
+int rte_memzone_max_set(uint32_t max);
+
+/**
+ * Get max memzone value
+ *
+ * @return
+ * Value of max memzone allocations
+ */
+__rte_experimental
+uint32_t rte_memzone_max_get(void);
+
#ifdef __cplusplus
}
#endif
diff --git a/lib/eal/version.map b/lib/eal/version.map
index 6d6978f..717c5b2 100644
--- a/lib/eal/version.map
+++ b/lib/eal/version.map
@@ -430,6 +430,10 @@ EXPERIMENTAL {
rte_thread_create_control;
rte_thread_set_name;
__rte_eal_trace_generic_blob;
+
+ # added in 23.07
+ rte_memzone_max_set;
+ rte_memzone_max_get;
};
INTERNAL {
--
2.8.4
next reply other threads:[~2023-04-19 8:37 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-19 8:36 Ophir Munk [this message]
2023-04-19 8:48 ` Ophir Munk
2023-04-19 13:42 ` [EXT] " Devendra Singh Rawat
2023-04-24 21:07 ` Ophir Munk
2023-04-19 14:42 ` Stephen Hemminger
2023-04-24 21:43 ` Ophir Munk
2023-04-19 14:51 ` Tyler Retzlaff
2023-04-20 7:43 ` Thomas Monjalon
2023-04-20 18:20 ` Tyler Retzlaff
2023-04-21 8:34 ` Thomas Monjalon
2023-04-21 11:08 ` Morten Brørup
2023-04-21 14:57 ` Thomas Monjalon
2023-04-21 15:19 ` Morten Brørup
2023-04-25 16:38 ` Ophir Munk
2023-04-25 13:46 ` Ophir Munk
2023-04-25 16:40 ` [RFC V2] " Ophir Munk
2023-05-03 7:26 ` [PATCH V3] " Ophir Munk
2023-05-03 21:41 ` Morten Brørup
2023-05-25 6:47 ` Ophir Munk
2023-05-04 7:27 ` David Marchand
2023-05-25 6:35 ` Ophir Munk
2023-05-18 15:54 ` Burakov, Anatoly
2023-05-25 6:43 ` Ophir Munk
2023-05-24 22:25 ` [PATCH v4] " Ophir Munk
2023-05-25 14:53 ` Burakov, Anatoly
2023-05-30 11:37 ` Ophir Munk
2023-05-26 9:55 ` David Marchand
2023-05-28 12:09 ` [EXT] " Alok Prasad
2023-05-30 13:32 ` Thomas Monjalon
2023-05-31 7:56 ` Ophir Munk
2023-05-31 7:52 ` [PATCH V5] " Ophir Munk
2023-05-31 8:41 ` [PATCH V6] " Ophir Munk
2023-06-05 8:52 ` [PATCH V7] " Ophir Munk
2023-06-05 10:50 ` [PATCH V8] " Ophir Munk
2023-06-05 16:50 ` Thomas Monjalon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230419083634.2027689-1-ophirmu@nvidia.com \
--to=ophirmu@nvidia.com \
--cc=bruce.richardson@intel.com \
--cc=dev@dpdk.org \
--cc=dsinghrawat@marvell.com \
--cc=lmargalit@nvidia.com \
--cc=matan@nvidia.com \
--cc=ophirmu@mellanox.com \
--cc=palok@marvell.com \
--cc=thomas@monjalon.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).