[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v2 2/6] geometry: Detect blocksize via ioctls in
From: |
Christian Borntraeger |
Subject: |
Re: [Qemu-devel] [PATCH v2 2/6] geometry: Detect blocksize via ioctls in separate static functions |
Date: |
Fri, 21 Nov 2014 11:17:02 +0100 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.2.0 |
Am 19.11.2014 um 11:17 schrieb Ekaterina Tumanova:
> Move the IOCTL calls that detect logical blocksize from raw_probe_alignment
> into separate function (probe_logical_blocksize).
> Introduce function which detect physical blocksize via IOCTL
> (probe_physical_blocksize).
> Both functions will be used in the next patch.
>
> Signed-off-by: Ekaterina Tumanova <address@hidden>
>From what I can tell this should be a no-op for raw_probe_alignment.
probe_physical_blocksize looks also good. When this patch is applied
stand-alone,
gcc will complain about a defined but unused function, though.
So we might want to move this function into patch 3 or just add an
__attribute__((unused))
here (and remove that in patch 3). Or just leave it as is.
Otherwise
Reviewed-by: Christian Borntraeger <address@hidden>
> ---
> block/raw-posix.c | 58
> +++++++++++++++++++++++++++++++++++++------------------
> 1 file changed, 39 insertions(+), 19 deletions(-)
>
> diff --git a/block/raw-posix.c b/block/raw-posix.c
> index e100ae2..45f1d79 100644
> --- a/block/raw-posix.c
> +++ b/block/raw-posix.c
> @@ -223,50 +223,70 @@ static int raw_normalize_devicepath(const char
> **filename)
> }
> #endif
>
> -static void raw_probe_alignment(BlockDriverState *bs, int fd, Error **errp)
> +static unsigned int probe_logical_blocksize(BlockDriverState *bs, int fd)
> {
> - BDRVRawState *s = bs->opaque;
> - char *buf;
> - unsigned int sector_size;
> -
> - /* For /dev/sg devices the alignment is not really used.
> - With buffered I/O, we don't have any restrictions. */
> - if (bs->sg || !s->needs_alignment) {
> - bs->request_alignment = 1;
> - s->buf_align = 1;
> - return;
> - }
> + unsigned int sector_size = 0;
>
> /* Try a few ioctls to get the right size */
> - bs->request_alignment = 0;
> - s->buf_align = 0;
> -
> #ifdef BLKSSZGET
> if (ioctl(fd, BLKSSZGET, §or_size) >= 0) {
> - bs->request_alignment = sector_size;
> + return sector_size;
> }
> #endif
> #ifdef DKIOCGETBLOCKSIZE
> if (ioctl(fd, DKIOCGETBLOCKSIZE, §or_size) >= 0) {
> - bs->request_alignment = sector_size;
> + return sector_size;
> }
> #endif
> #ifdef DIOCGSECTORSIZE
> if (ioctl(fd, DIOCGSECTORSIZE, §or_size) >= 0) {
> - bs->request_alignment = sector_size;
> + return sector_size;
> }
> #endif
> #ifdef CONFIG_XFS
> if (s->is_xfs) {
> struct dioattr da;
> if (xfsctl(NULL, fd, XFS_IOC_DIOINFO, &da) >= 0) {
> - bs->request_alignment = da.d_miniosz;
> + sector_size = da.d_miniosz;
> /* The kernel returns wrong information for d_mem */
> /* s->buf_align = da.d_mem; */
> + return sector_size;
> }
> }
> #endif
>
> + return 0;
> +}
> +
> +static unsigned int probe_physical_blocksize(BlockDriverState *bs, int fd)
> +{
> + unsigned int blk_size = 0;
> +#ifdef BLKPBSZGET
> + if (ioctl(fd, BLKPBSZGET, &blk_size) >= 0) {
> + return blk_size;
> + }
> +#endif
> +
> + return 0;
> +}
> +
> +static void raw_probe_alignment(BlockDriverState *bs, int fd, Error **errp)
> +{
> + BDRVRawState *s = bs->opaque;
> + char *buf;
> +
> + /* For /dev/sg devices the alignment is not really used.
> + With buffered I/O, we don't have any restrictions. */
> + if (bs->sg || !s->needs_alignment) {
> + bs->request_alignment = 1;
> + s->buf_align = 1;
> + return;
> + }
> +
> + s->buf_align = 0;
> + /* Let's try to use the logical blocksize for the alignment. */
> + bs->request_alignment = probe_logical_blocksize(bs, fd);
> +
> /* If we could not get the sizes so far, we can only guess them */
> if (!s->buf_align) {
> size_t align;
>
[Qemu-devel] [PATCH v2 3/6] geometry: Add driver methods to probe blocksizes and geometry, Ekaterina Tumanova, 2014/11/19
[Qemu-devel] [PATCH v2 4/6] geometry: Add block-backend wrappers for geometry probing, Ekaterina Tumanova, 2014/11/19
[Qemu-devel] [PATCH v2 5/6] geometry: Call backend function to detect geometry and blocksize, Ekaterina Tumanova, 2014/11/19