Commit 742b8796 authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Darek Stojaczyk
Browse files

bdev/nvme: Inline bdev_nvme_queue_cmd() into bdev_nvme_readv/writev() 



Subsequent patches will implement PI verification when PI error occurs,
but PI verification will be different between read and write.

Subsequent patches will set IO flags for normal read and write but
will not set IO flags for checked read.

Current nesting stack,
 bdev_nvme_readv/writev
  -> bdev_nvme_queue_cmd
   -> spdk_nvme_ns_cmd_readv/writev
    -> bdev_nvme_queued_done
makes these changes difficult.

Hence this patch inlines bdev_nvme_queue_cmd into bdev_nvme_readv/writev,
adds separate completion function bdev_nvme_readv/writev_done, and
removes enum direction.

This patch doesn't cause any functional change.

Change-Id: I2f97ff21245539c690490d0fc4134d2e0049eddd
Signed-off-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-on: https://review.gerrithub.io/c/443187


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent 50d7ad06

lib/bdev/nvme/bdev_nvme.c

+58 −50
Original line number Diff line number Diff line
@@ -82,11 +82,6 @@ struct nvme_bdev_io { 
	struct spdk_thread *orig_thread;

};



enum data_direction {

	BDEV_DISK_READ = 0,

	BDEV_DISK_WRITE = 1

};



struct nvme_probe_ctx {

	size_t count;

	struct spdk_nvme_transport_id trids[NVME_MAX_CONTROLLERS];
@@ -119,10 +114,12 @@ static TAILQ_HEAD(, nvme_ctrlr) g_nvme_ctrlrs = TAILQ_HEAD_INITIALIZER(g_nvme_ct 
static void nvme_ctrlr_create_bdevs(struct nvme_ctrlr *nvme_ctrlr);

static int bdev_nvme_library_init(void);

static void bdev_nvme_library_fini(void);

static int bdev_nvme_queue_cmd(struct nvme_bdev *bdev, struct spdk_nvme_qpair *qpair,

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

			   struct nvme_bdev_io *bio,

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

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

			    struct nvme_bdev_io *bio,

			       int direction, struct iovec *iov, int iovcnt, uint64_t lba_count,

			       uint64_t lba);

			    struct iovec *iov, int iovcnt, 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);
@@ -187,34 +184,6 @@ static struct spdk_bdev_module nvme_if = { 
};

SPDK_BDEV_MODULE_REGISTER(nvme, &nvme_if)



static int

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

		struct nvme_bdev_io *bio,

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

{

	struct nvme_io_channel *nvme_ch = spdk_io_channel_get_ctx(ch);



	SPDK_DEBUGLOG(SPDK_LOG_BDEV_NVME, "read %lu blocks with offset %#lx\n",

		      lba_count, lba);



	return bdev_nvme_queue_cmd(nbdev, nvme_ch->qpair, bio, BDEV_DISK_READ,

				   iov, iovcnt, lba_count, lba);

}



static int

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

		 struct nvme_bdev_io *bio,

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

{

	struct nvme_io_channel *nvme_ch = spdk_io_channel_get_ctx(ch);



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

		      lba_count, lba);



	return bdev_nvme_queue_cmd(nbdev, nvme_ch->qpair, bio, BDEV_DISK_WRITE,

				   iov, iovcnt, lba_count, lba);

}



static int

bdev_nvme_poll(void *arg)

{
@@ -1575,6 +1544,22 @@ nvme_ctrlr_create_bdevs(struct nvme_ctrlr *nvme_ctrlr) 
	}

}



static void

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

{

	struct spdk_bdev_io *bdev_io = spdk_bdev_io_from_ctx((struct nvme_bdev_io *)ref);



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

}



static void

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

{

	struct spdk_bdev_io *bdev_io = spdk_bdev_io_from_ctx((struct nvme_bdev_io *)ref);



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

}



static void

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

{
@@ -1648,30 +1633,53 @@ bdev_nvme_queued_next_sge(void *ref, void **address, uint32_t *length) 
}



static int

bdev_nvme_queue_cmd(struct nvme_bdev *bdev, struct spdk_nvme_qpair *qpair,

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

		struct nvme_bdev_io *bio,

		    int direction, struct iovec *iov, int iovcnt, uint64_t lba_count,

		    uint64_t lba)

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

{

	struct nvme_io_channel *nvme_ch = spdk_io_channel_get_ctx(ch);

	int rc;



	SPDK_DEBUGLOG(SPDK_LOG_BDEV_NVME, "read %lu blocks with offset %#lx\n",

		      lba_count, lba);



	bio->iovs = iov;

	bio->iovcnt = iovcnt;

	bio->iovpos = 0;

	bio->iov_offset = 0;



	if (direction == BDEV_DISK_READ) {

		rc = spdk_nvme_ns_cmd_readv(bdev->ns, qpair, lba,

					    lba_count, bdev_nvme_queued_done, bio, 0,

					    bdev_nvme_queued_reset_sgl, bdev_nvme_queued_next_sge);

	} else {

		rc = spdk_nvme_ns_cmd_writev(bdev->ns, qpair, lba,

					     lba_count, bdev_nvme_queued_done, bio, 0,

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

				    bdev_nvme_readv_done, bio, 0,

				    bdev_nvme_queued_reset_sgl, bdev_nvme_queued_next_sge);



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

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

	}

	return rc;

}



static int

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

		 struct nvme_bdev_io *bio,

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

{

	struct nvme_io_channel *nvme_ch = spdk_io_channel_get_ctx(ch);

	int rc;



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

		      lba_count, lba);



	bio->iovs = iov;

	bio->iovcnt = iovcnt;

	bio->iovpos = 0;

	bio->iov_offset = 0;



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

				     bdev_nvme_writev_done, bio, 0,

				     bdev_nvme_queued_reset_sgl, bdev_nvme_queued_next_sge);



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

		SPDK_ERRLOG("%s failed: rc = %d\n", direction == BDEV_DISK_READ ? "readv" : "writev", rc);

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

	}

	return rc;

}