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

bdev/nvme: Inline _bdev_nvme_submit_request() 



This is called only in a place. Inlining this into bdev_nvme_submit_request()
will simplify the following patches by removing unnecessary cast.

Besides, use -ENXIO if I/O path is not found. This will be better than -1.

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


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

module/bdev/nvme/bdev_nvme.c

+105 −108
Original line number Diff line number Diff line
@@ -736,8 +736,8 @@ exit: 
	}

}



static int

_bdev_nvme_submit_request(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_io)

static void

bdev_nvme_submit_request(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_io)

{

	struct nvme_io_channel *nvme_ch = spdk_io_channel_get_ctx(ch);

	struct spdk_bdev *bdev = bdev_io->bdev;
@@ -746,15 +746,17 @@ _bdev_nvme_submit_request(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_ 
	struct nvme_bdev_io *nbdev_io_to_abort;

	struct nvme_bdev_ns *nvme_ns;

	struct spdk_nvme_qpair *qpair;

	int rc = 0;



	if (spdk_unlikely(!bdev_nvme_find_io_path(nbdev, nvme_ch, &nvme_ns, &qpair))) {

		return -1;

		rc = -ENXIO;

		goto exit;

	}



	switch (bdev_io->type) {

	case SPDK_BDEV_IO_TYPE_READ:

		if (bdev_io->u.bdev.iovs && bdev_io->u.bdev.iovs[0].iov_base) {

			return bdev_nvme_readv(nvme_ns->ns,

			rc = bdev_nvme_readv(nvme_ns->ns,

					     qpair,

					     nbdev_io,

					     bdev_io->u.bdev.iovs,
@@ -766,11 +768,11 @@ _bdev_nvme_submit_request(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_ 
		} else {

			spdk_bdev_io_get_buf(bdev_io, bdev_nvme_get_buf_cb,

					     bdev_io->u.bdev.num_blocks * bdev->blocklen);

			return 0;

			rc = 0;

		}



		break;

	case SPDK_BDEV_IO_TYPE_WRITE:

		return bdev_nvme_writev(nvme_ns->ns,

		rc = bdev_nvme_writev(nvme_ns->ns,

				      qpair,

				      nbdev_io,

				      bdev_io->u.bdev.iovs,
@@ -779,9 +781,9 @@ _bdev_nvme_submit_request(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_ 
				      bdev_io->u.bdev.num_blocks,

				      bdev_io->u.bdev.offset_blocks,

				      bdev->dif_check_flags);



		break;

	case SPDK_BDEV_IO_TYPE_COMPARE:

		return bdev_nvme_comparev(nvme_ns->ns,

		rc = bdev_nvme_comparev(nvme_ns->ns,

					qpair,

					nbdev_io,

					bdev_io->u.bdev.iovs,
@@ -790,9 +792,9 @@ _bdev_nvme_submit_request(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_ 
					bdev_io->u.bdev.num_blocks,

					bdev_io->u.bdev.offset_blocks,

					bdev->dif_check_flags);



		break;

	case SPDK_BDEV_IO_TYPE_COMPARE_AND_WRITE:

		return bdev_nvme_comparev_and_writev(nvme_ns->ns,

		rc = bdev_nvme_comparev_and_writev(nvme_ns->ns,

						   qpair,

						   nbdev_io,

						   bdev_io->u.bdev.iovs,
@@ -803,26 +805,26 @@ _bdev_nvme_submit_request(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_ 
						   bdev_io->u.bdev.num_blocks,

						   bdev_io->u.bdev.offset_blocks,

						   bdev->dif_check_flags);



		break;

	case SPDK_BDEV_IO_TYPE_UNMAP:

		return bdev_nvme_unmap(nvme_ns->ns,

		rc = bdev_nvme_unmap(nvme_ns->ns,

				     qpair,

				     nbdev_io,

				     bdev_io->u.bdev.offset_blocks,

				     bdev_io->u.bdev.num_blocks);



		break;

	case SPDK_BDEV_IO_TYPE_RESET:

		return bdev_nvme_reset(nvme_ch, nbdev_io);



		rc = bdev_nvme_reset(nvme_ch, nbdev_io);

		break;

	case SPDK_BDEV_IO_TYPE_FLUSH:

		return bdev_nvme_flush(nvme_ns->ns,

		rc = bdev_nvme_flush(nvme_ns->ns,

				     qpair,

				     nbdev_io,

				     bdev_io->u.bdev.offset_blocks,

				     bdev_io->u.bdev.num_blocks);



		break;

	case SPDK_BDEV_IO_TYPE_ZONE_APPEND:

		return bdev_nvme_zone_appendv(nvme_ns->ns,

		rc = bdev_nvme_zone_appendv(nvme_ns->ns,

					    qpair,

					    nbdev_io,

					    bdev_io->u.bdev.iovs,
@@ -831,39 +833,39 @@ _bdev_nvme_submit_request(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_ 
					    bdev_io->u.bdev.num_blocks,

					    bdev_io->u.bdev.offset_blocks,

					    bdev->dif_check_flags);



		break;

	case SPDK_BDEV_IO_TYPE_GET_ZONE_INFO:

		return bdev_nvme_get_zone_info(nvme_ns->ns,

		rc = bdev_nvme_get_zone_info(nvme_ns->ns,

					     qpair,

					     nbdev_io,

					     bdev_io->u.zone_mgmt.zone_id,

					     bdev_io->u.zone_mgmt.num_zones,

					     bdev_io->u.zone_mgmt.buf);



		break;

	case SPDK_BDEV_IO_TYPE_ZONE_MANAGEMENT:

		return bdev_nvme_zone_management(nvme_ns->ns,

		rc = bdev_nvme_zone_management(nvme_ns->ns,

					       qpair,

					       nbdev_io,

					       bdev_io->u.zone_mgmt.zone_id,

					       bdev_io->u.zone_mgmt.zone_action);



		break;

	case SPDK_BDEV_IO_TYPE_NVME_ADMIN:

		return bdev_nvme_admin_passthru(nvme_ch,

		rc = bdev_nvme_admin_passthru(nvme_ch,

					      nbdev_io,

					      &bdev_io->u.nvme_passthru.cmd,

					      bdev_io->u.nvme_passthru.buf,

					      bdev_io->u.nvme_passthru.nbytes);



		break;

	case SPDK_BDEV_IO_TYPE_NVME_IO:

		return bdev_nvme_io_passthru(nvme_ns->ns,

		rc = bdev_nvme_io_passthru(nvme_ns->ns,

					   qpair,

					   nbdev_io,

					   &bdev_io->u.nvme_passthru.cmd,

					   bdev_io->u.nvme_passthru.buf,

					   bdev_io->u.nvme_passthru.nbytes);



		break;

	case SPDK_BDEV_IO_TYPE_NVME_IO_MD:

		return bdev_nvme_io_passthru_md(nvme_ns->ns,

		rc = bdev_nvme_io_passthru_md(nvme_ns->ns,

					      qpair,

					      nbdev_io,

					      &bdev_io->u.nvme_passthru.cmd,
@@ -871,24 +873,19 @@ _bdev_nvme_submit_request(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_ 
					      bdev_io->u.nvme_passthru.nbytes,

					      bdev_io->u.nvme_passthru.md_buf,

					      bdev_io->u.nvme_passthru.md_len);



		break;

	case SPDK_BDEV_IO_TYPE_ABORT:

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

		return bdev_nvme_abort(nvme_ch,

		rc = bdev_nvme_abort(nvme_ch,

				     nbdev_io,

				     nbdev_io_to_abort);



		break;

	default:

		return -EINVAL;

	}

	return 0;

		rc = -EINVAL;

		break;

	}



static void

bdev_nvme_submit_request(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_io)

{

	int rc = _bdev_nvme_submit_request(ch, bdev_io);



exit:

	if (spdk_unlikely(rc != 0)) {

		if (rc == -ENOMEM) {

			spdk_bdev_io_complete(bdev_io, SPDK_BDEV_IO_STATUS_NOMEM);