Commit 7f6fdcff authored by Changpeng Liu's avatar Changpeng Liu
Browse files

bdev/nvme: add arbitration configuration parameters to NVMe controller 



Change-Id: I9c69797670dbe652ee3f9dbe21125e9b46a96dda
Signed-off-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/467902


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent acb9849c

CHANGELOG.md

+4 −1
Original line number Diff line number Diff line
@@ -73,6 +73,9 @@ initialization. 


### rpc



Added optional parameters '--arbitration-burst' and '--low/medium/high-priority-weight' to

'bdev_nvme_set_options' RPC method.



Added optional parameter '--md-size' to 'construct_null_bdev' RPC method.



Added optional parameters '--dif-type' and '--dif-is-head-of-md' to 'construct_null_bdev'

doc/jsonrpc.md

+8 −0
Original line number Diff line number Diff line
@@ -1407,6 +1407,10 @@ Name | Optional | Type | Description 
action_on_timeout          | Optional | string      | Action to take on command time out: none, reset or abort

timeout_us                 | Optional | number      | Timeout for each command, in microseconds. If 0, don't track timeouts

retry_count                | Optional | number      | The number of attempts per I/O before an I/O fails

arbitration_burst          | Optional | number      | The value is expressed as a power of two, a value of 111b indicates no limit

low_priority_weight        | Optional | number      | The maximum number of commands that the controller may launch at one time from a low priority queue

medium_priority_weight     | Optional | number      | The maximum number of commands that the controller may launch at one time from a medium priority queue

high_priority_weight       | Optional | number      | The maximum number of commands that the controller may launch at one time from a high priority queue

nvme_adminq_poll_period_us | Optional | number      | How often the admin queue is polled for asynchronous events in microseconds

nvme_ioq_poll_period_us    | Optional | number      | How often I/O queues are polled for completions, in microseconds. Default: 0 (as fast as possible).

io_queue_requests          | Optional | number      | The number of requests allocated for each NVMe I/O queue. Default: 512.
@@ -1420,6 +1424,10 @@ request: 
{

  "params": {

    "retry_count": 5,

    "arbitration_burst": 3,

    "low_priority_weight": 8,

    "medium_priority_weight":8,

    "high_priority_weight": 8,

    "nvme_adminq_poll_period_us": 2000,

    "timeout_us": 10000000,

    "action_on_timeout": "reset",

module/bdev/nvme/bdev_nvme.c

+18 −0
Original line number Diff line number Diff line
@@ -105,6 +105,10 @@ static struct spdk_bdev_nvme_opts g_opts = { 
	.action_on_timeout = SPDK_BDEV_NVME_TIMEOUT_ACTION_NONE,

	.timeout_us = 0,

	.retry_count = 4,

	.arbitration_burst = 0,

	.low_priority_weight = 0,

	.medium_priority_weight = 0,

	.high_priority_weight = 0,

	.nvme_adminq_poll_period_us = 1000000ULL,

	.nvme_ioq_poll_period_us = 0,

	.io_queue_requests = 0,
@@ -777,6 +781,11 @@ hotplug_probe_cb(void *cb_ctx, const struct spdk_nvme_transport_id *trid, 
		}

	}



	opts->arbitration_burst = (uint8_t)g_opts.arbitration_burst;

	opts->low_priority_weight = (uint8_t)g_opts.low_priority_weight;

	opts->medium_priority_weight = (uint8_t)g_opts.medium_priority_weight;

	opts->high_priority_weight = (uint8_t)g_opts.high_priority_weight;



	SPDK_DEBUGLOG(SPDK_LOG_BDEV_NVME, "Attaching to %s\n", trid->traddr);



	return true;
@@ -817,6 +826,11 @@ probe_cb(void *cb_ctx, const struct spdk_nvme_transport_id *trid, 
		snprintf(opts->hostnqn, sizeof(opts->hostnqn), "%s", ctx->hostnqn);

	}



	opts->arbitration_burst = (uint8_t)g_opts.arbitration_burst;

	opts->low_priority_weight = (uint8_t)g_opts.low_priority_weight;

	opts->medium_priority_weight = (uint8_t)g_opts.medium_priority_weight;

	opts->high_priority_weight = (uint8_t)g_opts.high_priority_weight;



	return true;

}
@@ -2103,6 +2117,10 @@ bdev_nvme_config_json(struct spdk_json_write_ctx *w) 
	spdk_json_write_named_string(w, "action_on_timeout", action);

	spdk_json_write_named_uint64(w, "timeout_us", g_opts.timeout_us);

	spdk_json_write_named_uint32(w, "retry_count", g_opts.retry_count);

	spdk_json_write_named_uint32(w, "arbitration_burst", g_opts.arbitration_burst);

	spdk_json_write_named_uint32(w, "low_priority_weight", g_opts.low_priority_weight);

	spdk_json_write_named_uint32(w, "medium_priority_weight", g_opts.medium_priority_weight);

	spdk_json_write_named_uint32(w, "high_priority_weight", g_opts.high_priority_weight);

	spdk_json_write_named_uint64(w, "nvme_adminq_poll_period_us", g_opts.nvme_adminq_poll_period_us);

	spdk_json_write_named_uint64(w, "nvme_ioq_poll_period_us", g_opts.nvme_ioq_poll_period_us);

	spdk_json_write_named_uint32(w, "io_queue_requests", g_opts.io_queue_requests);

module/bdev/nvme/bdev_nvme.h

+4 −0
Original line number Diff line number Diff line
@@ -50,6 +50,10 @@ struct spdk_bdev_nvme_opts { 
	enum spdk_bdev_timeout_action action_on_timeout;

	uint64_t timeout_us;

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

module/bdev/nvme/bdev_nvme_rpc.c

+4 −0
Original line number Diff line number Diff line
@@ -73,6 +73,10 @@ 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},

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

	{"retry_count", offsetof(struct spdk_bdev_nvme_opts, retry_count), 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},

	{"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},