Commit 03b7aa9c authored by Yash Raj Singh's avatar Yash Raj Singh Committed by Konrad Sztyber
Browse files

bdev/nvme: Move the spdk_bdev_nvme_opts and spdk_bdev_timeout_action struct to the public header. 



This patch moves the spdk_bdev_nvme_opts and spdk_bdev_timeout_action
structs to the public header file include/spdk/module/bdev/nvme.h This
is required as a preliuminary step to expose the bdev_nvme_get_opts and
bdev_nvme_set_opts functions to the public API. Later patches will add
these functions to the public API.

Change-Id: Ib6bd16fa085a60f29dd920b4f9c350fa4ffb4c76
Signed-off-by: default avatarYash Raj Singh <yash.rajsingh@nutanix.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/25172


Reviewed-by: default avatarJim Harris <jim.harris@nvidia.com>
Community-CI: Community CI Samsung <spdk.community.ci.samsung@gmail.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarAnkit Kumar <ankit.kumar@samsung.com>
Community-CI: Mellanox Build Bot
Reviewed-by: default avatarAleksey Marchuk <alexeymar@nvidia.com>
parent d47eb51c

include/spdk/module/bdev/nvme.h

+41 −0
Original line number Diff line number Diff line
@@ -48,6 +48,47 @@ struct spdk_bdev_nvme_ctrlr_opts { 
	bool multipath;

};



enum spdk_bdev_timeout_action {

	SPDK_BDEV_NVME_TIMEOUT_ACTION_NONE = 0,

	SPDK_BDEV_NVME_TIMEOUT_ACTION_RESET,

	SPDK_BDEV_NVME_TIMEOUT_ACTION_ABORT,

};



struct spdk_bdev_nvme_opts {

	enum spdk_bdev_timeout_action action_on_timeout;

	uint64_t timeout_us;

	uint64_t timeout_admin_us;

	uint32_t keep_alive_timeout_ms;

	/* The number of attempts per I/O in the transport layer before an I/O fails. */

	uint32_t transport_retry_count;

	uint32_t arbitration_burst;

	uint32_t low_priority_weight;

	uint32_t medium_priority_weight;

	uint32_t high_priority_weight;

	uint64_t nvme_adminq_poll_period_us;

	uint64_t nvme_ioq_poll_period_us;

	uint32_t io_queue_requests;

	bool delay_cmd_submit;

	/* The number of attempts per I/O in the bdev layer before an I/O fails. */

	int32_t bdev_retry_count;

	uint8_t transport_ack_timeout;

	int32_t ctrlr_loss_timeout_sec;

	uint32_t reconnect_delay_sec;

	uint32_t fast_io_fail_timeout_sec;

	bool disable_auto_failback;

	bool generate_uuids;

	/* Type of Service - RDMA only */

	uint8_t transport_tos;

	bool nvme_error_stat;

	uint32_t rdma_srq_size;

	bool io_path_stat;

	bool allow_accel_sequence;

	uint32_t rdma_max_cq_size;

	uint16_t rdma_cm_event_timeout_ms;

	uint32_t dhchap_digests;

	uint32_t dhchap_dhgroups;

};



/**

 * Connect to the NVMe controller and populate namespaces as bdevs.

 *

module/bdev/nvme/bdev_nvme.h

+0 −41
Original line number Diff line number Diff line
@@ -282,47 +282,6 @@ struct nvme_ns *nvme_ctrlr_get_ns(struct nvme_ctrlr *nvme_ctrlr, uint32_t nsid); 
struct nvme_ns *nvme_ctrlr_get_first_active_ns(struct nvme_ctrlr *nvme_ctrlr);

struct nvme_ns *nvme_ctrlr_get_next_active_ns(struct nvme_ctrlr *nvme_ctrlr, struct nvme_ns *ns);



enum spdk_bdev_timeout_action {

	SPDK_BDEV_NVME_TIMEOUT_ACTION_NONE = 0,

	SPDK_BDEV_NVME_TIMEOUT_ACTION_RESET,

	SPDK_BDEV_NVME_TIMEOUT_ACTION_ABORT,

};



struct spdk_bdev_nvme_opts {

	enum spdk_bdev_timeout_action action_on_timeout;

	uint64_t timeout_us;

	uint64_t timeout_admin_us;

	uint32_t keep_alive_timeout_ms;

	/* The number of attempts per I/O in the transport layer before an I/O fails. */

	uint32_t transport_retry_count;

	uint32_t arbitration_burst;

	uint32_t low_priority_weight;

	uint32_t medium_priority_weight;

	uint32_t high_priority_weight;

	uint64_t nvme_adminq_poll_period_us;

	uint64_t nvme_ioq_poll_period_us;

	uint32_t io_queue_requests;

	bool delay_cmd_submit;

	/* The number of attempts per I/O in the bdev layer before an I/O fails. */

	int32_t bdev_retry_count;

	uint8_t transport_ack_timeout;

	int32_t ctrlr_loss_timeout_sec;

	uint32_t reconnect_delay_sec;

	uint32_t fast_io_fail_timeout_sec;

	bool disable_auto_failback;

	bool generate_uuids;

	/* Type of Service - RDMA only */

	uint8_t transport_tos;

	bool nvme_error_stat;

	uint32_t rdma_srq_size;

	bool io_path_stat;

	bool allow_accel_sequence;

	uint32_t rdma_max_cq_size;

	uint16_t rdma_cm_event_timeout_ms;

	uint32_t dhchap_digests;

	uint32_t dhchap_dhgroups;

};



struct spdk_nvme_qpair *bdev_nvme_get_io_qpair(struct spdk_io_channel *ctrlr_io_ch);

void bdev_nvme_get_opts(struct spdk_bdev_nvme_opts *opts);

int bdev_nvme_set_opts(const struct spdk_bdev_nvme_opts *opts);