d/numam-spdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

nvmf: Round-robin allocate subsystems to lcores

Browse Source 
Change-Id: I3f3937e0cdcf99f4e4be755df2865682ab230dfc
Signed-off-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
Ben Walker 2016-07-15 13:03:29 -07:00
parent e3d9e24e20
commit d38d299576
1 changed files with 35 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
lib/nvmf/conf.c
View File

@ -424,17 +424,38 @@ spdk_nvmf_validate_nqn(const char *nqn)
return 0;
}
static int
spdk_nvmf_allocate_lcore(uint64_t mask, uint32_t lcore)
{
uint32_t end;
if (lcore == 0) {
end = 0;
} else {
end = lcore - 1;
}
do {
if (((mask >> lcore) & 1U) == 1U) {
break;
}
lcore = (lcore + 1) % 64;
} while (lcore != end);
return lcore;
}
static int
spdk_nvmf_parse_subsystem(struct spdk_conf_section *sp)
{
const char *val, *nqn;
struct spdk_nvmf_subsystem *subsystem;
const char *port_name, *host_name;
int port_id, host_id;
struct spdk_nvmf_ctrlr *nvmf_ctrlr;
int i, ret;
uint64_t mask;
uint32_t lcore;
nqn = spdk_conf_section_get_val(sp, "NQN");
if (nqn == NULL) {
@ -446,7 +467,18 @@ spdk_nvmf_parse_subsystem(struct spdk_conf_section *sp)
return -1;
}
subsystem = nvmf_create_subsystem(sp->num, nqn, SPDK_NVMF_SUB_NVME, rte_get_master_lcore());
/* Determine which core to assign to the subsystem using round robin */
mask = spdk_app_get_core_mask();
lcore = 0;
for (i = 0; i < sp->num; i++) {
lcore = spdk_nvmf_allocate_lcore(mask, lcore);
lcore++;
}
lcore = spdk_nvmf_allocate_lcore(mask, lcore);
subsystem = nvmf_create_subsystem(sp->num, nqn, SPDK_NVMF_SUB_NVME, lcore);
if (subsystem == NULL) {
return -1;
}