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

bdevperf: correctly map targets to cores

Browse Source 
Previously this only worked if bdevperf was set to
run on a contiguous set of cores starting at 0.

Signed-off-by: Jim Harris <james.r.harris@intel.com>
Change-Id: I9983880711eb36681332495034b6656293eed3f6

Reviewed-on: https://review.gerrithub.io/374536
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
Jim Harris 2017-08-16 14:37:24 -07:00 committed by Daniel Verkamp
parent 2705f6f10d
commit 76bbc020e6
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
test/lib/bdev/bdevperf/bdevperf.c
View File

@ -89,6 +89,7 @@ struct io_target {
}; };
struct io_target *head[RTE_MAX_LCORE]; struct io_target *head[RTE_MAX_LCORE];
uint32_t coremap[RTE_MAX_LCORE];
static int g_target_count = 0; static int g_target_count = 0;
/* /*
@ -102,11 +103,16 @@ static size_t g_min_alignment = 8;
static void static void
blockdev_heads_init(void) blockdev_heads_init(void)
{ {
int i; uint32_t i, idx;
for (i = 0; i < RTE_MAX_LCORE; i++) { for (i = 0; i < RTE_MAX_LCORE; i++) {
head[i] = NULL; head[i] = NULL;
} }
idx = 0;
SPDK_ENV_FOREACH_CORE(i) {
coremap[idx++] = i;
}
} }
static void static void
@ -145,7 +151,7 @@ bdevperf_construct_targets(void)
/* Mapping each target to lcore */ /* Mapping each target to lcore */
index = g_target_count % spdk_env_get_core_count(); index = g_target_count % spdk_env_get_core_count();
target->next = head[index]; target->next = head[index];
target->lcore = index; target->lcore = coremap[index];
target->io_completed = 0; target->io_completed = 0;
target->current_queue_depth = 0; target->current_queue_depth = 0;
target->offset_in_ios = 0; target->offset_in_ios = 0;
@ -530,6 +536,7 @@ bdevperf_run(void *arg1, void *arg2)
struct io_target *target; struct io_target *target;
struct spdk_event *event; struct spdk_event *event;
blockdev_heads_init();
bdevperf_construct_targets(); bdevperf_construct_targets();
/* /*
@ -552,13 +559,14 @@ bdevperf_run(void *arg1, void *arg2)
} }
/* Send events to start all I/O */ /* Send events to start all I/O */
SPDK_ENV_FOREACH_CORE(i) { for (i = 0; i < spdk_env_get_core_count(); i++) {
target = head[i]; target = head[i];
if (target != NULL) { if (target == NULL) {
event = spdk_event_allocate(target->lcore, bdevperf_submit_on_core, break;
target, NULL);
spdk_event_call(event);
} }
event = spdk_event_allocate(target->lcore, bdevperf_submit_on_core,
target, NULL);
spdk_event_call(event);
} }
} }
@ -723,8 +731,6 @@ main(int argc, char **argv)
g_zcopy = false; g_zcopy = false;
} }
blockdev_heads_init();
bdevtest_init(config_file, core_mask, &opts); bdevtest_init(config_file, core_mask, &opts);
spdk_app_start(&opts, bdevperf_run, NULL, NULL); spdk_app_start(&opts, bdevperf_run, NULL, NULL);