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

lib/event: Allocate cpumask statically for reactor

Browse Source 
struct spdk_cpuset has been declared in the header file and
so we can allocate struct spdk_cpuset statically.  This change will
avoid potential out of memory failure for reactor too.

Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: Ic5f4fdb493d73b4ae11cddd2638eeb84ebbb792e
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/478150
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
This commit is contained in:
Shuhei Matsumoto 2019-12-16 20:25:10 -05:00 committed by Tomasz Zawadzki
parent 2597480328
commit ae4360f050
1 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/event/reactor.c
View File

@ -84,7 +84,7 @@ struct spdk_reactor {
} __attribute__((aligned(SPDK_CACHE_LINE_SIZE))); } __attribute__((aligned(SPDK_CACHE_LINE_SIZE)));
static struct spdk_reactor *g_reactors; static struct spdk_reactor *g_reactors;
static struct spdk_cpuset *g_reactor_core_mask; static struct spdk_cpuset g_reactor_core_mask;
static enum spdk_reactor_state g_reactor_state = SPDK_REACTOR_STATE_UNINITIALIZED; static enum spdk_reactor_state g_reactor_state = SPDK_REACTOR_STATE_UNINITIALIZED;
static bool g_framework_monitor_context_switch_enabled = true; static bool g_framework_monitor_context_switch_enabled = true;
@ -410,27 +410,19 @@ spdk_app_parse_core_mask(const char *mask, struct spdk_cpuset *cpumask)
struct spdk_cpuset * struct spdk_cpuset *
spdk_app_get_core_mask(void) spdk_app_get_core_mask(void)
{ {
return g_reactor_core_mask; return &g_reactor_core_mask;
} }
void void
spdk_reactors_start(void) spdk_reactors_start(void)
{ {
struct spdk_reactor *reactor; struct spdk_reactor *reactor;
struct spdk_cpuset *tmp_cpumask; struct spdk_cpuset tmp_cpumask = {};
uint32_t i, current_core; uint32_t i, current_core;
int rc; int rc;
char thread_name[32]; char thread_name[32];
tmp_cpumask = spdk_cpuset_alloc();
if (tmp_cpumask == NULL) {
SPDK_ERRLOG("spdk_cpuset_alloc() failed\n");
assert(false);
return;
}
g_reactor_state = SPDK_REACTOR_STATE_RUNNING; g_reactor_state = SPDK_REACTOR_STATE_RUNNING;
g_reactor_core_mask = spdk_cpuset_alloc();
current_core = spdk_env_get_current_core(); current_core = spdk_env_get_current_core();
SPDK_ENV_FOREACH_CORE(i) { SPDK_ENV_FOREACH_CORE(i) {
@ -450,16 +442,14 @@ spdk_reactors_start(void)
/* For now, for each reactor spawn one thread. */ /* For now, for each reactor spawn one thread. */
snprintf(thread_name, sizeof(thread_name), "reactor_%u", reactor->lcore); snprintf(thread_name, sizeof(thread_name), "reactor_%u", reactor->lcore);
spdk_cpuset_zero(tmp_cpumask); spdk_cpuset_zero(&tmp_cpumask);
spdk_cpuset_set_cpu(tmp_cpumask, i, true); spdk_cpuset_set_cpu(&tmp_cpumask, i, true);
spdk_thread_create(thread_name, tmp_cpumask); spdk_thread_create(thread_name, &tmp_cpumask);
} }
spdk_cpuset_set_cpu(g_reactor_core_mask, i, true); spdk_cpuset_set_cpu(&g_reactor_core_mask, i, true);
} }
spdk_cpuset_free(tmp_cpumask);
/* Start the master reactor */ /* Start the master reactor */
reactor = spdk_reactor_get(current_core); reactor = spdk_reactor_get(current_core);
assert(reactor != NULL); assert(reactor != NULL);
@ -468,8 +458,6 @@ spdk_reactors_start(void)
spdk_env_thread_wait_all(); spdk_env_thread_wait_all();
g_reactor_state = SPDK_REACTOR_STATE_SHUTDOWN; g_reactor_state = SPDK_REACTOR_STATE_SHUTDOWN;
spdk_cpuset_free(g_reactor_core_mask);
g_reactor_core_mask = NULL;
} }
void void