From patchwork Thu Nov 2 17:36:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Axtens X-Patchwork-Id: 833441 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 3ySXMh0pTZz9sBW; Fri, 3 Nov 2017 04:37:04 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1eAJQK-0007tl-BM; Thu, 02 Nov 2017 17:37:00 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1eAJQG-0007sL-Bn for kernel-team@lists.canonical.com; Thu, 02 Nov 2017 17:36:56 +0000 Received: from mail-pg0-f71.google.com ([74.125.83.71]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1eAJQG-0001I4-0K for kernel-team@lists.canonical.com; Thu, 02 Nov 2017 17:36:56 +0000 Received: by mail-pg0-f71.google.com with SMTP id a192so295686pge.1 for ; Thu, 02 Nov 2017 10:36:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=M4h3T/a6olMEcHe+YlJOThV1YNbPbisABBwzozAJyvA=; b=IIv+Z/frQ79ubIj8zuvm19WrY20H6V0YSVxPyDzef4o2iH5frN4fLK1Cg1CkZKdEWK NFr1reN0DNBAZEX3f8DyBbZzB0JKHJKz/J8JQtwrBCz7dcq5P+N1EN5hJ6i5uDEcBMpd Y1sE8bZVDbTWEb87XBBz0QgmaN5z0Cw3O1xU5Hmnj0rhnp5SbztlMAYkwfTMxo+wD2rc Ebx+xjMA3XrGYo/EzaU83UbriO5KB8qzg5JLitDQA37HVvjjQ/JNAL9WOg66HML4BRLc yy1uJ/VIeemSj4GkZGgH8yuY6RXQ9NGc+kuUH4f8ykoYVOq44onU1CNRLidp7tybEthF BE+g== X-Gm-Message-State: AMCzsaWlu4K9OBf1Md6+iXjzwhCwXPsfCHYApViOJDRQmhglXFmnCiy6 SX70vTgI7I13frQQHSEOnMVDScV7RyqdKEP6yI0BgIhjkX0oeViPAXcRPEYEskyQ3ZSn8diU68K b9Y+racrJ46lkAyC1aqC+JFMrr+VODFjvZxGY4Dvw0/yn4Pfl X-Received: by 10.84.128.72 with SMTP id 66mr3948403pla.250.1509644214435; Thu, 02 Nov 2017 10:36:54 -0700 (PDT) X-Google-Smtp-Source: ABhQp+TAsgZsmTQXcm5MAafHBOVb+BOC/nzEvIiswJZjcAVWDN22b6h1TDQ3ogf9qgFIzXn/bOAcbw== X-Received: by 10.84.128.72 with SMTP id 66mr3948389pla.250.1509644214188; Thu, 02 Nov 2017 10:36:54 -0700 (PDT) Received: from localhost.localdomain (ppp121-45-199-178.bras1.cbr1.internode.on.net. [121.45.199.178]) by smtp.gmail.com with ESMTPSA id a13sm5920762pgq.10.2017.11.02.10.36.52 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 Nov 2017 10:36:53 -0700 (PDT) From: Daniel Axtens To: kernel-team@lists.canonical.com Subject: [SRU][xenial/aws][PATCH 1/1] UBUNTU: SAUCE: nvme: update timeout module parameter type Date: Fri, 3 Nov 2017 04:36:43 +1100 Message-Id: <20171102173643.17547-2-daniel.axtens@canonical.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171102173643.17547-1-daniel.axtens@canonical.com> References: <20171102173643.17547-1-daniel.axtens@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Marc Olson 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 (backported from http://lists.infradead.org/pipermail/linux-nvme/2017-September/012701.html) Signed-off-by: Daniel Axtens Acked-by: Kleber Sacilotto de Souza Acked-by: Juerg Haefliger Acked-by: Juerg Haefliger --- 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;