Commit 53ca6a88 authored by yash.rajsingh's avatar yash.rajsingh Committed by Konrad Sztyber
Browse files

bdev/nvme: Rearrange fields in spdk_bdev_nvme_opts to reduce holes. 



This patch rearranges the fields in spdk_bdev_nvme_opts to reduce the
number of holes in the structure which reduces the size of the overall
structure. This is required as a preliminary 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: I6402afecd582297b3ead98383016e6c8dfd385ba
Signed-off-by: default avatarYash Raj Singh <yash.rajsingh@nutanix.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/25299


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

include/spdk/module/bdev/nvme.h

+4 −4
Original line number Diff line number Diff line
@@ -56,33 +56,33 @@ enum spdk_bdev_timeout_action { 


struct spdk_bdev_nvme_opts {

	enum spdk_bdev_timeout_action action_on_timeout;

	uint32_t keep_alive_timeout_ms;

	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;

	uint32_t io_queue_requests;

	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;

	uint8_t transport_ack_timeout;

	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_srq_size;

	uint32_t rdma_max_cq_size;

	uint16_t rdma_cm_event_timeout_ms;

	uint32_t dhchap_digests;

module/bdev/nvme/bdev_nvme.c

+3 −3
Original line number Diff line number Diff line
@@ -162,23 +162,23 @@ static TAILQ_HEAD(, nvme_probe_skip_entry) g_skipped_nvme_ctrlrs = TAILQ_HEAD_IN 


static struct spdk_bdev_nvme_opts g_opts = {

	.action_on_timeout = SPDK_BDEV_NVME_TIMEOUT_ACTION_NONE,

	.keep_alive_timeout_ms = SPDK_BDEV_NVME_DEFAULT_KEEP_ALIVE_TIMEOUT_IN_MS,

	.timeout_us = 0,

	.timeout_admin_us = 0,

	.keep_alive_timeout_ms = SPDK_BDEV_NVME_DEFAULT_KEEP_ALIVE_TIMEOUT_IN_MS,

	.transport_retry_count = 4,

	.arbitration_burst = 0,

	.low_priority_weight = 0,

	.medium_priority_weight = 0,

	.high_priority_weight = 0,

	.io_queue_requests = 0,

	.nvme_adminq_poll_period_us = 10000ULL,

	.nvme_ioq_poll_period_us = 0,

	.io_queue_requests = 0,

	.delay_cmd_submit = SPDK_BDEV_NVME_DEFAULT_DELAY_CMD_SUBMIT,

	.bdev_retry_count = 3,

	.transport_ack_timeout = 0,

	.ctrlr_loss_timeout_sec = 0,

	.reconnect_delay_sec = 0,

	.fast_io_fail_timeout_sec = 0,

	.transport_ack_timeout = 0,

	.disable_auto_failback = false,

	.generate_uuids = false,

	.transport_tos = 0,

module/bdev/nvme/bdev_nvme_rpc.c

+4 −4
Original line number Diff line number Diff line
@@ -110,30 +110,30 @@ rpc_decode_dhgroup_array(const struct spdk_json_val *val, void *out) 


static const struct spdk_json_object_decoder rpc_bdev_nvme_options_decoders[] = {

	{"action_on_timeout", offsetof(struct spdk_bdev_nvme_opts, action_on_timeout), rpc_decode_action_on_timeout, true},

	{"keep_alive_timeout_ms", offsetof(struct spdk_bdev_nvme_opts, keep_alive_timeout_ms), spdk_json_decode_uint32, true},

	{"timeout_us", offsetof(struct spdk_bdev_nvme_opts, timeout_us), spdk_json_decode_uint64, true},

	{"timeout_admin_us", offsetof(struct spdk_bdev_nvme_opts, timeout_admin_us), spdk_json_decode_uint64, true},

	{"keep_alive_timeout_ms", offsetof(struct spdk_bdev_nvme_opts, keep_alive_timeout_ms), spdk_json_decode_uint32, true},

	{"arbitration_burst", offsetof(struct spdk_bdev_nvme_opts, arbitration_burst), spdk_json_decode_uint32, true},

	{"low_priority_weight", offsetof(struct spdk_bdev_nvme_opts, low_priority_weight), spdk_json_decode_uint32, true},

	{"medium_priority_weight", offsetof(struct spdk_bdev_nvme_opts, medium_priority_weight), spdk_json_decode_uint32, true},

	{"high_priority_weight", offsetof(struct spdk_bdev_nvme_opts, high_priority_weight), spdk_json_decode_uint32, true},

	{"io_queue_requests", offsetof(struct spdk_bdev_nvme_opts, io_queue_requests), spdk_json_decode_uint32, true},

	{"nvme_adminq_poll_period_us", offsetof(struct spdk_bdev_nvme_opts, nvme_adminq_poll_period_us), spdk_json_decode_uint64, true},

	{"nvme_ioq_poll_period_us", offsetof(struct spdk_bdev_nvme_opts, nvme_ioq_poll_period_us), spdk_json_decode_uint64, true},

	{"io_queue_requests", offsetof(struct spdk_bdev_nvme_opts, io_queue_requests), spdk_json_decode_uint32, true},

	{"delay_cmd_submit", offsetof(struct spdk_bdev_nvme_opts, delay_cmd_submit), spdk_json_decode_bool, true},

	{"transport_retry_count", offsetof(struct spdk_bdev_nvme_opts, transport_retry_count), spdk_json_decode_uint32, true},

	{"bdev_retry_count", offsetof(struct spdk_bdev_nvme_opts, bdev_retry_count), spdk_json_decode_int32, true},

	{"transport_ack_timeout", offsetof(struct spdk_bdev_nvme_opts, transport_ack_timeout), spdk_json_decode_uint8, true},

	{"ctrlr_loss_timeout_sec", offsetof(struct spdk_bdev_nvme_opts, ctrlr_loss_timeout_sec), spdk_json_decode_int32, true},

	{"reconnect_delay_sec", offsetof(struct spdk_bdev_nvme_opts, reconnect_delay_sec), spdk_json_decode_uint32, true},

	{"fast_io_fail_timeout_sec", offsetof(struct spdk_bdev_nvme_opts, fast_io_fail_timeout_sec), spdk_json_decode_uint32, true},

	{"transport_ack_timeout", offsetof(struct spdk_bdev_nvme_opts, transport_ack_timeout), spdk_json_decode_uint8, true},

	{"disable_auto_failback", offsetof(struct spdk_bdev_nvme_opts, disable_auto_failback), spdk_json_decode_bool, true},

	{"generate_uuids", offsetof(struct spdk_bdev_nvme_opts, generate_uuids), spdk_json_decode_bool, true},

	{"transport_tos", offsetof(struct spdk_bdev_nvme_opts, transport_tos), spdk_json_decode_uint8, true},

	{"nvme_error_stat", offsetof(struct spdk_bdev_nvme_opts, nvme_error_stat), spdk_json_decode_bool, true},

	{"rdma_srq_size", offsetof(struct spdk_bdev_nvme_opts, rdma_srq_size), spdk_json_decode_uint32, true},

	{"io_path_stat", offsetof(struct spdk_bdev_nvme_opts, io_path_stat), spdk_json_decode_bool, true},

	{"allow_accel_sequence", offsetof(struct spdk_bdev_nvme_opts, allow_accel_sequence), spdk_json_decode_bool, true},

	{"rdma_srq_size", offsetof(struct spdk_bdev_nvme_opts, rdma_srq_size), spdk_json_decode_uint32, true},

	{"rdma_max_cq_size", offsetof(struct spdk_bdev_nvme_opts, rdma_max_cq_size), spdk_json_decode_uint32, true},

	{"rdma_cm_event_timeout_ms", offsetof(struct spdk_bdev_nvme_opts, rdma_cm_event_timeout_ms), spdk_json_decode_uint16, true},

	{"dhchap_digests", offsetof(struct spdk_bdev_nvme_opts, dhchap_digests), rpc_decode_digest_array, true},