nvme: Fix managing degraded controllers
Subsystems (2)
PATCH 1/1 nvme: Fix managing degraded controllers
commit 3e1e21c7bfcf upstream
Upstream is a near rewrite of the async nvme probe that ultimately didn't even cleanly merge in 4.5. This patch is a much smaller change targeted to the regression introduced in 4.4.
If a controller is in a degraded mode that needs admin assistence to recover, we need to leave the controller running. We just want to disable namespace access without shuting the controller down.
--- drivers/nvme/host/pci.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
drivers/nvme/host/pci.c +9 -4
@@ -2976,10 +2976,16 @@ static void nvme_dev_shutdown(struct nvme_dev *dev)mutex_unlock (&dev->shutdown_lock); } -static void nvme_dev_remove (struct nvme_dev *dev) +static void nvme_remove_namespaces (struct nvme_dev *dev) {struct nvme_ns *ns, *next; +list_for_each_entry_safe (ns, next, &dev->namespaces, list) +nvme_ns_remove (ns); +} + +static void nvme_dev_remove (struct nvme_dev *dev) +{if (nvme_io_incapable (dev)) {/* * If the device is not capable of IO (surprise hot-removal,
@@ -2989,8 +2995,7 @@ static void nvme_dev_remove(struct nvme_dev *dev)*/ nvme_dev_shutdown (dev); } -list_for_each_entry_safe (ns, next, &dev->namespaces, list) -nvme_ns_remove (ns); +nvme_remove_namespaces (dev); }static int nvme_setup_prp_pools (struct nvme_dev *dev)
@@ -3174,7 +3179,7 @@ static void nvme_probe_work(struct work_struct *work)*/ if (dev->online_queues <2 ) {dev_warn (dev->dev,"IO queues not created\n" ); -nvme_dev_remove (dev); +nvme_remove_namespaces (dev); }else {nvme_unfreeze_queues (dev);nvme_dev_add (dev);
Signature · 1 line
2.13.6
Greg Kroah-Hartman
maintainerPATCH 1/1 nvme: Fix managing degraded controllers
Quoted 1 line · Keith Busch
commit
3e1e21c7bfcfupstream
That's not a commit, that is a merge point :(
Quoted 4 lines
Upstream is a near rewrite of the async nvme probe that ultimately didn't even cleanly merge in 4.5. This patch is a much smaller change targeted to the regression introduced in 4.4.
Quoted 8 lines
If a controller is in a degraded mode that needs admin assistence to recover, we need to leave the controller running. We just want to disable namespace access without shuting the controller down.
Fixes 3cf519b5a8d4("nvme: merge nvme_dev_start, nvme_dev_resume and nvme_async_probe")Cc <[email protected]> # 4.4.xSigned-off-by Keith Busch <[email protected]>
Can I get a better commit id to match this up with?
thanks,
greg k-h
PATCH 1/1 nvme: Fix managing degraded controllers
commit 5bae7f73d378a986 upstream
Upstream is a near rewrite of the async nvme probe that ultimately didn't even cleanly merge in 4.5. This patch is a much smaller change targeted to the regression introduced in 4.4.
If a controller is in a degraded mode that needs admin assistence to recover, we need to leave the controller running. We just want to disable namespace access without shuting the controller down.
--- drivers/nvme/host/pci.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
drivers/nvme/host/pci.c +9 -4
@@ -2976,10 +2976,16 @@ static void nvme_dev_shutdown(struct nvme_dev *dev)mutex_unlock (&dev->shutdown_lock); } -static void nvme_dev_remove (struct nvme_dev *dev) +static void nvme_remove_namespaces (struct nvme_dev *dev) {struct nvme_ns *ns, *next; +list_for_each_entry_safe (ns, next, &dev->namespaces, list) +nvme_ns_remove (ns); +} + +static void nvme_dev_remove (struct nvme_dev *dev) +{if (nvme_io_incapable (dev)) {/* * If the device is not capable of IO (surprise hot-removal,
@@ -2989,8 +2995,7 @@ static void nvme_dev_remove(struct nvme_dev *dev)*/ nvme_dev_shutdown (dev); } -list_for_each_entry_safe (ns, next, &dev->namespaces, list) -nvme_ns_remove (ns); +nvme_remove_namespaces (dev); }static int nvme_setup_prp_pools (struct nvme_dev *dev)
@@ -3174,7 +3179,7 @@ static void nvme_probe_work(struct work_struct *work)*/ if (dev->online_queues <2 ) {dev_warn (dev->dev,"IO queues not created\n" ); -nvme_dev_remove (dev); +nvme_remove_namespaces (dev); }else {nvme_unfreeze_queues (dev);nvme_dev_add (dev);
Signature · 1 line
2.13.6
Patch "nvme: Fix managing degraded controllers" has been added to the 4.4-stable tree
This is a note to let you know that I've just added the patch titled
nvme: Fix managing degraded controllers
to the 4.4-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-fix-managing-degraded-controllers.patch
and it can be found in the queue-4.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <stable at vger.kernel.org> know about it.
Quoted 1 line
From keith.busch at intel.com Thu Feb 15 15:28:13 2018
From: Keith Busch <[email protected]>
Date: Tue, 13 Feb 2018 09:19:37 -0700
Subject: nvme: Fix managing degraded controllers
To: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
Cc: Linux NVMe <linux-nvme at lists.infradead.org>, stable at vger.kernel.org
Message-ID: <20180213161936.GE20962 at localhost.localdomain>
Content-Disposition: inline
From: Keith Busch <[email protected]>
commit 5bae7f73d378a986 upstream
Upstream is a near rewrite of the async nvme probe that ultimately didn't even cleanly merge in 4.5. This patch is a much smaller change targeted to the regression introduced in 4.4.
If a controller is in a degraded mode that needs admin assistence to recover, we need to leave the controller running. We just want to disable namespace access without shuting the controller down.
--- drivers/nvme/host/pci.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
drivers/nvme/host/pci.c +9 -4
@@ -2976,10 +2976,16 @@ static void nvme_dev_shutdown(struct nvmmutex_unlock (&dev->shutdown_lock); } -static void nvme_dev_remove (struct nvme_dev *dev) +static void nvme_remove_namespaces (struct nvme_dev *dev) {struct nvme_ns *ns, *next; +list_for_each_entry_safe (ns, next, &dev->namespaces, list) +nvme_ns_remove (ns); +} + +static void nvme_dev_remove (struct nvme_dev *dev) +{if (nvme_io_incapable (dev)) {/* * If the device is not capable of IO (surprise hot-removal,
@@ -2989,8 +2995,7 @@ static void nvme_dev_remove(struct nvme_*/ nvme_dev_shutdown (dev); } -list_for_each_entry_safe (ns, next, &dev->namespaces, list) -nvme_ns_remove (ns); +nvme_remove_namespaces (dev); }static int nvme_setup_prp_pools (struct nvme_dev *dev)
@@ -3174,7 +3179,7 @@ static void nvme_probe_work(struct work_*/ if (dev->online_queues <2 ) {dev_warn (dev->dev,"IO queues not created\n" ); -nvme_dev_remove (dev); +nvme_remove_namespaces (dev); }else {nvme_unfreeze_queues (dev);nvme_dev_add (dev);
Patches currently in stable-queue which might be from keith.busch at intel.com are
queue-4.4/nvme-fix-managing-degraded-controllers.patch