Commit ae4360f0 authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Tomasz Zawadzki
Browse files

lib/event: Allocate cpumask statically for reactor 



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: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: Ic5f4fdb493d73b4ae11cddd2638eeb84ebbb792e
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/478150


Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent 25974803

lib/event/reactor.c

+7 −19
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ struct spdk_reactor { 
} __attribute__((aligned(SPDK_CACHE_LINE_SIZE)));



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 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 *

spdk_app_get_core_mask(void)

{

	return g_reactor_core_mask;

	return &g_reactor_core_mask;

}



void

spdk_reactors_start(void)

{

	struct spdk_reactor *reactor;

	struct spdk_cpuset *tmp_cpumask;

	struct spdk_cpuset tmp_cpumask = {};

	uint32_t i, current_core;

	int rc;

	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_core_mask = spdk_cpuset_alloc();



	current_core = spdk_env_get_current_core();

	SPDK_ENV_FOREACH_CORE(i) {
@@ -450,16 +442,14 @@ spdk_reactors_start(void) 
			/* For now, for each reactor spawn one thread. */

			snprintf(thread_name, sizeof(thread_name), "reactor_%u", reactor->lcore);



			spdk_cpuset_zero(tmp_cpumask);

			spdk_cpuset_set_cpu(tmp_cpumask, i, true);

			spdk_cpuset_zero(&tmp_cpumask);

			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 */

	reactor = spdk_reactor_get(current_core);

	assert(reactor != NULL);
@@ -468,8 +458,6 @@ spdk_reactors_start(void) 
	spdk_env_thread_wait_all();



	g_reactor_state = SPDK_REACTOR_STATE_SHUTDOWN;

	spdk_cpuset_free(g_reactor_core_mask);

	g_reactor_core_mask = NULL;

}



void