From: Greg Kroah-Hartman Date: Thu, 6 Apr 2017 08:08:01 +0000 (+0200) Subject: 4.9-stable patches X-Git-Tag: v4.9.21~3 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=06e43cd6791bb922307148f99a958002551682b9;p=thirdparty%2Fkernel%2Fstable-queue.git 4.9-stable patches added patches: nvme-core-fix-race-kicking-freed-request_queue.patch nvme-pci-disable-on-removal-when-disconnected.patch padata-avoid-race-in-reordering.patch --- diff --git a/queue-4.9/nvme-core-fix-race-kicking-freed-request_queue.patch b/queue-4.9/nvme-core-fix-race-kicking-freed-request_queue.patch new file mode 100644 index 00000000000..4956a320230 --- /dev/null +++ b/queue-4.9/nvme-core-fix-race-kicking-freed-request_queue.patch @@ -0,0 +1,38 @@ +From f33447b90e96076483525b21cc4e0a8977cdd07c Mon Sep 17 00:00:00 2001 +From: Keith Busch +Date: Fri, 10 Feb 2017 18:15:51 -0500 +Subject: nvme/core: Fix race kicking freed request_queue + +From: Keith Busch + +commit f33447b90e96076483525b21cc4e0a8977cdd07c upstream. + +If a namespace has already been marked dead, we don't want to kick the +request_queue again since we may have just freed it from another thread. + +Signed-off-by: Keith Busch +Reviewed-by: Johannes Thumshirn +Reviewed-by: Christoph Hellwig +Signed-off-by: Sagi Grimberg +Signed-off-by: Jens Axboe +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/nvme/host/core.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +--- a/drivers/nvme/host/core.c ++++ b/drivers/nvme/host/core.c +@@ -2057,9 +2057,9 @@ void nvme_kill_queues(struct nvme_ctrl * + * Revalidating a dead namespace sets capacity to 0. This will + * end buffered writers dirtying pages that can't be synced. + */ +- if (ns->disk && !test_and_set_bit(NVME_NS_DEAD, &ns->flags)) +- revalidate_disk(ns->disk); +- ++ if (!ns->disk || test_and_set_bit(NVME_NS_DEAD, &ns->flags)) ++ continue; ++ revalidate_disk(ns->disk); + blk_set_queue_dying(ns->queue); + blk_mq_abort_requeue_list(ns->queue); + blk_mq_start_stopped_hw_queues(ns->queue, true); diff --git a/queue-4.9/nvme-pci-disable-on-removal-when-disconnected.patch b/queue-4.9/nvme-pci-disable-on-removal-when-disconnected.patch new file mode 100644 index 00000000000..63f2dc1b7a9 --- /dev/null +++ b/queue-4.9/nvme-pci-disable-on-removal-when-disconnected.patch @@ -0,0 +1,39 @@ +From 6db28eda266052f86a6b402422de61eeb7d2e351 Mon Sep 17 00:00:00 2001 +From: Keith Busch +Date: Fri, 10 Feb 2017 18:15:49 -0500 +Subject: nvme/pci: Disable on removal when disconnected + +From: Keith Busch + +commit 6db28eda266052f86a6b402422de61eeb7d2e351 upstream. + +If the device is not present, the driver should disable the queues +immediately. Prior to this, the driver was relying on the watchdog timer +to kill the queues if requests were outstanding to the device, and that +just delays removal up to one second. + +Signed-off-by: Keith Busch +Reviewed-by: Johannes Thumshirn +Reviewed-by: Christoph Hellwig +Signed-off-by: Sagi Grimberg +Signed-off-by: Jens Axboe +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/nvme/host/pci.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +--- a/drivers/nvme/host/pci.c ++++ b/drivers/nvme/host/pci.c +@@ -1983,8 +1983,10 @@ static void nvme_remove(struct pci_dev * + + pci_set_drvdata(pdev, NULL); + +- if (!pci_device_is_present(pdev)) ++ if (!pci_device_is_present(pdev)) { + nvme_change_ctrl_state(&dev->ctrl, NVME_CTRL_DEAD); ++ nvme_dev_disable(dev, false); ++ } + + flush_work(&dev->reset_work); + nvme_uninit_ctrl(&dev->ctrl); diff --git a/queue-4.9/padata-avoid-race-in-reordering.patch b/queue-4.9/padata-avoid-race-in-reordering.patch new file mode 100644 index 00000000000..d40e21415b4 --- /dev/null +++ b/queue-4.9/padata-avoid-race-in-reordering.patch @@ -0,0 +1,96 @@ +From de5540d088fe97ad583cc7d396586437b32149a5 Mon Sep 17 00:00:00 2001 +From: "Jason A. Donenfeld" +Date: Thu, 23 Mar 2017 12:24:43 +0100 +Subject: padata: avoid race in reordering + +From: Jason A. Donenfeld + +commit de5540d088fe97ad583cc7d396586437b32149a5 upstream. + +Under extremely heavy uses of padata, crashes occur, and with list +debugging turned on, this happens instead: + +[87487.298728] WARNING: CPU: 1 PID: 882 at lib/list_debug.c:33 +__list_add+0xae/0x130 +[87487.301868] list_add corruption. prev->next should be next +(ffffb17abfc043d0), but was ffff8dba70872c80. (prev=ffff8dba70872b00). +[87487.339011] [] dump_stack+0x68/0xa3 +[87487.342198] [] ? console_unlock+0x281/0x6d0 +[87487.345364] [] __warn+0xff/0x140 +[87487.348513] [] warn_slowpath_fmt+0x4a/0x50 +[87487.351659] [] __list_add+0xae/0x130 +[87487.354772] [] ? _raw_spin_lock+0x64/0x70 +[87487.357915] [] padata_reorder+0x1e6/0x420 +[87487.361084] [] padata_do_serial+0xa5/0x120 + +padata_reorder calls list_add_tail with the list to which its adding +locked, which seems correct: + +spin_lock(&squeue->serial.lock); +list_add_tail(&padata->list, &squeue->serial.list); +spin_unlock(&squeue->serial.lock); + +This therefore leaves only place where such inconsistency could occur: +if padata->list is added at the same time on two different threads. +This pdata pointer comes from the function call to +padata_get_next(pd), which has in it the following block: + +next_queue = per_cpu_ptr(pd->pqueue, cpu); +padata = NULL; +reorder = &next_queue->reorder; +if (!list_empty(&reorder->list)) { + padata = list_entry(reorder->list.next, + struct padata_priv, list); + spin_lock(&reorder->lock); + list_del_init(&padata->list); + atomic_dec(&pd->reorder_objects); + spin_unlock(&reorder->lock); + + pd->processed++; + + goto out; +} +out: +return padata; + +I strongly suspect that the problem here is that two threads can race +on reorder list. Even though the deletion is locked, call to +list_entry is not locked, which means it's feasible that two threads +pick up the same padata object and subsequently call list_add_tail on +them at the same time. The fix is thus be hoist that lock outside of +that block. + +Signed-off-by: Jason A. Donenfeld +Acked-by: Steffen Klassert +Signed-off-by: Herbert Xu +Signed-off-by: Greg Kroah-Hartman + +--- + kernel/padata.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +--- a/kernel/padata.c ++++ b/kernel/padata.c +@@ -190,19 +190,20 @@ static struct padata_priv *padata_get_ne + + reorder = &next_queue->reorder; + ++ spin_lock(&reorder->lock); + if (!list_empty(&reorder->list)) { + padata = list_entry(reorder->list.next, + struct padata_priv, list); + +- spin_lock(&reorder->lock); + list_del_init(&padata->list); + atomic_dec(&pd->reorder_objects); +- spin_unlock(&reorder->lock); + + pd->processed++; + ++ spin_unlock(&reorder->lock); + goto out; + } ++ spin_unlock(&reorder->lock); + + if (__this_cpu_read(pd->pqueue->cpu_index) == next_queue->cpu_index) { + padata = ERR_PTR(-ENODATA); diff --git a/queue-4.9/series b/queue-4.9/series index 6b2b40e1483..99466ede930 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -67,3 +67,6 @@ mips-lantiq-fix-cascaded-irq-setup.patch mm-workingset-fix-premature-shadow-node-shrinking-with-cgroups.patch blk-improve-order-of-bio-handling-in-generic_make_request.patch blk-ensure-users-for-current-bio_list-can-see-the-full-list.patch +padata-avoid-race-in-reordering.patch +nvme-core-fix-race-kicking-freed-request_queue.patch +nvme-pci-disable-on-removal-when-disconnected.patch