[PATCH v2] block: avoid repeated notifications for dead disks

From: Avi Weiss

Date: Thu Nov 05 2026 - 03:11:27 EST


blk_mark_disk_dead() reports disk death even when GD_DEAD is already
set. For example, NVMe reset failure and subsequent namespace removal
can call it twice, repeating holder mark_dead callbacks.

Move the GD_DEAD test-and-set into the callers of
__blk_mark_disk_dead() so blk_mark_disk_dead() reports holder death
only on the first transition. Preserve the helper's queue-drain
return value for __del_gendisk().

Fixes: d8530de5a6e8 ("block: call into the file system for bdev_mark_dead")
Signed-off-by: Avi Weiss <thnkslprpt@xxxxxxxxx>
---
Updated in v2:
- move the atomic GD_DEAD check into both callers, as suggested by
Christoph Hellwig
- keep the helper signature and queue-drain return semantics unchanged

block/genhd.c | 22 ++++++++++------------
1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/block/genhd.c b/block/genhd.c
index 10ca8b4d6eea..7e4570f9cea7 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -659,12 +659,6 @@ static void blk_report_disk_dead(struct gendisk *disk, bool surprise)

static bool __blk_mark_disk_dead(struct gendisk *disk)
{
- /*
- * Fail any new I/O.
- */
- if (test_and_set_bit(GD_DEAD, &disk->state))
- return false;
-
if (test_bit(GD_OWNS_QUEUE, &disk->state))
blk_queue_flag_set(QUEUE_FLAG_DYING, disk->queue);

@@ -689,17 +683,19 @@ static bool __blk_mark_disk_dead(struct gendisk *disk)
void blk_mark_disk_dead(struct gendisk *disk)
{
blk_queue_flag_set(QUEUE_FLAG_DYING, disk->queue);
- __blk_mark_disk_dead(disk);
- blk_report_disk_dead(disk, true);
+ if (!test_and_set_bit(GD_DEAD, &disk->state)) {
+ __blk_mark_disk_dead(disk);
+ blk_report_disk_dead(disk, true);
+ }
}
EXPORT_SYMBOL_GPL(blk_mark_disk_dead);

static void __del_gendisk(struct gendisk *disk)
{
struct request_queue *q = disk->queue;
+ bool start_drain = false;
struct block_device *part;
unsigned long idx;
- bool start_drain;

might_sleep();

@@ -727,9 +723,11 @@ static void __del_gendisk(struct gendisk *disk)
* Drop all partitions now that the disk is marked dead.
*/
mutex_lock(&disk->open_mutex);
- start_drain = __blk_mark_disk_dead(disk);
- if (start_drain)
- blk_freeze_acquire_lock(q);
+ if (!test_and_set_bit(GD_DEAD, &disk->state)) {
+ start_drain = __blk_mark_disk_dead(disk);
+ if (start_drain)
+ blk_freeze_acquire_lock(q);
+ }
xa_for_each_start(&disk->part_tbl, idx, part, 1)
drop_partition(part);
mutex_unlock(&disk->open_mutex);

base-commit: 36aad21d50d1af3f6954bb0c988257a908202477
--
2.43.0