qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
To: qemu-block@nongnu.org
Cc: fam@euphon.net, kwolf@redhat.com, vsementsov@virtuozzo.com,
	armbru@redhat.com, qemu-devel@nongnu.org, mreitz@redhat.com,
	stefanha@redhat.com, den@openvz.org
Subject: [PATCH v3 12/12] block/qcow2: automatically insert preallocate filter when on FUSE
Date: Mon, 17 Aug 2020 12:15:53 +0300	[thread overview]
Message-ID: <20200817091553.283155-13-vsementsov@virtuozzo.com> (raw)
In-Reply-To: <20200817091553.283155-1-vsementsov@virtuozzo.com>

vstorage has slow allocation, so this patch detect vstorage
(I hope, we don't use other FUSE filesystems) and inserts preallocate
filter between qcow2 node and its file child.

The following test executes more than 10 times faster
(43.2s -> 3.9s for me) with this patch. (/newssd3 is mount point of
vstorage, both cs and mds are on same ssd local ssd disk)

    IMG=/newssd3/z
    FILE_OPTS=file.filename=$IMG
    COUNT=15000
    CHUNK=64K
    CLUSTER=1M
    rm -f $IMG
    ./qemu-img create -f qcow2 -o cluster_size=$CLUSTER $IMG 1G
    ./qemu-img bench -c $COUNT -d 1 -s $CHUNK -w -t none -f qcow2 $IMG

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
 block/qcow2.c | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/block/qcow2.c b/block/qcow2.c
index 6ad6bdc166..f56507158e 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -1868,6 +1868,40 @@ static void coroutine_fn qcow2_open_entry(void *opaque)
     qemu_co_mutex_unlock(&s->lock);
 }
 
+static int qcow2_vz_insert_prealloc_filter(BlockDriverState *bs, Error **errp)
+{
+    QDict *options;
+    BlockDriverState *filter_bs;
+    Error *local_err = NULL;
+    int flags;
+
+    if (!bdrv_is_file_on_fuse(bs->file->bs)) {
+        /* Nothing to do */
+        return 0;
+    }
+
+    /* Assume it's a vstorage */
+    options = qdict_new();
+    qdict_put_str(options, "driver", "preallocate");
+    qdict_put_str(options, "file", bs->file->bs->node_name);
+    flags = bdrv_is_read_only(bs->file->bs) ? 0 : BDRV_O_RDWR;
+    filter_bs = bdrv_open(NULL, NULL, options, flags, errp);
+    if (!filter_bs) {
+        return -EINVAL;
+    }
+
+    bdrv_replace_node(bs->file->bs, filter_bs, &local_err);
+
+    /*
+     * On failure we want to remove filter_bs, on success it's referenced now by
+     * qcow2 node.
+     */
+    bdrv_unref(filter_bs);
+
+    error_propagate(errp, local_err);
+    return local_err ? -EINVAL : 0;
+}
+
 static int qcow2_open(BlockDriverState *bs, QDict *options, int flags,
                       Error **errp)
 {
@@ -1886,6 +1920,10 @@ static int qcow2_open(BlockDriverState *bs, QDict *options, int flags,
         return -EINVAL;
     }
 
+    if (qcow2_vz_insert_prealloc_filter(bs, errp) < 0) {
+        return -EINVAL;
+    }
+
     /* Initialise locks */
     qemu_co_mutex_init(&s->lock);
 
-- 
2.18.0



  parent reply	other threads:[~2020-08-17  9:34 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-08-17  9:15 [PATCH v3 00/12] preallocate filter Vladimir Sementsov-Ogievskiy
2020-08-17  9:15 ` [PATCH v3 01/12] block: simplify comment to BDRV_REQ_SERIALISING Vladimir Sementsov-Ogievskiy
2020-08-19 14:59   ` Stefan Hajnoczi
2020-08-17  9:15 ` [PATCH v3 02/12] block/io.c: drop assertion on double waiting for request serialisation Vladimir Sementsov-Ogievskiy
2020-08-19 15:28   ` Stefan Hajnoczi
2020-08-19 15:48     ` Paolo Bonzini
2020-08-17  9:15 ` [PATCH v3 03/12] block/io: split out bdrv_find_conflicting_request Vladimir Sementsov-Ogievskiy
2020-08-19 14:59   ` Stefan Hajnoczi
2020-08-17  9:15 ` [PATCH v3 04/12] block/io: bdrv_wait_serialising_requests_locked: drop extra bs arg Vladimir Sementsov-Ogievskiy
2020-08-19 14:59   ` Stefan Hajnoczi
2020-08-17  9:15 ` [PATCH v3 05/12] block: bdrv_mark_request_serialising: split non-waiting function Vladimir Sementsov-Ogievskiy
2020-08-19 14:40   ` Stefan Hajnoczi
2020-08-17  9:15 ` [PATCH v3 06/12] block: introduce BDRV_REQ_NO_WAIT flag Vladimir Sementsov-Ogievskiy
2020-08-19 14:42   ` Stefan Hajnoczi
2020-08-17  9:15 ` [PATCH v3 07/12] block: introduce preallocate filter Vladimir Sementsov-Ogievskiy
2020-08-19 14:57   ` Stefan Hajnoczi
2020-08-17  9:15 ` [PATCH v3 08/12] iotests.py: add verify_o_direct helper Vladimir Sementsov-Ogievskiy
2020-08-19 14:59   ` Stefan Hajnoczi
2020-08-17  9:15 ` [PATCH v3 09/12] iotests.py: add filter_img_check Vladimir Sementsov-Ogievskiy
2020-08-19 14:59   ` Stefan Hajnoczi
2020-08-17  9:15 ` [PATCH v3 10/12] iotests: add 298 to test new preallocate filter driver Vladimir Sementsov-Ogievskiy
2020-08-19 14:59   ` Stefan Hajnoczi
2020-08-17  9:15 ` [PATCH v3 11/12] block: add bdrv_is_file_on_fuse helper Vladimir Sementsov-Ogievskiy
2020-08-17  9:15 ` Vladimir Sementsov-Ogievskiy [this message]
2020-08-19 15:15   ` [PATCH v3 12/12] block/qcow2: automatically insert preallocate filter when on FUSE Stefan Hajnoczi
2020-08-20  9:46     ` Vladimir Sementsov-Ogievskiy
2020-08-17  9:45 ` [PATCH v3 00/12] preallocate filter no-reply
2020-08-17 10:44   ` Vladimir Sementsov-Ogievskiy
2020-08-17  9:48 ` no-reply
2020-08-17 10:46   ` Vladimir Sementsov-Ogievskiy
2020-08-19 15:29 ` Stefan Hajnoczi

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=20200817091553.283155-13-vsementsov@virtuozzo.com \
    --to=vsementsov@virtuozzo.com \
    --cc=armbru@redhat.com \
    --cc=den@openvz.org \
    --cc=fam@euphon.net \
    --cc=kwolf@redhat.com \
    --cc=mreitz@redhat.com \
    --cc=qemu-block@nongnu.org \
    --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).