Commit 05632afd authored by Atul Malakar's avatar Atul Malakar Committed by Konrad Sztyber
Browse files

nvmf: large IU and atomic write unit reporting 



Added spdk_nvmf_ctrlr_identify_ns_ext() to request the identify
namespace data and populate performance and atomic operations fields.

Change-Id: Ib809b174e08a4b8a26bbc6d396ff3fb4798fae98
Signed-off-by: default avatarAtul Malakar <a.malakar@samsung.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/24094


Community-CI: Mellanox Build Bot
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: default avatarJim Harris <jim.harris@samsung.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent 81fc34df

include/spdk/nvmf_cmd.h

+13 −0
Original line number Diff line number Diff line
@@ -79,6 +79,19 @@ int spdk_nvmf_ctrlr_identify_ns(struct spdk_nvmf_ctrlr *ctrlr, 
				struct spdk_nvme_cpl *rsp,

				struct spdk_nvme_ns_data *nsdata);



/**

 * Fills the identify namespace attributes for the specified controller.

 *

 * This funtion uses nvme passthru for the namespaces that are backed by bdevs

 * that support NVME_ADMIN IO type. It differs from spdk_nvmf_ctrlr_identify_ns

 * by requesting identify namespace data and populate performance and atomic

 * operations fields.

 *

 * \param req The NVMe-oF request

 * \return \ref spdk_nvmf_request_exec_status

 */

int spdk_nvmf_ctrlr_identify_ns_ext(struct spdk_nvmf_request *req);



/**

 * Callback function definition for a custom admin command handler.

 *

lib/nvmf/ctrlr.c

+88 −8
Original line number Diff line number Diff line
@@ -2759,8 +2759,8 @@ _nvmf_ctrlr_get_ns_safe(struct spdk_nvmf_ctrlr *ctrlr, 
	return ns;

}



int

spdk_nvmf_ctrlr_identify_ns(struct spdk_nvmf_ctrlr *ctrlr,

static void

nvmf_ctrlr_identify_ns(struct spdk_nvmf_ctrlr *ctrlr,

		       struct spdk_nvme_cmd *cmd,

		       struct spdk_nvme_cpl *rsp,

		       struct spdk_nvme_ns_data *nsdata)
@@ -2772,7 +2772,7 @@ spdk_nvmf_ctrlr_identify_ns(struct spdk_nvmf_ctrlr *ctrlr, 


	ns = _nvmf_ctrlr_get_ns_safe(ctrlr, cmd->nsid, rsp);

	if (ns == NULL) {

		return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;

		return;

	}



	nvmf_bdev_ctrlr_identify_ns(ns, nsdata, ctrlr->dif_insert_or_strip);
@@ -2803,10 +2803,89 @@ spdk_nvmf_ctrlr_identify_ns(struct spdk_nvmf_ctrlr *ctrlr, 
			nsdata->nuse = 0;

		}

	}

}



int

spdk_nvmf_ctrlr_identify_ns(struct spdk_nvmf_ctrlr *ctrlr,

			    struct spdk_nvme_cmd *cmd,

			    struct spdk_nvme_cpl *rsp,

			    struct spdk_nvme_ns_data *nsdata)

{

	nvmf_ctrlr_identify_ns(ctrlr, cmd, rsp, nsdata);



	return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;

}



static void

identify_ns_passthru_cb(struct spdk_nvmf_request *req)

{

	struct spdk_nvme_cmd *cmd = spdk_nvmf_request_get_cmd(req);

	struct spdk_nvmf_ctrlr *ctrlr = spdk_nvmf_request_get_ctrlr(req);

	struct spdk_nvme_cpl *rsp = spdk_nvmf_request_get_response(req);

	struct spdk_nvme_ns_data nvmf_nsdata = {};

	struct spdk_nvme_ns_data nvme_nsdata = {};

	size_t datalen;



	/* This is the identify data from the NVMe drive */

	datalen = spdk_nvmf_request_copy_to_buf(req, &nvme_nsdata,

						sizeof(nvme_nsdata));



	nvmf_ctrlr_identify_ns(ctrlr, cmd, rsp, &nvmf_nsdata);



	/* Update fabric's namespace according to SSD's namespace */

	if (nvme_nsdata.nsfeat.optperf) {

		nvmf_nsdata.nsfeat.optperf = nvme_nsdata.nsfeat.optperf;

		nvmf_nsdata.npwg = nvme_nsdata.npwg;

		nvmf_nsdata.npwa = nvme_nsdata.npwa;

		nvmf_nsdata.npdg = nvme_nsdata.npdg;

		nvmf_nsdata.npda = nvme_nsdata.npda;

		nvmf_nsdata.nows = nvme_nsdata.nows;

	}



	if (nvme_nsdata.nsfeat.ns_atomic_write_unit) {

		nvmf_nsdata.nsfeat.ns_atomic_write_unit = nvme_nsdata.nsfeat.ns_atomic_write_unit;

		nvmf_nsdata.nawun = nvme_nsdata.nawun;

		nvmf_nsdata.nawupf = nvme_nsdata.nawupf;

		nvmf_nsdata.nacwu = nvme_nsdata.nacwu;

	}



	nvmf_nsdata.nabsn = nvme_nsdata.nabsn;

	nvmf_nsdata.nabo = nvme_nsdata.nabo;

	nvmf_nsdata.nabspf = nvme_nsdata.nabspf;



	spdk_nvmf_request_copy_from_buf(req, &nvmf_nsdata, datalen);

}



