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

bdev/aio: Change the aio polling per bdev to group polling

Browse Source 
This patch is used to change the per bdev polling into a group polling
for each spdk thread.

Change-Id: I6e99fb1512fe8ee778d4436a193fbc24022f4b84
Signed-off-by: Ziye Yang <optimistyzy@gmail.com>
Reviewed-on: https://review.gerrithub.io/421573
Reviewed-by: GangCao <gang.cao@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
This commit is contained in:
Ziye Yang 2018-08-08 10:58:03 +08:00 committed by Changpeng Liu
parent dc55e08d01
commit 0c0d200b7c
2 changed files with 70 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
lib/bdev/aio/bdev_aio.c
View File

@ -47,6 +47,7 @@
#include "spdk_internal/log.h" #include "spdk_internal/log.h"
static int bdev_aio_initialize(void); static int bdev_aio_initialize(void);
static void bdev_aio_fini(void);
static void aio_free_disk(struct file_disk *fdisk); static void aio_free_disk(struct file_disk *fdisk);
static void bdev_aio_get_spdk_running_config(FILE *fp); static void bdev_aio_get_spdk_running_config(FILE *fp);
static TAILQ_HEAD(, file_disk) g_aio_disk_head; static TAILQ_HEAD(, file_disk) g_aio_disk_head;
@ -62,11 +63,16 @@ bdev_aio_get_ctx_size(void)
static struct spdk_bdev_module aio_if = { static struct spdk_bdev_module aio_if = {
.name = "aio", .name = "aio",
.module_init = bdev_aio_initialize, .module_init = bdev_aio_initialize,
.module_fini = NULL, .module_fini = bdev_aio_fini,
.config_text = bdev_aio_get_spdk_running_config, .config_text = bdev_aio_get_spdk_running_config,
.get_ctx_size = bdev_aio_get_ctx_size, .get_ctx_size = bdev_aio_get_ctx_size,
}; };
struct bdev_aio_group_channel {
struct spdk_poller *poller;
TAILQ_HEAD(, bdev_aio_io_channel) aio_channel_head;
};
SPDK_BDEV_MODULE_REGISTER(&aio_if) SPDK_BDEV_MODULE_REGISTER(&aio_if)
static int static int
@ -207,10 +213,11 @@ bdev_aio_initialize_io_channel(struct bdev_aio_io_channel *ch)
} }
static int static int
bdev_aio_poll(void *arg) bdev_aio_group_poll(void *arg)
{ {
struct bdev_aio_io_channel *ch = arg; struct bdev_aio_group_channel *group_ch = arg;
int nr, i; struct bdev_aio_io_channel *ch;
int nr, i, total_nr = 0;
enum spdk_bdev_io_status status; enum spdk_bdev_io_status status;
struct bdev_aio_task *aio_task; struct bdev_aio_task *aio_task;
struct timespec timeout; struct timespec timeout;
@ -218,28 +225,30 @@ bdev_aio_poll(void *arg)
timeout.tv_sec = 0; timeout.tv_sec = 0;
timeout.tv_nsec = 0; timeout.tv_nsec = 0;
TAILQ_FOREACH(ch, &group_ch->aio_channel_head, link) {
nr = io_getevents(ch->io_ctx, 1, SPDK_AIO_QUEUE_DEPTH,
events, &timeout);
nr = io_getevents(ch->io_ctx, 1, SPDK_AIO_QUEUE_DEPTH, if (nr < 0) {
events, &timeout); SPDK_ERRLOG("Returned %d on bdev_aio_io_channel %p\n", nr, ch);
continue;
if (nr < 0) {
SPDK_ERRLOG("%s: io_getevents returned %d\n", __func__, nr);
return -1;
}
for (i = 0; i < nr; i++) {
aio_task = events[i].data;
if (events[i].res != aio_task->len) {
status = SPDK_BDEV_IO_STATUS_FAILED;
} else {
status = SPDK_BDEV_IO_STATUS_SUCCESS;
} }
spdk_bdev_io_complete(spdk_bdev_io_from_ctx(aio_task), status); total_nr += nr;
ch->io_inflight--; for (i = 0; i < nr; i++) {
aio_task = events[i].data;
if (events[i].res != aio_task->len) {
status = SPDK_BDEV_IO_STATUS_FAILED;
} else {
status = SPDK_BDEV_IO_STATUS_SUCCESS;
}
spdk_bdev_io_complete(spdk_bdev_io_from_ctx(aio_task), status);
ch->io_inflight--;
}
} }
return nr; return total_nr;
} }
static void static void
@ -364,12 +373,15 @@ static int
bdev_aio_create_cb(void *io_device, void *ctx_buf) bdev_aio_create_cb(void *io_device, void *ctx_buf)
{ {
struct bdev_aio_io_channel *ch = ctx_buf; struct bdev_aio_io_channel *ch = ctx_buf;
struct bdev_aio_group_channel *group_ch_ctx;
if (bdev_aio_initialize_io_channel(ch) != 0) { if (bdev_aio_initialize_io_channel(ch) != 0) {
return -1; return -1;
} }
ch->poller = spdk_poller_register(bdev_aio_poll, ch, 0); ch->group_ch = spdk_get_io_channel(&aio_if);
group_ch_ctx = spdk_io_channel_get_ctx(ch->group_ch);
TAILQ_INSERT_TAIL(&group_ch_ctx->aio_channel_head, ch, link);
return 0; return 0;
} }
@ -377,9 +389,13 @@ static void
bdev_aio_destroy_cb(void *io_device, void *ctx_buf) bdev_aio_destroy_cb(void *io_device, void *ctx_buf)
{ {
struct bdev_aio_io_channel *io_channel = ctx_buf; struct bdev_aio_io_channel *io_channel = ctx_buf;
struct bdev_aio_group_channel *group_ch_ctx;
group_ch_ctx = spdk_io_channel_get_ctx(io_channel->group_ch);
TAILQ_REMOVE(&group_ch_ctx->aio_channel_head, io_channel, link);
spdk_put_io_channel(io_channel->group_ch);
io_destroy(io_channel->io_ctx); io_destroy(io_channel->io_ctx);
spdk_poller_unregister(&io_channel->poller);
} }
static struct spdk_io_channel * static struct spdk_io_channel *
@ -446,6 +462,24 @@ static void aio_free_disk(struct file_disk *fdisk)
free(fdisk); free(fdisk);
} }
static int
bdev_aio_group_create_cb(void *io_device, void *ctx_buf)
{
struct bdev_aio_group_channel *ch = ctx_buf;
TAILQ_INIT(&ch->aio_channel_head);
ch->poller = spdk_poller_register(bdev_aio_group_poll, ch, 0);
return 0;
}
static void
bdev_aio_group_destroy_cb(void *io_device, void *ctx_buf)
{
struct bdev_aio_group_channel *ch = ctx_buf;
spdk_poller_unregister(&ch->poller);
}
struct spdk_bdev * struct spdk_bdev *
create_aio_disk(const char *name, const char *filename, uint32_t block_size) create_aio_disk(const char *name, const char *filename, uint32_t block_size)
{ {
@ -593,6 +627,9 @@ bdev_aio_initialize(void)
struct spdk_bdev *bdev; struct spdk_bdev *bdev;
TAILQ_INIT(&g_aio_disk_head); TAILQ_INIT(&g_aio_disk_head);
spdk_io_device_register(&aio_if, bdev_aio_group_create_cb, bdev_aio_group_destroy_cb,
sizeof(struct bdev_aio_group_channel));
sp = spdk_conf_find_section(NULL, "AIO"); sp = spdk_conf_find_section(NULL, "AIO");
if (!sp) { if (!sp) {
return 0; return 0;
@ -635,6 +672,12 @@ bdev_aio_initialize(void)
return 0; return 0;
} }
static void
bdev_aio_fini(void)
{
spdk_io_device_unregister(&aio_if, NULL);
}
static void static void
bdev_aio_get_spdk_running_config(FILE *fp) bdev_aio_get_spdk_running_config(FILE *fp)
{ {

7
lib/bdev/aio/bdev_aio.h
View File

@ -50,9 +50,10 @@ struct bdev_aio_task {
}; };
struct bdev_aio_io_channel { struct bdev_aio_io_channel {
io_context_t io_ctx; io_context_t io_ctx;
struct spdk_poller *poller; uint64_t io_inflight;
uint64_t io_inflight; struct spdk_io_channel *group_ch;
TAILQ_ENTRY(bdev_aio_io_channel) link;
}; };
typedef void (*spdk_delete_aio_complete)(void *cb_arg, int bdeverrno); typedef void (*spdk_delete_aio_complete)(void *cb_arg, int bdeverrno);