From patchwork Fri Apr 22 23:40:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Blake X-Patchwork-Id: 8916461 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 21F159F457 for ; Fri, 22 Apr 2016 23:55:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6C4F42021B for ; Fri, 22 Apr 2016 23:55:00 +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 9ADD9201C7 for ; Fri, 22 Apr 2016 23:54:59 +0000 (UTC) Received: from localhost ([::1]:41863 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1atkuY-00072p-R6 for patchwork-qemu-devel@patchwork.kernel.org; Fri, 22 Apr 2016 19:54:58 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45461) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1atkhk-000466-BE for qemu-devel@nongnu.org; Fri, 22 Apr 2016 19:41:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1atkhj-0005Us-2r for qemu-devel@nongnu.org; Fri, 22 Apr 2016 19:41:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51496) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1atkhd-0005Qx-VS; Fri, 22 Apr 2016 19:41:38 -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 94B49C049D58; Fri, 22 Apr 2016 23:41:37 +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 u3MNfHXF028475; Fri, 22 Apr 2016 19:41:37 -0400 From: Eric Blake To: qemu-devel@nongnu.org Date: Fri, 22 Apr 2016 17:40:34 -0600 Message-Id: <1461368452-10389-27-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-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 26/44] qemu-io: Add 'write -z -u' to test MAY_UNMAP 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 control whether the BDRV_REQ_MAY_UNMAP flag can be passed through a write_zeroes command, by adding a flag to qemu-io. To be useful, the device has to be opened with 'qemu-io -d unmap' (or the just-added 'open -u' subcommand). Signed-off-by: Eric Blake --- qemu-io-cmds.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/qemu-io-cmds.c b/qemu-io-cmds.c index 1e444cc..ca23459 100644 --- a/qemu-io-cmds.c +++ b/qemu-io-cmds.c @@ -454,6 +454,7 @@ typedef struct { int64_t count; int64_t *total; bool fua; + bool unmap; int ret; bool done; } CoWriteZeroes; @@ -464,7 +465,8 @@ static void coroutine_fn co_write_zeroes_entry(void *opaque) data->ret = blk_co_write_zeroes(data->blk, data->offset / BDRV_SECTOR_SIZE, data->count / BDRV_SECTOR_SIZE, - data->fua ? BDRV_REQ_FUA : 0); + (data->fua ? BDRV_REQ_FUA : 0) | + (data->unmap ? BDRV_REQ_MAY_UNMAP : 0)); data->done = true; if (data->ret < 0) { *data->total = data->ret; @@ -475,7 +477,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, - bool fua, int64_t *total) + bool fua, bool unmap, int64_t *total) { Coroutine *co; CoWriteZeroes data = { @@ -484,6 +486,7 @@ static int do_co_write_zeroes(BlockBackend *blk, int64_t offset, int64_t count, .count = count, .total = total, .fua = fua, + .unmap = unmap, .done = false, }; @@ -959,6 +962,7 @@ static void write_help(void) " -P, -- use different pattern to fill file\n" " -C, -- report statistics in a machine parsable format\n" " -q, -- quiet mode, do not show I/O statistics\n" +" -u, -- with -z, allow unmapping\n" " -z, -- write zeroes using blk_co_write_zeroes\n" "\n"); } @@ -971,7 +975,7 @@ static const cmdinfo_t write_cmd = { .cfunc = write_f, .argmin = 2, .argmax = -1, - .args = "[-bcCfqz] [-P pattern ] off len", + .args = "[-bcCfquz] [-P pattern ] off len", .oneline = "writes a number of bytes at a specified offset", .help = write_help, }; @@ -980,7 +984,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, fflag = 0; + int cflag = 0, fflag = 0, uflag = 0; int c, cnt; char *buf = NULL; int64_t offset; @@ -989,7 +993,7 @@ static int write_f(BlockBackend *blk, int argc, char **argv) int64_t total = 0; int pattern = 0xcd; - while ((c = getopt(argc, argv, "bcCfpP:qz")) != -1) { + while ((c = getopt(argc, argv, "bcCfpP:quz")) != -1) { switch (c) { case 'b': bflag = 1; @@ -1016,6 +1020,9 @@ static int write_f(BlockBackend *blk, int argc, char **argv) case 'q': qflag = 1; break; + case 'u': + uflag = 1; + break; case 'z': zflag = 1; break; @@ -1038,6 +1045,11 @@ static int write_f(BlockBackend *blk, int argc, char **argv) return 0; } + if (uflag && !zflag) { + printf("-u requires -z to be specified\n"); + return 0; + } + if (zflag && Pflag) { printf("-z and -P cannot be specified at the same time\n"); return 0; @@ -1082,7 +1094,7 @@ 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, fflag, &total); + cnt = do_co_write_zeroes(blk, offset, count, fflag, uflag, &total); } else if (cflag) { cnt = do_write_compressed(blk, buf, offset, count, &total); } else {