Commit 0f015133 authored Feb 25, 2019 by Shuhei Matsumoto Committed by Changpeng Liu Feb 27, 2019

bdev: process failure of spdk_bdev_io_get_buf_cb in each bdev module



If success is false in each bdev module's spdk_bdev_io_get_buf_cb,
call spdk_bdev_io_complete with SPDK_BDEV_IO_STATUS_FAILED, and
then return.

Change-Id: I6f106d8d39a3616f7305201fa2efc4805d4d00ee
Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-on: https://review.gerrithub.io/c/446046


Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: Ziye Yang <ziye.yang@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>

parent de68dfee

lib/bdev/aio/bdev_aio.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -398,7 +398,10 @@ static void
		bdev_aio_get_buf_cb(struct spdk_io_channel ch, struct spdk_bdev_io bdev_io,
		bool success)
		{
		assert(success == true);
		if (!success) {
		spdk_bdev_io_complete(bdev_io, SPDK_BDEV_IO_STATUS_FAILED);
		return;
		}

		switch (bdev_io->type) {
		case SPDK_BDEV_IO_TYPE_READ:

lib/bdev/bdev.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -1657,7 +1657,10 @@ static void
		_spdk_bdev_io_split_get_buf_cb(struct spdk_io_channel ch, struct spdk_bdev_io bdev_io,
		bool success)
		{
		assert(success == true);
		if (!success) {
		spdk_bdev_io_complete(bdev_io, SPDK_BDEV_IO_STATUS_FAILED);
		return;
		}

		_spdk_bdev_io_split(ch, bdev_io);
		}

lib/bdev/crypto/vbdev_crypto.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -913,7 +913,10 @@ crypto_read_get_buf_cb(struct spdk_io_channel ch, struct spdk_bdev_io bdev_io,
		struct crypto_io_channel *crypto_ch = spdk_io_channel_get_ctx(ch);
		int rc;

		assert(success == true);
		if (!success) {
		spdk_bdev_io_complete(bdev_io, SPDK_BDEV_IO_STATUS_FAILED);
		return;
		}

		rc = spdk_bdev_readv_blocks(crypto_bdev->base_desc, crypto_ch->base_ch, bdev_io->u.bdev.iovs,
		bdev_io->u.bdev.iovcnt, bdev_io->u.bdev.offset_blocks,

lib/bdev/ftl/bdev_ftl.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -315,7 +315,11 @@ static void
		bdev_ftl_get_buf_cb(struct spdk_io_channel ch, struct spdk_bdev_io bdev_io,
		bool success)
		{
		assert(success == true);
		if (!success) {
		bdev_ftl_complete_io((struct ftl_bdev_io *)bdev_io->driver_ctx,
		SPDK_BDEV_IO_STATUS_FAILED);
		return;
		}

		int rc = bdev_ftl_readv((struct ftl_bdev *)bdev_io->bdev->ctxt,
		ch, (struct ftl_bdev_io *)bdev_io->driver_ctx);

lib/bdev/iscsi/bdev_iscsi.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -400,7 +400,10 @@ static void
		bdev_iscsi_get_buf_cb(struct spdk_io_channel ch, struct spdk_bdev_io bdev_io,
		bool success)
		{
		assert(success == true);
		if (!success) {
		spdk_bdev_io_complete(bdev_io, SPDK_BDEV_IO_STATUS_FAILED);
		return;
		}

		bdev_iscsi_readv((struct bdev_iscsi_lun *)bdev_io->bdev->ctxt,
		(struct bdev_iscsi_io *)bdev_io->driver_ctx,