Skip to contentSkip to conversation

block: fix leaking minors of hidden disks

PATCH In review Keith Busch 5 participants 7 messages Oct 7, 2022 – Oct 10, 2022 Block layer

lore
Share & tools
lore
#0 lore raw

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

From: Keith Busch <[email protected]>

The major/minor of a hidden gendisk is not propagated to the block device. This is required to suppress it from being visible. For these disks, we need to handle freeing the dynamic minor directly when it's released since bdev_free_inode() won't be able to.

---
v1->v2:

Actually check that the disk is hidden before assuming the minor needs to be freed.

 block/genhd.c | 2 ++
 1 file changed, 2 insertions(+)
block/genhd.c +2 -0
index 514395361d7c..0afcdbb7575c 100644
@@ -1166,6 +1166,8 @@ static void disk_release(struct device *dev)
 	if (test_bit(GD_ADDED, &disk->state) && disk->fops->free_disk)
 		disk->fops->free_disk(disk);
 
+	if ((disk->flags & GENHD_FL_HIDDEN) && disk->major == BLOCK_EXT_MAJOR)
+		blk_free_ext_minor(disk->first_minor);
 	iput(disk->part0->bd_inode);	/* frees the disk */
 }
 
Signature · 1 line
2.30.2
Tested-by on v2 1/1
#1 lore raw
Quoted 10 lines · Keith Busch

From: Keith Busch <[email protected]>

The major/minor of a hidden gendisk is not propagated to the block device. This is required to suppress it from being visible. For these disks, we need to handle freeing the dynamic minor directly when it's released since bdev_free_inode() won't be able to.

Thanks for the quick fix!

# ls -l /dev/nvme*
crw------- 1 root root  10, 124 Oct 10 08:39 /dev/nvme-fabrics
crw------- 1 root root 243,   0 Oct 10 08:38 /dev/nvme0
brw-rw---- 1 root disk 259,   0 Oct 10 08:38 /dev/nvme0n1
crw------- 1 root root 243,   2 Oct 10 08:41 /dev/nvme2
brw-rw---- 1 root disk 259,   2 Oct 10 08:41 /dev/nvme2n1
brw-rw---- 1 root disk 259,   3 Oct 10 08:41 /dev/nvme2n1p1
brw-rw---- 1 root disk 259,   5 Oct 10 08:41 /dev/nvme2n2
brw-rw---- 1 root disk 259,   7 Oct 10 08:41 /dev/nvme2n3
brw-rw---- 1 root disk 259,   9 Oct 10 08:41 /dev/nvme2n4
crw------- 1 root root 243,   3 Oct 10 08:41 /dev/nvme3
crw------- 1 root root 243,   4 Oct 10 08:41 /dev/nvme4
crw------- 1 root root 243,   5 Oct 10 08:41 /dev/nvme5
# nvme disconnect-all
# nvme connect-all
# ls -l /dev/nvme*
crw------- 1 root root  10, 124 Oct 10 08:39 /dev/nvme-fabrics
crw------- 1 root root 243,   0 Oct 10 08:38 /dev/nvme0
brw-rw---- 1 root disk 259,   0 Oct 10 08:38 /dev/nvme0n1
crw------- 1 root root 243,   2 Oct 10 08:41 /dev/nvme2
brw-rw---- 1 root disk 259,   2 Oct 10 08:41 /dev/nvme2n1
brw-rw---- 1 root disk 259,   3 Oct 10 08:41 /dev/nvme2n1p1
brw-rw---- 1 root disk 259,   5 Oct 10 08:41 /dev/nvme2n2
brw-rw---- 1 root disk 259,   7 Oct 10 08:41 /dev/nvme2n3
brw-rw---- 1 root disk 259,   9 Oct 10 08:41 /dev/nvme2n4
crw------- 1 root root 243,   3 Oct 10 08:41 /dev/nvme3
crw------- 1 root root 243,   4 Oct 10 08:41 /dev/nvme4
crw------- 1 root root 243,   5 Oct 10 08:41 /dev/nvme5
Reviewed-by on v2 1/1
#2 lore raw
In reply to Keith Busch
Quoted 24 lines · Keith Busch

From: Keith Busch <[email protected]>

