ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

event: Add a user option to change the size of spdk_msg_mempool

Browse Source 
The spdk_msg_mempool structure has a fixed size, which is not flexible
enough. The size of the memory allocation can now be changed in the
options given to the spdk_app_start function.

Signed-off-by: Alexis Lescouet <alexis.lescouet@nutanix.com>
Change-Id: I1d6524ab8cf23f69f553aedb0f5b0cdc9dde374b
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/11635
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Shuhei Matsumoto <smatsumoto@nvidia.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
Alexis Lescouet 2022-02-13 18:32:26 +00:00 committed by Tomasz Zawadzki
parent c58d5161e9
commit a71cd5214b
11 changed files with 45 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@ -31,6 +31,12 @@ A new flag `ACCEL_FLAG_PERSISTENT` was added to indicate the target memory is PM
Added `bdev_nvme_add_error_injection` and `bdev_nvme_remove_error_injection` RPCs to add and
remove NVMe error injections.
### event
Added `msg_mempool_size` parameter to `spdk_reactors_init` and `spdk_thread_lib_init_ext`.
The size of `g_spdk_msg_mempool` can now be controlled through the same-named
user option of `spdk_app_opts` structure.
### nvmf
Removed deprecated max_qpairs_per_ctrlr parameter from nvmf_create_transport RPC. Use

2
examples/nvmf/nvmf/nvmf.c
View File

