From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794046444; b=Lden+geXwddmGRS9tsi69zj7awGF3rLdJwkh9P9HihiaaPb0P24jtlLIqRlNrshit56n MqGZtg7wDXlAR/2Rf7G+izuT17oMCchzj/CIVf4ntRs6bFaaswNVMuR8WgzVKc2DptKrT d8P66VA2r3pA8Bxpm5OA25aOrae5QUJbYpGvb2/qAxAuH3KSDpkv5OC9aiDhZkO4NRQj8 nJdELz4d3K5WZOzlKkDUQxd0UrkC6WHjRvc7iN6e+JGtF2Tw7hL+Yb2DLgl7Wmd5bQgyr G8tatj2ZujPJu31gvoMYkmWZfPBjydlKBC8c/HSkP2ztL4CZeaWf4iakZfRWcg7SNPw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794046444; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: MIME-Version:Content-Type:Content-Transfer-Encoding; bh=EpuYPwkURKmJDPDHvQeVAV/X3tyZzUnbBKJPDS581b0=; b=3kBv+lXEqny+yiMbyXkih9dIVdCAFCHvW8p6Zxf6VRHXTuuJRJ6H3mQWaXp7BuYeb6vD wbeFkfu9lGKwVHJmq0wufYhJt3CGguk5kie928wyoizyXGSiOZzoI8W0XtUGNRqIFrVRj q4IIQ/8w5BlowIXPNxrNgZfAwATZqpXghKEA4IsQdEVsuq3OkXTwRnjiQCCg1wgd59HTq XlQfN1HpmjrYBG37ICMCDbS7LOQMPW/x4gMt2xgJ0bRDwTd/rhrDc8dTQy1G/2PA2ALPW 3l12UPXsNaD2qzeCjPUzbPXziRmaUC6ug5lD3e5012pqEGPQnn0OR3BhXPQ0njzCjQQ== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=ktnizZsG; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3E87C606A32F for ; Sat, 7 Nov 2026 10:14:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=ktnizZsG Received: by smtp.kernel.org (Postfix) with ESMTPSA id 32B831F0089F; Sat, 7 Nov 2026 10:14:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1794046443; bh=EpuYPwkURKmJDPDHvQeVAV/X3tyZzUnbBKJPDS581b0=; h=From:To:Cc:Subject:Date; b=ktnizZsG3EcZZ48amYC/O/D3kY7QHb3rrExhP+4n2qqerpmzdSUjKwtesn4I6dhZ/ cjZfTnN4omiLZExRhuykgqs/UimOf2rkCdFpatwBklTr9nQb3uRuZ7P8xfac/WpnZz Muq5EtYcvQh5Rm5rwymj3VKpfBfzfCnteuPwS0qcpMAayuf2A15SbI7ZSx8fF7J4Lr 2CWEozl1dVJjvbKGBmaXA6MJqObwd2R0YqU3rZjsMf8bJ5EY3U4RgL599W5DWj0fzW dXg9ns5jUHwiE/fhpKge5yaDD8oAKmck8nEJyjIm7rD1WcKwV/k4QNac3ijMDmKltT 6fUjHoxbniNyg== From: Sasha Levin To: bvanassche@acm.org, hch@lst.de, hulianqin@vivo.com, john.garry@linux.dev, mkp@kernel.org Cc: stable@vger.kernel.org Subject: FAILED: patch "[PATCH] scsi: sd: Mark the disk dead if runtime resume fails in sd_remove()" failed to apply to 6.18-stable tree Date: Sat, 7 Nov 2026 05:14:02 -0500 Message-ID: <20261107051401-failed-6.18-085bb18a0b91@kernel.org> X-Mailer: git-send-email 2.53.0 X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.18-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.18.y git checkout FETCH_HEAD git cherry-pick -x 085bb18a0b91007f04ddca13af30277c78040157 # git commit -s git send-email --to '' --in-reply-to '20261107051401-failed-6.18-085bb18a0b91@kernel.org' --subject-prefix 'PATCH 6.18.y' 'HEAD^..' Thanks, Sasha ------------------ original commit in Linus's tree ------------------ >From 085bb18a0b91007f04ddca13af30277c78040157 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Mon, 19 Oct 2026 14:55:32 -0700 Subject: [PATCH] scsi: sd: Mark the disk dead if runtime resume fails in sd_remove() If a SCSI disk is unplugged while runtime suspended, its request queue is still in the pm-only state when sd_remove() is called. The runtime resume attempted by scsi_autopm_get_device() fails because the parent device, e.g. a USB device in the USB_STATE_NOTATTACHED state, cannot be resumed. Hence, sdev_runtime_resume() is not called and the pm-only state is not cleared. Next, del_gendisk() calls blk_report_disk_dead(disk, false), which calls sync_filesystem(). Any bio submitted by the filesystem waits forever in __bio_queue_enter() because the queue will never leave the pm-only state and because GD_DEAD has not yet been set: __bio_queue_enter+0xb8/0x174 blk_mq_submit_bio+0x640/0x7e4 [ ... ] exfat_sync_fs+0xa4/0xe0 sync_filesystem+0xa8/0xdc fs_bdev_mark_dead+0x30/0x88 bdev_mark_dead+0x54/0xc4 blk_report_disk_dead+0x8c/0xd4 del_gendisk+0xa0/0x2f8 sd_remove+0x30/0x60 [ ... ] scsi_remove_host+0x88/0x18c usb_stor_disconnect+0x68/0xf4 Fix this hang by calling blk_mark_disk_dead() if runtime resume fails. This sets GD_DEAD, tells the filesystem that the disk has been removed without attempting to sync it, and wakes up any bios that are waiting in __bio_queue_enter(). Syncing the filesystem is not possible anyway if runtime resume failed, so no data is lost that could otherwise have been written. If runtime resume succeeds, behavior is not changed. Please note that this patch converts temporary runtime resume failures into permanent failures. Before this patch, if runtime resume fails temporarily, a filesytem sync would be postponed until a later resume succeeds. Cc: Christoph Hellwig Tested-by: Lianqin Hu Reported-by: Lianqin Hu Closes: https://lore.kernel.org/all/TYUPR06MB6217DD31B1B3CD09E431CC12D2922@TYUPR06MB6217.apcprd06.prod.outlook.com/ Fixes: 6f8191fdf41d ("block: simplify disk shutdown") Cc: stable@vger.kernel.org Signed-off-by: Bart Van Assche Reviewed-by: John Garry Link: https://patch.msgid.link/2c0c76d70f0fe197932836b9bcf8496095135d1b.1792446921.git.bvanassche@acm.org Signed-off-by: Martin K. Petersen (Oracle) --- drivers/scsi/sd.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index b0d2542fd3172..dc45df819c426 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -4268,7 +4268,15 @@ static void sd_remove(struct scsi_device *sdp) struct device *dev = &sdp->sdev_gendev; struct scsi_disk *sdkp = dev_get_drvdata(dev); - scsi_autopm_get_device(sdkp->device); + /* + * If runtime resume fails, e.g. because the device was unplugged + * while runtime suspended, the request queue stays in the pm-only + * state and any I/O submitted by del_gendisk(), e.g. from + * sync_filesystem(), would wait forever in __bio_queue_enter(). + * Prevent this by marking the disk dead. + */ + if (scsi_autopm_get_device(sdkp->device) < 0) + blk_mark_disk_dead(sdkp->disk); device_del(&sdkp->disk_dev); del_gendisk(sdkp->disk); -- 2.53.0