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

bdev_aio: fix aio error indication

Browse Source 
From aio_abi.h, io_event.res is defined __s64, negative
errno is assigned to io_event.res for error situation
in Linux Kernel.
But from libaio.h, io_event.res is defined unsigned long,
so convert it to signed value for error detection.

Fixes issue #2325

Change-Id: I99f8b03e8bfedfa260fe91f3e9e8ef0e5ecd0b77
Signed-off-by: Liu Xiaodong <xiaodong.liu@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/12882
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
This commit is contained in:
Liu Xiaodong 2022-06-02 21:53:19 -04:00 committed by Jim Harris
parent b79199af39
commit 9be660eabd
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -338,29 +338,25 @@ bdev_aio_io_channel_poll(struct bdev_aio_io_channel *io_ch)
int nr, i = 0; int nr, i = 0;
struct bdev_aio_task *aio_task; struct bdev_aio_task *aio_task;
struct io_event events[SPDK_AIO_QUEUE_DEPTH]; struct io_event events[SPDK_AIO_QUEUE_DEPTH];
uint64_t io_result;
nr = bdev_user_io_getevents(io_ch->io_ctx, SPDK_AIO_QUEUE_DEPTH, events); nr = bdev_user_io_getevents(io_ch->io_ctx, SPDK_AIO_QUEUE_DEPTH, events);
if (nr < 0) { if (nr < 0) {
return 0; return 0;
} }
#define MAX_AIO_ERRNO 256
for (i = 0; i < nr; i++) { for (i = 0; i < nr; i++) {
aio_task = events[i].data; aio_task = events[i].data;
aio_task->ch->io_inflight--; aio_task->ch->io_inflight--;
io_result = events[i].res; if (events[i].res == aio_task->len) {
if (io_result == aio_task->len) {
spdk_bdev_io_complete(spdk_bdev_io_from_ctx(aio_task), SPDK_BDEV_IO_STATUS_SUCCESS); spdk_bdev_io_complete(spdk_bdev_io_from_ctx(aio_task), SPDK_BDEV_IO_STATUS_SUCCESS);
} else if (io_result < MAX_AIO_ERRNO) {
/* Linux AIO will return its errno to io_event.res */
int aio_errno = io_result;
spdk_bdev_io_complete_aio_status(spdk_bdev_io_from_ctx(aio_task), -aio_errno);
} else { } else {
/* From aio_abi.h, io_event.res is defined __s64, negative errno
* will be assigned to io_event.res for error situation.
* But from libaio.h, io_event.res is defined unsigned long, so
* convert it to signed value for error detection.
*/
SPDK_ERRLOG("failed to complete aio: rc %"PRId64"\n", events[i].res); SPDK_ERRLOG("failed to complete aio: rc %"PRId64"\n", events[i].res);
spdk_bdev_io_complete(spdk_bdev_io_from_ctx(aio_task), SPDK_BDEV_IO_STATUS_FAILED); spdk_bdev_io_complete_aio_status(spdk_bdev_io_from_ctx(aio_task), (int)events[i].res);
} }
} }