int

spdk_nvmf_ctrlr_identify_ns_ext(struct spdk_nvmf_request *req)

{

	struct spdk_nvme_cmd *cmd = spdk_nvmf_request_get_cmd(req);

	struct spdk_nvmf_ctrlr *ctrlr = spdk_nvmf_request_get_ctrlr(req);

	struct spdk_nvme_cpl *rsp = spdk_nvmf_request_get_response(req);

	struct spdk_bdev *bdev;

	struct spdk_bdev_desc *desc;

	struct spdk_io_channel *ch;

	struct spdk_nvme_ns_data nsdata = {};

	struct spdk_iov_xfer ix;

	int rc;



	nvmf_ctrlr_identify_ns(ctrlr, cmd, rsp, &nsdata);



	rc = spdk_nvmf_request_get_bdev(cmd->nsid, req, &bdev, &desc, &ch);

	if (rc) {

		return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;

	}



	if (!spdk_bdev_io_type_supported(bdev, SPDK_BDEV_IO_TYPE_NVME_ADMIN)) {

		spdk_iov_xfer_init(&ix, req->iov, req->iovcnt);

		spdk_iov_xfer_from_buf(&ix, &nsdata, sizeof(nsdata));



		return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;

	}



	return spdk_nvmf_bdev_ctrlr_nvme_passthru_admin(bdev, desc, ch, req, identify_ns_passthru_cb);

}



static void

nvmf_ctrlr_populate_oacs(struct spdk_nvmf_ctrlr *ctrlr,

			 struct spdk_nvme_ctrlr_data *cdata)
@@ -3287,8 +3366,9 @@ nvmf_ctrlr_identify(struct spdk_nvmf_request *req) 


	switch (cns) {

	case SPDK_NVME_IDENTIFY_NS:

		ret = spdk_nvmf_ctrlr_identify_ns(ctrlr, cmd, rsp, (void *)&tmpbuf);

		break;

		/* Function below can be asynchronous & we always need to have the data in request's buffer

		 * So just return here */

		return spdk_nvmf_ctrlr_identify_ns_ext(req);

	case SPDK_NVME_IDENTIFY_CTRLR:

		ret = spdk_nvmf_ctrlr_identify_ctrlr(ctrlr, (void *)&tmpbuf);

		break;

lib/nvmf/spdk_nvmf.map

+1 −0
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ 
	spdk_nvmf_ctrlr_identify_ctrlr;

	spdk_nvmf_ctrlr_identify_iocs_specific;

	spdk_nvmf_ctrlr_identify_ns;

	spdk_nvmf_ctrlr_identify_ns_ext;

	spdk_nvmf_set_custom_admin_cmd_hdlr;

	spdk_nvmf_set_passthru_admin_cmd;

	spdk_nvmf_bdev_ctrlr_nvme_passthru_admin;

test/unit/lib/nvmf/ctrlr.c/ctrlr_ut.c

+3 −0
Original line number Diff line number Diff line
@@ -225,6 +225,9 @@ DEFINE_STUB(nvmf_auth_request_exec, int, (struct spdk_nvmf_request *r), 
DEFINE_STUB(spdk_nvmf_subsystem_get_nqn, const char *,

	    (const struct spdk_nvmf_subsystem *subsystem), NULL);



DEFINE_STUB(spdk_bdev_io_type_supported, bool,

	    (struct spdk_bdev *bdev, enum spdk_bdev_io_type io_type), false);



void

nvmf_qpair_set_state(struct spdk_nvmf_qpair *qpair, enum spdk_nvmf_qpair_state state)

{

test/unit/lib/nvmf/tcp.c/tcp_ut.c

+2 −1
Original line number Diff line number Diff line
@@ -266,7 +266,8 @@ DEFINE_STUB(nvmf_qpair_auth_init, int, (struct spdk_nvmf_qpair *q), 0); 
DEFINE_STUB(nvmf_auth_request_exec, int, (struct spdk_nvmf_request *r),

	    SPDK_NVMF_REQUEST_EXEC_STATUS_ASYNCHRONOUS);

DEFINE_STUB(nvmf_request_get_buffers_abort, bool, (struct spdk_nvmf_request *r), false);



DEFINE_STUB(spdk_bdev_io_type_supported, bool,

	    (struct spdk_bdev *bdev, enum spdk_bdev_io_type io_type), false);

struct spdk_io_channel *

spdk_accel_get_io_channel(void)

{