qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Denis V. Lunev" <den@openvz.org>
Cc: Kevin Wolf <kwolf@redhat.com>,
	qemu-devel@nongnu.org, Stefan Hajnoczi <stefanha@redhat.com>
Subject: Re: [Qemu-devel] [PATCH 08/27] block/parallels: _co_writev callback for Parallels format
Date: Wed, 22 Apr 2015 15:44:39 +0300	[thread overview]
Message-ID: <553797B7.20406@openvz.org> (raw)
In-Reply-To: <1426069701-1405-9-git-send-email-den@openvz.org>

On 11/03/15 13:28, Denis V. Lunev wrote:
> Support write on Parallels images. The code is almost the same as one
> in the previous patch implemented scatter-gather IO for read.
>
> Signed-off-by: Denis V. Lunev <den@openvz.org>
> Reviewed-by: Roman Kagan <rkagan@parallels.com>
> CC: Kevin Wolf <kwolf@redhat.com>
> CC: Stefan Hajnoczi <stefanha@redhat.com>
> ---
>   block/parallels.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
>   1 file changed, 75 insertions(+), 2 deletions(-)
>
> diff --git a/block/parallels.c b/block/parallels.c
> index 306f2e3..61d7da7 100644
> --- a/block/parallels.c
> +++ b/block/parallels.c
> @@ -81,8 +81,6 @@ static int parallels_open(BlockDriverState *bs, QDict *options, int flags,
>       ParallelsHeader ph;
>       int ret;
>   
> -    bs->read_only = 1; // no write support yet
> -
>       ret = bdrv_pread(bs->file, 0, &ph, sizeof(ph));
>       if (ret < 0) {
>           goto fail;
> @@ -166,6 +164,37 @@ static int cluster_remainder(BDRVParallelsState *s, int64_t sector_num,
>       return MIN(nb_sectors, ret);
>   }
>   
> +static int64_t allocate_cluster(BlockDriverState *bs, int64_t sector_num)
> +{
> +    BDRVParallelsState *s = bs->opaque;
> +    uint32_t idx, offset, tmp;
> +    int64_t pos;
> +    int ret;
> +
> +    idx = sector_num / s->tracks;
> +    offset = sector_num % s->tracks;
> +
> +    if (idx >= s->catalog_size) {
> +        return -EINVAL;
> +    }
> +    if (s->catalog_bitmap[idx] != 0) {
> +        return (uint64_t)s->catalog_bitmap[idx] * s->off_multiplier + offset;
> +    }
> +
> +    pos = bdrv_getlength(bs->file) >> BDRV_SECTOR_BITS;
> +    bdrv_truncate(bs->file, (pos + s->tracks) << BDRV_SECTOR_BITS);
> +    s->catalog_bitmap[idx] = pos / s->off_multiplier;
> +
> +    tmp = cpu_to_le32(s->catalog_bitmap[idx]);
> +
> +    ret = bdrv_pwrite_sync(bs->file,
> +            sizeof(ParallelsHeader) + idx * sizeof(tmp), &tmp, sizeof(tmp));
> +    if (ret < 0) {
> +        return ret;
> +    }
> +    return (uint64_t)s->catalog_bitmap[idx] * s->off_multiplier + offset;
> +}
> +
>   static int64_t coroutine_fn parallels_co_get_block_status(BlockDriverState *bs,
>           int64_t sector_num, int nb_sectors, int *pnum)
>   {
> @@ -186,6 +215,49 @@ static int64_t coroutine_fn parallels_co_get_block_status(BlockDriverState *bs,
>           BDRV_BLOCK_DATA | BDRV_BLOCK_OFFSET_VALID;
>   }
>   
> +static coroutine_fn int parallels_co_writev(BlockDriverState *bs,
> +        int64_t sector_num, int nb_sectors, QEMUIOVector *qiov)
> +{
> +    BDRVParallelsState *s = bs->opaque;
> +    uint64_t bytes_done = 0;
> +    QEMUIOVector hd_qiov;
> +    int ret = 0;
> +
> +    qemu_iovec_init(&hd_qiov, qiov->niov);
> +
> +    qemu_co_mutex_lock(&s->lock);
> +    while (nb_sectors > 0) {
> +        int64_t position = allocate_cluster(bs, sector_num);
> +        int n = cluster_remainder(s, sector_num, nb_sectors);
> +        int nbytes = n << BDRV_SECTOR_BITS;
> +
> +        if (position < 0) {
> +            ret = (int)position;
> +            break;
> +        }
> +
> +        qemu_iovec_reset(&hd_qiov);
> +        qemu_iovec_concat(&hd_qiov, qiov, bytes_done, nbytes);
> +
> +        qemu_co_mutex_unlock(&s->lock);
> +        ret = bdrv_co_writev(bs->file, position, n, &hd_qiov);
> +        qemu_co_mutex_lock(&s->lock);
> +
> +        if (ret < 0) {
> +            goto fail;
same problem with unlock as in patch 6


> +        }
> +
> +        nb_sectors -= n;
> +        sector_num += n;
> +        bytes_done += nbytes;
> +    }
> +    qemu_co_mutex_unlock(&s->lock);
> +
> +fail:
> +    qemu_iovec_destroy(&hd_qiov);
> +    return ret;
> +}
> +
>   static coroutine_fn int parallels_co_readv(BlockDriverState *bs,
>           int64_t sector_num, int nb_sectors, QEMUIOVector *qiov)
>   {
> @@ -242,6 +314,7 @@ static BlockDriver bdrv_parallels = {
>       .bdrv_close		= parallels_close,
>       .bdrv_co_get_block_status = parallels_co_get_block_status,
>       .bdrv_co_readv  = parallels_co_readv,
> +    .bdrv_co_writev = parallels_co_writev,
>   };
>   
>   static void bdrv_parallels_init(void)

  reply	other threads:[~2015-04-22 12:45 UTC|newest]

Thread overview: 77+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-03-11 10:27 [Qemu-devel] [PATCH v3 0/27] write/create for Parallels images with reasonable performance Denis V. Lunev
2015-03-11 10:27 ` [Qemu-devel] [PATCH 01/27] iotests, parallels: quote TEST_IMG in 076 test to be path-safe Denis V. Lunev
2015-04-22 12:19   ` Stefan Hajnoczi
2015-03-11 10:27 ` [Qemu-devel] [PATCH 02/27] block/parallels: rename parallels_header to ParallelsHeader Denis V. Lunev
2015-04-22 12:19   ` Stefan Hajnoczi
2015-03-11 10:27 ` [Qemu-devel] [PATCH 03/27] block/parallels: switch to bdrv_read Denis V. Lunev
2015-04-22 12:23   ` Stefan Hajnoczi
2015-04-22 12:30     ` Denis V. Lunev
2015-04-23  8:48       ` Stefan Hajnoczi
2015-03-11 10:27 ` [Qemu-devel] [PATCH 04/27] block/parallels: read up to cluster end in one go Denis V. Lunev
2015-04-22 12:28   ` Stefan Hajnoczi
2015-03-11 10:27 ` [Qemu-devel] [PATCH 05/27] block/parallels: add get_block_status Denis V. Lunev
2015-04-22 12:39   ` Stefan Hajnoczi
2015-04-22 12:42     ` Denis V. Lunev
2015-04-23  9:03       ` Stefan Hajnoczi
2015-04-23  9:23         ` Denis V. Lunev
2015-04-24  8:27           ` Stefan Hajnoczi
2015-03-11 10:28 ` [Qemu-devel] [PATCH 06/27] block/parallels: provide _co_readv routine for parallels format driver Denis V. Lunev
2015-04-22 12:41   ` Stefan Hajnoczi
2015-04-22 12:43     ` Denis V. Lunev
2015-03-11 10:28 ` [Qemu-devel] [PATCH 07/27] block/parallels: replace magic constants 4, 64 with proper sizeofs Denis V. Lunev
2015-04-22 12:42   ` Stefan Hajnoczi
2015-03-11 10:28 ` [Qemu-devel] [PATCH 08/27] block/parallels: _co_writev callback for Parallels format Denis V. Lunev
2015-04-22 12:44   ` Denis V. Lunev [this message]
2015-04-22 13:00   ` Stefan Hajnoczi
2015-04-22 13:08   ` Stefan Hajnoczi
2015-04-22 13:16     ` Denis V. Lunev
2015-04-23  9:20       ` Stefan Hajnoczi
2015-04-23  9:32         ` Kevin Wolf
2015-04-23  9:47           ` Denis V. Lunev
2015-04-23 10:09             ` Kevin Wolf
2015-04-23  9:36         ` Denis V. Lunev
2015-03-11 10:28 ` [Qemu-devel] [PATCH 09/27] iotests, parallels: test for write into Parallels image Denis V. Lunev
2015-04-22 13:09   ` Stefan Hajnoczi
2015-03-11 10:28 ` [Qemu-devel] [PATCH 10/27] block/parallels: support parallels image creation Denis V. Lunev
2015-04-22 13:15   ` Stefan Hajnoczi
2015-03-11 10:28 ` [Qemu-devel] [PATCH 11/27] iotests, parallels: test for newly created parallels image via qemu-img Denis V. Lunev
2015-04-22 13:17   ` Stefan Hajnoczi
2015-03-11 10:28 ` [Qemu-devel] [PATCH 12/27] parallels: change copyright information in the image header Denis V. Lunev
2015-04-22 13:26   ` Stefan Hajnoczi
2015-04-22 13:26   ` Stefan Hajnoczi
2015-03-11 10:28 ` [Qemu-devel] [PATCH 13/27] block/parallels: rename catalog_ names to bat_ Denis V. Lunev
2015-04-22 13:28   ` Stefan Hajnoczi
2015-03-11 10:28 ` [Qemu-devel] [PATCH 14/27] block/parallels: create bat2sect helper Denis V. Lunev
2015-04-22 13:29   ` Stefan Hajnoczi
2015-03-11 10:28 ` [Qemu-devel] [PATCH 15/27] block/parallels: keep BAT bitmap data in little endian in memory Denis V. Lunev
2015-04-22 13:31   ` Stefan Hajnoczi
2015-03-11 10:28 ` [Qemu-devel] [PATCH 16/27] block/parallels: read parallels image header and BAT into single buffer Denis V. Lunev
2015-04-22 13:39   ` Stefan Hajnoczi
2015-03-11 10:28 ` [Qemu-devel] [PATCH 17/27] block/parallels: move parallels_open/probe to the very end of the file Denis V. Lunev
2015-04-22 13:40   ` Stefan Hajnoczi
2015-03-11 10:28 ` [Qemu-devel] [PATCH 18/27] block/parallels: implement parallels_check method of block driver Denis V. Lunev
2015-03-11 10:44   ` Roman Kagan
2015-04-22 13:53   ` Stefan Hajnoczi
2015-03-11 10:28 ` [Qemu-devel] [PATCH 19/27] block/parallels: implement incorrect close detection Denis V. Lunev
2015-04-22 13:55   ` Stefan Hajnoczi
2015-03-11 10:28 ` [Qemu-devel] [PATCH 20/27] iotests, parallels: check for incorrectly closed image in tests Denis V. Lunev
2015-04-22 14:04   ` Stefan Hajnoczi
2015-03-11 10:28 ` [Qemu-devel] [PATCH 21/27] block/parallels: no need to flush on each block allocation table update Denis V. Lunev
2015-04-22 14:05   ` Stefan Hajnoczi
2015-04-22 14:08     ` Denis V. Lunev
2015-03-11 10:28 ` [Qemu-devel] [PATCH 22/27] block/parallels: improve image reading performance Denis V. Lunev
2015-04-22 14:11   ` Stefan Hajnoczi
2015-04-22 14:13     ` Denis V. Lunev
2015-03-11 10:28 ` [Qemu-devel] [PATCH 23/27] block/parallels: create bat_entry_off helper Denis V. Lunev
2015-04-22 14:13   ` Stefan Hajnoczi
2015-03-11 10:28 ` [Qemu-devel] [PATCH 24/27] block/parallels: delay writing to BAT till bdrv_co_flush_to_os Denis V. Lunev
2015-04-22 14:16   ` Stefan Hajnoczi
2015-03-11 10:28 ` [Qemu-devel] [PATCH 25/27] block/parallels: add prealloc-mode and prealloc-size open paramemets Denis V. Lunev
2015-03-11 10:28 ` [Qemu-devel] [PATCH 26/27] block/parallels: optimize linear image expansion Denis V. Lunev
2015-04-22 14:18   ` Stefan Hajnoczi
2015-04-22 14:25     ` Denis V. Lunev
2015-04-22 15:41       ` Denis V. Lunev
2015-04-23  9:26       ` Stefan Hajnoczi
2015-03-11 10:28 ` [Qemu-devel] [PATCH 27/27] block/parallels: improve image writing performance further Denis V. Lunev
2015-04-22 14:19 ` [Qemu-devel] [PATCH v3 0/27] write/create for Parallels images with reasonable performance Stefan Hajnoczi
  -- strict thread matches above, loose matches on Subject: below --
2015-03-10  8:50 Denis V. Lunev
2015-03-10  8:51 ` [Qemu-devel] [PATCH 08/27] block/parallels: _co_writev callback for Parallels format Denis V. Lunev

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=553797B7.20406@openvz.org \
    --to=den@openvz.org \
    --cc=kwolf@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).