Skip to contentSkip to conversation

block: fix leaking minors of hidden disks

PATCH Applied Christoph Hellwig 4 participants 4 messages Oct 10, 2022 – Oct 12, 2022 Block layer

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 block: fix leaking minors of hidden disks

The major/minor of a hidden gendisk is not propagated to the block device because it is never registered using bdev_add. But the lack of bd_dev also causes the dynamic major minor number not to be freed. Assign bd_dev manually to ensure the dynamic major minor gets freed.

Based on a patch by Keith Busch.

Fixes 8ddcd653257c ("block: introduce GENHD_FL_HIDDEN")
---
 block/genhd.c | 7 +++++++
 1 file changed, 7 insertions(+)
block/genhd.c +7 -0
index 514395361d7c5..17b33c62423df 100644
@@ -507,6 +507,13 @@ int __must_check device_add_disk(struct device *parent, struct gendisk *disk,
 		 */
 		dev_set_uevent_suppress(ddev, 0);
 		disk_uevent(disk, KOBJ_ADD);
+	} else {
+		/*
+		 * Even if the block_device for a hidden gendisk is not
+		 * registered, it needs to have a valid bd_dev so that the
+		 * freeing of the dynamic major works.
+		 */
+		disk->part0->bd_dev = MKDEV(disk->major, disk->first_minor);
 	}
 
 	disk_update_readahead(disk);
Signature · 1 line
2.30.2
Reviewed-by on v1 1/1
#1 lore raw
Quoted 5 lines · Christoph Hellwig

The major/minor of a hidden gendisk is not propagated to the block device because it is never registered using bdev_add. But the lack of bd_dev also causes the dynamic major minor number not to be freed. Assign bd_dev manually to ensure the dynamic major minor gets freed.

Looks good.

maintainer Applied
#2 lore raw
In reply to Christoph Hellwig
Quoted 8 lines · Christoph Hellwig

The major/minor of a hidden gendisk is not propagated to the block device because it is never registered using bdev_add. But the lack of bd_dev also causes the dynamic major minor number not to be freed. Assign bd_dev manually to ensure the dynamic major minor gets freed.

Based on a patch by Keith Busch.

[...]

Applied, thanks!

[1/1] block: fix leaking minors of hidden disks

      commit: a0a6314ae774f8a5e52a599946aa2ad0db867b83

Best regards,

Signature · 1 line
Jens Axboe
Reviewed-by on v1 1/1
#3 lore raw
In reply to Christoph Hellwig
Quoted 23 lines · Christoph Hellwig

The major/minor of a hidden gendisk is not propagated to the block device because it is never registered using bdev_add. But the lack of bd_dev also causes the dynamic major minor number not to be freed. Assign bd_dev manually to ensure the dynamic major minor gets freed.

Based on a patch by Keith Busch.

Fixes 8ddcd653257c ("block: introduce GENHD_FL_HIDDEN")
---
  block/genhd.c | 7 +++++++
  1 file changed, 7 insertions(+)
block/genhd.c +0 -0
index 514395361d7c5..17b33c62423df 100644
@@ -507,6 +507,13 @@ int __must_check device_add_disk(struct device *parent, struct gendisk *disk,
  		 */
  		dev_set_uevent_suppress(ddev, 0);
  		disk_uevent(disk, KOBJ_ADD);

block/genhd.c int __must_check device_add_disk(struct device *parent, struct gendisk *disk, · line 519

Quoted 10 lines
block/genhd.c +7 -0
+	} else {
+		/*
+		 * Even if the block_device for a hidden gendisk is not
+		 * registered, it needs to have a valid bd_dev so that the
+		 * freeing of the dynamic major works.
+		 */
+		disk->part0->bd_dev = MKDEV(disk->major, disk->first_minor);
  	}
 
  	disk_update_readahead(disk);

Cheers,

Hannes

Signature · 5 lines
Dr. Hannes Reinecke                Kernel Storage Architect
[email protected]                              +49 911 74053 688
SUSE Software Solutions GmbH, Maxfeldstr. 5, 90409 Nürnberg
HRB 36809 (AG Nürnberg), Geschäftsführer: Ivo Totev, Andrew
Myers, Andrew McDonald, Martje Boudien Moerman