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

bdev/nvme: Admin commands fall through even if optimal io_path is not found 



bdev_nvme_admin_passthrough(), bdev_nvme_reset_io(), and
bdev_nvme_abort() do not use io_path. So simply fall through even
if the optimal io_path is not found for these, and clear the
cached io_path for these.

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


Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
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 d2e2405f

module/bdev/nvme/bdev_nvme.c

+26 −2
Original line number Diff line number Diff line
@@ -639,6 +639,21 @@ bdev_nvme_destroy_bdev_channel_cb(void *io_device, void *ctx_buf) 
	_bdev_nvme_delete_io_paths(nbdev_ch);

}



static inline bool

bdev_nvme_io_type_is_admin(enum spdk_bdev_io_type io_type)

{

	switch (io_type) {

	case SPDK_BDEV_IO_TYPE_RESET:

	case SPDK_BDEV_IO_TYPE_NVME_ADMIN:

	case SPDK_BDEV_IO_TYPE_ABORT:

		return true;

	default:

		break;

	}



	return false;

}



static inline bool

nvme_io_path_is_available(struct nvme_io_path *io_path)

{
@@ -1285,10 +1300,16 @@ bdev_nvme_submit_request(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_i 


	nbdev_io->io_path = bdev_nvme_find_io_path(nbdev_ch);

	if (spdk_unlikely(!nbdev_io->io_path)) {

		if (!bdev_nvme_io_type_is_admin(bdev_io->type)) {

			rc = -ENXIO;

			goto exit;

		}



		/* Admin commands do not use the optimal I/O path.

		 * Simply fall through even if it is not found.

		 */

	}



	switch (bdev_io->type) {

	case SPDK_BDEV_IO_TYPE_READ:

		if (bdev_io->u.bdev.iovs && bdev_io->u.bdev.iovs[0].iov_base) {
@@ -1347,6 +1368,7 @@ bdev_nvme_submit_request(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_i 
					     bdev_io->u.bdev.num_blocks);

		break;

	case SPDK_BDEV_IO_TYPE_RESET:

		nbdev_io->io_path = NULL;

		bdev_nvme_reset_io(nbdev_ch, nbdev_io);

		break;

	case SPDK_BDEV_IO_TYPE_FLUSH:
@@ -1375,6 +1397,7 @@ bdev_nvme_submit_request(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_i 
					       bdev_io->u.zone_mgmt.zone_action);

		break;

	case SPDK_BDEV_IO_TYPE_NVME_ADMIN:

		nbdev_io->io_path = NULL;

		rc = bdev_nvme_admin_passthru(nbdev_ch,

					      nbdev_io,

					      &bdev_io->u.nvme_passthru.cmd,
@@ -1396,6 +1419,7 @@ bdev_nvme_submit_request(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_i 
					      bdev_io->u.nvme_passthru.md_len);

		break;

	case SPDK_BDEV_IO_TYPE_ABORT:

		nbdev_io->io_path = NULL;

		nbdev_io_to_abort = (struct nvme_bdev_io *)bdev_io->u.abort.bio_to_abort->driver_ctx;

		bdev_nvme_abort(nbdev_ch,

				nbdev_io,