FAILED: patch "[PATCH] block: remove redundant GD_NEED_PART_SCAN in add_disk_final()" failed to apply to 6.12-stable tree
Subsystems (2)
[email protected]
maintainerThe patch below does not apply to the 6.12-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 <[email protected]>.
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.12.y
git checkout FETCH_HEAD
git cherry-pick -x 181bb9c9eae4f69fe510a62a42c2932d0314a800
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026072021-refurnish-abdomen-0f40@gregkh' --subject-prefix 'PATCH 6.12.y' 'HEAD^..'
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 181bb9c9eae4f69fe510a62a42c2932d0314a800 Mon Sep 17 00:00:00 2001
From: Connor Williamson <[email protected]>
Date: Mon, 15 Jun 2026 13:07:15 +0000
Subject: [PATCH] block: remove redundant GD_NEED_PART_SCAN in add_disk_final()
add_disk_final() sets GD_NEED_PART_SCAN before calling bdev_add(), then calls disk_scan_partitions() which sets the flag itself. The early set is redundant and introduces a race.
Between bdev_add() and disk_scan_partitions(), concurrent openers (multipathd, blkid, LVM) see the flag in blkdev_get_whole() and trigger bdev_disk_changed(). When disk_scan_partitions() then runs, it calls bdev_disk_changed() again, dropping the partitions the concurrent opener already created before re-adding them, which can result in transient partition disappearances.
The race is observable by inserting an msleep() between bdev_add() and disk_scan_partitions() while running concurrent open() calls during device bind. Without artificial delay, it manifests under scheduling pressure during boot on systems with aggressive device scanners (multipathd, systemd-udevd).
Therefore, do not set GD_NEED_PART_SCAN in add_disk_final(). Other GD_NEED_PART_SCAN consumers (blkdev_get_whole(), sd_need_revalidate()) should not be affected as the flag is set internally by disk_scan_partitions().
The retry-on-next-open intention from commit e5cfefa97bcc ("block: fix scan partition for exclusively open device again") should also not be affected as the early return paths in disk_scan_partitions() should be unreachable at device registration time (bd_holder is NULL and open_partitions is zero).
block/genhd.c +0 -4
@@ -407,10 +407,6 @@ static void add_disk_final(struct gendisk *disk)struct device *ddev =disk_to_dev (disk);if (!(disk->flags &GENHD_FL_HIDDEN )) { -/* Make sure the first partition scan will be proceed */ -if (get_capacity (disk) &&disk_has_partscan (disk)) -set_bit (GD_NEED_PART_SCAN , &disk->state); -bdev_add (disk->part0, ddev->devt);if (get_capacity (disk))disk_scan_partitions (disk,BLK_OPEN_READ );
Sasha Levin
maintainerPATCH 1/2 block: add helper add_disk_final()
From: Ming Lei <[email protected]>
[ Upstream commit 5fad1490ef510e3b70ad8b0a5a1e28a26638a95f ]
Add helper add_disk_final() for scanning partitions, announcing disk and handling the last thing for adding disk.
No functional change, and prepare for prevent adding disk from happening when updating nr_hw_queues.
Stable-dep-of: 181bb9c9eae4 ("block: remove redundant GD_NEED_PART_SCAN in add_disk_final()")
--- block/genhd.c | 46 +++++++++++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 19 deletions(-)
block/genhd.c +27 -19
@@ -382,6 +382,32 @@ int disk_scan_partitions(struct gendisk *disk, blk_mode_t mode)return ret; } +static void add_disk_final (struct gendisk *disk) +{ +struct device *ddev =disk_to_dev (disk); + +if (!(disk->flags &GENHD_FL_HIDDEN )) { +/* Make sure the first partition scan will be proceed */ +if (get_capacity (disk) &&disk_has_partscan (disk)) +set_bit (GD_NEED_PART_SCAN , &disk->state); + +bdev_add (disk->part0, ddev->devt); +if (get_capacity (disk)) +disk_scan_partitions (disk,BLK_OPEN_READ ); + +/* +* Announce the disk and partitions after all partitions are +* created. (for hidden disks uevents remain suppressed forever) +*/ +dev_set_uevent_suppress (ddev,0 ); +disk_uevent (disk,KOBJ_ADD ); + } + +blk_apply_bdi_limits (disk->bdi, &disk->queue->limits); +disk_add_events (disk); +set_bit (GD_ADDED , &disk->state); +} +/** * device_add_disk - add disk information to kernel list * @parent: parent device for the disk
@@ -500,21 +526,6 @@ int __must_check device_add_disk(struct device *parent, struct gendisk *disk, &disk->bdi->dev->kobj, "bdi");if (ret) goto out_unregister_bdi; - -/* Make sure the first partition scan will be proceed */ -if (get_capacity (disk) &&disk_has_partscan (disk)) -set_bit (GD_NEED_PART_SCAN , &disk->state); - -bdev_add (disk->part0, ddev->devt); -if (get_capacity (disk)) -disk_scan_partitions (disk,BLK_OPEN_READ ); - -/* -* Announce the disk and partitions after all partitions are -* created. (for hidden disks uevents remain suppressed forever) -*/ -dev_set_uevent_suppress (ddev,0 ); -disk_uevent (disk,KOBJ_ADD ); }else {/* * Even if the block_device for a hidden gendisk is not
@@ -523,10 +534,7 @@ int __must_check device_add_disk(struct device *parent, struct gendisk *disk,*/ disk->part0->bd_dev =MKDEV (disk->major, disk->first_minor); } - -blk_apply_bdi_limits (disk->bdi, &disk->queue->limits); -disk_add_events (disk); -set_bit (GD_ADDED , &disk->state); +add_disk_final (disk);return 0 ; out_unregister_bdi:
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 2/2 block: remove redundant GD_NEED_PART_SCAN in add_disk_final()
From: Connor Williamson <[email protected]>
[ Upstream commit 181bb9c9eae4f69fe510a62a42c2932d0314a800 ]
add_disk_final() sets GD_NEED_PART_SCAN before calling bdev_add(), then calls disk_scan_partitions() which sets the flag itself. The early set is redundant and introduces a race.
Between bdev_add() and disk_scan_partitions(), concurrent openers (multipathd, blkid, LVM) see the flag in blkdev_get_whole() and trigger bdev_disk_changed(). When disk_scan_partitions() then runs, it calls bdev_disk_changed() again, dropping the partitions the concurrent opener already created before re-adding them, which can result in transient partition disappearances.
The race is observable by inserting an msleep() between bdev_add() and disk_scan_partitions() while running concurrent open() calls during device bind. Without artificial delay, it manifests under scheduling pressure during boot on systems with aggressive device scanners (multipathd, systemd-udevd).
Therefore, do not set GD_NEED_PART_SCAN in add_disk_final(). Other GD_NEED_PART_SCAN consumers (blkdev_get_whole(), sd_need_revalidate()) should not be affected as the flag is set internally by disk_scan_partitions().
The retry-on-next-open intention from commit e5cfefa97bcc ("block: fix scan partition for exclusively open device again") should also not be affected as the early return paths in disk_scan_partitions() should be unreachable at device registration time (bd_holder is NULL and open_partitions is zero).
--- block/genhd.c | 4 ---- 1 file changed, 4 deletions(-)
block/genhd.c +0 -4
@@ -387,10 +387,6 @@ static void add_disk_final(struct gendisk *disk)struct device *ddev =disk_to_dev (disk);if (!(disk->flags &GENHD_FL_HIDDEN )) { -/* Make sure the first partition scan will be proceed */ -if (get_capacity (disk) &&disk_has_partscan (disk)) -set_bit (GD_NEED_PART_SCAN , &disk->state); -bdev_add (disk->part0, ddev->devt);if (get_capacity (disk))disk_scan_partitions (disk,BLK_OPEN_READ );
Signature · 1 line
2.53.0