From: "Denis V. Lunev" <den@openvz.org>
Cc: Kevin Wolf <kwolf@redhat.com>, "Denis V. Lunev" <den@openvz.org>,
qemu-devel@nongnu.org, Stefan Hajnoczi <stefanha@redhat.com>
Subject: [Qemu-devel] [PATCH 08/19] block/parallels: _co_writev callback for Parallels format
Date: Tue, 30 Dec 2014 12:28:20 +0300 [thread overview]
Message-ID: <1419931701-19362-9-git-send-email-den@openvz.org> (raw)
In-Reply-To: <1419931701-19362-1-git-send-email-den@openvz.org>
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>
Acked-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..dca3d0b 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;
@@ -159,6 +157,37 @@ static int64_t seek_to_sector(BDRVParallelsState *s, int64_t sector_num)
return (uint64_t)s->catalog_bitmap[index] * s->off_multiplier + offset;
}
+static int64_t allocate_sector(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 int cluster_remainder(BDRVParallelsState *s, int64_t sector_num,
int nb_sectors)
{
@@ -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_sector(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;
+ }
+
+ 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)
--
1.9.1
next prev parent reply other threads:[~2014-12-30 9:28 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-30 9:28 [Qemu-devel] [PATCH v2 0/19] write/create for Parallels images with reasonable performance Denis V. Lunev
2014-12-30 9:28 ` [Qemu-devel] [PATCH 01/19] iotests, parallels: quote TEST_IMG in 076 test to be path-safe Denis V. Lunev
2014-12-30 9:28 ` [Qemu-devel] [PATCH 02/19] block/parallels: rename parallels_header to ParallelsHeader Denis V. Lunev
2014-12-30 9:28 ` [Qemu-devel] [PATCH 03/19] block/parallels: switch to bdrv_read Denis V. Lunev
2014-12-30 9:28 ` [Qemu-devel] [PATCH 04/19] block/parallels: read up to cluster end in one go Denis V. Lunev
2014-12-30 9:28 ` [Qemu-devel] [PATCH 05/19] block/parallels: add get_block_status Denis V. Lunev
2014-12-30 9:28 ` [Qemu-devel] [PATCH 06/19] block/parallels: provide _co_readv routine for parallels format driver Denis V. Lunev
2014-12-30 9:28 ` [Qemu-devel] [PATCH 07/19] block/parallels: replace magic constants 4, 64 with proper sizeofs Denis V. Lunev
2014-12-30 9:28 ` Denis V. Lunev [this message]
2014-12-30 9:28 ` [Qemu-devel] [PATCH 09/19] iotests, parallels: test for write into Parallels image Denis V. Lunev
2014-12-30 10:07 ` [Qemu-devel] [PATCH 10/19] block/parallels: support parallels image creation Denis V. Lunev
2014-12-30 10:07 ` [Qemu-devel] [PATCH 11/19] iotests, parallels: test for newly created parallels image via qemu-img Denis V. Lunev
2014-12-30 10:07 ` [Qemu-devel] [PATCH 12/19] parallels: change copyright information in the image header Denis V. Lunev
2014-12-30 10:07 ` [Qemu-devel] [PATCH 13/19] block/parallels: store ParallelsHeader to the BDRVParallelsState Denis V. Lunev
2015-01-13 14:13 ` Roman Kagan
2014-12-30 10:07 ` [Qemu-devel] [PATCH 14/19] block/parallels: create catalog_offset helper Denis V. Lunev
2015-01-13 14:14 ` Roman Kagan
2014-12-30 10:07 ` [Qemu-devel] [PATCH 15/19] block/parallels: rename catalog_ names to bat_ Denis V. Lunev
2015-01-13 14:15 ` Roman Kagan
2014-12-30 10:07 ` [Qemu-devel] [PATCH 16/19] block/parallels: no need to flush on each block allocation table update Denis V. Lunev
2015-01-13 14:50 ` Roman Kagan
2015-01-13 15:17 ` Denis V. Lunev
2015-01-13 20:16 ` Denis V. Lunev
2015-01-14 12:01 ` Roman Kagan
2015-01-14 12:30 ` Denis V. Lunev
2014-12-30 10:07 ` [Qemu-devel] [PATCH 17/19] block/parallels: delay writing to BAT till bdrv_co_flush_to_os Denis V. Lunev
2015-01-14 13:03 ` Roman Kagan
2015-01-14 13:08 ` Denis V. Lunev
2015-01-14 13:34 ` Roman Kagan
2015-01-14 14:29 ` Denis V. Lunev
2015-01-14 16:44 ` Denis V. Lunev
2014-12-30 10:07 ` [Qemu-devel] [PATCH 18/19] block/parallels: add prealloc-mode and prealloc-size open paramemets Denis V. Lunev
2015-01-14 14:26 ` Roman Kagan
2015-01-14 14:31 ` Denis V. Lunev
2015-01-14 17:22 ` Roman Kagan
2014-12-30 10:07 ` [Qemu-devel] [PATCH 19/19] block/parallels: optimize linear image expansion Denis V. Lunev
2015-01-14 17:56 ` Roman Kagan
2015-01-14 17:57 ` 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=1419931701-19362-9-git-send-email-den@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).