From patchwork Mon Jan 23 12:30:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fam Zheng X-Patchwork-Id: 718552 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3v6WWx2S7tz9t0k for ; Mon, 23 Jan 2017 23:55:57 +1100 (AEDT) Received: from localhost ([::1]:41264 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cVeA6-0007id-TY for incoming@patchwork.ozlabs.org; Mon, 23 Jan 2017 07:55:54 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41640) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cVdoR-0005FI-Dv for qemu-devel@nongnu.org; Mon, 23 Jan 2017 07:33:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cVdoO-0006XT-89 for qemu-devel@nongnu.org; Mon, 23 Jan 2017 07:33:31 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52682) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cVdoK-0006Vp-Lj; Mon, 23 Jan 2017 07:33:24 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C832FC05681B; Mon, 23 Jan 2017 12:33:24 +0000 (UTC) Received: from lemon.redhat.com (ovpn-8-19.pek2.redhat.com [10.72.8.19]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v0NCV0uU006049; Mon, 23 Jan 2017 07:33:19 -0500 From: Fam Zheng To: qemu-devel@nongnu.org Date: Mon, 23 Jan 2017 20:30:56 +0800 Message-Id: <20170123123056.30383-17-famz@redhat.com> In-Reply-To: <20170123123056.30383-1-famz@redhat.com> References: <20170123123056.30383-1-famz@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Mon, 23 Jan 2017 12:33:24 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v12 16/16] tests: Add test-image-lock X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , qemu-block@nongnu.org, rjones@redhat.com, Max Reitz Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Fam Zheng --- tests/Makefile.include | 2 + tests/test-image-lock.c | 206 +++++++++++++++++++++++++++++++++++++++++++++++ tests/test-replication.c | 6 +- 3 files changed, 211 insertions(+), 3 deletions(-) create mode 100644 tests/test-image-lock.c diff --git a/tests/Makefile.include b/tests/Makefile.include index 96f5970..7718a9b 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -55,6 +55,7 @@ check-unit-y += tests/test-hbitmap$(EXESUF) gcov-files-test-hbitmap-y = blockjob.c check-unit-y += tests/test-blockjob$(EXESUF) check-unit-y += tests/test-blockjob-txn$(EXESUF) +check-unit-y += tests/test-image-lock$(EXESUF) check-unit-y += tests/test-x86-cpuid$(EXESUF) # all code tested by test-x86-cpuid is inside topology.h gcov-files-test-x86-cpuid-y = @@ -516,6 +517,7 @@ tests/test-aio$(EXESUF): tests/test-aio.o $(test-block-obj-y) tests/test-throttle$(EXESUF): tests/test-throttle.o $(test-block-obj-y) tests/test-blockjob$(EXESUF): tests/test-blockjob.o $(test-block-obj-y) $(test-util-obj-y) tests/test-blockjob-txn$(EXESUF): tests/test-blockjob-txn.o $(test-block-obj-y) $(test-util-obj-y) +tests/test-image-lock$(EXESUF): tests/test-image-lock.o $(test-block-obj-y) $(libqos-obj-y) tests/test-thread-pool$(EXESUF): tests/test-thread-pool.o $(test-block-obj-y) tests/test-iov$(EXESUF): tests/test-iov.o $(test-util-obj-y) tests/test-hbitmap$(EXESUF): tests/test-hbitmap.o $(test-util-obj-y) diff --git a/tests/test-image-lock.c b/tests/test-image-lock.c new file mode 100644 index 0000000..9c929ca --- /dev/null +++ b/tests/test-image-lock.c @@ -0,0 +1,206 @@ +/* + * Image lock tests + * + * Copyright 2016 Red Hat, Inc. + * + * Authors: + * Fam Zheng + * + * This work is licensed under the terms of the GNU LGPL, version 2 or later. + * See the COPYING.LIB file in the top-level directory. + */ + +#include "qemu/osdep.h" +#include "qapi/error.h" +#include "qemu/error-report.h" +#include "qapi/qmp/qbool.h" +#include "sysemu/block-backend.h" + +#define DEBUG_IMAGE_LOCK_TEST 0 +#define DPRINTF(...) do { \ + if (DEBUG_IMAGE_LOCK_TEST) { \ + printf(__VA_ARGS__); \ + } \ + } while (0) + +#define TEST_IMAGE_SIZE 4096 +static char test_image[] = "/tmp/qtest.XXXXXX"; +static int test_image_fd; + +static BlockBackend *open_test_image(int flags, bool disable_lock) +{ + QDict *opts = qdict_new(); + + qdict_set_default_str(opts, "filename", test_image); + qdict_set_default_str(opts, "driver", "file"); + if (disable_lock) { + qdict_put(opts, "disable-lock", qbool_from_bool(true)); + } + + return blk_new_open(NULL, NULL, opts, flags | BDRV_O_ALLOW_RDWR, NULL); +} + +#define RW true +#define RO false +#define SHARE true +#define EXCLU false + +static struct CompatData { + bool write_1; + bool share_1; + bool write_2; + bool share_2; + bool compatible; +} compat_data[] = { + /* Write 1, Share 1, Write 2, Share 2, Compatible. */ + { RO, SHARE, RO, SHARE, true, }, + { RO, SHARE, RO, EXCLU, true, }, + { RO, SHARE, RW, SHARE, true, }, + { RO, SHARE, RW, EXCLU, true, }, + + { RO, EXCLU, RO, EXCLU, true, }, + { RO, EXCLU, RW, SHARE, false, }, + { RO, EXCLU, RW, EXCLU, false, }, + + { RW, SHARE, RW, SHARE, true, }, + { RW, SHARE, RW, EXCLU, false, }, + + { RW, EXCLU, RW, EXCLU, false, }, +}; + +/* Test one combination scenario. + * + * @flags1: The flags of the first blk. + * @flags2: The flags of the second blk. + * @disable1: The value for raw-posix disable-lock option of the first blk. + * @disable2: The value for raw-posix disable-lock option of the second blk. + * @from_reopen: Whether or not the first blk should get flags1 from a reopen. + * @initial: The source flags from which the blk1 is reopened, only + * effective if @from_reopen is true. + */ +static void do_test_compat_one(int flags1, int flags2, + bool disable1, bool disable2, + bool from_reopen, int initial_flags, + bool compatible) +{ + BlockBackend *blk1, *blk2; + + DPRINTF("\n===\ndo test compat one\n"); + DPRINTF("flags %x %x\n", flags1, flags2); + DPRINTF("disable %d %d\n", disable1, disable2); + DPRINTF("from reopen %d, initial flags %d\n", from_reopen, initial_flags); + DPRINTF("compatible %d\n", compatible); + if (!from_reopen) { + blk1 = open_test_image(flags1, disable1); + } else { + int ret; + blk1 = open_test_image(initial_flags, disable1); + BlockReopenQueue *rq = NULL; + + rq = bdrv_reopen_queue(rq, blk_bs(blk1), NULL, flags1); + ret = bdrv_reopen_multiple(blk_get_aio_context(blk1), rq, &error_abort); + g_assert_cmpint(ret, ==, 0); + } + g_assert_nonnull(blk1); + g_assert_cmphex(blk_get_flags(blk1) & (BDRV_O_SHARE_RW | BDRV_O_RDWR), + ==, flags1); + blk2 = open_test_image(flags2, disable2); + if (compatible) { + g_assert_nonnull(blk2); + } else { + g_assert_null(blk2); + } + blk_unref(blk1); + blk_unref(blk2); +} + +static void do_test_compat(bool test_disable, bool from_reopen, + int initial_flags) +{ + int i; + int flags1, flags2; + + for (i = 0; i < ARRAY_SIZE(compat_data); i++) { + struct CompatData *data = &compat_data[i]; + bool compat = data->compatible; + + flags1 = (data->write_1 ? BDRV_O_RDWR : 0) | + (data->share_1 ? BDRV_O_SHARE_RW : 0); + flags2 = (data->write_2 ? BDRV_O_RDWR : 0) | + (data->share_2 ? BDRV_O_SHARE_RW : 0); + if (!test_disable) { + do_test_compat_one(flags1, flags2, false, false, + from_reopen, initial_flags, compat); + + do_test_compat_one(flags2, flags1, false, false, + from_reopen, initial_flags, compat); + } else { + compat = true; + do_test_compat_one(flags1, flags2, true, false, + from_reopen, initial_flags, compat); + do_test_compat_one(flags1, flags2, false, true, + from_reopen, initial_flags, compat); + do_test_compat_one(flags2, flags1, true, false, + from_reopen, initial_flags, compat); + do_test_compat_one(flags2, flags1, false, true, + from_reopen, initial_flags, compat); + do_test_compat_one(flags1, flags2, true, true, + from_reopen, initial_flags, compat); + } + } +} + +static void test_compat(void) +{ + do_test_compat(false, false, 0); +} + +static void test_compat_after_reopen(void) +{ + do_test_compat(false, true, 0); + do_test_compat(false, true, BDRV_O_SHARE_RW); + do_test_compat(false, true, BDRV_O_RDWR); + do_test_compat(false, true, BDRV_O_RDWR | BDRV_O_SHARE_RW); +} + +static void test_0bytefile(void) +{ + int ret; + ret = ftruncate(test_image_fd, 0); + g_assert_cmpint(ret, ==, 0); + do_test_compat(false, false, 0); +} + +static void test_disable(void) +{ + do_test_compat(true, false, 0); + do_test_compat(true, true, 0); + do_test_compat(true, true, BDRV_O_SHARE_RW); + do_test_compat(true, true, BDRV_O_RDWR); + do_test_compat(true, true, BDRV_O_RDWR | BDRV_O_SHARE_RW); +} + +int main(int argc, char **argv) +{ +#ifndef F_OFD_SETLK + return 0; +#endif + int r; + test_image_fd = mkstemp(test_image); + + qemu_init_main_loop(&error_fatal); + bdrv_init(); + + g_assert(test_image_fd >= 0); + r = ftruncate(test_image_fd, TEST_IMAGE_SIZE); + g_assert_cmpint(r, ==, 0); + g_test_init(&argc, &argv, NULL); + g_test_add_func("/image-lock/compat", test_compat); + g_test_add_func("/image-lock/compat_after_reopen", test_compat_after_reopen); + g_test_add_func("/image-lock/compat_0bytefile", test_0bytefile); + g_test_add_func("/image-lock/disable", test_disable); + aio_context_acquire(qemu_get_aio_context()); + r = g_test_run(); + aio_context_release(qemu_get_aio_context()); + return r; +} diff --git a/tests/test-replication.c b/tests/test-replication.c index 5bede49..5fb69d2 100644 --- a/tests/test-replication.c +++ b/tests/test-replication.c @@ -312,7 +312,7 @@ static BlockBackend *start_secondary(void) /* add s_local_disk and forge S_LOCAL_DISK_ID */ cmdline = g_strdup_printf("file.filename=%s,driver=qcow2," - "file.file.disable-lock=on", + "file.disable-lock=on", s_local_disk); opts = qemu_opts_parse_noisily(&qemu_drive_opts, cmdline, false); g_free(cmdline); @@ -334,10 +334,10 @@ static BlockBackend *start_secondary(void) /* add S_(ACTIVE/HIDDEN)_DISK and forge S_ID */ cmdline = g_strdup_printf("driver=replication,mode=secondary,top-id=%s," "file.driver=qcow2,file.file.filename=%s," - "file.file.disable-lock=on", + "file.file.disable-lock=on," "file.backing.driver=qcow2," "file.backing.file.filename=%s," - "file.backing.file.disable-lock=on", + "file.backing.file.disable-lock=on," "file.backing.backing=%s" , S_ID, s_active_disk, s_hidden_disk , S_LOCAL_DISK_ID);