block: Support online resize of disk partitions
Subsystems (2)
v3 cover block: Support online resize of disk partitions
Hi,
This is V3 of patch which adds support for online resizing of a partition. This patch is based on previously posted patches by Phillip Susi.
There are two patches. Out of which one is kernel patch and other one is util-linux patch to add support of a user space utility "resizepart" to allow resizing the partition.
This ioctl only resizes the partition size in kenrel and does not change the size on disk. A user needs to make sure that corresponding changes are made to disk data structures also using fdisk(or partx), if changes are to be retained across reboot.
Changes since V2
----------------
- Do not ignore the "start" parameter in RESIZE ioctl.
- Change resizepart utility to parse sysfs to get to partition start.
Changes since V1
----------------
Following are changes since the version Phillip posted.
- RESIZE ioctl ignores the partition "start" and does not expect user to specify one. Caller needs to just specify "device", "partition number" and "size" of new partition.
- Got rid of part_nr_sects_write_begin/part_nr_sects_write_end functions and replaced these with single part_nr_sects_write().
- Some sequence counter related changes are simply lifted from i_size_write().
- Initialized part->nr_sects_seq using seqcount_init().
Phillip, do let me know if I should put your signed-off-by also in the patch.
Any review feedback is welcome.
I did following test.
- Create a partition of 10MB on a disk using fdisk.
- Add this partition to a volume group
- Use fdisk to increase the partition size to 20MB. (First delete the partition and then create a new one of 20MB size).
- Use resizepart to extend partition size in kernel.
resizepart /dev/sdc 1 40960
- Do pvresize on partition so that physical volume can be incrased in size online.
pvresize /dev/sda1
pvresize does recognize the new size. Also lsblk and /proc/partitions report the new size of partition.
Thanks
Vivek
[PATCH 1/2] block: add partition resize function to blkpg ioctl [PATCH 2/2] util-linux: resizepart: Utility to resize a partition
PATCH v3 1/2 block: add partition resize function to blkpg ioctl
Add a new operation code ( BLKPG_RESIZE_PARTITION ) to the BLKPG ioctl that allows altering the size of an existing partition, even if it is currently in use.
--- block/genhd.c | 20 ++++++++++++---- block/ioctl.c | 57 ++++++++++++++++++++++++++++++++++++++++++-- block/partition-generic.c | 4 ++- include/linux/blkpg.h | 1 + include/linux/genhd.h | 57 +++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 130 insertions(+), 9 deletions(-)
block/genhd.c +15 -5
@@ -153,7 +153,7 @@ struct hd_struct *disk_part_iter_next(struct disk_part_iter *piter) part =rcu_dereference (ptbl->part[piter->idx]);if (!part)continue ; -if (!part->nr_sects && +if (!part_nr_sects_read (part) && !(piter->flags &DISK_PITER_INCL_EMPTY ) && !(piter->flags &DISK_PITER_INCL_EMPTY_PART0 && piter->idx ==0 ))
@@ -190,7 +190,7 @@ EXPORT_SYMBOL_GPL(disk_part_iter_exit);static inline int sector_in_part (struct hd_struct *part,sector_t sector) {return part->start_sect <= sector && - sector < part->start_sect + part->nr_sects; + sector < part->start_sect +part_nr_sects_read (part); }/**
@@ -765,8 +765,8 @@ void __init printk_all_partitions(void)printk ("%s%s %10llu %s %s" , is_part0 ?"" :" " ,bdevt_str (part_devt (part), devt_buf), - (unsigned long long )part->nr_sects >>1 , -disk_name (disk, part->partno, name_buf), uuid); + (unsigned long long )part_nr_sects_read (part) >>1 + ,disk_name (disk, part->partno, name_buf), uuid);if (is_part0) {if (disk->driverfs_dev !=NULL && disk->driverfs_dev->driver !=NULL )
@@ -857,7 +857,7 @@ static int show_partition(struct seq_file *seqf, void *v)while ((part =disk_part_iter_next (&piter)))seq_printf (seqf,"%4d %7d %10llu %s\n" ,MAJOR (part_devt (part)),MINOR (part_devt (part)), - (unsigned long long )part->nr_sects >>1 , + (unsigned long long )part_nr_sects_read (part) >>1 ,disk_name (sgp, part->partno, buf));disk_part_iter_exit (&piter);
@@ -1263,6 +1263,16 @@ struct gendisk *alloc_disk_node(int minors, int node_id) } disk->part_tbl->part[0 ] = &disk->part0; +/* +* set_capacity() and get_capacity() currently don't use +* seqcounter to read/update the part0->nr_sects. Still init +* the counter as we can read the sectors in IO submission +* patch using seqence counters. +* +* TODO: Ideally set_capacity() and get_capacity() should be +* converted to make use of bd_mutex and sequence counters. +*/ +seqcount_init (&disk->part0.nr_sects_seq);hd_ref_init (&disk->part0); disk->minors = minors;
block/ioctl.c +54 -3
75 lines not on this page · raw message
block/partition-generic.c +3 -1
@@ -84,7 +84,7 @@ ssize_t part_size_show(struct device *dev, struct device_attribute *attr, char *buf) { struct hd_struct *p = dev_to_part(dev); -return sprintf (buf,"%llu\n" ,(unsigned long long )p->nr_sects); +return sprintf (buf,"%llu\n" ,(unsigned long long )part_nr_sects_read (p)); } static ssize_t part_ro_show(struct device *dev,
@@ -294,6 +294,8 @@ struct hd_struct *add_partition(struct gendisk *disk, int partno, err = -ENOMEM ; goto out_free; } + +seqcount_init (&p->nr_sects_seq); pdev =part_to_dev (p); p->start_sect = start;
include/linux/blkpg.h +1 -0
@@ -40,6 +40,7 @@ struct blkpg_ioctl_arg {/* The subfunctions (for the op field) */ #define BLKPG_ADD_PARTITION 1#define BLKPG_DEL_PARTITION 2 +#define BLKPG_RESIZE_PARTITION 3/* Sizes of name fields. Unused at present. */ #define BLKPG_DEVNAMELTH 64
include/linux/genhd.h +57 -0
70 lines not on this page · raw message
Signature · 1 line
1.7.6.4
Re: [PATCH 1/2] block: add partition resize function to blkpg ioctl
Quoted 3 lines · Vivek Goyal
Add a new operation code (
BLKPG_RESIZE_PARTITION) to the BLKPG ioctl that allows altering the size of an existing partition, even if it is currently in use.
Hi Phillip,
Are you ok with the change?
Thanks
Vivek
Quoted 263 lines
Signed-off-by Vivek Goyal <[email protected]>--- block/genhd.c | 20 ++++++++++++---- block/ioctl.c | 57 ++++++++++++++++++++++++++++++++++++++++++-- block/partition-generic.c | 4 ++- include/linux/blkpg.h | 1 + include/linux/genhd.h | 57 +++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 130 insertions(+), 9 deletions(-)block/genhd.c +15
-5@@ -153,7 +153,7 @@ struct hd_struct *disk_part_iter_next(struct disk_part_iter *piter) part =rcu_dereference (ptbl->part[piter->idx]);if (!part)continue ; -if (!part->nr_sects && +if (!part_nr_sects_read (part) && !(piter->flags &DISK_PITER_INCL_EMPTY ) && !(piter->flags &DISK_PITER_INCL_EMPTY_PART0 && piter->idx ==0 ))@@ -190,7 +190,7 @@ EXPORT_SYMBOL_GPL(disk_part_iter_exit);static inline int sector_in_part (struct hd_struct *part,sector_t sector) {return part->start_sect <= sector && - sector < part->start_sect + part->nr_sects; + sector < part->start_sect +part_nr_sects_read (part); }/** @@ -765,8 +765,8 @@ void __init printk_all_partitions(void)printk ("%s%s %10llu %s %s" , is_part0 ?"" :" " ,bdevt_str (part_devt (part), devt_buf), - (unsigned long long )part->nr_sects >>1 , -disk_name (disk, part->partno, name_buf), uuid); + (unsigned long long )part_nr_sects_read (part) >>1 + ,disk_name (disk, part->partno, name_buf), uuid);if (is_part0) {if (disk->driverfs_dev !=NULL && disk->driverfs_dev->driver !=NULL )@@ -857,7 +857,7 @@ static int show_partition(struct seq_file *seqf, void *v)while ((part =disk_part_iter_next (&piter)))seq_printf (seqf,"%4d %7d %10llu %s\n" ,MAJOR (part_devt (part)),MINOR (part_devt (part)), - (unsigned long long )part->nr_sects >>1 , + (unsigned long long )part_nr_sects_read (part) >>1 ,disk_name (sgp, part->partno, buf));disk_part_iter_exit (&piter);@@ -1263,6 +1263,16 @@ struct gendisk *alloc_disk_node(int minors, int node_id) } disk->part_tbl->part[0 ] = &disk->part0; +/* +* set_capacity() and get_capacity() currently don't use +* seqcounter to read/update the part0->nr_sects. Still init +* the counter as we can read the sectors in IO submission +* patch using seqence counters. +* +* TODO: Ideally set_capacity() and get_capacity() should be +* converted to make use of bd_mutex and sequence counters. +*/ +seqcount_init (&disk->part0.nr_sects_seq);hd_ref_init (&disk->part0); disk->minors = minors;block/ioctl.c +54
-3@@ -13,7 +13,7 @@ static int blkpg_ioctl(struct block_device *bdev, struct blkpg_ioctl_arg __user {struct block_device *bdevp;struct gendisk *disk; -struct hd_struct *part; +struct hd_struct *part, *lpart;struct blkpg_ioctl_arg a;struct blkpg_partition p;struct disk_part_iter piter;@@ -36,8 +36,8 @@ static int blkpg_ioctl(struct block_device *bdev, struct blkpg_ioctl_arg __usercase BLKPG_ADD_PARTITION : start = p.start >>9 ; length = p.length >>9 ; -/* check for fit in a hd_struct */ -if (sizeof (sector_t) ==sizeof (long ) && +/* check for fit in a hd_struct */ +if (sizeof (sector_t) ==sizeof (long ) &&sizeof (long long ) >sizeof (long )) {long pstart = start, plength = length; if (pstart != start || plength != length@@ -92,6 +92,57 @@ static int blkpg_ioctl(struct block_device *bdev, struct blkpg_ioctl_arg __userbdput (bdevp);return 0 ; +case BLKPG_RESIZE_PARTITION : + start = p.start >>9 ; +/* new length of partition in bytes */ + length = p.length >>9 ; +/* check for fit in a hd_struct */ +if (sizeof (sector_t) ==sizeof (long ) && +sizeof (long long ) >sizeof (long )) { +long pstart = start, plength = length; +if (pstart != start || plength != length + || pstart <0 || plength <0 ) +return -EINVAL ; + } + part =disk_get_part (disk, partno); +if (!part) +return -ENXIO ; + bdevp =bdget (part_devt (part)); +if (!bdevp) { +disk_put_part (part); +return -ENOMEM ; + } +mutex_lock (&bdevp->bd_mutex); +mutex_lock_nested (&bdev->bd_mutex,1 ); +if (start != part->start_sect) { +mutex_unlock (&bdevp->bd_mutex); +mutex_unlock (&bdev->bd_mutex); +disk_put_part (part); +return -EINVAL ; + } +/* overlap? */ +disk_part_iter_init (&piter, disk, +DISK_PITER_INCL_EMPTY ); +while ((lpart =disk_part_iter_next (&piter))) { +if (lpart->partno != partno && + !(start + length <= lpart->start_sect || + start >= lpart->start_sect + lpart->nr_sects) + ) { +disk_part_iter_exit (&piter); +mutex_unlock (&bdevp->bd_mutex); +mutex_unlock (&bdev->bd_mutex); +disk_put_part (part); +return -EBUSY ; + } + } +disk_part_iter_exit (&piter); +part_nr_sects_write (part, (sector_t )length); +i_size_write (bdevp->bd_inode, p.length); +mutex_unlock (&bdevp->bd_mutex); +mutex_unlock (&bdev->bd_mutex); +bdput (bdevp); +disk_put_part (part); +return 0 ;default :return -EINVAL ; }block/partition-generic.c +3
-1@@ -84,7 +84,7 @@ ssize_t part_size_show(struct device *dev, struct device_attribute *attr, char *buf) { struct hd_struct *p = dev_to_part(dev); -return sprintf (buf,"%llu\n" ,(unsigned long long )p->nr_sects); +return sprintf (buf,"%llu\n" ,(unsigned long long )part_nr_sects_read (p)); } static ssize_t part_ro_show(struct device *dev,@@ -294,6 +294,8 @@ struct hd_struct *add_partition(struct gendisk *disk, int partno, err = -ENOMEM ; goto out_free; } + +seqcount_init (&p->nr_sects_seq); pdev =part_to_dev (p); p->start_sect = start;include/linux/blkpg.h +1
-0@@ -40,6 +40,7 @@ struct blkpg_ioctl_arg {/* The subfunctions (for the op field) */ #define BLKPG_ADD_PARTITION 1#define BLKPG_DEL_PARTITION 2 +#define BLKPG_RESIZE_PARTITION 3/* Sizes of name fields. Unused at present. */ #define BLKPG_DEVNAMELTH 64include/linux/genhd.h +57
-0@@ -98,7 +98,13 @@ struct partition_meta_info {struct hd_struct {sector_t start_sect; +/* +* nr_sects is protected by sequence counter. One might extend a +* partition while IO is happening to it and update of nr_sects +* can be non-atomic on 32bit machines with 64bit sector_t. +*/ sector_t nr_sects; +seqcount_t nr_sects_seq;sector_t alignment_offset;unsigned int discard_alignment;struct device __dev;@@ -653,6 +659,57 @@ static inline void hd_struct_put(struct hd_struct *part) __delete_partition(part); } +/* +* Any access of part->nr_sects which is not protected by partition +* bd_mutex or gendisk bdev bd_mutex, should be done using this +* accessor function. +* +* Code written along the lines of i_size_read() and i_size_write(). +* CONFIG_PREEMPT case optimizes the case of UP kernel with preemption +* on. +*/ +static inline sector_t part_nr_sects_read (struct hd_struct *part) +{ +#if BITS_PER_LONG ==32 && defined(CONFIG_LBDAF ) && defined(CONFIG_SMP ) +sector_t nr_sects; +unsigned seq; +do { + seq =read_seqcount_begin (&part->nr_sects_seq); + nr_sects = part->nr_sects; + }while (read_seqcount_retry (&part->nr_sects_seq, seq)); +return nr_sects; +#elif BITS_PER_LONG ==32 && defined(CONFIG_PREEMPT ) +sector_t nr_sects; + +preempt_disable (); + nr_sects = part->nr_sects; +preempt_enable (); +return nr_sects; +#else +return part->nr_sects; +#endif +} + +/* +* Should be called with mutex lock held (typically bd_mutex) of partition +* to provide mutual exlusion among writers otherwise seqcount might be +* left in wrong state leaving the readers spinning infinitely. +*/ +static inline void part_nr_sects_write (struct hd_struct *part,sector_t size) +{ +#if BITS_PER_LONG ==32 && defined(CONFIG_LBDAF ) && defined(CONFIG_SMP ) +write_seqcount_begin (&part->nr_sects_seq); + part->nr_sects = size; +write_seqcount_end (&part->nr_sects_seq); +#elif BITS_PER_LONG ==32 && defined(CONFIG_LBDAF ) && defined(CONFIG_PREEMPT ) +preempt_disable (); + part->nr_sects = size; +preempt_enable (); +#else + part->nr_sects = size; +#endif +} +#else /* CONFIG_BLOCK */ static inline void printk_all_partitions (void ) { }Signature · 1 line
1.7.6.4
Re: [PATCH 1/2] block: add partition resize function to blkpg ioctl
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Quoted 8 lines · Vivek Goyal
Quoted 3 lines · Vivek Goyal
Add a new operation code (
BLKPG_RESIZE_PARTITION) to the BLKPG ioctl that allows altering the size of an existing partition, even if it is currently in use.Hi Phillip,
Are you ok with the change?
Yes.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (MingW32)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
iQEcBAEBAgAGBQJPQmQWAAoJEJrBOlT6nu75V8YH/0khEQy1sCiDmjqaVAqJGn3R xjS7eCU6ndgGj3CHE+j4AJCTJ6cdrcaheEF/QWd3f2GxI0kQ6bBiWzxMeEXaSA57 VQOyKqoGalaWA78a3xFR1oax8ZwOAQi7LdyttdvzXUTKDXrO57cAAIHGQcLTPFiv a926d27kMulNQzXvjhBj/h8LAOeUVFIEbrGk5QxOw28gdStEv/RtMKeSvuq3e4qu /TxNT78K49HBaWuhTZJB4Mg7ttyBTQJrQr5c23oo9KLSUgd+3ZvaHF53vUsP7IMm Kbor7u648P0Xo2gaWGXPF5z4hmyhO08/1SNFKAKw0CSycpOlwjsbel/Ys57gIAY= =oTDA
-----END PGP SIGNATURE-----
Re: [PATCH 1/2] block: add partition resize function to blkpg ioctl
In reply to Vivek GoyalQuoted 5 lines · Vivek Goyal
Add a new operation code (
BLKPG_RESIZE_PARTITION) to the BLKPG ioctl that allows altering the size of an existing partition, even if it is currently in use.Signed-off-by Vivek Goyal <[email protected]>
Hi Jens,
Can you please consider this patch for inclusion. One of our customer does want to be able to grow partitions without having to reboot the system.
Thanks
Vivek
Quoted 261 lines
--- block/genhd.c | 20 ++++++++++++---- block/ioctl.c | 57 ++++++++++++++++++++++++++++++++++++++++++-- block/partition-generic.c | 4 ++- include/linux/blkpg.h | 1 + include/linux/genhd.h | 57 +++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 130 insertions(+), 9 deletions(-)block/genhd.c +15
-5@@ -153,7 +153,7 @@ struct hd_struct *disk_part_iter_next(struct disk_part_iter *piter) part =rcu_dereference (ptbl->part[piter->idx]);if (!part)continue ; -if (!part->nr_sects && +if (!part_nr_sects_read (part) && !(piter->flags &DISK_PITER_INCL_EMPTY ) && !(piter->flags &DISK_PITER_INCL_EMPTY_PART0 && piter->idx ==0 ))@@ -190,7 +190,7 @@ EXPORT_SYMBOL_GPL(disk_part_iter_exit);static inline int sector_in_part (struct hd_struct *part,sector_t sector) {return part->start_sect <= sector && - sector < part->start_sect + part->nr_sects; + sector < part->start_sect +part_nr_sects_read (part); }/** @@ -765,8 +765,8 @@ void __init printk_all_partitions(void)printk ("%s%s %10llu %s %s" , is_part0 ?"" :" " ,bdevt_str (part_devt (part), devt_buf), - (unsigned long long )part->nr_sects >>1 , -disk_name (disk, part->partno, name_buf), uuid); + (unsigned long long )part_nr_sects_read (part) >>1 + ,disk_name (disk, part->partno, name_buf), uuid);if (is_part0) {if (disk->driverfs_dev !=NULL && disk->driverfs_dev->driver !=NULL )@@ -857,7 +857,7 @@ static int show_partition(struct seq_file *seqf, void *v)while ((part =disk_part_iter_next (&piter)))seq_printf (seqf,"%4d %7d %10llu %s\n" ,MAJOR (part_devt (part)),MINOR (part_devt (part)), - (unsigned long long )part->nr_sects >>1 , + (unsigned long long )part_nr_sects_read (part) >>1 ,disk_name (sgp, part->partno, buf));disk_part_iter_exit (&piter);@@ -1263,6 +1263,16 @@ struct gendisk *alloc_disk_node(int minors, int node_id) } disk->part_tbl->part[0 ] = &disk->part0; +/* +* set_capacity() and get_capacity() currently don't use +* seqcounter to read/update the part0->nr_sects. Still init +* the counter as we can read the sectors in IO submission +* patch using seqence counters. +* +* TODO: Ideally set_capacity() and get_capacity() should be +* converted to make use of bd_mutex and sequence counters. +*/ +seqcount_init (&disk->part0.nr_sects_seq);hd_ref_init (&disk->part0); disk->minors = minors;block/ioctl.c +54
-3@@ -13,7 +13,7 @@ static int blkpg_ioctl(struct block_device *bdev, struct blkpg_ioctl_arg __user {struct block_device *bdevp;struct gendisk *disk; -struct hd_struct *part; +struct hd_struct *part, *lpart;struct blkpg_ioctl_arg a;struct blkpg_partition p;struct disk_part_iter piter;@@ -36,8 +36,8 @@ static int blkpg_ioctl(struct block_device *bdev, struct blkpg_ioctl_arg __usercase BLKPG_ADD_PARTITION : start = p.start >>9 ; length = p.length >>9 ; -/* check for fit in a hd_struct */ -if (sizeof (sector_t) ==sizeof (long ) && +/* check for fit in a hd_struct */ +if (sizeof (sector_t) ==sizeof (long ) &&sizeof (long long ) >sizeof (long )) {long pstart = start, plength = length; if (pstart != start || plength != length@@ -92,6 +92,57 @@ static int blkpg_ioctl(struct block_device *bdev, struct blkpg_ioctl_arg __userbdput (bdevp);return 0 ; +case BLKPG_RESIZE_PARTITION : + start = p.start >>9 ; +/* new length of partition in bytes */ + length = p.length >>9 ; +/* check for fit in a hd_struct */ +if (sizeof (sector_t) ==sizeof (long ) && +sizeof (long long ) >sizeof (long )) { +long pstart = start, plength = length; +if (pstart != start || plength != length + || pstart <0 || plength <0 ) +return -EINVAL ; + } + part =disk_get_part (disk, partno); +if (!part) +return -ENXIO ; + bdevp =bdget (part_devt (part)); +if (!bdevp) { +disk_put_part (part); +return -ENOMEM ; + } +mutex_lock (&bdevp->bd_mutex); +mutex_lock_nested (&bdev->bd_mutex,1 ); +if (start != part->start_sect) { +mutex_unlock (&bdevp->bd_mutex); +mutex_unlock (&bdev->bd_mutex); +disk_put_part (part); +return -EINVAL ; + } +/* overlap? */ +disk_part_iter_init (&piter, disk, +DISK_PITER_INCL_EMPTY ); +while ((lpart =disk_part_iter_next (&piter))) { +if (lpart->partno != partno && + !(start + length <= lpart->start_sect || + start >= lpart->start_sect + lpart->nr_sects) + ) { +disk_part_iter_exit (&piter); +mutex_unlock (&bdevp->bd_mutex); +mutex_unlock (&bdev->bd_mutex); +disk_put_part (part); +return -EBUSY ; + } + } +disk_part_iter_exit (&piter); +part_nr_sects_write (part, (sector_t )length); +i_size_write (bdevp->bd_inode, p.length); +mutex_unlock (&bdevp->bd_mutex); +mutex_unlock (&bdev->bd_mutex); +bdput (bdevp); +disk_put_part (part); +return 0 ;default :return -EINVAL ; }block/partition-generic.c +3
-1@@ -84,7 +84,7 @@ ssize_t part_size_show(struct device *dev, struct device_attribute *attr, char *buf) { struct hd_struct *p = dev_to_part(dev); -return sprintf (buf,"%llu\n" ,(unsigned long long )p->nr_sects); +return sprintf (buf,"%llu\n" ,(unsigned long long )part_nr_sects_read (p)); } static ssize_t part_ro_show(struct device *dev,@@ -294,6 +294,8 @@ struct hd_struct *add_partition(struct gendisk *disk, int partno, err = -ENOMEM ; goto out_free; } + +seqcount_init (&p->nr_sects_seq); pdev =part_to_dev (p); p->start_sect = start;include/linux/blkpg.h +1
-0@@ -40,6 +40,7 @@ struct blkpg_ioctl_arg {/* The subfunctions (for the op field) */ #define BLKPG_ADD_PARTITION 1#define BLKPG_DEL_PARTITION 2 +#define BLKPG_RESIZE_PARTITION 3/* Sizes of name fields. Unused at present. */ #define BLKPG_DEVNAMELTH 64include/linux/genhd.h +57
-0@@ -98,7 +98,13 @@ struct partition_meta_info {struct hd_struct {sector_t start_sect; +/* +* nr_sects is protected by sequence counter. One might extend a +* partition while IO is happening to it and update of nr_sects +* can be non-atomic on 32bit machines with 64bit sector_t. +*/ sector_t nr_sects; +seqcount_t nr_sects_seq;sector_t alignment_offset;unsigned int discard_alignment;struct device __dev;@@ -653,6 +659,57 @@ static inline void hd_struct_put(struct hd_struct *part) __delete_partition(part); } +/* +* Any access of part->nr_sects which is not protected by partition +* bd_mutex or gendisk bdev bd_mutex, should be done using this +* accessor function. +* +* Code written along the lines of i_size_read() and i_size_write(). +* CONFIG_PREEMPT case optimizes the case of UP kernel with preemption +* on. +*/ +static inline sector_t part_nr_sects_read (struct hd_struct *part) +{ +#if BITS_PER_LONG ==32 && defined(CONFIG_LBDAF ) && defined(CONFIG_SMP ) +sector_t nr_sects; +unsigned seq; +do { + seq =read_seqcount_begin (&part->nr_sects_seq); + nr_sects = part->nr_sects; + }while (read_seqcount_retry (&part->nr_sects_seq, seq)); +return nr_sects; +#elif BITS_PER_LONG ==32 && defined(CONFIG_PREEMPT ) +sector_t nr_sects; + +preempt_disable (); + nr_sects = part->nr_sects; +preempt_enable (); +return nr_sects; +#else +return part->nr_sects; +#endif +} + +/* +* Should be called with mutex lock held (typically bd_mutex) of partition +* to provide mutual exlusion among writers otherwise seqcount might be +* left in wrong state leaving the readers spinning infinitely. +*/ +static inline void part_nr_sects_write (struct hd_struct *part,sector_t size) +{ +#if BITS_PER_LONG ==32 && defined(CONFIG_LBDAF ) && defined(CONFIG_SMP ) +write_seqcount_begin (&part->nr_sects_seq); + part->nr_sects = size; +write_seqcount_end (&part->nr_sects_seq); +#elif BITS_PER_LONG ==32 && defined(CONFIG_LBDAF ) && defined(CONFIG_PREEMPT ) +preempt_disable (); + part->nr_sects = size; +preempt_enable (); +#else + part->nr_sects = size; +#endif +} +#else /* CONFIG_BLOCK */ static inline void printk_all_partitions (void ) { }Signature · 1 line
1.7.6.4
Re: [PATCH 1/2] block: add partition resize function to blkpg ioctl
Quoted 5 lines · Vivek Goyal
Quoted 4 lines · Vivek Goyal
Add a new operation code (
BLKPG_RESIZE_PARTITION) to the BLKPG ioctl that allows altering the size of an existing partition, even if it is currently in use.
Quoted 7 lines
Quoted 1 line
Signed-off-by Vivek Goyal <[email protected]>Hi Jens,
Can you please consider this patch for inclusion. One of our customer does want to be able to grow partitions without having to reboot the system.
Hi Jens,
Do you have concerns about this patch? If no, can you please consider merging it.
Thanks
Vivek
Quoted 262 lines
Quoted 262 lines
--- block/genhd.c | 20 ++++++++++++---- block/ioctl.c | 57 ++++++++++++++++++++++++++++++++++++++++++-- block/partition-generic.c | 4 ++- include/linux/blkpg.h | 1 + include/linux/genhd.h | 57 +++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 130 insertions(+), 9 deletions(-)block/genhd.c +15
-5@@ -153,7 +153,7 @@ struct hd_struct *disk_part_iter_next(struct disk_part_iter *piter) part =rcu_dereference (ptbl->part[piter->idx]);if (!part)continue ; -if (!part->nr_sects && +if (!part_nr_sects_read (part) && !(piter->flags &DISK_PITER_INCL_EMPTY ) && !(piter->flags &DISK_PITER_INCL_EMPTY_PART0 && piter->idx ==0 ))@@ -190,7 +190,7 @@ EXPORT_SYMBOL_GPL(disk_part_iter_exit);static inline int sector_in_part (struct hd_struct *part,sector_t sector) {return part->start_sect <= sector && - sector < part->start_sect + part->nr_sects; + sector < part->start_sect +part_nr_sects_read (part); }/** @@ -765,8 +765,8 @@ void __init printk_all_partitions(void)printk ("%s%s %10llu %s %s" , is_part0 ?"" :" " ,bdevt_str (part_devt (part), devt_buf), - (unsigned long long )part->nr_sects >>1 , -disk_name (disk, part->partno, name_buf), uuid); + (unsigned long long )part_nr_sects_read (part) >>1 + ,disk_name (disk, part->partno, name_buf), uuid);if (is_part0) {if (disk->driverfs_dev !=NULL && disk->driverfs_dev->driver !=NULL )@@ -857,7 +857,7 @@ static int show_partition(struct seq_file *seqf, void *v)while ((part =disk_part_iter_next (&piter)))seq_printf (seqf,"%4d %7d %10llu %s\n" ,MAJOR (part_devt (part)),MINOR (part_devt (part)), - (unsigned long long )part->nr_sects >>1 , + (unsigned long long )part_nr_sects_read (part) >>1 ,disk_name (sgp, part->partno, buf));disk_part_iter_exit (&piter);@@ -1263,6 +1263,16 @@ struct gendisk *alloc_disk_node(int minors, int node_id) } disk->part_tbl->part[0 ] = &disk->part0; +/* +* set_capacity() and get_capacity() currently don't use +* seqcounter to read/update the part0->nr_sects. Still init +* the counter as we can read the sectors in IO submission +* patch using seqence counters. +* +* TODO: Ideally set_capacity() and get_capacity() should be +* converted to make use of bd_mutex and sequence counters. +*/ +seqcount_init (&disk->part0.nr_sects_seq);hd_ref_init (&disk->part0); disk->minors = minors;block/ioctl.c +54
-3@@ -13,7 +13,7 @@ static int blkpg_ioctl(struct block_device *bdev, struct blkpg_ioctl_arg __user {struct block_device *bdevp;struct gendisk *disk; -struct hd_struct *part; +struct hd_struct *part, *lpart;struct blkpg_ioctl_arg a;struct blkpg_partition p;struct disk_part_iter piter;@@ -36,8 +36,8 @@ static int blkpg_ioctl(struct block_device *bdev, struct blkpg_ioctl_arg __usercase BLKPG_ADD_PARTITION : start = p.start >>9 ; length = p.length >>9 ; -/* check for fit in a hd_struct */ -if (sizeof (sector_t) ==sizeof (long ) && +/* check for fit in a hd_struct */ +if (sizeof (sector_t) ==sizeof (long ) &&sizeof (long long ) >sizeof (long )) {long pstart = start, plength = length; if (pstart != start || plength != length@@ -92,6 +92,57 @@ static int blkpg_ioctl(struct block_device *bdev, struct blkpg_ioctl_arg __userbdput (bdevp);return 0 ; +case BLKPG_RESIZE_PARTITION : + start = p.start >>9 ; +/* new length of partition in bytes */ + length = p.length >>9 ; +/* check for fit in a hd_struct */ +if (sizeof (sector_t) ==sizeof (long ) && +sizeof (long long ) >sizeof (long )) { +long pstart = start, plength = length; +if (pstart != start || plength != length + || pstart <0 || plength <0 ) +return -EINVAL ; + } + part =disk_get_part (disk, partno); +if (!part) +return -ENXIO ; + bdevp =bdget (part_devt (part)); +if (!bdevp) { +disk_put_part (part); +return -ENOMEM ; + } +mutex_lock (&bdevp->bd_mutex); +mutex_lock_nested (&bdev->bd_mutex,1 ); +if (start != part->start_sect) { +mutex_unlock (&bdevp->bd_mutex); +mutex_unlock (&bdev->bd_mutex); +disk_put_part (part); +return -EINVAL ; + } +/* overlap? */ +disk_part_iter_init (&piter, disk, +DISK_PITER_INCL_EMPTY ); +while ((lpart =disk_part_iter_next (&piter))) { +if (lpart->partno != partno && + !(start + length <= lpart->start_sect || + start >= lpart->start_sect + lpart->nr_sects) + ) { +disk_part_iter_exit (&piter); +mutex_unlock (&bdevp->bd_mutex); +mutex_unlock (&bdev->bd_mutex); +disk_put_part (part); +return -EBUSY ; + } + } +disk_part_iter_exit (&piter); +part_nr_sects_write (part, (sector_t )length); +i_size_write (bdevp->bd_inode, p.length); +mutex_unlock (&bdevp->bd_mutex); +mutex_unlock (&bdev->bd_mutex); +bdput (bdevp); +disk_put_part (part); +return 0 ;default :return -EINVAL ; }block/partition-generic.c +3
-1@@ -84,7 +84,7 @@ ssize_t part_size_show(struct device *dev, struct device_attribute *attr, char *buf) { struct hd_struct *p = dev_to_part(dev); -return sprintf (buf,"%llu\n" ,(unsigned long long )p->nr_sects); +return sprintf (buf,"%llu\n" ,(unsigned long long )part_nr_sects_read (p)); } static ssize_t part_ro_show(struct device *dev,@@ -294,6 +294,8 @@ struct hd_struct *add_partition(struct gendisk *disk, int partno, err = -ENOMEM ; goto out_free; } + +seqcount_init (&p->nr_sects_seq); pdev =part_to_dev (p); p->start_sect = start;include/linux/blkpg.h +1
-0@@ -40,6 +40,7 @@ struct blkpg_ioctl_arg {/* The subfunctions (for the op field) */ #define BLKPG_ADD_PARTITION 1#define BLKPG_DEL_PARTITION 2 +#define BLKPG_RESIZE_PARTITION 3/* Sizes of name fields. Unused at present. */ #define BLKPG_DEVNAMELTH 64include/linux/genhd.h +57
-0@@ -98,7 +98,13 @@ struct partition_meta_info {struct hd_struct {sector_t start_sect; +/* +* nr_sects is protected by sequence counter. One might extend a +* partition while IO is happening to it and update of nr_sects +* can be non-atomic on 32bit machines with 64bit sector_t. +*/ sector_t nr_sects; +seqcount_t nr_sects_seq;sector_t alignment_offset;unsigned int discard_alignment;struct device __dev;@@ -653,6 +659,57 @@ static inline void hd_struct_put(struct hd_struct *part) __delete_partition(part); } +/* +* Any access of part->nr_sects which is not protected by partition +* bd_mutex or gendisk bdev bd_mutex, should be done using this +* accessor function. +* +* Code written along the lines of i_size_read() and i_size_write(). +* CONFIG_PREEMPT case optimizes the case of UP kernel with preemption +* on. +*/ +static inline sector_t part_nr_sects_read (struct hd_struct *part) +{ +#if BITS_PER_LONG ==32 && defined(CONFIG_LBDAF ) && defined(CONFIG_SMP ) +sector_t nr_sects; +unsigned seq; +do { + seq =read_seqcount_begin (&part->nr_sects_seq); + nr_sects = part->nr_sects; + }while (read_seqcount_retry (&part->nr_sects_seq, seq)); +return nr_sects; +#elif BITS_PER_LONG ==32 && defined(CONFIG_PREEMPT ) +sector_t nr_sects; + +preempt_disable (); + nr_sects = part->nr_sects; +preempt_enable (); +return nr_sects; +#else +return part->nr_sects; +#endif +} + +/* +* Should be called with mutex lock held (typically bd_mutex) of partition +* to provide mutual exlusion among writers otherwise seqcount might be +* left in wrong state leaving the readers spinning infinitely. +*/ +static inline void part_nr_sects_write (struct hd_struct *part,sector_t size) +{ +#if BITS_PER_LONG ==32 && defined(CONFIG_LBDAF ) && defined(CONFIG_SMP ) +write_seqcount_begin (&part->nr_sects_seq); + part->nr_sects = size; +write_seqcount_end (&part->nr_sects_seq); +#elif BITS_PER_LONG ==32 && defined(CONFIG_LBDAF ) && defined(CONFIG_PREEMPT ) +preempt_disable (); + part->nr_sects = size; +preempt_enable (); +#else + part->nr_sects = size; +#endif +} +#else /* CONFIG_BLOCK */ static inline void printk_all_partitions (void ) { }Signature · 1 line
1.7.6.4
Re: [PATCH 1/2] block: add partition resize function to blkpg ioctl
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
What's the status of this patch? Forgotten, or are there still any outstanding concerns?
Quoted 7 lines · Vivek Goyal
Hi Jens,
Do you have concerns about this patch? If no, can you please consider merging it.
Thanks
Vivek
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
iQEcBAEBAgAGBQJP95YUAAoJEJrBOlT6nu75A/kIAIEWs+MlA8Me05jjBGpSFQsn VigiYTF4UdWjA3bG0CNB41eqpzOKVl/B4vTBAy1YezuUXMamBRp1OD6hatEL/blO ps/M2S2NNPgFOzDmZBgfWIib6tnbCJvTowLdt4n4NnP0DoQRn+5bXopL/jcm4lwU XWheiqFFX1xSB5YgP+GMl4zVWZhyrHYcynqK/25EimbEXtjgTyR3Cy4wMfGgMdnI HkY7D0Kn420n+X6uRLXZW8hV3apATZCz3PGsxg7FI83gFi7Tc9rneOhwgRkAXHxq FcJ2NABK83dACAYOU0fhVTmxoumxuHNCmp7iRGiavnbNCBJWxLV2x1WhceX23lc= =1FUQ
-----END PGP SIGNATURE-----
Re: [PATCH 1/2] block: add partition resize function to blkpg ioctl
Quoted 4 lines · Phillip Susi
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1What's the status of this patch? Forgotten, or are there still any outstanding concerns?
There was one outstanding concern from maxim about missing "bdput(bdevp)". Will see if I can find some time to brush it up and test patches again. If somebody can beat me to it, that would be great.
Thanks
Vivek
Quoted 21 lines · Vivek Goyal
Quoted 7 lines
Hi Jens,
Do you have concerns about this patch? If no, can you please consider merging it.
Thanks
Vivek-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/iQEcBAEBAgAGBQJP95YUAAoJEJrBOlT6nu75A/kIAIEWs+MlA8Me05jjBGpSFQsn VigiYTF4UdWjA3bG0CNB41eqpzOKVl/B4vTBAy1YezuUXMamBRp1OD6hatEL/blO ps/M2S2NNPgFOzDmZBgfWIib6tnbCJvTowLdt4n4NnP0DoQRn+5bXopL/jcm4lwU XWheiqFFX1xSB5YgP+GMl4zVWZhyrHYcynqK/25EimbEXtjgTyR3Cy4wMfGgMdnI HkY7D0Kn420n+X6uRLXZW8hV3apATZCz3PGsxg7FI83gFi7Tc9rneOhwgRkAXHxq FcJ2NABK83dACAYOU0fhVTmxoumxuHNCmp7iRGiavnbNCBJWxLV2x1WhceX23lc= =1FUQ
-----END PGP SIGNATURE-----
Re: [PATCH 1/2] block: add partition resize function to blkpg ioctl
In reply to Vivek GoyalHi Vivek,
See please inline comments below...
block/genhd.c void __init printk_all_partitions(void) · line 769
Quoted 9 lines · Vivek Goyal
...
block/genhd.c +2
-2@@ -765,8 +765,8 @@ void __init printk_all_partitions(void)printk ("%s%s %10llu %s %s" , is_part0 ?"" :" " ,bdevt_str (part_devt (part), devt_buf), - (unsigned long long )part->nr_sects>>1 , -disk_name (disk, part->partno, name_buf), uuid); + (unsigned long long )part_nr_sects_read (part)>>1 + ,disk_name (disk, part->partno, name_buf), uuid);
A line starting from comma looks unusual. Is it what you intended?
Quoted 26 lines
block/ioctl.c +17
-0@@ -92,6 +92,57 @@ static int blkpg_ioctl(struct block_device *bdev, struct blkpg_ioctl_arg __userbdput (bdevp);return 0 ; +case BLKPG_RESIZE_PARTITION : + start = p.start>>9 ; +/* new length of partition in bytes */ + length = p.length>>9 ; +/* check for fit in a hd_struct */ +if (sizeof (sector_t) ==sizeof (long )&& +sizeof (long long )>sizeof (long )) { +long pstart = start, plength = length; +if (pstart != start || plength != length + || pstart<0 || plength<0 ) +return -EINVAL ; + } + part =disk_get_part (disk, partno); +if (!part) +return -ENXIO ; + bdevp =bdget (part_devt (part)); +if (!bdevp) {
block/ioctl.c static int blkpg_ioctl(struct block_device *bdev, struct blkpg_ioctl_arg __user · line 121
Quoted 10 lines
block/ioctl.c +10
-0+disk_put_part (part); +return -ENOMEM ; + } +mutex_lock (&bdevp->bd_mutex); +mutex_lock_nested (&bdev->bd_mutex,1 ); +if (start != part->start_sect) { +mutex_unlock (&bdevp->bd_mutex); +mutex_unlock (&bdev->bd_mutex); +disk_put_part (part); +return -EINVAL ;
bdput(bdevp) missed?
Quoted 4 lines
block/ioctl.c +4
-0+ } +/* overlap? */ +disk_part_iter_init (&piter, disk, +DISK_PITER_INCL_EMPTY );
block/ioctl.c static int blkpg_ioctl(struct block_device *bdev, struct blkpg_ioctl_arg __user · line 135
Quoted 10 lines
block/ioctl.c +10
-0+while ((lpart =disk_part_iter_next (&piter))) { +if (lpart->partno != partno&& + !(start + length<= lpart->start_sect || + start>= lpart->start_sect + lpart->nr_sects) + ) { +disk_part_iter_exit (&piter); +mutex_unlock (&bdevp->bd_mutex); +mutex_unlock (&bdev->bd_mutex); +disk_put_part (part); +return -EBUSY ;
bdput(bdevp) missed?
block/ioctl.c static int blkpg_ioctl(struct block_device *bdev, struct blkpg_ioctl_arg __user · line 148
Quoted 13 lines
block/ioctl.c +10
-0+ } + } +disk_part_iter_exit (&piter); +part_nr_sects_write (part, (sector_t )length); +i_size_write (bdevp->bd_inode, p.length); +mutex_unlock (&bdevp->bd_mutex); +mutex_unlock (&bdev->bd_mutex); +bdput (bdevp); +disk_put_part (part); +return 0 ;default :return -EINVAL ; }
Thanks,
Maxim
PATCH v3 2/2 util-linux: resizepart: Utility to resize a partition
In reply to Vivek GoyalA simple user space utility to resize an existing partition. It tries to read the start of partiton from sysfs.
This is a real quick dirty patch I used for my testing. I am sure there are better and faster ways of getting to partition "start" from device and partition number.
--- partx/Makefile.am | 9 ++++- partx/partx.h | 19 ++++++++++ partx/resizepart.8 | 38 +++++++++++++++++++++ partx/resizepart.c | 95 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 159 insertions(+), 2 deletions(-) create mode 100644 partx/resizepart.8 create mode 100644 partx/resizepart.c
partx/Makefile.am +7 -2
@@ -1,7 +1,12 @@ include $(top_srcdir)/config/include-Makefile.am -usrsbin_exec_PROGRAMS = addpart delpart -dist_man_MANS = addpart.8 delpart.8 +usrsbin_exec_PROGRAMS = addpart delpart resizepart +dist_man_MANS = addpart.8 delpart.8 resizepart.8 + +resizepart_SOURCES = resizepart.c \ + $(top_srcdir)/lib/sysfs.c \ + $(top_srcdir)/lib/canonicalize.c \ + $(top_srcdir)/lib/at.c usrsbin_exec_PROGRAMS += partx partx_SOURCES = partx.c partx.h \
partx/partx.h +19 -0
@@ -41,4 +41,23 @@ static inline int partx_add_partition(int fd, int partno, return ioctl(fd, BLKPG, &a); } +static inline int partx_resize_partition (int fd,int partno, +long long start,long long size) +{ +struct blkpg_ioctl_arg a; +struct blkpg_partition p; + + p.pno = partno; + p.start = start <<9 ; + p.length = size <<9 ; + p.devname[0 ] =0 ; + p.volname[0 ] =0 ; + a.op =BLKPG_RESIZE_PARTITION ; + a.flags =0 ; + a.datalen =sizeof (p); + a.data = &p; + +return ioctl (fd,BLKPG , &a); +} +#endif /* UTIL_LINUX_PARTX_H */
partx/resizepart.8 new file +38 -0
@@ -0,0 +1,38 @@ +.\" resizepart.8 -- +.\" Copyright 2012 Vivek Goyal <[email protected]> +.\" Copyright 2012 Red Hat, Inc. +.\" May be distributed under the GNU General Public License +.TH RESIZEPART 8 "February 2012" "util-linux" "System Administration" +.SH NAME +resizepart \- +simple wrapper around the "resize partition" ioctl +.SH SYNOPSIS +.B resizepart +.I device partition length +.SH DESCRIPTION +.B resizepart +is a program that informs the Linux kernel of new partition size. + +This command doesn't manipulate partitions on hard drive. + +.SH PARAMETERS +.TP +.I device +Specify the disk device. +.TP +.I partition +Specify the partition number. +.TP +.I length +Specify the length of the partition (in 512-byte sectors). + +.SH SEE ALSO +.BR addpart (8), +.BR delpart (8), +.BR fdisk (8), +.BR parted (8), +.BR partprobe (8), +.BR partx (8) +.SH AVAILABILITY +The addpart command is part of the util-linux package and is available from +ftp://ftp.kernel.org/pub/linux/utils/util-linux/.
partx/resizepart.c new file +95 -0
95 lines not on this page · raw message
Signature · 1 line
1.7.6.4