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

bdev_aio: allow value of efd to be 0

Browse Source 
Previously, value '0' is used to reflect efd's
invalidation. But it is possible that efd is 0
if STDIN is closed. So change related condition
checking, and assign efd to be '-1' in initializing

Change-Id: Iffea09b1f094617ab2edd3fe3b98336ec9084b8a
Signed-off-by: Liu Xiaodong <xiaodong.liu@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/5781
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Liu Xiaodong 2021-01-02 15:53:21 -05:00 committed by Jim Harris
parent 7a3246bfb2
commit 7f6afb7bc0
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
module/bdev/aio/bdev_aio.c
View File

@ -59,6 +59,9 @@ struct bdev_aio_io_channel {
}; };
struct bdev_aio_group_channel { struct bdev_aio_group_channel {
/* eventfd for io completion notification in interrupt mode.
* Negative value like '-1' indicates it is invalid or unused.
*/
int efd; int efd;
struct spdk_interrupt *intr; struct spdk_interrupt *intr;
struct spdk_poller *poller; struct spdk_poller *poller;
@ -173,7 +176,7 @@ bdev_aio_readv(struct file_disk *fdisk, struct spdk_io_channel *ch,
int rc; int rc;
io_prep_preadv(iocb, fdisk->fd, iov, iovcnt, offset); io_prep_preadv(iocb, fdisk->fd, iov, iovcnt, offset);
if (aio_ch->group_ch->efd) { if (aio_ch->group_ch->efd >= 0) {
io_set_eventfd(iocb, aio_ch->group_ch->efd); io_set_eventfd(iocb, aio_ch->group_ch->efd);
} }
iocb->data = aio_task; iocb->data = aio_task;
@ -207,7 +210,7 @@ bdev_aio_writev(struct file_disk *fdisk, struct spdk_io_channel *ch,
int rc; int rc;
io_prep_pwritev(iocb, fdisk->fd, iov, iovcnt, offset); io_prep_pwritev(iocb, fdisk->fd, iov, iovcnt, offset);
if (aio_ch->group_ch->efd) { if (aio_ch->group_ch->efd >= 0) {
io_set_eventfd(iocb, aio_ch->group_ch->efd); io_set_eventfd(iocb, aio_ch->group_ch->efd);
} }
iocb->data = aio_task; iocb->data = aio_task;
@ -369,7 +372,7 @@ bdev_aio_group_interrupt(void *arg)
int rc; int rc;
uint64_t num_events; uint64_t num_events;
assert(group_ch->efd); assert(group_ch->efd >= 0);
/* if completed IO number is larger than SPDK_AIO_QUEUE_DEPTH, /* if completed IO number is larger than SPDK_AIO_QUEUE_DEPTH,
* io_getevent should be called again to ensure all completed IO are processed. * io_getevent should be called again to ensure all completed IO are processed.
@ -642,7 +645,7 @@ bdev_aio_unregister_interrupt(struct bdev_aio_group_channel *ch)
{ {
spdk_interrupt_unregister(&ch->intr); spdk_interrupt_unregister(&ch->intr);
close(ch->efd); close(ch->efd);
ch->efd = 0; ch->efd = -1;
} }
static int static int
@ -651,6 +654,8 @@ bdev_aio_group_create_cb(void *io_device, void *ctx_buf)
struct bdev_aio_group_channel *ch = ctx_buf; struct bdev_aio_group_channel *ch = ctx_buf;
TAILQ_INIT(&ch->io_ch_head); TAILQ_INIT(&ch->io_ch_head);
/* Initialize ch->efd to be invalid and unused. */
ch->efd = -1;
if (spdk_interrupt_mode_is_enabled()) { if (spdk_interrupt_mode_is_enabled()) {
return bdev_aio_register_interrupt(ch); return bdev_aio_register_interrupt(ch);