Commit 7f957f56 authored by Daniel Verkamp's avatar Daniel Verkamp Committed by Jim Harris
Browse files

bdev/nvme: add HotplugEnable option 



Change-Id: I53fb7c3b469d5d5bb5b86c095bf1efc914299ec7
Signed-off-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
parent edbca2a6

etc/spdk/iscsi.conf.in

+3 −0
Original line number Diff line number Diff line
@@ -108,6 +108,9 @@ 
  # Units in microseconds.

  AdminPollRate 100000



  # Enable handling of hotplug (runtime insert and remove) events

  HotplugEnable Yes



# Users may change this section to create a different number or size of

#  malloc LUNs.

# If the system has hardware DMA engine, it will use an IOAT

etc/spdk/nvmf.conf.in

+3 −0
Original line number Diff line number Diff line
@@ -99,6 +99,9 @@ 
  # Units in microseconds.

  AdminPollRate 100000



  # Enable handling of hotplug (runtime insert and remove) events

  HotplugEnable Yes



# The Split virtual block device slices block devices into multiple smaller bdevs.

[Split]

  # Syntax:

etc/spdk/vhost.conf.in

+4 −0
Original line number Diff line number Diff line
@@ -90,6 +90,10 @@ 
  # Units in microseconds.

  AdminPollRate 100000



  # Enable handling of hotplug (runtime insert and remove) events

  # vhost currently does not support hotplug

  HotplugEnable No



# The Split virtual block device slices block devices into multiple smaller bdevs.

[Split]

  # Syntax:

lib/bdev/nvme/blockdev_nvme.c

+10 −3
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ static int g_hot_insert_nvme_controller_index = 0; 
static bool g_reset_controller_on_timeout = false;

static int g_timeout = 0;

static int g_nvme_adminq_poll_timeout_us = 0;

static bool g_nvme_hotplug_enabled;

static int g_nvme_hotplug_poll_timeout_us = 0;

static int g_nvme_hotplug_poll_core = 0;

static struct spdk_poller *g_hotplug_poller;
@@ -780,6 +781,8 @@ bdev_nvme_library_init(void) 
		g_nvme_adminq_poll_timeout_us = 1000000;

	}



	g_nvme_hotplug_enabled = spdk_conf_section_get_boolval(sp, "HotplugEnable", true);



	g_nvme_hotplug_poll_timeout_us = spdk_conf_section_get_intval(sp, "HotplugPollRate");

	if (g_nvme_hotplug_poll_timeout_us <= 0 || g_nvme_hotplug_poll_timeout_us > 100000) {

		g_nvme_hotplug_poll_timeout_us = 100000;
@@ -794,8 +797,10 @@ bdev_nvme_library_init(void) 
		return -1;

	}



	if (g_nvme_hotplug_enabled) {

		spdk_poller_register(&g_hotplug_poller, blockdev_nvme_hotplug, NULL,

				     g_nvme_hotplug_poll_core, g_nvme_hotplug_poll_timeout_us);

	}



	return 0;

}
@@ -805,7 +810,9 @@ bdev_nvme_library_fini(void) 
{

	struct nvme_bdev *nvme_bdev, *btmp;



	if (g_nvme_hotplug_enabled) {

		spdk_poller_unregister(&g_hotplug_poller, NULL);

	}



	TAILQ_FOREACH_SAFE(nvme_bdev, &g_nvme_bdevs, link, btmp) {

		bdev_nvme_destruct(&nvme_bdev->disk);