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

bdevperf: Add io_target_group and chain associated io_targets to it

Browse Source 
Add struct io_target_group and chain associated io_targets to it.

Particularly, replace current target->next pointer by TAILQ, pass
not the head io_target pointer but the io_target_group pointer to
event call, and use TAILQ_INSERT_HEAD() in bdevperf_construct_target()
to keep the current ordering.

Besides, add pointer to the queued io_target_group to struct
io_target to use it later.

Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: Ib37db825a863f7795c55c19fae0d38efd80c607e
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/478563
Community-CI: SPDK CI Jenkins <sys_sgci@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Seth Howell <seth.howell@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Shuhei Matsumoto 2019-12-23 17:54:32 -05:00 committed by Tomasz Zawadzki
parent 25c5e3f59d
commit bc08958b6a
1 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
test/bdev/bdevperf/bdevperf.c
View File

@ -97,7 +97,8 @@ struct io_target {
struct spdk_bdev *bdev; struct spdk_bdev *bdev;
struct spdk_bdev_desc *bdev_desc; struct spdk_bdev_desc *bdev_desc;
struct spdk_io_channel *ch; struct spdk_io_channel *ch;
struct io_target *next; TAILQ_ENTRY(io_target) link;
struct io_target_group *group;
unsigned lcore; unsigned lcore;
uint64_t io_completed; uint64_t io_completed;
uint64_t prev_io_completed; uint64_t prev_io_completed;
@ -113,7 +114,11 @@ struct io_target {
TAILQ_HEAD(, bdevperf_task) task_list; TAILQ_HEAD(, bdevperf_task) task_list;
}; };
struct io_target **g_head; struct io_target_group {
TAILQ_HEAD(, io_target) targets;
};
struct io_target_group *g_head;
uint32_t *g_coremap; uint32_t *g_coremap;
static uint32_t g_target_count = 0; static uint32_t g_target_count = 0;
@ -223,13 +228,17 @@ blockdev_heads_init(void)
uint32_t i, idx = 0; uint32_t i, idx = 0;
uint32_t core_count = spdk_env_get_core_count(); uint32_t core_count = spdk_env_get_core_count();
g_head = calloc(core_count, sizeof(struct io_target *)); g_head = calloc(core_count, sizeof(struct io_target_group));
if (!g_head) { if (!g_head) {
fprintf(stderr, "Cannot allocate g_head array with size=%u\n", fprintf(stderr, "Cannot allocate g_head array with size=%u\n",
core_count); core_count);
return -1; return -1;
} }
for (i = 0; i < core_count; i++) {
TAILQ_INIT(&g_head[i].targets);
}
g_coremap = calloc(core_count, sizeof(uint32_t)); g_coremap = calloc(core_count, sizeof(uint32_t));
if (!g_coremap) { if (!g_coremap) {
free(g_head); free(g_head);
@ -265,7 +274,7 @@ static void
bdevperf_free_targets(void) bdevperf_free_targets(void)
{ {
uint32_t i, core_count; uint32_t i, core_count;
struct io_target *target, *next_target; struct io_target *target, *tmp;
if (!g_head) { if (!g_head) {
return; return;
@ -273,12 +282,9 @@ bdevperf_free_targets(void)
core_count = spdk_env_get_core_count(); core_count = spdk_env_get_core_count();
for (i = 0; i < core_count; i++) { for (i = 0; i < core_count; i++) {
target = g_head[i]; TAILQ_FOREACH_SAFE(target, &g_head[i].targets, link, tmp) {
g_head[i] = NULL; TAILQ_REMOVE(&g_head[i].targets, target, link);
while (target != NULL) {
next_target = target->next;
bdevperf_free_target(target); bdevperf_free_target(target);
target = next_target;
} }
} }
} }
@ -382,9 +388,9 @@ bdevperf_construct_target(struct spdk_bdev *bdev)
/* Mapping each created target to lcore */ /* Mapping each created target to lcore */
index = g_target_count % spdk_env_get_core_count(); index = g_target_count % spdk_env_get_core_count();
target->next = g_head[index];
target->lcore = g_coremap[index]; target->lcore = g_coremap[index];
g_head[index] = target; target->group = &g_head[index];
TAILQ_INSERT_HEAD(&g_head[index].targets, target, link);
g_target_count++; g_target_count++;
return 0; return 0;
@ -914,11 +920,12 @@ reset_target(void *arg)
static void static void
bdevperf_submit_on_core(void *arg1, void *arg2) bdevperf_submit_on_core(void *arg1, void *arg2)
{ {
struct io_target *target = arg1; struct io_target_group *group = arg1;
struct io_target *target;
/* Submit initial I/O for each block device. Each time one /* Submit initial I/O for each block device. Each time one
* completes, another will be submitted. */ * completes, another will be submitted. */
while (target != NULL) { TAILQ_FOREACH(target, &group->targets, link) {
target->ch = spdk_bdev_get_io_channel(target->bdev_desc); target->ch = spdk_bdev_get_io_channel(target->bdev_desc);
if (!target->ch) { if (!target->ch) {
printf("Skip this device (%s) as IO channel not setup.\n", printf("Skip this device (%s) as IO channel not setup.\n",
@ -926,8 +933,6 @@ bdevperf_submit_on_core(void *arg1, void *arg2)
g_target_count--; g_target_count--;
g_run_failed = true; g_run_failed = true;
spdk_bdev_close(target->bdev_desc); spdk_bdev_close(target->bdev_desc);
target = target->next;
continue; continue;
} }
@ -939,7 +944,6 @@ bdevperf_submit_on_core(void *arg1, void *arg2)
10 * 1000000); 10 * 1000000);
} }
bdevperf_submit_io(target, g_queue_depth); bdevperf_submit_io(target, g_queue_depth);
target = target->next;
} }
} }
@ -1002,12 +1006,12 @@ performance_dump(uint64_t io_time_in_usec, uint64_t ema_period)
total_io_per_second = 0; total_io_per_second = 0;
total_mb_per_second = 0; total_mb_per_second = 0;
for (index = 0; index < spdk_env_get_core_count(); index++) { for (index = 0; index < spdk_env_get_core_count(); index++) {
target = g_head[index]; target = TAILQ_FIRST(&g_head[index].targets);
if (target != NULL) { if (target != NULL) {
lcore_id = target->lcore; lcore_id = target->lcore;
printf("\r Logical core: %u\n", lcore_id); printf("\r Logical core: %u\n", lcore_id);
} }
while (target != NULL) { TAILQ_FOREACH(target, &g_head[index].targets, link) {
if (ema_period == 0) { if (ema_period == 0) {
io_per_second = get_cma_io_per_second(target, io_time_in_usec); io_per_second = get_cma_io_per_second(target, io_time_in_usec);
} else { } else {
@ -1018,7 +1022,6 @@ performance_dump(uint64_t io_time_in_usec, uint64_t ema_period)
target->name, io_per_second, mb_per_second); target->name, io_per_second, mb_per_second);
total_io_per_second += io_per_second; total_io_per_second += io_per_second;
total_mb_per_second += mb_per_second; total_mb_per_second += mb_per_second;
target = target->next;
} }
} }
@ -1092,8 +1095,7 @@ bdevperf_construct_targets_tasks(void)
/* Initialize task list for each target */ /* Initialize task list for each target */
for (i = 0; i < spdk_env_get_core_count(); i++) { for (i = 0; i < spdk_env_get_core_count(); i++) {
target = g_head[i]; TAILQ_FOREACH(target, &g_head[i].targets, link) {
while (target != NULL) {
for (j = 0; j < task_num; j++) { for (j = 0; j < task_num; j++) {
task = bdevperf_construct_task_on_target(target); task = bdevperf_construct_task_on_target(target);
if (task == NULL) { if (task == NULL) {
@ -1101,7 +1103,6 @@ bdevperf_construct_targets_tasks(void)
} }
TAILQ_INSERT_TAIL(&target->task_list, task, link); TAILQ_INSERT_TAIL(&target->task_list, task, link);
} }
target = target->next;
} }
} }
@ -1281,10 +1282,10 @@ bdevperf_test(void)
/* Send events to start all I/O */ /* Send events to start all I/O */
for (i = 0; i < core_count; i++) { for (i = 0; i < core_count; i++) {
target = g_head[i]; target = TAILQ_FIRST(&g_head[i].targets);
if (target != NULL) { if (target != NULL) {
event = spdk_event_allocate(target->lcore, bdevperf_submit_on_core, event = spdk_event_allocate(target->lcore, bdevperf_submit_on_core,
target, NULL); &g_head[i], NULL);
spdk_event_call(event); spdk_event_call(event);
} }
} }
@ -1327,12 +1328,12 @@ bdevperf_run(void *arg1)
static void static void
bdevperf_stop_io_on_core(void *arg1, void *arg2) bdevperf_stop_io_on_core(void *arg1, void *arg2)
{ {
struct io_target *target = arg1; struct io_target_group *group = arg1;
struct io_target *target;
/* Stop I/O for each block device. */ /* Stop I/O for each block device. */
while (target != NULL) { TAILQ_FOREACH(target, &group->targets, link) {
end_target(target); end_target(target);
target = target->next;
} }
} }
@ -1359,10 +1360,10 @@ spdk_bdevperf_shutdown_cb(void)
/* Send events to stop all I/O on each core */ /* Send events to stop all I/O on each core */
for (i = 0; i < spdk_env_get_core_count(); i++) { for (i = 0; i < spdk_env_get_core_count(); i++) {
target = g_head[i]; target = TAILQ_FIRST(&g_head[i].targets);
if (target != NULL) { if (target != NULL) {
event = spdk_event_allocate(target->lcore, bdevperf_stop_io_on_core, event = spdk_event_allocate(target->lcore, bdevperf_stop_io_on_core,
target, NULL); &g_head[i], NULL);
spdk_event_call(event); spdk_event_call(event);
} }
} }