[PATCH] NVMe: Increase shutdown complete time

[Dan McLeran]

Probably want to use ulong if we're going to make this a module param.

On Thu, 3 Apr 2014, Keith Busch wrote:

> On Thu, 3 Apr 2014, Yung-Chin Chen wrote:
>> Why do we choose 5 seconds? Are we able to make this parameter
>> configurable? Thanks.
>
> This is the second time I've been asked this in two days. :)
>
> Any thoughts on something like the following?
>
> diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c
> index 59e2adcc..6ade8de 100644
> --- a/drivers/block/nvme-core.c
> +++ b/drivers/block/nvme-core.c
> @@ -51,6 +51,10 @@
> #define ADMIN_TIMEOUT	(60 * HZ)
>
> +int nvme_io_timeout = 5;
> +module_param(nvme_io_timeout, int, 0);
> +MODULE_PARM_DESC(nvme_io_timeout, "timeout in seconds for io submitted to 
> queue");
> +
> static int nvme_major;
> module_param(nvme_major, int, 0);
>
> diff --git a/include/linux/nvme.h b/include/linux/nvme.h
> index 5993455..490488e 100644
> --- a/include/linux/nvme.h
> +++ b/include/linux/nvme.h
> @@ -66,7 +66,8 @@ enum {
>
> #define NVME_VS(major, minor)	(major << 16 | minor)
>
> -#define NVME_IO_TIMEOUT	(5 * HZ)
> +extern int nvme_io_timeout;
> +#define NVME_IO_TIMEOUT	(nvme_io_timeout * HZ)
>
> /*
>  * Represents an NVM Express device.  Each nvme_dev is a PCI function.
>