Commit 61d6254d authored by Maciej Szwed's avatar Maciej Szwed Committed by Tomasz Zawadzki
Browse files

bdev/nvme: Add bdev_nvme_comparev_and_writev function 



This function will be used for NVMe which supports
fused commands natively.

Signed-off-by: default avatarMaciej Szwed <maciej.szwed@intel.com>
Change-Id: I5c41d98e1830ea9e14a521ccb06c6e9284857eb6
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/477026


Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Community-CI: Broadcom SPDK FC-NVMe CI <spdk-ci.pdl@broadcom.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent 8ffec69b

module/bdev/nvme/bdev_nvme.c

+97 −0
Original line number Diff line number Diff line
@@ -74,6 +74,9 @@ struct nvme_bdev_io { 


	/** Originating thread */

	struct spdk_thread *orig_thread;



	/** Intermediate compare-and-write status */

	bool first_fused_submitted;

};



struct nvme_probe_ctx {
@@ -135,6 +138,9 @@ static int bdev_nvme_writev(struct nvme_bdev *nbdev, struct spdk_io_channel *ch, 
static int bdev_nvme_comparev(struct nvme_bdev *nbdev, struct spdk_io_channel *ch,

			      struct nvme_bdev_io *bio,

			      struct iovec *iov, int iovcnt, void *md, uint64_t lba_count, uint64_t lba);

static int bdev_nvme_comparev_and_writev(struct nvme_bdev *nbdev, struct spdk_io_channel *ch,

		struct nvme_bdev_io *bio,

		struct iovec *iov, int iovcnt, void *md, uint64_t lba_count, uint64_t lba);

static int bdev_nvme_admin_passthru(struct nvme_bdev *nbdev, struct spdk_io_channel *ch,

				    struct nvme_bdev_io *bio,

				    struct spdk_nvme_cmd *cmd, void *buf, size_t nbytes);
@@ -506,6 +512,16 @@ _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);



	case SPDK_BDEV_IO_TYPE_COMPARE_AND_WRITE:

		return bdev_nvme_comparev_and_writev(nbdev,

						     ch,

						     nbdev_io,

						     bdev_io->u.bdev.iovs,

						     bdev_io->u.bdev.iovcnt,

						     bdev_io->u.bdev.md_buf,

						     bdev_io->u.bdev.num_blocks,

						     bdev_io->u.bdev.offset_blocks);



	case SPDK_BDEV_IO_TYPE_WRITE_ZEROES:

		return bdev_nvme_unmap(nbdev,

				       ch,
@@ -618,6 +634,13 @@ bdev_nvme_io_type_supported(void *ctx, enum spdk_bdev_io_type io_type) 
		 */

		return false;



	case SPDK_BDEV_IO_TYPE_COMPARE_AND_WRITE:

		if (spdk_nvme_ctrlr_get_flags(nbdev->nvme_bdev_ctrlr->ctrlr) &

		    SPDK_NVME_CTRLR_COMPARE_AND_WRITE_SUPPORTED) {

			return true;

		}

		return false;



	default:

		return false;

	}
@@ -1972,6 +1995,27 @@ bdev_nvme_comparev_done(void *ref, const struct spdk_nvme_cpl *cpl) 
	spdk_bdev_io_complete_nvme_status(bdev_io, cpl->cdw0, cpl->status.sct, cpl->status.sc);

}



static void

bdev_nvme_comparev_and_writev_done(void *ref, const struct spdk_nvme_cpl *cpl)

{

	struct nvme_bdev_io *bio = ref;

	struct spdk_bdev_io *bdev_io = spdk_bdev_io_from_ctx(bio);



	/* We need to check if compare operation failed to make sure that in such case

	 * write operation failed as well. We don't need to know if we are in compare

	 * or write callback because for compare callback below check will always result

	 * as false. */

	if (spdk_nvme_cpl_is_error(&bio->cpl)) {

		assert(spdk_nvme_cpl_is_error(cpl));

	}



	/* Save compare result for write callback. In case this is write callback this

	 * line does not matter */

	bio->cpl = *cpl;



	spdk_bdev_io_complete_nvme_status(bdev_io, cpl->cdw0, cpl->status.sct, cpl->status.sc);

}



static void

bdev_nvme_queued_done(void *ref, const struct spdk_nvme_cpl *cpl)

{
@@ -2152,6 +2196,59 @@ bdev_nvme_comparev(struct nvme_bdev *nbdev, struct spdk_io_channel *ch, 
	return rc;

}



static int

bdev_nvme_comparev_and_writev(struct nvme_bdev *nbdev, struct spdk_io_channel *ch,

			      struct nvme_bdev_io *bio,

			      struct iovec *iov, int iovcnt, void *md, uint64_t lba_count, uint64_t lba)

{

	struct nvme_io_channel *nvme_ch = spdk_io_channel_get_ctx(ch);

	struct spdk_bdev_io *bdev_io = spdk_bdev_io_from_ctx(bio);

	uint32_t flags = nbdev->disk.dif_check_flags;

	int rc;



	SPDK_DEBUGLOG(SPDK_LOG_BDEV_NVME, "compare and write %lu blocks with offset %#lx\n",

		      lba_count, lba);



	bio->iovs = iov;

	bio->iovcnt = iovcnt;

	bio->iovpos = 0;

	bio->iov_offset = 0;



	if (bdev_io->num_retries == 0) {

		bio->first_fused_submitted = false;

	}



	if (!bio->first_fused_submitted) {

		flags |= SPDK_NVME_IO_FLAGS_FUSE_FIRST;

		memset(&bio->cpl, 0, sizeof(bio->cpl));



		rc = spdk_nvme_ns_cmd_comparev_with_md(nbdev->nvme_ns->ns, nvme_ch->qpair, lba, lba_count,

						       bdev_nvme_comparev_and_writev_done, bio, flags,

						       bdev_nvme_queued_reset_sgl, bdev_nvme_queued_next_sge, md, 0, 0);

		if (rc == 0) {

			bio->first_fused_submitted = true;

			flags &= ~SPDK_NVME_IO_FLAGS_FUSE_FIRST;

		} else {

			if (rc != -ENOMEM) {

				SPDK_ERRLOG("compare failed: rc = %d\n", rc);

			}

			return rc;

		}

	}



	flags |= SPDK_NVME_IO_FLAGS_FUSE_SECOND;



	rc = spdk_nvme_ns_cmd_writev_with_md(nbdev->nvme_ns->ns, nvme_ch->qpair, lba, lba_count,

					     bdev_nvme_comparev_and_writev_done, bio, flags,

					     bdev_nvme_queued_reset_sgl, bdev_nvme_queued_next_sge, md, 0, 0);

	if (rc != 0 && rc != -ENOMEM) {

		SPDK_ERRLOG("write failed: rc = %d\n", rc);

		rc = 0;

	}



	return rc;

}



static int

bdev_nvme_unmap(struct nvme_bdev *nbdev, struct spdk_io_channel *ch,

		struct nvme_bdev_io *bio,