Commit 38520df4 authored by Evgeniy Kochetov's avatar Evgeniy Kochetov Committed by Tomasz Zawadzki
Browse files

bdev/nvme: Add 'delay_cmd_submit' to nvme bdev options 



Signed-off-by: default avatarEvgeniy Kochetov <evgeniik@mellanox.com>
Signed-off-by: default avatarSasha Kotchubievsky <sashakot@mellanox.com>
Signed-off-by: default avatarAlexey Marchuk <alexeymar@mellanox.com>
Change-Id: I7dada3265f57dda61202797e5a02251b28dd0b30
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/475306


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Broadcom SPDK FC-NVMe CI <spdk-ci.pdl@broadcom.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent ffc7c4a9

module/bdev/nvme/bdev_nvme.c

+5 −2
Original line number Diff line number Diff line
@@ -51,6 +51,8 @@ 
#include "spdk/bdev_module.h"

#include "spdk_internal/log.h"



#define SPDK_BDEV_NVME_DEFAULT_DELAY_CMD_SUBMIT true



static void bdev_nvme_get_spdk_running_config(FILE *fp);

static int bdev_nvme_config_json(struct spdk_json_write_ctx *w);
@@ -102,6 +104,7 @@ static struct spdk_bdev_nvme_opts g_opts = { 
	.nvme_adminq_poll_period_us = 1000000ULL,

	.nvme_ioq_poll_period_us = 0,

	.io_queue_requests = 0,

	.delay_cmd_submit = SPDK_BDEV_NVME_DEFAULT_DELAY_CMD_SUBMIT,

};



#define NVME_HOTPLUG_POLL_PERIOD_MAX			10000000ULL
@@ -326,7 +329,7 @@ _bdev_nvme_reset_create_qpair(struct spdk_io_channel_iter *i) 
	struct spdk_nvme_io_qpair_opts opts;



	spdk_nvme_ctrlr_get_default_io_qpair_opts(nvme_bdev_ctrlr->ctrlr, &opts, sizeof(opts));

	opts.delay_cmd_submit = true;

	opts.delay_cmd_submit = g_opts.delay_cmd_submit;



	nvme_ch->qpair = spdk_nvme_ctrlr_alloc_io_qpair(nvme_bdev_ctrlr->ctrlr, &opts, sizeof(opts));

	if (!nvme_ch->qpair) {
@@ -608,7 +611,7 @@ bdev_nvme_create_cb(void *io_device, void *ctx_buf) 
#endif



	spdk_nvme_ctrlr_get_default_io_qpair_opts(nvme_bdev_ctrlr->ctrlr, &opts, sizeof(opts));

	opts.delay_cmd_submit = true;

	opts.delay_cmd_submit = g_opts.delay_cmd_submit;

	opts.io_queue_requests = spdk_max(g_opts.io_queue_requests, opts.io_queue_requests);

	g_opts.io_queue_requests = opts.io_queue_requests;

module/bdev/nvme/bdev_nvme.h

+3 −2
Original line number Diff line number Diff line 
/*-

 *   BSD LICENSE

 *

 *   Copyright (c) Intel Corporation.

 *   All rights reserved.

 *   Copyright (c) Intel Corporation. All rights reserved.

 *   Copyright (c) 2019 Mellanox Technologies LTD. All rights reserved.

 *

 *   Redistribution and use in source and binary forms, with or without

 *   modification, are permitted provided that the following conditions
@@ -59,6 +59,7 @@ struct spdk_bdev_nvme_opts { 
	uint64_t nvme_adminq_poll_period_us;

	uint64_t nvme_ioq_poll_period_us;

	uint32_t io_queue_requests;

	bool delay_cmd_submit;

};



struct spdk_nvme_qpair *spdk_bdev_nvme_get_io_qpair(struct spdk_io_channel *ctrlr_io_ch);