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

nvmf: Rename nvmf_tgt_get_qpair_core nvmf_tgt_get_pg

Browse Source 
Begin shifting away from being core-centric to instead
be thread-centric.

Change-Id: I0664cdef6766c158f793dd25cc47f6bbd7d928ad
Signed-off-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/452471
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
This commit is contained in:
Ben Walker 2019-04-29 14:06:57 -07:00 committed by Jim Harris
parent d34635f04c
commit 3555e24505
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/event/subsystems/nvmf/nvmf_tgt.c
View File

@ -56,7 +56,8 @@ enum nvmf_tgt_state {
}; };
struct nvmf_tgt_poll_group { struct nvmf_tgt_poll_group {
struct spdk_nvmf_poll_group *group; struct spdk_nvmf_poll_group *group;
uint32_t core;
}; };
struct nvmf_tgt_host_trid { struct nvmf_tgt_host_trid {
@ -151,8 +152,8 @@ nvmf_tgt_remove_host_trid(struct spdk_nvmf_qpair *qpair)
return; return;
} }
static uint32_t static struct nvmf_tgt_poll_group *
nvmf_tgt_get_qpair_core(struct spdk_nvmf_qpair *qpair) nvmf_tgt_get_pg(struct spdk_nvmf_qpair *qpair)
{ {
struct spdk_nvme_transport_id trid; struct spdk_nvme_transport_id trid;
struct nvmf_tgt_host_trid *tmp_trid = NULL, *new_trid = NULL; struct nvmf_tgt_host_trid *tmp_trid = NULL, *new_trid = NULL;
@ -195,7 +196,7 @@ nvmf_tgt_get_qpair_core(struct spdk_nvmf_qpair *qpair)
break; break;
} }
return core; return &g_poll_groups[core];
} }
static void static void
@ -215,7 +216,6 @@ new_qpair(struct spdk_nvmf_qpair *qpair)
{ {
struct spdk_event *event; struct spdk_event *event;
struct nvmf_tgt_poll_group *pg; struct nvmf_tgt_poll_group *pg;
uint32_t core;
uint32_t attempts; uint32_t attempts;
if (g_tgt_state != NVMF_TGT_RUNNING) { if (g_tgt_state != NVMF_TGT_RUNNING) {
@ -224,8 +224,7 @@ new_qpair(struct spdk_nvmf_qpair *qpair)
} }
for (attempts = 0; attempts < g_num_poll_groups; attempts++) { for (attempts = 0; attempts < g_num_poll_groups; attempts++) {
core = nvmf_tgt_get_qpair_core(qpair); pg = nvmf_tgt_get_pg(qpair);
pg = &g_poll_groups[core];
if (pg->group != NULL) { if (pg->group != NULL) {
break; break;
} else { } else {
@ -239,7 +238,7 @@ new_qpair(struct spdk_nvmf_qpair *qpair)
return; return;
} }
event = spdk_event_allocate(core, nvmf_tgt_poll_group_add, qpair, pg); event = spdk_event_allocate(pg->core, nvmf_tgt_poll_group_add, qpair, pg);
spdk_event_call(event); spdk_event_call(event);
} }
@ -284,9 +283,13 @@ static void
nvmf_tgt_create_poll_group(void *ctx) nvmf_tgt_create_poll_group(void *ctx)
{ {
struct nvmf_tgt_poll_group *pg; struct nvmf_tgt_poll_group *pg;
uint32_t core;
pg = &g_poll_groups[spdk_env_get_current_core()]; core = spdk_env_get_current_core();
pg = &g_poll_groups[core];
assert(pg->core == SPDK_ENV_LCORE_ID_ANY);
pg->core = core;
pg->group = spdk_nvmf_poll_group_create(g_spdk_nvmf_tgt); pg->group = spdk_nvmf_poll_group_create(g_spdk_nvmf_tgt);
} }
@ -359,6 +362,7 @@ nvmf_tgt_advance_state(void)
{ {
enum nvmf_tgt_state prev_state; enum nvmf_tgt_state prev_state;
int rc = -1; int rc = -1;
uint32_t i;
do { do {
prev_state = g_tgt_state; prev_state = g_tgt_state;
@ -376,6 +380,9 @@ nvmf_tgt_advance_state(void)
rc = -ENOMEM; rc = -ENOMEM;
break; break;
} }
SPDK_ENV_FOREACH_CORE(i) {
g_poll_groups[i].core = SPDK_ENV_LCORE_ID_ANY;
}
g_tgt_core = spdk_env_get_first_core(); g_tgt_core = spdk_env_get_first_core();
break; break;