The major/minor of a hidden gendisk is not propagated to the block device. This is required to suppress it from being visible. For these disks, we need to handle freeing the dynamic minor directly when it's released since bdev_free_inode() won't be able to.

---
v1->v2:

Actually check that the disk is hidden before assuming the minor needs to be freed.

  block/genhd.c | 2 ++
  1 file changed, 2 insertions(+)
block/genhd.c +0 -0
index 514395361d7c..0afcdbb7575c 100644

block/genhd.c static void disk_release(struct device *dev) · line 1173

Quoted 8 lines
block/genhd.c +2 -0
@@ -1166,6 +1166,8 @@ static void disk_release(struct device *dev)
  	if (test_bit(GD_ADDED, &disk->state) && disk->fops->free_disk)
  		disk->fops->free_disk(disk);
 
+	if ((disk->flags & GENHD_FL_HIDDEN) && disk->major == BLOCK_EXT_MAJOR)
+		blk_free_ext_minor(disk->first_minor);
  	iput(disk->part0->bd_inode);	/* frees the disk */
  }
 

Looks good.

-ck

#3 lore raw
In reply to Keith Busch
Quoted 6 lines · Keith Busch

From: Keith Busch <[email protected]>

The major/minor of a hidden gendisk is not propagated to the block device. This is required to suppress it from being visible. For these disks, we need to handle freeing the dynamic minor directly when it's released since bdev_free_inode() won't be able to.

This now leads to a different lifetime. I think the proper fix is the one below (untested):

block/genhd.c +2 -0
index d36fabf0abc1f..1752ce356484e 100644
@@ -507,6 +507,8 @@ int __must_check device_add_disk(struct device *parent, struct gendisk *disk,
 		 */
 		dev_set_uevent_suppress(ddev, 0);
 		disk_uevent(disk, KOBJ_ADD);
+	} else {
+		disk->part0->bd_dev = ddev->devt;
 	}
 
 	disk_update_readahead(disk);
#4 lore raw
Quoted 16 lines · Christoph Hellwig
Quoted 6 lines · Keith Busch

From: Keith Busch <[email protected]>

The major/minor of a hidden gendisk is not propagated to the block device. This is required to suppress it from being visible. For these disks, we need to handle freeing the dynamic minor directly when it's released since bdev_free_inode() won't be able to.

This now leads to a different lifetime. I think the proper fix is the one below (untested):

block/genhd.c +0 -0
index d36fabf0abc1f..1752ce356484e 100644

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

Quoted 8 lines
block/genhd.c +2 -0
@@ -507,6 +507,8 @@ int __must_check device_add_disk(struct device *parent, struct gendisk *disk,
 		 */
 		dev_set_uevent_suppress(ddev, 0);
 		disk_uevent(disk, KOBJ_ADD);
+	} else {
+		disk->part0->bd_dev = ddev->devt;
 	}
 
 	disk_update_readahead(disk);

Doesn't give me the same consistent result as with Keith's version:

# ls -l /dev/nvme*
crw------- 1 root root  10, 124 Oct 10 10:00 /dev/nvme-fabrics
crw------- 1 root root 243,   0 Oct 10 09:58 /dev/nvme0
brw-rw---- 1 root disk 259,   0 Oct 10 09:58 /dev/nvme0n1
crw------- 1 root root 243,   2 Oct 10 10:00 /dev/nvme2
brw-rw---- 1 root disk 259,   2 Oct 10 10:00 /dev/nvme2n1
brw-rw---- 1 root disk 259,   3 Oct 10 10:00 /dev/nvme2n1p1
brw-rw---- 1 root disk 259,   5 Oct 10 10:00 /dev/nvme2n2
brw-rw---- 1 root disk 259,   7 Oct 10 10:00 /dev/nvme2n3
brw-rw---- 1 root disk 259,   9 Oct 10 10:00 /dev/nvme2n4
crw------- 1 root root 243,   3 Oct 10 10:00 /dev/nvme3
crw------- 1 root root 243,   4 Oct 10 10:00 /dev/nvme4
crw------- 1 root root 243,   5 Oct 10 10:00 /dev/nvme5
# nvme disconnect-all
# nvme connect-all
# ls -l /dev/nvme*
crw------- 1 root root  10, 124 Oct 10 10:00 /dev/nvme-fabrics
crw------- 1 root root 243,   0 Oct 10 09:58 /dev/nvme0
brw-rw---- 1 root disk 259,   0 Oct 10 09:58 /dev/nvme0n1
crw------- 1 root root 243,   2 Oct 10 10:00 /dev/nvme2
brw-rw---- 1 root disk 259,   3 Oct 10 10:00 /dev/nvme2n1
brw-rw---- 1 root disk 259,   5 Oct 10 10:00 /dev/nvme2n1p1
brw-rw---- 1 root disk 259,   9 Oct 10 10:00 /dev/nvme2n2
brw-rw---- 1 root disk 259,  23 Oct 10 10:00 /dev/nvme2n3
brw-rw---- 1 root disk 259,  25 Oct 10 10:00 /dev/nvme2n4
crw------- 1 root root 243,   3 Oct 10 10:00 /dev/nvme3
crw------- 1 root root 243,   4 Oct 10 10:00 /dev/nvme4
crw------- 1 root root 243,   5 Oct 10 10:00 /dev/nvme5
#5 lore raw
Quoted 1 line · Daniel Wagner

