more partition handling cleanups v2
Subsystems (4)
Hi Jens,
this series cleans up more lose ends in the partitioning code. It also removes a rather annoying use of ioctl_by_bdev in the s390 dasd driver.
Changes since v1:
- fix a brown paperbag typo in blkpg_do_ioctl
- fix a commit message typo
PATCH 1/10 block: refactor blkpg_ioctl
Split each sub-command out into a separate helper, and move those helpers to block/partitions/core.c instead of having a lot of partition manipulation logic open coded in block/ioctl.c.
--- block/blk.h | 8 ++- block/ioctl.c | 150 +++++++--------------------------------- block/partitions/core.c | 115 +++++++++++++++++++++++++++++- 3 files changed, 145 insertions(+), 128 deletions(-)
block/blk.h +5 -3
@@ -389,11 +389,13 @@ char *disk_name(struct gendisk *hd, int partno, char *buf);#define ADDPART_FLAG_NONE 0#define ADDPART_FLAG_RAID 1#define ADDPART_FLAG_WHOLEDISK 2 -struct hd_struct *__must_check add_partition (struct gendisk *disk,int partno, -sector_t start,sector_t len,int flags, -struct partition_meta_info *info);void __delete_partition (struct percpu_ref *ref);void delete_partition (struct gendisk *disk,int partno); +int bdev_add_partition (struct block_device *bdev,int partno, +sector_t start,sector_t length); +int bdev_del_partition (struct block_device *bdev,int partno); +int bdev_resize_partition (struct block_device *bdev,int partno, +sector_t start,sector_t length);int disk_expand_part_tbl (struct gendisk *disk,int target);static inline int hd_ref_init (struct hd_struct *part)
block/ioctl.c +26 -124
168 lines not on this page · raw message
block/partitions/core.c +114 -1
127 lines not on this page · raw message
Signature · 1 line
2.25.1
Re: [PATCH 01/10] block: refactor blkpg_ioctl
Looks good,
PATCH 2/10 block: pass a hd_struct to delete_partition
In reply to Christoph HellwigAll callers have the hd_struct at hand, so pass it instead of performing another lookup.
--- block/blk.h | 2 +- block/genhd.c | 2 +- block/partitions/core.c | 22 ++++++++-------------- 3 files changed, 10 insertions(+), 16 deletions(-)
block/blk.h +1 -1
@@ -390,7 +390,7 @@ char *disk_name(struct gendisk *hd, int partno, char *buf);#define ADDPART_FLAG_RAID 1#define ADDPART_FLAG_WHOLEDISK 2void __delete_partition (struct percpu_ref *ref); -void delete_partition (struct gendisk *disk,int partno); +void delete_partition (struct gendisk *disk,struct hd_struct *part);int bdev_add_partition (struct block_device *bdev,int partno,sector_t start,sector_t length);int bdev_del_partition (struct block_device *bdev,int partno);
block/genhd.c +1 -1
@@ -897,7 +897,7 @@ void del_gendisk(struct gendisk *disk)while ((part =disk_part_iter_next (&piter))) {invalidate_partition (disk, part->partno);bdev_unhash_inode (part_devt (part)); -delete_partition (disk, part->partno); +delete_partition (disk, part); }disk_part_iter_exit (&piter);
block/partitions/core.c +8 -14
@@ -296,20 +296,12 @@ void __delete_partition(struct percpu_ref *ref)* Must be called either with bd_mutex held, before a disk can be opened or * after all disk users are gone. */ -void delete_partition (struct gendisk *disk,int partno) +void delete_partition (struct gendisk *disk,struct hd_struct *part) {struct disk_part_tbl *ptbl =rcu_dereference_protected (disk->part_tbl,1 ); -struct hd_struct *part; - -if (partno >= ptbl->len) -return ; - part =rcu_dereference_protected (ptbl->part[partno],1 ); -if (!part) -return ; - -rcu_assign_pointer (ptbl->part[partno],NULL ); +rcu_assign_pointer (ptbl->part[part->partno],NULL );rcu_assign_pointer (ptbl->last_lookup,NULL );kobject_put (part->holder_dir);device_del (part_to_dev (part));
@@ -520,10 +512,10 @@ int bdev_del_partition(struct block_device *bdev, int partno)if (!part)return -ENXIO ; + ret = -ENOMEM ; bdevp =bdget (part_devt (part)); -disk_put_part (part);if (!bdevp) -return -ENOMEM ; + goto out_put_part;mutex_lock (&bdevp->bd_mutex);
@@ -535,13 +527,15 @@ int bdev_del_partition(struct block_device *bdev, int partno)invalidate_bdev (bdevp);mutex_lock_nested (&bdev->bd_mutex,1 ); -delete_partition (bdev->bd_disk, partno); +delete_partition (bdev->bd_disk, part);mutex_unlock (&bdev->bd_mutex); ret =0 ; out_unlock:mutex_unlock (&bdevp->bd_mutex);bdput (bdevp); +out_put_part: +disk_put_part (part);return ret; }
@@ -617,7 +611,7 @@ int blk_drop_partitions(struct gendisk *disk, struct block_device *bdev)disk_part_iter_init (&piter, disk,DISK_PITER_INCL_EMPTY );while ((part =disk_part_iter_next (&piter))) -delete_partition (disk, part->partno); +delete_partition (disk, part);disk_part_iter_exit (&piter);return 0 ;
Signature · 1 line
2.25.1
PATCH 3/10 block: cleanup hd_struct freeing
In reply to Christoph HellwigMove hd_ref_init out of line as there it isn't anywhere near a fast path, and rename the rcu ref freeing callbacks to be more descriptive.
--- block/blk.h | 10 +--------- block/partitions/core.c | 18 +++++++++++++----- 2 files changed, 14 insertions(+), 14 deletions(-)
block/blk.h +1 -9
@@ -389,7 +389,6 @@ char *disk_name(struct gendisk *hd, int partno, char *buf);#define ADDPART_FLAG_NONE 0#define ADDPART_FLAG_RAID 1#define ADDPART_FLAG_WHOLEDISK 2 -void __delete_partition (struct percpu_ref *ref);void delete_partition (struct gendisk *disk,struct hd_struct *part);int bdev_add_partition (struct block_device *bdev,int partno,sector_t start,sector_t length);
@@ -397,14 +396,7 @@ int bdev_del_partition(struct block_device *bdev, int partno);int bdev_resize_partition (struct block_device *bdev,int partno,sector_t start,sector_t length);int disk_expand_part_tbl (struct gendisk *disk,int target); - -static inline int hd_ref_init (struct hd_struct *part) -{ -if (percpu_ref_init (&part->ref, __delete_partition,0 , -GFP_KERNEL )) -return -ENOMEM ; -return 0 ; -} +int hd_ref_init (struct hd_struct *part);static inline void hd_struct_get (struct hd_struct *part) {
block/partitions/core.c +13 -5
@@ -274,10 +274,10 @@ struct device_type part_type = { .uevent = part_uevent, }; -static void delete_partition_work_fn (struct work_struct *work) +static void hd_struct_free_work (struct work_struct *work) { - struct hd_struct *part = container_of(to_rcu_work(work), struct hd_struct, - rcu_work); +struct hd_struct *part = + container_of(to_rcu_work(work), struct hd_struct, rcu_work); part->start_sect =0 ; part->nr_sects =0 ;
@@ -285,13 +285,21 @@ static void delete_partition_work_fn(struct work_struct *work)put_device (part_to_dev (part)); } -void __delete_partition (struct percpu_ref *ref) +static void hd_struct_free (struct percpu_ref *ref) { struct hd_struct *part = container_of(ref, struct hd_struct, ref); -INIT_RCU_WORK (&part->rcu_work, delete_partition_work_fn); + +INIT_RCU_WORK (&part->rcu_work, hd_struct_free_work);queue_rcu_work (system_wq, &part->rcu_work); } +int hd_ref_init (struct hd_struct *part) +{ +if (percpu_ref_init (&part->ref, hd_struct_free,0 ,GFP_KERNEL )) +return -ENOMEM ; +return 0 ; +} +/* * Must be called either with bd_mutex held, before a disk can be opened or * after all disk users are gone.
Signature · 1 line
2.25.1
PATCH 4/10 block: remove hd_struct_kill
In reply to Christoph HellwigThe function has a single caller, so just open code it.
--- block/blk.h | 5 ----- block/partitions/core.c | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-)
block/blk.h +0 -5
@@ -413,11 +413,6 @@ static inline void hd_struct_put(struct hd_struct *part)percpu_ref_put (&part->ref); } -static inline void hd_struct_kill (struct hd_struct *part) -{ -percpu_ref_kill (&part->ref); -} -static inline void hd_free_part (struct hd_struct *part) {free_part_stats (part);
block/partitions/core.c +1 -1
@@ -321,7 +321,7 @@ void delete_partition(struct gendisk *disk, struct hd_struct *part)* "in-use" until we really free the gendisk. */ blk_invalidate_devt (part_devt (part)); -hd_struct_kill (part); +percpu_ref_kill (&part->ref); } static ssize_t whole_disk_show(struct device *dev,
Signature · 1 line
2.25.1
PATCH 5/10 block: remove the disk argument from blk_drop_partitions
In reply to Christoph HellwigThe gendisk can be trivially deducted from the block_device.
--- block/partitions/core.c | 10 +++++----- fs/block_dev.c | 2 +- include/linux/genhd.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-)
block/partitions/core.c +5 -5
@@ -603,23 +603,23 @@ static bool disk_unlock_native_capacity(struct gendisk *disk) } } -int blk_drop_partitions (struct gendisk *disk,struct block_device *bdev) +int blk_drop_partitions (struct block_device *bdev) {struct disk_part_iter piter;struct hd_struct *part;int res; -if (!disk_part_scan_enabled (disk)) +if (!disk_part_scan_enabled (bdev->bd_disk))return 0 ;if (bdev->bd_part_count || bdev->bd_openers >1 )return -EBUSY ; - res =invalidate_partition (disk,0 ); + res =invalidate_partition (bdev->bd_disk,0 );if (res)return res; -disk_part_iter_init (&piter, disk,DISK_PITER_INCL_EMPTY ); +disk_part_iter_init (&piter, bdev->bd_disk,DISK_PITER_INCL_EMPTY );while ((part =disk_part_iter_next (&piter))) -delete_partition (disk, part); +delete_partition (bdev->bd_disk, part);disk_part_iter_exit (&piter);return 0 ;
fs/block_dev.c +1 -1
@@ -1517,7 +1517,7 @@ int bdev_disk_changed(struct block_device *bdev, bool invalidate)lockdep_assert_held (&bdev->bd_mutex); rescan: - ret =blk_drop_partitions (disk, bdev); + ret =blk_drop_partitions (bdev);if (ret)return ret;
include/linux/genhd.h +1 -1
@@ -339,7 +339,7 @@ extern dev_t blk_lookup_devt(const char *name, int partno);int bdev_disk_changed (struct block_device *bdev,bool invalidate);int blk_add_partitions (struct gendisk *disk,struct block_device *bdev); -int blk_drop_partitions (struct gendisk *disk,struct block_device *bdev); +int blk_drop_partitions (struct block_device *bdev);extern void printk_all_partitions (void );extern struct gendisk *__alloc_disk_node (int minors,int node_id);
Signature · 1 line
2.25.1
PATCH 6/10 dasd: use blk_drop_partitions instead of badly reimplementing it
In reply to Christoph HellwigUse the blk_drop_partitions function instead of messing around with ioctls that get kernel pointers. For this blk_drop_partitions needs to be exported, which it normally shouldn't - make an exception for s390 only.
--- block/partitions/core.c | 4 ++++ drivers/s390/block/dasd_genhd.c | 20 ++++---------------- 2 files changed, 8 insertions(+), 16 deletions(-)
block/partitions/core.c +4 -0
@@ -624,6 +624,10 @@ int blk_drop_partitions(struct block_device *bdev)return 0 ; } +#ifdef CONFIG_S390 +/* for historic reasons in the DASD driver */ +EXPORT_SYMBOL_GPL (blk_drop_partitions); +#endif static bool blk_add_partition (struct gendisk *disk,struct block_device *bdev,struct parsed_partitions *state,int p)
drivers/s390/block/dasd_genhd.c +4 -16
@@ -143,9 +143,6 @@ int dasd_scan_partitions(struct dasd_block *block)*/ void dasd_destroy_partitions (struct dasd_block *block) { -/* The two structs have 168/176 byte on 31/64 bit. */ -struct blkpg_partition bpart; -struct blkpg_ioctl_arg barg;struct block_device *bdev;/*
@@ -155,19 +152,10 @@ void dasd_destroy_partitions(struct dasd_block *block) bdev = block->bdev; block->bdev =NULL ; -/* -* See fs/partition/check.c:delete_partition -* Can't call delete_partitions directly. Use ioctl. -* The ioctl also does locking and invalidation. -*/ -memset (&bpart,0 ,sizeof (struct blkpg_partition )); -memset (&barg,0 ,sizeof (struct blkpg_ioctl_arg )); - barg.data = (void __force __user *) &bpart; - barg.op =BLKPG_DEL_PARTITION ; -for (bpart.pno = block->gdp->minors -1 ; bpart.pno >0 ; bpart.pno--) -ioctl_by_bdev (bdev,BLKPG , (unsigned long ) &barg); - -invalidate_partition (block->gdp,0 ); +mutex_lock (&bdev->bd_mutex); +blk_drop_partitions (bdev); +mutex_unlock (&bdev->bd_mutex); +/* Matching blkdev_put to the blkdev_get in dasd_scan_partitions. */ blkdev_put (bdev,FMODE_READ );set_capacity (block->gdp,0 );
Signature · 1 line
2.25.1
PATCH 7/10 block: don't call invalidate_partition from blk_drop_partitions
In reply to Christoph HellwigGiven that the device must not be busy, most of the calls from invalidate_partition that are related to file system metadata are guranteed to not happen. Just open code the calls to sync_blockdev and invalidate_bdev instead.
--- block/partitions/core.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
block/partitions/core.c +3 -4
@@ -607,15 +607,14 @@ int blk_drop_partitions(struct block_device *bdev) {struct disk_part_iter piter;struct hd_struct *part; -int res;if (!disk_part_scan_enabled (bdev->bd_disk))return 0 ;if (bdev->bd_part_count || bdev->bd_openers >1 )return -EBUSY ; - res =invalidate_partition (bdev->bd_disk,0 ); -if (res) -return res; + +sync_blockdev (bdev); +invalidate_bdev (bdev);disk_part_iter_init (&piter, bdev->bd_disk,DISK_PITER_INCL_EMPTY );while ((part =disk_part_iter_next (&piter)))
Signature · 1 line
2.25.1
Re: [PATCH 07/10] block: don't call invalidate_partition from blk_drop_partitions
Looks good,
PATCH 8/10 block: simplify block device syncing in bdev_del_partition
In reply to Christoph HellwigWe just checked a little above that the block device for the partition im busy. That implies no file system is mounted, and thus the only thing in fsync_bdev that actually is used is sync_blockdev. Just call sync_blockdev directly.
--- block/partitions/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
block/partitions/core.c +1 -1
@@ -531,7 +531,7 @@ int bdev_del_partition(struct block_device *bdev, int partno)if (bdevp->bd_openers) goto out_unlock; -fsync_bdev (bdevp); +sync_blockdev (bdevp);invalidate_bdev (bdevp);mutex_lock_nested (&bdev->bd_mutex,1 );
Signature · 1 line
2.25.1
PATCH 9/10 block: mark invalidate_partition static
In reply to Christoph Hellwiginvalidate_partition is only used in genhd.c, so mark it static. Also drop the return value given that is is always ignored.
--- block/genhd.c | 27 +++++++++++++-------------- include/linux/fs.h | 1 - 2 files changed, 13 insertions(+), 15 deletions(-)
block/genhd.c +13 -14
@@ -878,6 +878,19 @@ void device_add_disk_no_queue_reg(struct device *parent, struct gendisk *disk) }EXPORT_SYMBOL (device_add_disk_no_queue_reg); +static void invalidate_partition (struct gendisk *disk,int partno) +{ +struct block_device *bdev; + + bdev =bdget_disk (disk, partno); +if (!bdev) +return ; + +fsync_bdev (bdev); +__invalidate_device (bdev, true); +bdput (bdev); +} +void del_gendisk (struct gendisk *disk) {struct disk_part_iter piter;
@@ -1806,20 +1819,6 @@ int bdev_read_only(struct block_device *bdev)EXPORT_SYMBOL (bdev_read_only); -int invalidate_partition (struct gendisk *disk,int partno) -{ -int res =0 ; -struct block_device *bdev =bdget_disk (disk, partno); -if (bdev) { -fsync_bdev (bdev); - res =__invalidate_device (bdev, true); -bdput (bdev); - } -return res; -} - -EXPORT_SYMBOL (invalidate_partition); -/* * Disk events - monitor disk events like media change and eject request. */
include/linux/fs.h +0 -1
@@ -2723,7 +2723,6 @@ extern bool is_bad_inode(struct inode *);extern int revalidate_disk (struct gendisk *);extern int check_disk_change (struct block_device *);extern int __invalidate_device (struct block_device *,bool ); -extern int invalidate_partition (struct gendisk *,int );#endif unsigned long invalidate_mapping_pages (struct address_space *mapping,pgoff_t start,pgoff_t end);
Signature · 1 line
2.25.1
PATCH 10/10 block: fold bdev_unhash_inode into invalidate_partition
In reply to Christoph Hellwiginvalidate_partition and bdev_unhash_inode are always paired, and invalidate_partition already does an icache lookup for the block device inode. Piggy back on that to remove the inode from the hash.
--- block/genhd.c | 8 ++++++-- fs/block_dev.c | 15 --------------- include/linux/fs.h | 1 - 3 files changed, 6 insertions(+), 18 deletions(-)
block/genhd.c +6 -2
@@ -888,6 +888,12 @@ static void invalidate_partition(struct gendisk *disk, int partno)fsync_bdev (bdev);__invalidate_device (bdev, true); + +/* +* Unhash the bdev inode for this device so that it gets evicted as soon +* as last inode reference is dropped. +*/ +remove_inode_hash (bdev->bd_inode);bdput (bdev); }
@@ -909,13 +915,11 @@ void del_gendisk(struct gendisk *disk) DISK_PITER_INCL_EMPTY | DISK_PITER_REVERSE);while ((part =disk_part_iter_next (&piter))) {invalidate_partition (disk, part->partno); -bdev_unhash_inode (part_devt (part));delete_partition (disk, part); }disk_part_iter_exit (&piter);invalidate_partition (disk,0 ); -bdev_unhash_inode (disk_devt (disk));set_capacity (disk,0 ); disk->flags &= ~GENHD_FL_UP ;up_write (&disk->lookup_sem);
fs/block_dev.c +0 -15
@@ -883,21 +883,6 @@ static int bdev_set(struct inode *inode, void *data)static LIST_HEAD (all_bdevs); -/* -* If there is a bdev inode for this device, unhash it so that it gets evicted -* as soon as last inode reference is dropped. -*/ -void bdev_unhash_inode (dev_t dev) -{ -struct inode *inode; - - inode =ilookup5 (blockdev_superblock,hash (dev), bdev_test, &dev); -if (inode) { -remove_inode_hash (inode); -iput (inode); - } -} -struct block_device *bdget (dev_t dev) {struct block_device *bdev;
include/linux/fs.h +0 -1
@@ -2581,7 +2581,6 @@ extern struct kmem_cache *names_cachep;#ifdef CONFIG_BLOCK extern int register_blkdev (unsigned int ,const char *);extern void unregister_blkdev (unsigned int ,const char *); -extern void bdev_unhash_inode (dev_t dev);extern struct block_device *bdget (dev_t );extern struct block_device *bdgrab (struct block_device *bdev);extern void bd_set_size (struct block_device *,loff_t size);
Signature · 1 line
2.25.1
Quoted 8 lines · Christoph Hellwig
Hi Jens,
this series cleans up more lose ends in the partitioning code. It also removes a rather annoying use of
ioctl_by_bdevin the s390 dasd driver.Changes since v1:
- fix a brown paperbag typo inblkpg_do_ioctl
- fix a commit message typo
ping? This is the first of a few series to eventually kill ioctl_by_bdev, so I'd like to get things moving.
Jens Axboe
maintainerQuoted 8 lines · Christoph Hellwig
Hi Jens,
this series cleans up more lose ends in the partitioning code. It also removes a rather annoying use of
ioctl_by_bdevin the s390 dasd driver.Changes since v1:
- fix a brown paperbag typo inblkpg_do_ioctl
- fix a commit message typo
Applied for 5.8.
Signature · 1 line
Jens Axboe