From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Sagi Grimberg <sagi@grimberg.me>, Keith Busch <kbusch@kernel.org>,
Hannes Reinecke <hare@suse.de>, Christoph Hellwig <hch@lst.de>,
Sasha Levin <sashal@kernel.org>,
linux-nvme@lists.infradead.org
Subject: [PATCH AUTOSEL 4.19 13/47] nvme: fix deadlock caused by ANA update wrong locking
Date: Sat, 18 Apr 2020 10:41:53 -0400 [thread overview]
Message-ID: <20200418144227.9802-13-sashal@kernel.org> (raw)
In-Reply-To: <20200418144227.9802-1-sashal@kernel.org>
From: Sagi Grimberg <sagi@grimberg.me>
[ Upstream commit 657f1975e9d9c880fa13030e88ba6cc84964f1db ]
The deadlock combines 4 flows in parallel:
- ns scanning (triggered from reconnect)
- request timeout
- ANA update (triggered from reconnect)
- I/O coming into the mpath device
(1) ns scanning triggers disk revalidation -> update disk info ->
freeze queue -> but blocked, due to (2)
(2) timeout handler reference the g_usage_counter - > but blocks in
the transport .timeout() handler, due to (3)
(3) the transport timeout handler (indirectly) calls nvme_stop_queue() ->
which takes the (down_read) namespaces_rwsem - > but blocks, due to (4)
(4) ANA update takes the (down_write) namespaces_rwsem -> calls
nvme_mpath_set_live() -> which synchronize the ns_head srcu
(see commit 504db087aacc) -> but blocks, due to (5)
(5) I/O came into nvme_mpath_make_request -> took srcu_read_lock ->
direct_make_request > blk_queue_enter -> but blocked, due to (1)
==> the request queue is under freeze -> deadlock.
The fix is making ANA update take a read lock as the namespaces list
is not manipulated, it is just the ns and ns->head that are being
updated (which is protected with the ns->head lock).
Fixes: 0d0b660f214dc ("nvme: add ANA support")
Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
Reviewed-by: Keith Busch <kbusch@kernel.org>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/nvme/host/multipath.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c
index e8bc25aed44ca..588864beabd80 100644
--- a/drivers/nvme/host/multipath.c
+++ b/drivers/nvme/host/multipath.c
@@ -402,7 +402,7 @@ static int nvme_update_ana_state(struct nvme_ctrl *ctrl,
if (!nr_nsids)
return 0;
- down_write(&ctrl->namespaces_rwsem);
+ down_read(&ctrl->namespaces_rwsem);
list_for_each_entry(ns, &ctrl->namespaces, list) {
unsigned nsid = le32_to_cpu(desc->nsids[n]);
@@ -413,7 +413,7 @@ static int nvme_update_ana_state(struct nvme_ctrl *ctrl,
if (++n == nr_nsids)
break;
}
- up_write(&ctrl->namespaces_rwsem);
+ up_read(&ctrl->namespaces_rwsem);
return 0;
}
--
2.20.1
next prev parent reply other threads:[~2020-04-18 14:42 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-18 14:41 [PATCH AUTOSEL 4.19 01/47] iommu/amd: Fix the configuration of GCR3 table root pointer Sasha Levin
2020-04-18 14:41 ` [PATCH AUTOSEL 4.19 02/47] watchdog: reset last_hw_keepalive time at start Sasha Levin
2020-04-18 14:41 ` [PATCH AUTOSEL 4.19 03/47] ovl: fix value of i_ino for lower hardlink corner case Sasha Levin
2020-04-18 14:41 ` [PATCH AUTOSEL 4.19 04/47] iommu/vt-d: Fix mm reference leak Sasha Levin
2020-04-18 14:41 ` [PATCH AUTOSEL 4.19 05/47] scsi: lpfc: Fix kasan slab-out-of-bounds error in lpfc_unreg_login Sasha Levin
2020-04-18 14:41 ` [PATCH AUTOSEL 4.19 06/47] scsi: lpfc: Fix crash in target side cable pulls hitting WAIT_FOR_UNREG Sasha Levin
2020-04-18 14:41 ` [PATCH AUTOSEL 4.19 07/47] ceph: return ceph_mdsc_do_request() errors from __get_parent() Sasha Levin
2020-04-18 14:41 ` [PATCH AUTOSEL 4.19 08/47] ceph: don't skip updating wanted caps when cap is stale Sasha Levin
2020-04-18 14:41 ` [PATCH AUTOSEL 4.19 09/47] pwm: rcar: Fix late Runtime PM enablement Sasha Levin
2020-04-18 14:41 ` [PATCH AUTOSEL 4.19 10/47] ASoC: dpcm: allow start or stop during pause for backend Sasha Levin
2020-04-18 14:41 ` [PATCH AUTOSEL 4.19 11/47] scsi: iscsi: Report unbind session event when the target has been removed Sasha Levin
2020-04-18 14:41 ` [PATCH AUTOSEL 4.19 12/47] ASoC: Intel: atom: Take the drv->lock mutex before calling sst_send_slot_map() Sasha Levin
2020-04-18 14:41 ` Sasha Levin [this message]
2020-04-18 14:41 ` [PATCH AUTOSEL 4.19 14/47] kernel/gcov/fs.c: gcov_seq_next() should increase position index Sasha Levin
2020-04-18 14:41 ` [PATCH AUTOSEL 4.19 15/47] selftests: kmod: fix handling test numbers above 9 Sasha Levin
2020-04-18 14:41 ` [PATCH AUTOSEL 4.19 16/47] ipc/util.c: sysvipc_find_ipc() should increase position index Sasha Levin
2020-04-18 14:41 ` [PATCH AUTOSEL 4.19 17/47] kconfig: qconf: Fix a few alignment issues Sasha Levin
2020-04-18 14:41 ` [PATCH AUTOSEL 4.19 18/47] KVM: s390: vsie: Fix possible race when shadowing region 3 tables Sasha Levin
2020-04-18 14:41 ` [PATCH AUTOSEL 4.19 19/47] s390/cio: avoid duplicated 'ADD' uevents Sasha Levin
2020-04-18 14:42 ` [PATCH AUTOSEL 4.19 20/47] loop: Better discard support for block devices Sasha Levin
2020-04-18 14:42 ` [PATCH AUTOSEL 4.19 21/47] pwm: pca9685: Fix PWM/GPIO inter-operation Sasha Levin
2020-04-18 14:42 ` [PATCH AUTOSEL 4.19 22/47] Revert "powerpc/64: irq_work avoid interrupt when called with hardware irqs enabled" Sasha Levin
2020-04-18 14:42 ` [PATCH AUTOSEL 4.19 23/47] drm/amdkfd: kfree the wrong pointer Sasha Levin
2020-04-18 14:42 ` [PATCH AUTOSEL 4.19 24/47] pwm: renesas-tpu: Fix late Runtime PM enablement Sasha Levin
2020-04-18 14:42 ` [PATCH AUTOSEL 4.19 25/47] pwm: bcm2835: Dynamically allocate base Sasha Levin
2020-04-18 14:42 ` [PATCH AUTOSEL 4.19 26/47] drm/vc4: Fix HDMI mode validation Sasha Levin
2020-04-18 14:42 ` [PATCH AUTOSEL 4.19 27/47] libnvdimm: Out of bounds read in __nd_ioctl() Sasha Levin
2020-04-18 14:42 ` [PATCH AUTOSEL 4.19 28/47] ocfs2: no need try to truncate file beyond i_size Sasha Levin
2020-04-18 14:42 ` [PATCH AUTOSEL 4.19 29/47] hfsplus: fix crash and filesystem corruption when deleting files Sasha Levin
2020-04-18 14:42 ` [PATCH AUTOSEL 4.19 30/47] ALSA: hda/realtek - Add quirk for MSI GL63 Sasha Levin
2020-04-18 14:42 ` [PATCH AUTOSEL 4.19 31/47] perf/core: Disable page faults when getting phys address Sasha Levin
2020-04-18 14:42 ` [PATCH AUTOSEL 4.19 32/47] libata: Return correct status in sata_pmp_eh_recover_pm() when ATA_DFLAG_DETACH is set Sasha Levin
2020-04-18 14:42 ` [PATCH AUTOSEL 4.19 33/47] ALSA: ice1724: Fix invalid access for enumerated ctl items Sasha Levin
2020-04-18 14:42 ` [PATCH AUTOSEL 4.19 34/47] ALSA: hda: Fix potential access overflow in beep helper Sasha Levin
2020-04-18 14:42 ` [PATCH AUTOSEL 4.19 35/47] KVM: s390: vsie: Fix delivery of addressing exceptions Sasha Levin
2020-04-18 14:42 ` [PATCH AUTOSEL 4.19 36/47] ASoC: Intel: bytcr_rt5640: Add quirk for MPMAN MPWIN895CL tablet Sasha Levin
2020-04-18 14:42 ` [PATCH AUTOSEL 4.19 37/47] ipmi: fix hung processes in __get_guid() Sasha Levin
2020-04-18 14:42 ` [PATCH AUTOSEL 4.19 38/47] scsi: mpt3sas: Fix kernel panic observed on soft HBA unplug Sasha Levin
2020-04-18 14:42 ` [PATCH AUTOSEL 4.19 39/47] xhci: Ensure link state is U3 after setting USB_SS_PORT_LS_U3 Sasha Levin
2020-04-18 14:42 ` [PATCH AUTOSEL 4.19 40/47] drm/amd/display: Not doing optimize bandwidth if flip pending Sasha Levin
2020-04-18 14:42 ` [PATCH AUTOSEL 4.19 41/47] powerpc/powernv/ioda: Fix ref count for devices with their own PE Sasha Levin
2020-04-21 11:06 ` Frederic Barrat
2020-04-18 14:42 ` [PATCH AUTOSEL 4.19 42/47] pci/hotplug/pnv-php: Remove erroneous warning Sasha Levin
2020-04-18 14:42 ` [PATCH AUTOSEL 4.19 43/47] ocxl: Add PCI hotplug dependency to Kconfig Sasha Levin
2020-04-18 14:42 ` [PATCH AUTOSEL 4.19 44/47] tracing/selftests: Turn off timeout setting Sasha Levin
2020-04-18 14:42 ` [PATCH AUTOSEL 4.19 45/47] virtio-blk: improve virtqueue error to BLK_STS Sasha Levin
2020-04-18 14:42 ` [PATCH AUTOSEL 4.19 46/47] scsi: smartpqi: fix call trace in device discovery Sasha Levin
2020-04-18 14:42 ` [PATCH AUTOSEL 4.19 47/47] PCI/ASPM: Allow re-enabling Clock PM Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200418144227.9802-13-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=hare@suse.de \
--cc=hch@lst.de \
--cc=kbusch@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=sagi@grimberg.me \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).