Doesn't give me the same consistent result as with Keith's version:

That's because it is broken.. Try this version:

block/genhd.c +2 -0
index 514395361d7c5..2296ad422523a 100644
@@ -507,6 +507,8 @@ int __must_check device_add_disk(struct device *parent, struct gendisk *disk,
 		 */
 		dev_set_uevent_suppress(ddev, 0);
 		disk_uevent(disk, KOBJ_ADD);
+	} else {
+		disk->part0->bd_dev = MKDEV(disk->major, disk->first_minor);
 	}
 
 	disk_update_readahead(disk);
Tested-by
#6 lore raw
Quoted 4 lines · Christoph Hellwig
Quoted 1 line · Daniel Wagner

Doesn't give me the same consistent result as with Keith's version:

That's because it is broken.. Try this version:

This version works.

# ls -l /dev/nvme*
crw------- 1 root root  10, 124 Oct 10 10:47 /dev/nvme-fabrics
crw------- 1 root root 243,   0 Oct 10 10:46 /dev/nvme0
brw-rw---- 1 root disk 259,   0 Oct 10 10:46 /dev/nvme0n1
crw------- 1 root root 243,   2 Oct 10 10:48 /dev/nvme2
brw-rw---- 1 root disk 259,   2 Oct 10 10:48 /dev/nvme2n1
brw-rw---- 1 root disk 259,   3 Oct 10 10:48 /dev/nvme2n1p1
brw-rw---- 1 root disk 259,   5 Oct 10 10:48 /dev/nvme2n2
brw-rw---- 1 root disk 259,   7 Oct 10 10:48 /dev/nvme2n3
brw-rw---- 1 root disk 259,   9 Oct 10 10:48 /dev/nvme2n4
crw------- 1 root root 243,   3 Oct 10 10:48 /dev/nvme3
crw------- 1 root root 243,   4 Oct 10 10:48 /dev/nvme4
crw------- 1 root root 243,   5 Oct 10 10:48 /dev/nvme5
# nvme disconnect-all
# nvme connect-all
# ls -l /dev/nvme*
crw------- 1 root root  10, 124 Oct 10 10:47 /dev/nvme-fabrics
crw------- 1 root root 243,   0 Oct 10 10:46 /dev/nvme0
brw-rw---- 1 root disk 259,   0 Oct 10 10:46 /dev/nvme0n1
crw------- 1 root root 243,   2 Oct 10 10:48 /dev/nvme2
brw-rw---- 1 root disk 259,   2 Oct 10 10:48 /dev/nvme2n1
brw-rw---- 1 root disk 259,   3 Oct 10 10:48 /dev/nvme2n1p1
brw-rw---- 1 root disk 259,   5 Oct 10 10:48 /dev/nvme2n2
brw-rw---- 1 root disk 259,   7 Oct 10 10:48 /dev/nvme2n3
brw-rw---- 1 root disk 259,   9 Oct 10 10:48 /dev/nvme2n4
crw------- 1 root root 243,   3 Oct 10 10:48 /dev/nvme3
crw------- 1 root root 243,   4 Oct 10 10:48 /dev/nvme4
crw------- 1 root root 243,   5 Oct 10 10:48 /dev/nvme5