Commit 269f4a3c authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Tomasz Zawadzki
Browse files

bdev/null: Support I/O type ABORT 



As malloc bdev module supports I/O type ABORT, it will be helpful
if any bdev module other than NVMe bdev module supports I/O type
ABORT.

Update bdev_null_io_type_supported() to return true for
SPDK_BDEV_IO_TYPE_ABORT and update bdev_null_submit_request() to
try aborting the target I/O if queued.

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


Community-CI: Broadcom CI
Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
parent e2d1dfb4

module/bdev/null/bdev_null.c

+24 −0
Original line number Diff line number Diff line
@@ -85,6 +85,22 @@ bdev_null_destruct(void *ctx) 
	return 0;

}



static bool

bdev_null_abort_io(struct null_io_channel *ch, struct spdk_bdev_io *bio_to_abort)

{

	struct spdk_bdev_io *bdev_io;



	TAILQ_FOREACH(bdev_io, &ch->io, module_link) {

		if (bdev_io == bio_to_abort) {

			TAILQ_REMOVE(&ch->io, bio_to_abort, module_link);

			spdk_bdev_io_complete(bio_to_abort, SPDK_BDEV_IO_STATUS_ABORTED);

			return true;

		}

	}



	return false;

}



static void

bdev_null_submit_request(struct spdk_io_channel *_ch, struct spdk_bdev_io *bdev_io)

{
@@ -165,6 +181,13 @@ bdev_null_submit_request(struct spdk_io_channel *_ch, struct spdk_bdev_io *bdev_ 
	case SPDK_BDEV_IO_TYPE_RESET:

		TAILQ_INSERT_TAIL(&ch->io, bdev_io, module_link);

		break;

	case SPDK_BDEV_IO_TYPE_ABORT:

		if (bdev_null_abort_io(ch, bdev_io->u.abort.bio_to_abort)) {

			spdk_bdev_io_complete(bdev_io, SPDK_BDEV_IO_STATUS_SUCCESS);

		} else {

			spdk_bdev_io_complete(bdev_io, SPDK_BDEV_IO_STATUS_FAILED);

		}

		break;

	case SPDK_BDEV_IO_TYPE_FLUSH:

	case SPDK_BDEV_IO_TYPE_UNMAP:

	default:
@@ -181,6 +204,7 @@ bdev_null_io_type_supported(void *ctx, enum spdk_bdev_io_type io_type) 
	case SPDK_BDEV_IO_TYPE_WRITE:

	case SPDK_BDEV_IO_TYPE_WRITE_ZEROES:

	case SPDK_BDEV_IO_TYPE_RESET:

	case SPDK_BDEV_IO_TYPE_ABORT:

		return true;

	case SPDK_BDEV_IO_TYPE_FLUSH:

	case SPDK_BDEV_IO_TYPE_UNMAP: