summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorSagi Grimberg <sagi@grimberg.me>2020-04-02 09:34:54 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-04-29 16:31:12 +0200
commitb15eafb3f928a6d4717d828701f15e1e8bf19da7 (patch)
treeeb45b723bc1ae832546504c1a856dc04625fddd4 /kernel
parentb9b57d4d67a454eae688400c5d4db183c609d85f (diff)
downloadlinux-stable-b15eafb3f928a6d4717d828701f15e1e8bf19da7.tar.gz
linux-stable-b15eafb3f928a6d4717d828701f15e1e8bf19da7.tar.bz2
linux-stable-b15eafb3f928a6d4717d828701f15e1e8bf19da7.zip
nvme: fix deadlock caused by ANA update wrong locking
[ 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>
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions