Commit 3875f287 authored by Ben Walker's avatar Ben Walker Committed by Tomasz Zawadzki
Browse files

nvme: Add spdk_nvme_ctrlr_get_opts 



This is needed for reporting additional information in JSON RPCs

Change-Id: I45da2ea78cd5415f7536130b6793ca29e929b86e
Signed-off-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/9338


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 avatarPaul Luse <paul.e.luse@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarZiye Yang <ziye.yang@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
parent 343e2c85

CHANGELOG.md

+2 −0
Original line number Diff line number Diff line
@@ -63,6 +63,8 @@ Added new functions `spdk_nvme_ctrlr_write_boot_partition`, 
`spdk_nvme_ctrlr_read_boot_partition_start` and `spdk_nvme_ctrlr_read_boot_partition_poll`

to write and read the boot partitions of a controller.



Added `spdk_nvme_ctrlr_get_opts` to retrieve the current controller options.



### dpdk



Updated DPDK submodule to DPDK 21.08.

include/spdk/nvme.h

+8 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ struct spdk_nvme_ctrlr_opts { 
	/**

	 * The host NQN to use when connecting to NVMe over Fabrics controllers.

	 *

	 * Unused for local PCIe-attached NVMe devices.

	 * If empty, a default value will be used.

	 */

	char hostnqn[SPDK_NVMF_NQN_MAX_LEN + 1];
@@ -324,6 +324,13 @@ bool spdk_nvme_ctrlr_is_fabrics(struct spdk_nvme_ctrlr *ctrlr); 
void spdk_nvme_ctrlr_get_default_ctrlr_opts(struct spdk_nvme_ctrlr_opts *opts,

		size_t opts_size);



/*

 * Get the options in use for a given controller.

 *

 * \param ctrlr Opaque handle to NVMe controller.

 */

const struct spdk_nvme_ctrlr_opts *spdk_nvme_ctrlr_get_opts(struct spdk_nvme_ctrlr *ctrlr);



/**

 * Reason for qpair disconnect at the transport layer.

 *

lib/nvme/nvme_ctrlr.c

+6 −0
Original line number Diff line number Diff line
@@ -234,6 +234,12 @@ spdk_nvme_ctrlr_get_default_ctrlr_opts(struct spdk_nvme_ctrlr_opts *opts, size_t 
#undef SET_FIELD

}



const struct spdk_nvme_ctrlr_opts *

spdk_nvme_ctrlr_get_opts(struct spdk_nvme_ctrlr *ctrlr)

{

	return &ctrlr->opts;

}



/**

 * This function will be called when the process allocates the IO qpair.

 * Note: the ctrlr_lock must be held when calling this function.

lib/nvme/spdk_nvme.map

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
	spdk_nvme_ctrlr_is_discovery;

	spdk_nvme_ctrlr_is_fabrics;

	spdk_nvme_ctrlr_get_default_ctrlr_opts;

	spdk_nvme_ctrlr_get_opts;

	spdk_nvme_ctrlr_set_trid;

	spdk_nvme_ctrlr_reset_subsystem;

	spdk_nvme_ctrlr_reset;