[SRU,xenial/aws,1/1] UBUNTU: SAUCE: nvme: update timeout module parameter type

Message ID 20171102173643.17547-2-daniel.axtens@canonical.com
State New
Headers show
Series
  • [SRU,xenial/aws,1/1] UBUNTU: SAUCE: nvme: update timeout module parameter type
Related show

Commit Message

Daniel Axtens Nov. 2, 2017, 5:36 p.m.
From: Marc Olson <marcolso@amazon.com>

BugLink: https://bugs.launchpad.net/bugs/1729119

The underlying blk_mq_tag_set, and request timeout parameters support an
unsigned int. Extend the size of the nvme module parameters for io and
admin commands to match.

Signed-off-by: Marc Olson <marcolso@amazon.com>
(backported from http://lists.infradead.org/pipermail/linux-nvme/2017-September/012701.html)
Signed-off-by: Daniel Axtens <daniel.axtens@canonical.com>
---
 drivers/nvme/host/nvme.h | 4 ++--
 drivers/nvme/host/pci.c  | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

Comments

Kleber Souza Nov. 3, 2017, 1:45 p.m. | #1
On 11/02/17 18:36, Daniel Axtens wrote:
> From: Marc Olson <marcolso@amazon.com>
> 
> BugLink: https://bugs.launchpad.net/bugs/1729119
> 
> The underlying blk_mq_tag_set, and request timeout parameters support an
> unsigned int. Extend the size of the nvme module parameters for io and
> admin commands to match.
> 
> Signed-off-by: Marc Olson <marcolso@amazon.com>
> (backported from http://lists.infradead.org/pipermail/linux-nvme/2017-September/012701.html)
> Signed-off-by: Daniel Axtens <daniel.axtens@canonical.com>
Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>

> ---
>  drivers/nvme/host/nvme.h | 4 ++--
>  drivers/nvme/host/pci.c  | 8 ++++----
>  2 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
> index ff66714d624e..e00732d492d8 100644
> --- a/drivers/nvme/host/nvme.h
> +++ b/drivers/nvme/host/nvme.h
> @@ -29,10 +29,10 @@ enum {
>  	NVME_SC_CANCELLED		= -EINTR,
>  };
>  
> -extern unsigned char nvme_io_timeout;
> +extern unsigned int nvme_io_timeout;
>  #define NVME_IO_TIMEOUT	(nvme_io_timeout * HZ)
>  
> -extern unsigned char admin_timeout;
> +extern unsigned int admin_timeout;
>  #define ADMIN_TIMEOUT	(admin_timeout * HZ)
>  
>  extern unsigned char shutdown_timeout;
> diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
> index b9cf5aa78753..e17076fdde1a 100644
> --- a/drivers/nvme/host/pci.c
> +++ b/drivers/nvme/host/pci.c
> @@ -61,12 +61,12 @@
>  #define NVME_NR_AEN_COMMANDS	1
>  #define NVME_AQ_BLKMQ_DEPTH	(NVME_AQ_DEPTH - NVME_NR_AEN_COMMANDS)
>  
> -unsigned char admin_timeout = 60;
> -module_param(admin_timeout, byte, 0644);
> +unsigned int admin_timeout = 60;
> +module_param(admin_timeout, uint, 0644);
>  MODULE_PARM_DESC(admin_timeout, "timeout in seconds for admin commands");
>  
> -unsigned char nvme_io_timeout = 30;
> -module_param_named(io_timeout, nvme_io_timeout, byte, 0644);
> +unsigned int nvme_io_timeout = 30;
> +module_param_named(io_timeout, nvme_io_timeout, uint, 0644);
>  MODULE_PARM_DESC(io_timeout, "timeout in seconds for I/O");
>  
>  unsigned char shutdown_timeout = 5;
>
Juerg Haefliger Nov. 3, 2017, 1:58 p.m. | #2
On 11/02/2017 06:36 PM, Daniel Axtens wrote:
> From: Marc Olson <marcolso@amazon.com>
> 
> BugLink: https://bugs.launchpad.net/bugs/1729119
> 
> The underlying blk_mq_tag_set, and request timeout parameters support an
> unsigned int. Extend the size of the nvme module parameters for io and
> admin commands to match.
> 
> Signed-off-by: Marc Olson <marcolso@amazon.com>
> (backported from http://lists.infradead.org/pipermail/linux-nvme/2017-September/012701.html)
> Signed-off-by: Daniel Axtens <daniel.axtens@canonical.com>
> ---
>  drivers/nvme/host/nvme.h | 4 ++--
>  drivers/nvme/host/pci.c  | 8 ++++----
>  2 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
> index ff66714d624e..e00732d492d8 100644
> --- a/drivers/nvme/host/nvme.h
> +++ b/drivers/nvme/host/nvme.h
> @@ -29,10 +29,10 @@ enum {
>  	NVME_SC_CANCELLED		= -EINTR,
>  };
>  
> -extern unsigned char nvme_io_timeout;
> +extern unsigned int nvme_io_timeout;
>  #define NVME_IO_TIMEOUT	(nvme_io_timeout * HZ)
>  
> -extern unsigned char admin_timeout;
> +extern unsigned int admin_timeout;
>  #define ADMIN_TIMEOUT	(admin_timeout * HZ)
>  
>  extern unsigned char shutdown_timeout;
> diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
> index b9cf5aa78753..e17076fdde1a 100644
> --- a/drivers/nvme/host/pci.c
> +++ b/drivers/nvme/host/pci.c
> @@ -61,12 +61,12 @@
>  #define NVME_NR_AEN_COMMANDS	1
>  #define NVME_AQ_BLKMQ_DEPTH	(NVME_AQ_DEPTH - NVME_NR_AEN_COMMANDS)
>  
> -unsigned char admin_timeout = 60;
> -module_param(admin_timeout, byte, 0644);
> +unsigned int admin_timeout = 60;
> +module_param(admin_timeout, uint, 0644);
>  MODULE_PARM_DESC(admin_timeout, "timeout in seconds for admin commands");
>  
> -unsigned char nvme_io_timeout = 30;
> -module_param_named(io_timeout, nvme_io_timeout, byte, 0644);
> +unsigned int nvme_io_timeout = 30;
> +module_param_named(io_timeout, nvme_io_timeout, uint, 0644);
>  MODULE_PARM_DESC(io_timeout, "timeout in seconds for I/O");
>  
>  unsigned char shutdown_timeout = 5;

Looks good.

Acked-by: Juerg Haefliger <juerg.haefliger@canonical.com>
Juerg Haefliger Nov. 3, 2017, 1:58 p.m. | #3
On 11/02/2017 06:36 PM, Daniel Axtens wrote:
> From: Marc Olson <marcolso@amazon.com>
> 
> BugLink: https://bugs.launchpad.net/bugs/1729119
> 
> The underlying blk_mq_tag_set, and request timeout parameters support an
> unsigned int. Extend the size of the nvme module parameters for io and
> admin commands to match.
> 
> Signed-off-by: Marc Olson <marcolso@amazon.com>
> (backported from http://lists.infradead.org/pipermail/linux-nvme/2017-September/012701.html)
> Signed-off-by: Daniel Axtens <daniel.axtens@canonical.com>
> ---
>  drivers/nvme/host/nvme.h | 4 ++--
>  drivers/nvme/host/pci.c  | 8 ++++----
>  2 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
> index ff66714d624e..e00732d492d8 100644
> --- a/drivers/nvme/host/nvme.h
> +++ b/drivers/nvme/host/nvme.h
> @@ -29,10 +29,10 @@ enum {
>  	NVME_SC_CANCELLED		= -EINTR,
>  };
>  
> -extern unsigned char nvme_io_timeout;
> +extern unsigned int nvme_io_timeout;
>  #define NVME_IO_TIMEOUT	(nvme_io_timeout * HZ)
>  
> -extern unsigned char admin_timeout;
> +extern unsigned int admin_timeout;
>  #define ADMIN_TIMEOUT	(admin_timeout * HZ)
>  
>  extern unsigned char shutdown_timeout;
> diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
> index b9cf5aa78753..e17076fdde1a 100644
> --- a/drivers/nvme/host/pci.c
> +++ b/drivers/nvme/host/pci.c
> @@ -61,12 +61,12 @@
>  #define NVME_NR_AEN_COMMANDS	1
>  #define NVME_AQ_BLKMQ_DEPTH	(NVME_AQ_DEPTH - NVME_NR_AEN_COMMANDS)
>  
> -unsigned char admin_timeout = 60;
> -module_param(admin_timeout, byte, 0644);
> +unsigned int admin_timeout = 60;
> +module_param(admin_timeout, uint, 0644);
>  MODULE_PARM_DESC(admin_timeout, "timeout in seconds for admin commands");
>  
> -unsigned char nvme_io_timeout = 30;
> -module_param_named(io_timeout, nvme_io_timeout, byte, 0644);
> +unsigned int nvme_io_timeout = 30;
> +module_param_named(io_timeout, nvme_io_timeout, uint, 0644);
>  MODULE_PARM_DESC(io_timeout, "timeout in seconds for I/O");
>  
>  unsigned char shutdown_timeout = 5;

Looks good.

Acked-by: Juerg Haefliger <juerg.haefliger@canonical.com>
Kleber Souza Nov. 3, 2017, 2:31 p.m. | #4
Applied to xenial/linux-aws/master branch. Thanks.
Kleber Souza Nov. 3, 2017, 4:54 p.m. | #5
Applied to trusty/linux-aws/master branch. Thanks.

Patch

diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
index ff66714d624e..e00732d492d8 100644
--- a/drivers/nvme/host/nvme.h
+++ b/drivers/nvme/host/nvme.h
@@ -29,10 +29,10 @@  enum {
 	NVME_SC_CANCELLED		= -EINTR,
 };
 
-extern unsigned char nvme_io_timeout;
+extern unsigned int nvme_io_timeout;
 #define NVME_IO_TIMEOUT	(nvme_io_timeout * HZ)
 
-extern unsigned char admin_timeout;
+extern unsigned int admin_timeout;
 #define ADMIN_TIMEOUT	(admin_timeout * HZ)
 
 extern unsigned char shutdown_timeout;
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index b9cf5aa78753..e17076fdde1a 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -61,12 +61,12 @@ 
 #define NVME_NR_AEN_COMMANDS	1
 #define NVME_AQ_BLKMQ_DEPTH	(NVME_AQ_DEPTH - NVME_NR_AEN_COMMANDS)
 
-unsigned char admin_timeout = 60;
-module_param(admin_timeout, byte, 0644);
+unsigned int admin_timeout = 60;
+module_param(admin_timeout, uint, 0644);
 MODULE_PARM_DESC(admin_timeout, "timeout in seconds for admin commands");
 
-unsigned char nvme_io_timeout = 30;
-module_param_named(io_timeout, nvme_io_timeout, byte, 0644);
+unsigned int nvme_io_timeout = 30;
+module_param_named(io_timeout, nvme_io_timeout, uint, 0644);
 MODULE_PARM_DESC(io_timeout, "timeout in seconds for I/O");
 
 unsigned char shutdown_timeout = 5;