Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1202464 > unrolled thread

[PATCHv2 0/4] loop: enable different physical blocksizes

Started byHannes Reinecke <hare@suse.de>
First post2015-08-07 11:00 +0200
Last post2015-08-07 11:00 +0200
Articles 4 — 2 participants

Back to article view | Back to linux.kernel

Contents

  [PATCHv2 0/4] loop: enable different physical blocksizes Hannes Reinecke <hare@suse.de> - 2015-08-07 11:00 +0200
    [PATCH 2/4] loop: Enable correct physical blocksize Hannes Reinecke <hare@suse.de> - 2015-08-07 11:00 +0200
      Re: [PATCH 2/4] loop: Enable correct physical blocksize Ming Lei <tom.leiming@gmail.com> - 2015-08-10 10:00 +0200
    [PATCH 4/4] loop: Pass logical blocksize in 'lo_init[0]' ioctl field Hannes Reinecke <hare@suse.de> - 2015-08-07 11:00 +0200

#1202464 — [PATCHv2 0/4] loop: enable different physical blocksizes

FromHannes Reinecke <hare@suse.de>
Date2015-08-07 11:00 +0200
Subject[PATCHv2 0/4] loop: enable different physical blocksizes
Message-ID<pULFn-2Wd-7@gated-at.bofh.it>
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.

This patchset extends the current LOOP_SET_STATUS64 ioctl to
set the logical and physical 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

Hannes Reinecke (4):
  loop: Remove unused 'bdev' argument from loop_set_capacity
  loop: Enable correct physical blocksize
  loop: Add 'lo_logical_blocksize'
  loop: Pass logical blocksize in 'lo_init[0]' ioctl field

 drivers/block/loop.c      | 35 ++++++++++++++++++++++++++++++-----
 drivers/block/loop.h      |  1 +
 include/uapi/linux/loop.h |  1 +
 3 files changed, 32 insertions(+), 5 deletions(-)

-- 
1.8.4.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [next] | [standalone]

#1202465 — [PATCH 2/4] loop: Enable correct physical blocksize

FromHannes Reinecke <hare@suse.de>
Date2015-08-07 11:00 +0200
Subject[PATCH 2/4] loop: Enable correct physical blocksize
Message-ID<pULFo-2Wd-25@gated-at.bofh.it>
In reply to#1202464
When running on files the physical blocksize is actually 4k,
so we should be announcing it as such. This is enabled with
a new LO_FLAGS_BLOCKSIZE flag value to the existing ioctl.

Signed-off-by: Hannes Reinecke <hare@suse.de>
---
 drivers/block/loop.c      | 9 ++++++++-
 include/uapi/linux/loop.h | 1 +
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index b9e12a0..fce13bd 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -177,6 +177,8 @@ 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)
+		blk_queue_physical_block_size(lo->lo_queue, lo->lo_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 */
@@ -758,7 +760,7 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
 
 	lo->lo_blocksize = lo_blocksize;
 	lo->lo_device = bdev;
-	lo->lo_flags = lo_flags;
+	lo->lo_flags |= lo_flags;
 	lo->lo_backing_file = file;
 	lo->transfer = NULL;
 	lo->ioctl = NULL;
@@ -769,6 +771,8 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
 	if (!(lo_flags & LO_FLAGS_READ_ONLY) && file->f_op->fsync)
 		blk_queue_flush(lo->lo_queue, REQ_FLUSH);
 
+	if (lo->lo_flags & LO_FLAGS_BLOCKSIZE)
+		blk_queue_physical_block_size(lo->lo_queue, lo->lo_blocksize);
 	set_capacity(lo->lo_disk, size);
 	bd_set_size(bdev, size << 9);
 	loop_sysfs_init(lo);
@@ -951,6 +955,9 @@ 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 (lo->lo_offset != info->lo_offset ||
 	    lo->lo_sizelimit != info->lo_sizelimit)
 		if (figure_loop_size(lo, info->lo_offset, info->lo_sizelimit))
diff --git a/include/uapi/linux/loop.h b/include/uapi/linux/loop.h
index e0cecd2..caec9d3 100644
--- a/include/uapi/linux/loop.h
+++ b/include/uapi/linux/loop.h
@@ -21,6 +21,7 @@ enum {
 	LO_FLAGS_READ_ONLY	= 1,
 	LO_FLAGS_AUTOCLEAR	= 4,
 	LO_FLAGS_PARTSCAN	= 8,
+	LO_FLAGS_BLOCKSIZE	= 16,
 };
 
 #include <asm/posix_types.h>	/* for __kernel_old_dev_t */
-- 
1.8.4.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]

#1203870 — Re: [PATCH 2/4] loop: Enable correct physical blocksize

