loop: fix partition scan race between udev and loop_reread_partitions()
PATCH v3 1/3 loop: fix partition scan race between udev and loop_reread_partitions()
When LOOP_CONFIGURE is called with LO_FLAGS_PARTSCAN, the following sequence occurs:
1. disk_force_media_change() sets GD_NEED_PART_SCAN
2. Uevent suppression is lifted and a KOBJ_CHANGE uevent is sent
3. loop_global_unlock() releases the lock
4. loop_reread_partitions() calls bdev_disk_changed() to scan
There is a race between steps 2 and 4: when udev receives the uevent and opens the device before loop_reread_partitions() runs, blkdev_get_whole() in bdev.c sees GD_NEED_PART_SCAN set and calls bdev_disk_changed() for a first scan. Then loop_reread_partitions() does a second scan. The open_mutex serializes these two scans, but does not prevent both from running.
The second scan in bdev_disk_changed() drops all partition devices from the first scan (via blk_drop_partitions()) before re-adding them, causing partition block devices to briefly disappear. This breaks any systemd unit with BindsTo= on the partition device: systemd observes the device going dead, fails the dependent units, and does not retry them when the device reappears.
Fix this by removing the GD_NEED_PART_SCAN set from disk_force_media_change() entirely. None of the current callers need the lazy on-open partition scan triggered by this flag:
- floppy: sets GENHD_FL_NO_PART, so disk_has_partscan() is always false and GD_NEED_PART_SCAN has no effect.
- loop (loop_configure, loop_change_fd): when LO_FLAGS_PARTSCAN is set, loop_reread_partitions() performs an explicit scan. When not set, GD_SUPPRESS_PART_SCAN prevents the lazy scan path.
- loop (__loop_clr_fd): calls bdev_disk_changed() explicitly if LO_FLAGS_PARTSCAN is set.
- nbd (nbd_clear_sock_ioctl): capacity is set to zero immediately after; nbd manages GD_NEED_PART_SCAN explicitly elsewhere.
With GD_NEED_PART_SCAN no longer set by disk_force_media_change(), udev opening the loop device after the uevent no longer triggers a redundant scan in blkdev_get_whole(), and only the single explicit scan from loop_reread_partitions() runs.
A regression test for this bug has been submitted to blktests:
https://github.com/linux-blktests/blktests/pull/240.
--- block/disk-events.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
block/disk-events.c +2 -1
@@ -290,13 +290,14 @@ EXPORT_SYMBOL(disk_check_media_change);* Should be called when the media changes for @disk. Generates a uevent * and attempts to free all dentries and inodes and invalidates all block * device page cache entries in that case. +* +* Callers that need a partition re-scan should arrange for one explicitly. */ void disk_force_media_change (struct gendisk *disk) {disk_event_uevent (disk,DISK_EVENT_MEDIA_CHANGE );inc_diskseq (disk);bdev_mark_dead (disk->part0, true); -set_bit (GD_NEED_PART_SCAN , &disk->state); }EXPORT_SYMBOL_GPL (disk_force_media_change);
Signature · 1 line
2.53.0
Quoted 41 lines · Daan De Meyer
When
LOOP_CONFIGUREis called withLO_FLAGS_PARTSCAN, the following sequence occurs:1.
disk_force_media_change()setsGD_NEED_PART_SCAN
2. Uevent suppression is lifted and aKOBJ_CHANGEuevent is sent
3.loop_global_unlock()releases the lock
4.loop_reread_partitions()callsbdev_disk_changed()to scanThere is a race between steps 2 and 4: when udev receives the uevent and opens the device before
loop_reread_partitions()runs,blkdev_get_whole()inbdev.cseesGD_NEED_PART_SCANset and callsbdev_disk_changed()for a first scan. Thenloop_reread_partitions()does a second scan. Theopen_mutexserializes these two scans, but does not prevent both from running.The second scan in
bdev_disk_changed()drops all partition devices from the first scan (viablk_drop_partitions()) before re-adding them, causing partition block devices to briefly disappear. This breaks any systemd unit with BindsTo= on the partition device: systemd observes the device going dead, fails the dependent units, and does not retry them when the device reappears.Fix this by removing the
GD_NEED_PART_SCANset fromdisk_force_media_change()entirely. None of the current callers need the lazy on-open partition scan triggered by this flag:- floppy: sets
GENHD_FL_NO_PART, sodisk_has_partscan()is always false andGD_NEED_PART_SCANhas no effect.
- loop (loop_configure,loop_change_fd): whenLO_FLAGS_PARTSCANis set,loop_reread_partitions()performs an explicit scan. When not set,GD_SUPPRESS_PART_SCANprevents the lazy scan path.
- loop (__loop_clr_fd): callsbdev_disk_changed()explicitly ifLO_FLAGS_PARTSCANis set.
- nbd (nbd_clear_sock_ioctl): capacity is set to zero immediately after; nbd managesGD_NEED_PART_SCANexplicitly elsewhere.With
GD_NEED_PART_SCANno longer set bydisk_force_media_change(), udev opening the loop device after the uevent no longer triggers a redundant scan inblkdev_get_whole(), and only the single explicit scan fromloop_reread_partitions()runs.
Quoted 6 lines
A regression test for this bug has been submitted to blktests:
https://github.com/linux-blktests/blktests/pull/240.Fixes 9f65c489b68d ("loop: raise media_change event")Signed-off-by Daan De Meyer <[email protected]>---
Looks good to me,
Quoted 9 lines · Daan De Meyer
When
LOOP_CONFIGUREis called withLO_FLAGS_PARTSCAN, the following sequence occurs:1.
disk_force_media_change()setsGD_NEED_PART_SCAN
2. Uevent suppression is lifted and aKOBJ_CHANGEuevent is sent
3.loop_global_unlock()releases the lock
4.loop_reread_partitions()callsbdev_disk_changed()to scan[...]
Applied, thanks!
[1/3] loop: fix partition scan race between udev and loop_reread_partitions()
commit: 267ec4d7223a783f029a980f41b93c39b17996da
Best regards,
Signature · 1 line
Jens Axboe
The subject looks odd - for one this is now a block patch and not loop, so the prefix is wrong. It also claims to be patch 1 of a 3 patch series, but so far I've not seen more than this or a cover letter.
Otherwise this looks good to me.