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

bdevperf: Create and terminate io_target group threads explicitly

Browse Source 
At startup, use number of created io_target groups to detect completion
and move to the next step. By returning completion message to the
master thread, we can avoid using any atomic operation.

At shutdown, we can use spdk_for_each_channel() conveniently. Put
voluntary spdk_thread_exit() calls into the callback to
spdk_put_io_channel().

To maintain the original behavior, number of threads created is
equal to the number of cores that SPDK app uses.

Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: I92ca4b1c1e8da0f45b47367bc2387701f4a9742f
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/890
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
This commit is contained in:
Shuhei Matsumoto 2020-02-13 10:20:14 -05:00 committed by Tomasz Zawadzki
parent e58b96f928
commit 36274df5ae
1 changed files with 42 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -121,10 +121,12 @@ struct io_target_group {
struct spdk_bdevperf {
TAILQ_HEAD(, io_target_group) groups;
uint32_t num_groups;
};
static struct spdk_bdevperf g_bdevperf = {
.groups = TAILQ_HEAD_INITIALIZER(g_bdevperf.groups),
.num_groups = 0,
};
struct io_target_group *g_next_tg;
@ -1250,12 +1252,30 @@ io_target_group_create(void *io_device, void *ctx_buf)
static void
io_target_group_destroy(void *io_device, void *ctx_buf)
{
struct io_target_group *group = ctx_buf;
struct spdk_io_channel *ch;
struct spdk_thread *thread;
ch = spdk_io_channel_from_ctx(group);
thread = spdk_io_channel_get_thread(ch);
assert(thread == spdk_get_thread());
spdk_thread_exit(thread);
}
static void
_bdevperf_init_thread_done(void *ctx)
{
g_master_thread = spdk_get_thread();
struct io_target_group *group = ctx;
TAILQ_INSERT_TAIL(&g_bdevperf.groups, group, link);
assert(g_bdevperf.num_groups < spdk_env_get_core_count());
if (++g_bdevperf.num_groups < spdk_env_get_core_count()) {
return;
}
if (g_wait_for_tests) {
/* Do not perform any tests until RPC is received */
@ -1274,17 +1294,35 @@ _bdevperf_init_thread(void *ctx)
ch = spdk_get_io_channel(&g_bdevperf);
group = spdk_io_channel_get_ctx(ch);
TAILQ_INSERT_TAIL(&g_bdevperf.groups, group, link);
spdk_thread_send_msg(g_master_thread, _bdevperf_init_thread_done, group);
}
static void
bdevperf_run(void *arg1)
{
struct spdk_cpuset tmp_cpumask = {};
uint32_t i;
char thread_name[32];
struct spdk_thread *thread;
g_master_thread = spdk_get_thread();
spdk_io_device_register(&g_bdevperf, io_target_group_create, io_target_group_destroy,
sizeof(struct io_target_group), "bdevperf");
/* Send a message to each thread and create a target group */
spdk_for_each_thread(_bdevperf_init_thread, NULL, _bdevperf_init_thread_done);
/* Create threads for CPU cores active for this application, and send a
* message to each thread to create a target group on it.
*/
SPDK_ENV_FOREACH_CORE(i) {
spdk_cpuset_zero(&tmp_cpumask);
spdk_cpuset_set_cpu(&tmp_cpumask, i, true);
snprintf(thread_name, sizeof(thread_name), "bdevperf_tg_%u", i);
thread = spdk_thread_create(thread_name, &tmp_cpumask);
assert(thread != NULL);
spdk_thread_send_msg(thread, _bdevperf_init_thread, NULL);
}
}
static void