@ -334,7 +334,7 @@ nvmf_init_threads(void)
* framework. The size of the extra memory allocated is the second parameter.
*/
spdk_thread_lib_init_ext(nvmf_reactor_thread_op, nvmf_reactor_thread_op_supported,
sizeof(struct nvmf_lw_thread));
sizeof(struct nvmf_lw_thread), SPDK_DEFAULT_MSG_MEMPOOL_SIZE);
/* Spawn one system thread per CPU core. The system thread is called a reactor.
* SPDK will spawn lightweight threads that must be mapped to reactors in

7
include/spdk/event.h
View File

@ -147,6 +147,13 @@ struct spdk_app_opts {
* Default is `false`.
*/
bool disable_signal_handlers;
/**
* The allocated size for the message pool used by the threading library.
*
* Default is `SPDK_DEFAULT_MSG_MEMPOOL_SIZE`.
*/
size_t msg_mempool_size;
};
/**

6
include/spdk/thread.h
View File

@ -213,6 +213,9 @@ typedef void (*spdk_channel_for_each_cpl)(struct spdk_io_channel_iter *i, int st
#define SPDK_IO_CHANNEL_STRUCT_SIZE 96
/* Power of 2 minus 1 is optimal for memory consumption */
#define SPDK_DEFAULT_MSG_MEMPOOL_SIZE (262144 - 1)
/**
* Initialize the threading library. Must be called once prior to allocating any threads.
*
@ -236,12 +239,13 @@ int spdk_thread_lib_init(spdk_new_thread_fn new_thread_fn, size_t ctx_sz);
* \param thread_op_supported_fn Called to check whether the SPDK thread operation is supported.
* \param ctx_sz For each thread allocated, for use by the thread scheduler. A pointer
* to this region may be obtained by calling spdk_thread_get_ctx().
* \param msg_mempool_size Size of the allocated spdk_msg_mempool.
*
* \return 0 on success. Negated errno on failure.
*/
int spdk_thread_lib_init_ext(spdk_thread_op_fn thread_op_fn,
spdk_thread_op_supported_fn thread_op_supported_fn,
size_t ctx_sz);
size_t ctx_sz, size_t msg_mempool_size);
/**
* Release all resources associated with this library.

2
include/spdk_internal/event.h
View File

@ -116,7 +116,7 @@ struct spdk_reactor {
int resched_fd;
} __attribute__((aligned(SPDK_CACHE_LINE_SIZE)));
int spdk_reactors_init(void);
int spdk_reactors_init(size_t msg_mempool_size);
void spdk_reactors_fini(void);
void spdk_reactors_start(void);

6
lib/event/app.c
View File

@ -225,6 +225,7 @@ spdk_app_opts_init(struct spdk_app_opts *opts, size_t opts_size)
SET_FIELD(num_entries, SPDK_APP_DEFAULT_NUM_TRACE_ENTRIES);
SET_FIELD(delay_subsystem_init, false);
SET_FIELD(disable_signal_handlers, false);
SET_FIELD(msg_mempool_size, SPDK_DEFAULT_MSG_MEMPOOL_SIZE);
#undef SET_FIELD
}
@ -520,10 +521,11 @@ app_copy_opts(struct spdk_app_opts *opts, struct spdk_app_opts *opts_user, size_
SET_FIELD(log);
SET_FIELD(base_virtaddr);
SET_FIELD(disable_signal_handlers);
SET_FIELD(msg_mempool_size);
/* You should not remove this statement, but need to update the assert statement
* if you add a new field, and also add a corresponding SET_FIELD statement */
SPDK_STATIC_ASSERT(sizeof(struct spdk_app_opts) == 192, "Incorrect size");
SPDK_STATIC_ASSERT(sizeof(struct spdk_app_opts) == 200, "Incorrect size");
#undef SET_FIELD
}
@ -600,7 +602,7 @@ spdk_app_start(struct spdk_app_opts *opts_user, spdk_msg_fn start_fn,
spdk_log_open(opts->log);
SPDK_NOTICELOG("Total cores available: %d\n", spdk_env_get_core_count());
if ((rc = spdk_reactors_init()) != 0) {
if ((rc = spdk_reactors_init(opts->msg_mempool_size)) != 0) {
SPDK_ERRLOG("Reactor Initialization failed: rc = %d\n", rc);
return 1;
}

4
lib/event/reactor.c
View File

@ -233,7 +233,7 @@ static int reactor_thread_op(struct spdk_thread *thread, enum spdk_thread_op op)
static bool reactor_thread_op_supported(enum spdk_thread_op op);
int
spdk_reactors_init(void)
spdk_reactors_init(size_t msg_mempool_size)
{
struct spdk_reactor *reactor;
int rc;
@ -274,7 +274,7 @@ spdk_reactors_init(void)
memset(g_reactors, 0, (g_reactor_count) * sizeof(struct spdk_reactor));
spdk_thread_lib_init_ext(reactor_thread_op, reactor_thread_op_supported,
sizeof(struct spdk_lw_thread));
sizeof(struct spdk_lw_thread), msg_mempool_size);
SPDK_ENV_FOREACH_CORE(i) {
reactor_construct(&g_reactors[i], i);

14
lib/thread/thread.c
View File

@ -266,19 +266,21 @@ _get_thread(void)
}
static int
_thread_lib_init(size_t ctx_sz)
_thread_lib_init(size_t ctx_sz, size_t msg_mempool_sz)
{
char mempool_name[SPDK_MAX_MEMZONE_NAME_LEN];
g_ctx_sz = ctx_sz;
snprintf(mempool_name, sizeof(mempool_name), "msgpool_%d", getpid());
g_spdk_msg_mempool = spdk_mempool_create(mempool_name,
262144 - 1, /* Power of 2 minus 1 is optimal for memory consumption */
g_spdk_msg_mempool = spdk_mempool_create(mempool_name, msg_mempool_sz,
sizeof(struct spdk_msg),
0, /* No cache. We do our own. */
SPDK_ENV_SOCKET_ID_ANY);
SPDK_DEBUGLOG(thread, "spdk_msg_mempool was created with size: %zu\n",
msg_mempool_sz);
if (!g_spdk_msg_mempool) {
SPDK_ERRLOG("spdk_msg_mempool creation failed\n");
return -1;
@ -299,13 +301,13 @@ spdk_thread_lib_init(spdk_new_thread_fn new_thread_fn, size_t ctx_sz)
g_new_thread_fn = new_thread_fn;
}
return _thread_lib_init(ctx_sz);
return _thread_lib_init(ctx_sz, SPDK_DEFAULT_MSG_MEMPOOL_SIZE);
}
int
spdk_thread_lib_init_ext(spdk_thread_op_fn thread_op_fn,
spdk_thread_op_supported_fn thread_op_supported_fn,
size_t ctx_sz)
size_t ctx_sz, size_t msg_mempool_sz)
{
assert(g_new_thread_fn == NULL);
assert(g_thread_op_fn == NULL);
@ -323,7 +325,7 @@ spdk_thread_lib_init_ext(spdk_thread_op_fn thread_op_fn,
g_thread_op_supported_fn = thread_op_supported_fn;
}
return _thread_lib_init(ctx_sz);
return _thread_lib_init(ctx_sz, msg_mempool_sz);
}
void

2
test/unit/lib/event/app.c/app_ut.c
View File

@ -56,7 +56,7 @@ DEFINE_STUB_V(spdk_subsystem_init_from_json_config, (const char *json_config_fil
spdk_subsystem_init_fn cb_fn, void *cb_arg, bool stop_on_error));
DEFINE_STUB_V(spdk_reactors_start, (void));
DEFINE_STUB_V(spdk_reactors_stop, (void *arg1));
DEFINE_STUB(spdk_reactors_init, int, (void), 0);
DEFINE_STUB(spdk_reactors_init, int, (size_t msg_mempool_size), 0);
DEFINE_STUB_V(spdk_reactors_fini, (void));
DEFINE_STUB_V(_spdk_scheduler_set_period, (uint64_t period));
bool g_scheduling_in_progress;

16
test/unit/lib/event/reactor.c/reactor_ut.c
View File

@ -83,7 +83,7 @@ test_init_reactors(void)
allocate_cores(3);
CU_ASSERT(spdk_reactors_init() == 0);
CU_ASSERT(spdk_reactors_init(SPDK_DEFAULT_MSG_MEMPOOL_SIZE) == 0);
CU_ASSERT(g_reactor_state == SPDK_REACTOR_STATE_INITIALIZED);
for (core = 0; core < 3; core++) {
@ -118,7 +118,7 @@ test_event_call(void)
allocate_cores(1);
CU_ASSERT(spdk_reactors_init() == 0);
CU_ASSERT(spdk_reactors_init(SPDK_DEFAULT_MSG_MEMPOOL_SIZE) == 0);
evt = spdk_event_allocate(0, ut_event_fn, &test1, &test2);
CU_ASSERT(evt != NULL);
@ -155,7 +155,7 @@ test_schedule_thread(void)
allocate_cores(5);
CU_ASSERT(spdk_reactors_init() == 0);
CU_ASSERT(spdk_reactors_init(SPDK_DEFAULT_MSG_MEMPOOL_SIZE) == 0);
spdk_cpuset_set_cpu(&cpuset, 3, true);
g_next_core = 4;
@ -207,7 +207,7 @@ test_reschedule_thread(void)
allocate_cores(3);
CU_ASSERT(spdk_reactors_init() == 0);
CU_ASSERT(spdk_reactors_init(SPDK_DEFAULT_MSG_MEMPOOL_SIZE) == 0);
spdk_cpuset_set_cpu(&g_reactor_core_mask, 0, true);
spdk_cpuset_set_cpu(&g_reactor_core_mask, 1, true);
@ -309,7 +309,7 @@ test_for_each_reactor(void)
allocate_cores(5);
CU_ASSERT(spdk_reactors_init() == 0);
CU_ASSERT(spdk_reactors_init(SPDK_DEFAULT_MSG_MEMPOOL_SIZE) == 0);
spdk_for_each_reactor(for_each_reactor_cb, &count, &done, for_each_reactor_done);
@ -404,7 +404,7 @@ test_reactor_stats(void)
allocate_cores(1);
CU_ASSERT(spdk_reactors_init() == 0);
CU_ASSERT(spdk_reactors_init(SPDK_DEFAULT_MSG_MEMPOOL_SIZE) == 0);
spdk_cpuset_set_cpu(&cpuset, 0, true);
@ -577,7 +577,7 @@ test_scheduler(void)
allocate_cores(3);
CU_ASSERT(spdk_reactors_init() == 0);
CU_ASSERT(spdk_reactors_init(SPDK_DEFAULT_MSG_MEMPOOL_SIZE) == 0);
spdk_scheduler_set("dynamic");
@ -816,7 +816,7 @@ test_governor(void)
allocate_cores(2);
CU_ASSERT(spdk_reactors_init() == 0);
CU_ASSERT(spdk_reactors_init(SPDK_DEFAULT_MSG_MEMPOOL_SIZE) == 0);
spdk_scheduler_set("dynamic");
spdk_governor_set("dpdk_governor");

3
test/unit/lib/thread/thread.c/thread_ut.c
View File

@ -109,7 +109,8 @@ thread_alloc(void)
spdk_thread_lib_fini();
/* Scheduling callback exists with extended thread library initialization. */
spdk_thread_lib_init_ext(_thread_op, _thread_op_supported, 0);
spdk_thread_lib_init_ext(_thread_op, _thread_op_supported, 0,
SPDK_DEFAULT_MSG_MEMPOOL_SIZE);
/* Scheduling succeeds */
g_sched_rc = 0;