From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 47717EE498B for ; Wed, 11 Sep 2024 09:51:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=OjuSu1E6xXfuK8zU0Ollu5H8OFw7kcfOo8dkeQNxeHI=; b=hL20jei9VxHLJPWYSicedLtipS g2qVujUFuLYZIaiVXJpNNOAXDLDC+z8NqsozpaqXt8KV3+Kodc2O/3lHN9u9FztPcOHYl5sXxxxTR peKv+u2KOxJw7iUEQw4Q/SUI92t+WAINNg6ULRLmQYh9sHiabBR9pdJHoDpFMbqblNKjdXGByRhKD KM3ztZNbEuRhrdrtEJ5O9slXSkaWgLwYqT4k8XNfWZkfQn8Z5pqb/l3VMUeW0GGuYr8tVdTanzjsv tuG68bZuVDujH29DNKdskeZ3IPS93pgpci/VZqOnjyBcpy1pX/9bhuGWE4MMtf1HzXjLExn2wmY9P 5kQUbbiw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1soK0h-00000008zUS-2sAz; Wed, 11 Sep 2024 09:51:39 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1soK0N-00000008zNR-3EGP for linux-nvme@lists.infradead.org; Wed, 11 Sep 2024 09:51:36 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 9E0BB5C06A5; Wed, 11 Sep 2024 09:51:15 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A1D23C4CED1; Wed, 11 Sep 2024 09:51:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1726048278; bh=gnPC3bVfXHSb9goE/TiVvsgFbiONVLXJEv25LgXBWZw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bBo3/Tgf7/3wb/xm1u7hYFCUJXSOU+3sjAXbwn6iminB11X58mO/0GlAiIXMHJOJg zRSuFpWV+B/vierNs2dnbUqQxboSAINI5fr9a3OT/ePH3eX60Yzygu51IM7pCW70gq Nzt8odSO3i7LIJkzMCa9iP3J2zd4R5cudhKdPlMD62gmvlihpgfNPLKmBpk0JYMaFE aeu1/AF3oj8PUTE/jQ7MWgzquxi68HcMOeszYEnTAENNJShrFNJP8pzb7/HWGfWq1d ab4tLXUbpaMMTX/Ql/ePpobm3pBDymM5JtEPMLcfQAJoc+8prmq7fVU3rsyIeUoPtv ghUnaVuEytOfQ== From: Hannes Reinecke To: Christoph Hellwig Cc: Sagi Grimberg , Keith Busch , linux-nvme@lists.infradead.org, Hannes Reinecke Subject: [PATCH 2/3] nvme-multipath: avoid hang on inaccessible namespaces Date: Wed, 11 Sep 2024 11:51:06 +0200 Message-Id: <20240911095107.121688-3-hare@kernel.org> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20240911095107.121688-1-hare@kernel.org> References: <20240911095107.121688-1-hare@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240911_025119_900394_1C190A5E X-CRM114-Status: GOOD ( 15.43 ) X-BeenThere: linux-nvme@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-nvme" Errors-To: linux-nvme-bounces+linux-nvme=archiver.kernel.org@lists.infradead.org During repetitive namespace remapping operations on the target the namespace might have changed between the time the initial scan was performed, and partition scan was invoked by device_add_disk() in nvme_mpath_set_live(). We then end up with a stuck scanning process: [<0>] folio_wait_bit_common+0x12a/0x310 [<0>] filemap_read_folio+0x97/0xd0 [<0>] do_read_cache_folio+0x108/0x390 [<0>] read_part_sector+0x31/0xa0 [<0>] read_lba+0xc5/0x160 [<0>] efi_partition+0xd9/0x8f0 [<0>] bdev_disk_changed+0x23d/0x6d0 [<0>] blkdev_get_whole+0x78/0xc0 [<0>] bdev_open+0x2c6/0x3b0 [<0>] bdev_file_open_by_dev+0xcb/0x120 [<0>] disk_scan_partitions+0x5d/0x100 [<0>] device_add_disk+0x402/0x420 [<0>] nvme_mpath_set_live+0x4f/0x1f0 [nvme_core] [<0>] nvme_mpath_add_disk+0x107/0x120 [nvme_core] [<0>] nvme_alloc_ns+0xac6/0xe60 [nvme_core] [<0>] nvme_scan_ns+0x2dd/0x3e0 [nvme_core] [<0>] nvme_scan_work+0x1a3/0x490 [nvme_core] This happens when we have several paths, some of which are inaccessible, and the active paths are removed first. Then nvme_find_path() will requeue I/O in the ns_head (as paths are present), but the requeue list is never triggered as all remaining paths are inactive. This patch checks for NVME_NSHEAD_DISK_LIVE in nvme_available_path(), and requeue I/O after NVME_NSHEAD_DISK_LIVE has been cleared once the last path has been removed to properly terminate pending I/O. Signed-off-by: Hannes Reinecke Reviewed-by: Sagi Grimberg --- drivers/nvme/host/multipath.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c index c9d23b1b8efc..f72c5a6a2d8e 100644 --- a/drivers/nvme/host/multipath.c +++ b/drivers/nvme/host/multipath.c @@ -421,6 +421,9 @@ static bool nvme_available_path(struct nvme_ns_head *head) { struct nvme_ns *ns; + if (!test_bit(NVME_NSHEAD_DISK_LIVE, &head->flags)) + return NULL; + list_for_each_entry_rcu(ns, &head->list, siblings) { if (test_bit(NVME_CTRL_FAILFAST_EXPIRED, &ns->ctrl->flags)) continue; @@ -967,11 +970,16 @@ void nvme_mpath_shutdown_disk(struct nvme_ns_head *head) { if (!head->disk) return; - kblockd_schedule_work(&head->requeue_work); - if (test_bit(NVME_NSHEAD_DISK_LIVE, &head->flags)) { + if (test_and_clear_bit(NVME_NSHEAD_DISK_LIVE, &head->flags)) { nvme_cdev_del(&head->cdev, &head->cdev_device); del_gendisk(head->disk); } + /* + * requeue I/O after NVME_NSHEAD_DISK_LIVE has been cleared + * to allow multipath to fail all I/O. + */ + synchronize_srcu(&head->srcu); + kblockd_schedule_work(&head->requeue_work); } void nvme_mpath_remove_disk(struct nvme_ns_head *head) -- 2.35.3