FromMing Lei <tom.leiming@gmail.com>
Date2015-08-10 10:00 +0200
SubjectRe: [PATCH 2/4] loop: Enable correct physical blocksize
Message-ID<pVQ9Z-88c-15@gated-at.bofh.it>
In reply to#1202465
On Fri, Aug 7, 2015 at 4:54 AM, Hannes Reinecke <hare@suse.de> wrote:
> When running on files the physical blocksize is actually 4k,
> so we should be announcing it as such. This is enabled with
> a new LO_FLAGS_BLOCKSIZE flag value to the existing ioctl.
>
> Signed-off-by: Hannes Reinecke <hare@suse.de>
> ---
>  drivers/block/loop.c      | 9 ++++++++-
>  include/uapi/linux/loop.h | 1 +
>  2 files changed, 9 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/block/loop.c b/drivers/block/loop.c
> index b9e12a0..fce13bd 100644
> --- a/drivers/block/loop.c
> +++ b/drivers/block/loop.c
> @@ -177,6 +177,8 @@ 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)
> +               blk_queue_physical_block_size(lo->lo_queue, lo->lo_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 */
> @@ -758,7 +760,7 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
>
>         lo->lo_blocksize = lo_blocksize;
>         lo->lo_device = bdev;
> -       lo->lo_flags = lo_flags;
> +       lo->lo_flags |= lo_flags;

lo->lo_flags is cleared in loop_clr_fd(), and set_status() can only
be done when loop's state is bound, so why do you want to
keep previous zero flag?

>         lo->lo_backing_file = file;
>         lo->transfer = NULL;
>         lo->ioctl = NULL;
> @@ -769,6 +771,8 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
>         if (!(lo_flags & LO_FLAGS_READ_ONLY) && file->f_op->fsync)
>                 blk_queue_flush(lo->lo_queue, REQ_FLUSH);
>
> +       if (lo->lo_flags & LO_FLAGS_BLOCKSIZE)
> +               blk_queue_physical_block_size(lo->lo_queue, lo->lo_blocksize);
>         set_capacity(lo->lo_disk, size);
>         bd_set_size(bdev, size << 9);
>         loop_sysfs_init(lo);
> @@ -951,6 +955,9 @@ 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 (lo->lo_offset != info->lo_offset ||
>             lo->lo_sizelimit != info->lo_sizelimit)
>                 if (figure_loop_size(lo, info->lo_offset, info->lo_sizelimit))
> diff --git a/include/uapi/linux/loop.h b/include/uapi/linux/loop.h
> index e0cecd2..caec9d3 100644
> --- a/include/uapi/linux/loop.h
> +++ b/include/uapi/linux/loop.h
> @@ -21,6 +21,7 @@ enum {
>         LO_FLAGS_READ_ONLY      = 1,
>         LO_FLAGS_AUTOCLEAR      = 4,
>         LO_FLAGS_PARTSCAN       = 8,
> +       LO_FLAGS_BLOCKSIZE      = 16,
>  };
>
>  #include <asm/posix_types.h>   /* for __kernel_old_dev_t */
> --
> 1.8.4.5
>



-- 
Ming Lei
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]

#1202468 — [PATCH 4/4] loop: Pass logical blocksize in 'lo_init[0]' ioctl field

FromHannes Reinecke <hare@suse.de>
Date2015-08-07 11:00 +0200
Subject[PATCH 4/4] loop: Pass logical blocksize in 'lo_init[0]' ioctl field
Message-ID<pULFn-2Wd-15@gated-at.bofh.it>
In reply to#1202464
The current LOOP_SET_STATUS64 ioctl has two unused fields
'init[2]', which can be used in conjunction with the
LO_FLAGS_BLOCKSIZE flag to pass in the new logical blocksize.

Signed-off-by: Hannes Reinecke <hare@suse.de>
---
 drivers/block/loop.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index 321f296..3d2ee0f 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -963,11 +963,21 @@ loop_set_status(struct loop_device *lo, const struct loop_info64 *info)
 	if (err)
 		return err;
 
-	if (info->lo_flags & LO_FLAGS_BLOCKSIZE)
+	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;
+		lo->lo_logical_blocksize = info->lo_init[0];
+	}
 
 	if (lo->lo_offset != info->lo_offset ||
-	    lo->lo_sizelimit != info->lo_sizelimit)
+	    lo->lo_sizelimit != info->lo_sizelimit ||
+	    lo->lo_flags & LO_FLAGS_BLOCKSIZE)
 		if (figure_loop_size(lo, info->lo_offset, info->lo_sizelimit))
 			return -EFBIG;
 
-- 
1.8.4.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web