From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:48914 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753235AbdI1NeO (ORCPT ); Thu, 28 Sep 2017 09:34:14 -0400 Subject: Patch "nvme-pci: propagate (some) errors from host memory buffer setup" has been added to the 4.13-stable tree To: hch@lst.de, gregkh@linuxfoundation.org, keith.busch@intel.com Cc: , From: Date: Thu, 28 Sep 2017 15:33:52 +0200 Message-ID: <15066056322198@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled nvme-pci: propagate (some) errors from host memory buffer setup to the 4.13-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: nvme-pci-propagate-some-errors-from-host-memory-buffer-setup.patch and it can be found in the queue-4.13 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From 9620cfba97a8b88ae91f0e275e8ff110b578bb6e Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Wed, 6 Sep 2017 12:19:57 +0200 Subject: nvme-pci: propagate (some) errors from host memory buffer setup From: Christoph Hellwig commit 9620cfba97a8b88ae91f0e275e8ff110b578bb6e upstream. We want to catch command execution errors when resetting the device, so propagate errors from the Set Features when setting up the host memory buffer. We keep ignoring memory allocation failures, as the spec clearly says that the controller must work without a host memory buffer. Signed-off-by: Christoph Hellwig Reviewed-by: Keith Busch Signed-off-by: Greg Kroah-Hartman --- drivers/nvme/host/pci.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -1690,12 +1690,13 @@ static int nvme_alloc_host_mem(struct nv return -ENOMEM; } -static void nvme_setup_host_mem(struct nvme_dev *dev) +static int nvme_setup_host_mem(struct nvme_dev *dev) { u64 max = (u64)max_host_mem_size_mb * SZ_1M; u64 preferred = (u64)dev->ctrl.hmpre * 4096; u64 min = (u64)dev->ctrl.hmmin * 4096; u32 enable_bits = NVME_HOST_MEM_ENABLE; + int ret = 0; preferred = min(preferred, max); if (min > max) { @@ -1703,7 +1704,7 @@ static void nvme_setup_host_mem(struct n "min host memory (%lld MiB) above limit (%d MiB).\n", min >> ilog2(SZ_1M), max_host_mem_size_mb); nvme_free_host_mem(dev); - return; + return 0; } /* @@ -1720,7 +1721,7 @@ static void nvme_setup_host_mem(struct n if (nvme_alloc_host_mem(dev, min, preferred)) { dev_warn(dev->ctrl.device, "failed to allocate host memory buffer.\n"); - return; + return 0; /* controller must work without HMB */ } dev_info(dev->ctrl.device, @@ -1728,8 +1729,10 @@ static void nvme_setup_host_mem(struct n dev->host_mem_size >> ilog2(SZ_1M)); } - if (nvme_set_host_mem(dev, enable_bits)) + ret = nvme_set_host_mem(dev, enable_bits); + if (ret) nvme_free_host_mem(dev); + return ret; } static int nvme_setup_io_queues(struct nvme_dev *dev) @@ -2173,8 +2176,11 @@ static void nvme_reset_work(struct work_ "unable to allocate dma for dbbuf\n"); } - if (dev->ctrl.hmpre) - nvme_setup_host_mem(dev); + if (dev->ctrl.hmpre) { + result = nvme_setup_host_mem(dev); + if (result < 0) + goto out; + } result = nvme_setup_io_queues(dev); if (result) Patches currently in stable-queue which might be from hch@lst.de are queue-4.13/nvme-pci-propagate-some-errors-from-host-memory-buffer-setup.patch queue-4.13/nvme-pci-use-appropriate-initial-chunk-size-for-hmb-allocation.patch queue-4.13/nvme-pci-fix-host-memory-buffer-allocation-fallback.patch queue-4.13/scsi-scsi_transport_fc-fix-null-pointer-dereference-in-fc_bsg_job_timeout.patch