Commit 8889f7b7 authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Tomasz Zawadzki
Browse files

lib/bdev: Add SPDK_BDEV_IO_STATUS_ABORTED to notify the upper layer correctly 



The I/O aborted by the abort command should be completed with SC = 07h, i.e.,
"Command Abort Requested". However, if the generic bdev layer or non-NVMe
bdev module aborted the I/O, the aborted I/O would complete with SC = 06h, i.e.,
"Internal Error". To fix this unexpected behavior, add an new I/O status
SPDK_BDEV_IO_STATUS_ABORTED and update spdk_bdev_io_get_nvme_status() to
set SC to 07h if the I/O status is SPDK_BDEV_IO_STATUS_ABORTED.
If the NVMe bdev module aborts the I/O, the I/O status is set to
SPDK_BDEV_IO_STATUS_NVME_ERROR and SC is set as expected.

Signed-off-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: Ifc99a97248a8d54a8c8d2fab74a90c7ce99c2e6e
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2582


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
Community-CI: Broadcom CI
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 7cd20dd3

include/spdk/bdev_module.h

+1 −0
Original line number Diff line number Diff line
@@ -222,6 +222,7 @@ struct spdk_bdev_fn_table { 


/** bdev I/O completion status */

enum spdk_bdev_io_status {

	SPDK_BDEV_IO_STATUS_ABORTED = -7,

	SPDK_BDEV_IO_STATUS_FIRST_FUSED_FAILED = -6,

	SPDK_BDEV_IO_STATUS_MISCOMPARE = -5,

	/*

lib/bdev/bdev.c

+3 −0
Original line number Diff line number Diff line
@@ -4949,6 +4949,9 @@ spdk_bdev_io_get_nvme_status(const struct spdk_bdev_io *bdev_io, uint32_t *cdw0, 
	} else if (bdev_io->internal.status == SPDK_BDEV_IO_STATUS_SUCCESS) {

		*sct = SPDK_NVME_SCT_GENERIC;

		*sc = SPDK_NVME_SC_SUCCESS;

	} else if (bdev_io->internal.status == SPDK_BDEV_IO_STATUS_ABORTED) {

		*sct = SPDK_NVME_SCT_GENERIC;

		*sc = SPDK_NVME_SC_ABORTED_BY_REQUEST;

	} else {

		*sct = SPDK_NVME_SCT_GENERIC;

		*sc = SPDK_NVME_SC_INTERNAL_DEVICE_ERROR;