loop: enable different logical blocksizes
v4 cover loop: enable different logical blocksizes
Currently the loop driver just simulates 512-byte blocks. When creating bootable images for virtual machines it might be required to use a different physical blocksize (eg 4k for S/390 DASD), as the some bootloaders (like lilo or zipl for S/390) need to know the physical block addresses of the kernel and initrd.
With this patchset the loop driver will export the logical and physical blocksize and the current LOOP_SET_STATUS64 ioctl is extended to set the logical blocksize by re-using the existing 'init' fields, which are currently unused.
As usual, comments and reviews are welcome.
Changes to v1:
- Move LO_FLAGS_BLOCKSIZE definition
- Reshuffle patches
Changes to v2:
- Include reviews from Ming Lei
Changes to v3:
- Include reviews from Christoph
- Merge patches
Hannes Reinecke (2):
loop: Remove unused 'bdev' argument from loop_set_capacity
loop: support 4k physical blocksize
drivers/block/loop.c | 40 +++++++++++++++++++++++++++++++++------- drivers/block/loop.h | 1 + include/uapi/linux/loop.h | 1 + 3 files changed, 35 insertions(+), 7 deletions(-)
Signature · 1 line
2.6.6
PATCH v3 1/2 loop: Remove unused 'bdev' argument from loop_set_capacity
--- drivers/block/loop.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/block/loop.c +2 -2
@@ -1298,7 +1298,7 @@ loop_get_status64(struct loop_device *lo, struct loop_info64 __user *arg) {return err; } -static int loop_set_capacity (struct loop_device *lo,struct block_device *bdev) +static int loop_set_capacity (struct loop_device *lo) {if (unlikely (lo->lo_state != Lo_bound))return -ENXIO ;
@@ -1361,7 +1361,7 @@ static int lo_ioctl(struct block_device *bdev, fmode_t mode,case LOOP_SET_CAPACITY : err = -EPERM ;if ((mode &FMODE_WRITE ) ||capable (CAP_SYS_ADMIN )) - err =loop_set_capacity (lo, bdev); + err =loop_set_capacity (lo);break ;case LOOP_SET_DIRECT_IO : err = -EPERM ;
Signature · 1 line
2.6.6
PATCH v4 2/2 loop: support 4k physical blocksize
In reply to Hannes ReineckeWhen generating bootable VM images certain systems (most notably s390x) require devices with 4k blocksize. This patch implements a new flag 'LO_FLAGS_BLOCKSIZE' which will set the physical blocksize to that of the underlying device, and allow to change the logical blocksize for up to the physical blocksize.
--- drivers/block/loop.c | 36 +++++++++++++++++++++++++++++++----- drivers/block/loop.h | 1 + include/uapi/linux/loop.h | 1 + 3 files changed, 33 insertions(+), 5 deletions(-)
drivers/block/loop.c +31 -5
@@ -221,7 +221,8 @@ static void __loop_update_dio(struct loop_device *lo, bool dio) }static int -figure_loop_size (struct loop_device *lo,loff_t offset,loff_t sizelimit) +figure_loop_size (struct loop_device *lo,loff_t offset,loff_t sizelimit, +loff_t logical_blocksize) {loff_t size =get_size (offset, sizelimit, lo->lo_backing_file);sector_t x = (sector_t )size;
@@ -233,6 +234,12 @@ figure_loop_size(struct loop_device *lo, loff_t offset, loff_t sizelimit) lo->lo_offset = offset;if (lo->lo_sizelimit != sizelimit) lo->lo_sizelimit = sizelimit; +if (lo->lo_flags &LO_FLAGS_BLOCKSIZE ) { + lo->lo_logical_blocksize = logical_blocksize; +blk_queue_physical_block_size (lo->lo_queue, lo->lo_blocksize); +blk_queue_logical_block_size (lo->lo_queue, + lo->lo_logical_blocksize); + }set_capacity (lo->lo_disk, x);bd_set_size (bdev, (loff_t )get_capacity (bdev->bd_disk) <<9 );/* let user-space know about the new size */
@@ -814,6 +821,7 @@ static void loop_config_discard(struct loop_device *lo)struct file *file = lo->lo_backing_file;struct inode *inode = file->f_mapping->host;struct request_queue *q = lo->lo_queue; +int lo_bits =blksize_bits (lo->lo_logical_blocksize);/* * We use punch hole to reclaim the free space used by the
@@ -833,7 +841,7 @@ static void loop_config_discard(struct loop_device *lo) q->limits.discard_granularity = inode->i_sb->s_blocksize; q->limits.discard_alignment =0 ; -blk_queue_max_discard_sectors (q,UINT_MAX >>9 ); +blk_queue_max_discard_sectors (q,UINT_MAX >> lo_bits); q->limits.discard_zeroes_data =1 ;queue_flag_set_unlocked (QUEUE_FLAG_DISCARD , q); }
@@ -922,6 +930,7 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode, lo->use_dio = false; lo->lo_blocksize = lo_blocksize; + lo->lo_logical_blocksize =512 ; lo->lo_device = bdev; lo->lo_flags = lo_flags; lo->lo_backing_file = file;
@@ -1087,6 +1096,7 @@ loop_set_status(struct loop_device *lo, const struct loop_info64 *info)int err;struct loop_func_table *xfer;kuid_t uid =current_uid (); +int lo_flags = lo->lo_flags; if (lo->lo_encrypt_key_size && !uid_eq(lo->lo_key_owner, uid) &&
@@ -1116,9 +1126,24 @@ loop_set_status(struct loop_device *lo, const struct loop_info64 *info)if (err)return err; +if (info->lo_flags &LO_FLAGS_BLOCKSIZE ) { + lo->lo_flags |=LO_FLAGS_BLOCKSIZE ; +if ((info->lo_init[0 ] !=512 ) && + (info->lo_init[0 ] !=1024 ) && + (info->lo_init[0 ] !=2048 ) && + (info->lo_init[0 ] !=4096 )) +return -EINVAL ; +if (info->lo_init[0 ] > lo->lo_blocksize) +return -EINVAL ; + } +if (lo->lo_offset != info->lo_offset || - lo->lo_sizelimit != info->lo_sizelimit) -if (figure_loop_size (lo, info->lo_offset, info->lo_sizelimit)) + lo->lo_sizelimit != info->lo_sizelimit || + lo->lo_flags != lo_flags || + ((lo->lo_flags &LO_FLAGS_BLOCKSIZE ) && + (lo->lo_logical_blocksize != info->lo_init[0 ]))) +if (figure_loop_size (lo, info->lo_offset, info->lo_sizelimit, + info->lo_init[0 ]))return -EFBIG ;loop_config_discard (lo);
@@ -1303,7 +1328,8 @@ static int loop_set_capacity(struct loop_device *lo)if (unlikely (lo->lo_state != Lo_bound))return -ENXIO ; -return figure_loop_size (lo, lo->lo_offset, lo->lo_sizelimit); +return figure_loop_size (lo, lo->lo_offset, lo->lo_sizelimit, + lo->lo_logical_blocksize); }static int loop_set_dio (struct loop_device *lo,unsigned long arg)
drivers/block/loop.h +1 -0
@@ -49,6 +49,7 @@ struct loop_device {struct file * lo_backing_file;struct block_device *lo_device;unsigned lo_blocksize; +unsigned lo_logical_blocksize;void *key_data;gfp_t old_gfp_mask;
include/uapi/linux/loop.h +1 -0
@@ -22,6 +22,7 @@ enum {LO_FLAGS_AUTOCLEAR =4 ,LO_FLAGS_PARTSCAN =8 ,LO_FLAGS_DIRECT_IO =16 , + LO_FLAGS_BLOCKSIZE = 32, };#include <asm/posix_types.h> /* for __kernel_old_dev_t */
Signature · 1 line
2.6.6
Re: [PATCH 2/2] loop: support 4k physical blocksize
Quoted 7 lines
drivers/block/loop.c +2
-1-figure_loop_size(struct loop_device *lo, loff_t offset, loff_t sizelimit) +figure_loop_size(struct loop_device *lo, loff_t offset, loff_t sizelimit, + loff_t logical_blocksize) { loff_t size = get_size(offset, sizelimit, lo->lo_backing_file);sector_t x = (sector_t )size;
drivers/block/loop.c figure_loop_size(struct loop_device *lo, loff_t offset, loff_t sizelimit) · line 242
Quoted 9 lines
drivers/block/loop.c +6
-0@@ -233,6 +234,12 @@ figure_loop_size(struct loop_device *lo, loff_t offset, loff_t sizelimit) lo->lo_offset = offset;if (lo->lo_sizelimit != sizelimit) lo->lo_sizelimit = sizelimit; +if (lo->lo_flags &LO_FLAGS_BLOCKSIZE ) { + lo->lo_logical_blocksize = logical_blocksize; +blk_queue_physical_block_size (lo->lo_queue, lo->lo_blocksize); +blk_queue_logical_block_size (lo->lo_queue, + lo->lo_logical_blocksize); + }
I've looked how the existing code uses lo_blocksize and this whole thing confuses me to no end. Can we have all the blocksize assignments (i.e. including the existing lo_blocksize assignments) in one single place and documented? Especialy as it seems so far lo_blocksize seems to be the "fs" blocksize as set by set_blocksize, which seems totally wrong to be set by loop at all.
drivers/block/loop.c loop_set_status(struct loop_device *lo, const struct loop_info64 *info) · line 1135
Quoted 7 lines
drivers/block/loop.c +7
-0+if (info->lo_flags &LO_FLAGS_BLOCKSIZE ) { + lo->lo_flags |=LO_FLAGS_BLOCKSIZE ; +if ((info->lo_init[0 ] !=512 ) && + (info->lo_init[0 ] !=1024 ) && + (info->lo_init[0 ] !=2048 ) && + (info->lo_init[0 ] !=4096 )) +return -EINVAL ;
No need for the inner braces. Also please find a way to have a descriptive name for the field, be that an anonymous union, or a #define.
drivers/block/loop.c loop_set_status(struct loop_device *lo, const struct loop_info64 *info) · line 1144
Quoted 1 line
drivers/block/loop.c +1
-0+ (lo->lo_logical_blocksize != info->lo_init[0])))
Same comment about the inner braces here.
drivers/block/loop.c static int loop_set_capacity(struct loop_device *lo) · line 1332
Quoted 12 lines
drivers/block/loop.c +4
-1+if (figure_loop_size (lo, info->lo_offset, info->lo_sizelimit, + info->lo_init[0 ]))return -EFBIG ;loop_config_discard (lo);@@ -1303,7 +1328,8 @@ static int loop_set_capacity(struct loop_device *lo)if (unlikely (lo->lo_state != Lo_bound))return -ENXIO ; -return figure_loop_size (lo, lo->lo_offset, lo->lo_sizelimit); +return figure_loop_size (lo, lo->lo_offset, lo->lo_sizelimit, + lo->lo_logical_blocksize);
I'd say drop all the arguments but lo here (maybe in a prep patch) as passing them all seems pointless and confusing.
Re: [PATCH 2/2] loop: support 4k physical blocksize
Quoted 15 lines · Christoph Hellwig
Quoted 15 lines
drivers/block/loop.c +7
-1-figure_loop_size(struct loop_device *lo, loff_t offset, loff_t sizelimit) +figure_loop_size(struct loop_device *lo, loff_t offset, loff_t sizelimit, + loff_t logical_blocksize) { loff_t size = get_size(offset, sizelimit, lo->lo_backing_file);sector_t x = (sector_t )size;@@ -233,6 +234,12 @@ figure_loop_size(struct loop_device *lo, loff_t offset, loff_t sizelimit) lo->lo_offset = offset;if (lo->lo_sizelimit != sizelimit) lo->lo_sizelimit = sizelimit; +if (lo->lo_flags &LO_FLAGS_BLOCKSIZE ) { + lo->lo_logical_blocksize = logical_blocksize; +blk_queue_physical_block_size (lo->lo_queue, lo->lo_blocksize); +blk_queue_logical_block_size (lo->lo_queue, + lo->lo_logical_blocksize);
Quoted 8 lines
Review figure_loop_size(struct loop_device *lo, loff_t offset, loff_t sizelimit) · line 242
Quoted 1 line
(quoted diff) +1
-0+ }I've looked how the existing code uses
lo_blocksizeand this whole thing confuses me to no end. Can we have all the blocksize assignments (i.e. including the existinglo_blocksizeassignments) in one single place and documented? Especialy as it seems so farlo_blocksizeseems to be the "fs" blocksize as set byset_blocksize, which seems totally wrong to be set by loop at all.
This patch uses backing fs block size to emulate physical block size of loop block device, and the logical block size of loop is set from user space, seems the idea is correct.
Quoted 31 lines
drivers/block/loop.c loop_set_status(struct loop_device *lo, const struct loop_info64 *info) · line 1135
Quoted 8 lines
drivers/block/loop.c +7
-0+if (info->lo_flags &LO_FLAGS_BLOCKSIZE ) { + lo->lo_flags |=LO_FLAGS_BLOCKSIZE ; +if ((info->lo_init[0 ] !=512 ) && + (info->lo_init[0 ] !=1024 ) && + (info->lo_init[0 ] !=2048 ) && + (info->lo_init[0 ] !=4096 )) +return -EINVAL ;No need for the inner braces. Also please find a way to have a descriptive name for the field, be that an anonymous union, or a #define.
Quoted 1 line
+ (
lo->lo_logical_blocksize!= info->lo_init[0])))Same comment about the inner braces here.
drivers/block/loop.c static int loop_set_capacity(struct loop_device *lo) · line 1332
Quoted 12 lines
drivers/block/loop.c +4
-1+if (figure_loop_size (lo, info->lo_offset, info->lo_sizelimit, + info->lo_init[0 ]))return -EFBIG ;loop_config_discard (lo);@@ -1303,7 +1328,8 @@ static int loop_set_capacity(struct loop_device *lo)if (unlikely (lo->lo_state != Lo_bound))return -ENXIO ; -return figure_loop_size (lo, lo->lo_offset, lo->lo_sizelimit); +return figure_loop_size (lo, lo->lo_offset, lo->lo_sizelimit, + lo->lo_logical_blocksize);I'd say drop all the arguments but lo here (maybe in a prep patch) as passing them all seems pointless and confusing.
Signature · 1 line
Ming Lei