From patchwork Fri Apr 22 23:40:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Blake X-Patchwork-Id: 8916481 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 2F69A9F1D3 for ; Fri, 22 Apr 2016 23:56:54 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D155820212 for ; Fri, 22 Apr 2016 23:56:51 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id F0CDB2020F for ; Fri, 22 Apr 2016 23:56:50 +0000 (UTC) Received: from localhost ([::1]:41883 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1atkwM-0002kp-31 for patchwork-qemu-devel@patchwork.kernel.org; Fri, 22 Apr 2016 19:56:50 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45392) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1atkhj-000430-2K for qemu-devel@nongnu.org; Fri, 22 Apr 2016 19:41:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1atkhh-0005T3-6m for qemu-devel@nongnu.org; Fri, 22 Apr 2016 19:41:42 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39648) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1atkhc-0005Q5-Sn; Fri, 22 Apr 2016 19:41:37 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (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 78ABB627C9; Fri, 22 Apr 2016 23:41:36 +0000 (UTC) Received: from red.redhat.com (ovpn-113-21.phx2.redhat.com [10.3.113.21]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u3MNfHXD028475; Fri, 22 Apr 2016 19:41:36 -0400 From: Eric Blake To: qemu-devel@nongnu.org Date: Fri, 22 Apr 2016 17:40:32 -0600 Message-Id: <1461368452-10389-25-git-send-email-eblake@redhat.com> In-Reply-To: <1461368452-10389-1-git-send-email-eblake@redhat.com> References: <1461368452-10389-1-git-send-email-eblake@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Fri, 22 Apr 2016 23:41:36 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 24/44] qemu-io: Add 'write -f' to test FUA flag 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 , alex@alex.org.uk, qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Make it easier to test block drivers with BDRV_REQ_FUA in .supported_write_flags, by adding a flag to qemu-io to conditionally pass the flag through to specific writes. You'll want to use 'qemu-io -t none' to actually make -f useful (as otherwise, the default writethrough mode automatically sets the FUA bit on every write). Signed-off-by: Eric Blake --- qemu-io-cmds.c | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/qemu-io-cmds.c b/qemu-io-cmds.c index 4184fb8..1e444cc 100644 --- a/qemu-io-cmds.c +++ b/qemu-io-cmds.c @@ -434,13 +434,14 @@ static int do_pread(BlockBackend *blk, char *buf, int64_t offset, } static int do_pwrite(BlockBackend *blk, char *buf, int64_t offset, - int64_t count, int64_t *total) + int64_t count, bool fua, int64_t *total) { if (count > INT_MAX) { return -ERANGE; } - *total = blk_pwrite(blk, offset, (uint8_t *)buf, count, 0); + *total = blk_pwrite(blk, offset, (uint8_t *)buf, count, + fua ? BDRV_REQ_FUA : 0); if (*total < 0) { return *total; } @@ -452,6 +453,7 @@ typedef struct { int64_t offset; int64_t count; int64_t *total; + bool fua; int ret; bool done; } CoWriteZeroes; @@ -461,7 +463,8 @@ static void coroutine_fn co_write_zeroes_entry(void *opaque) CoWriteZeroes *data = opaque; data->ret = blk_co_write_zeroes(data->blk, data->offset / BDRV_SECTOR_SIZE, - data->count / BDRV_SECTOR_SIZE, 0); + data->count / BDRV_SECTOR_SIZE, + data->fua ? BDRV_REQ_FUA : 0); data->done = true; if (data->ret < 0) { *data->total = data->ret; @@ -472,7 +475,7 @@ static void coroutine_fn co_write_zeroes_entry(void *opaque) } static int do_co_write_zeroes(BlockBackend *blk, int64_t offset, int64_t count, - int64_t *total) + bool fua, int64_t *total) { Coroutine *co; CoWriteZeroes data = { @@ -480,6 +483,7 @@ static int do_co_write_zeroes(BlockBackend *blk, int64_t offset, int64_t count, .offset = offset, .count = count, .total = total, + .fua = fua, .done = false, }; @@ -950,6 +954,7 @@ static void write_help(void) " filled with a set pattern (0xcdcdcdcd).\n" " -b, -- write to the VM state rather than the virtual disk\n" " -c, -- write compressed data with blk_write_compressed\n" +" -f, -- use Force Unit Access semantics\n" " -p, -- ignored for back-compat\n" " -P, -- use different pattern to fill file\n" " -C, -- report statistics in a machine parsable format\n" @@ -966,7 +971,7 @@ static const cmdinfo_t write_cmd = { .cfunc = write_f, .argmin = 2, .argmax = -1, - .args = "[-bcCqz] [-P pattern ] off len", + .args = "[-bcCfqz] [-P pattern ] off len", .oneline = "writes a number of bytes at a specified offset", .help = write_help, }; @@ -975,7 +980,7 @@ static int write_f(BlockBackend *blk, int argc, char **argv) { struct timeval t1, t2; int Cflag = 0, qflag = 0, bflag = 0, Pflag = 0, zflag = 0; - int cflag = 0; + int cflag = 0, fflag = 0; int c, cnt; char *buf = NULL; int64_t offset; @@ -984,7 +989,7 @@ static int write_f(BlockBackend *blk, int argc, char **argv) int64_t total = 0; int pattern = 0xcd; - while ((c = getopt(argc, argv, "bcCpP:qz")) != -1) { + while ((c = getopt(argc, argv, "bcCfpP:qz")) != -1) { switch (c) { case 'b': bflag = 1; @@ -995,6 +1000,9 @@ static int write_f(BlockBackend *blk, int argc, char **argv) case 'C': Cflag = 1; break; + case 'f': + fflag = 1; + break; case 'p': /* Ignored for back-compat */ break; @@ -1025,6 +1033,11 @@ static int write_f(BlockBackend *blk, int argc, char **argv) return 0; } + if (fflag && (bflag + cflag)) { + printf("-f and -b or -c cannot be specified at the same time\n"); + return 0; + } + if (zflag && Pflag) { printf("-z and -P cannot be specified at the same time\n"); return 0; @@ -1069,11 +1082,11 @@ static int write_f(BlockBackend *blk, int argc, char **argv) if (bflag) { cnt = do_save_vmstate(blk, buf, offset, count, &total); } else if (zflag) { - cnt = do_co_write_zeroes(blk, offset, count, &total); + cnt = do_co_write_zeroes(blk, offset, count, fflag, &total); } else if (cflag) { cnt = do_write_compressed(blk, buf, offset, count, &total); } else { - cnt = do_pwrite(blk, buf, offset, count, &total); + cnt = do_pwrite(blk, buf, offset, count, fflag, &total); } gettimeofday(&t2, NULL);