From patchwork Wed Jun 8 09:16:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 632106 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 ozlabs.org (Postfix) with ESMTPS id 3rPkDW75j6z9sxS for ; Wed, 8 Jun 2016 19:49:31 +1000 (AEST) Received: from localhost ([::1]:55596 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bAa77-0007gL-UB for incoming@patchwork.ozlabs.org; Wed, 08 Jun 2016 05:49:30 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58472) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bAZcT-0003uS-Do for qemu-devel@nongnu.org; Wed, 08 Jun 2016 05:17:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bAZcK-0001b8-W2 for qemu-devel@nongnu.org; Wed, 08 Jun 2016 05:17:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54765) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bAZcD-0001Vz-0L; Wed, 08 Jun 2016 05:17:33 -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 A35C1C069B2C; Wed, 8 Jun 2016 09:17:32 +0000 (UTC) Received: from noname.str.redhat.com. (dhcp-192-197.str.redhat.com [10.33.192.197]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u589H0eV029817; Wed, 8 Jun 2016 05:17:32 -0400 From: Kevin Wolf To: qemu-block@nongnu.org Date: Wed, 8 Jun 2016 11:16:56 +0200 Message-Id: <1465377417-5012-31-git-send-email-kwolf@redhat.com> In-Reply-To: <1465377417-5012-1-git-send-email-kwolf@redhat.com> References: <1465377417-5012-1-git-send-email-kwolf@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.31]); Wed, 08 Jun 2016 09:17:32 +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] [PULL 30/31] qemu-img bench: Implement -S (step size) 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: kwolf@redhat.com, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" With this new option, qemu-img bench can be told to advance the current offset after each request by a different value than the buffer size. This is useful for controlling the conditions for cluster allocation in image formats (e.g. qcow2 cluster allocation with COW in front of the request, or COW areas that aren't overwritten immediately). Signed-off-by: Kevin Wolf Reviewed-by: Denis V. Lunev Reviewed-by: Stefan Hajnoczi --- qemu-img-cmds.hx | 4 ++-- qemu-img.c | 25 +++++++++++++++++++++---- qemu-img.texi | 6 ++++-- 3 files changed, 27 insertions(+), 8 deletions(-) diff --git a/qemu-img-cmds.hx b/qemu-img-cmds.hx index 117d0f9..05a2991 100644 --- a/qemu-img-cmds.hx +++ b/qemu-img-cmds.hx @@ -10,9 +10,9 @@ STEXI ETEXI DEF("bench", img_bench, - "bench [-c count] [-d depth] [-f fmt] [-n] [-o offset] [--pattern=pattern] [-q] [-s buffer_size] [-t cache] [-w] filename") + "bench [-c count] [-d depth] [-f fmt] [-n] [-o offset] [--pattern=pattern] [-q] [-s buffer_size] [-S step_size] [-t cache] [-w] filename") STEXI -@item bench [-c @var{count}] [-d @var{depth}] [-f @var{fmt}] [-n] [-o @var{offset}] [--pattern=@var{pattern}] [-q] [-s @var{buffer_size}] [-t @var{cache}] [-w] @var{filename} +@item bench [-c @var{count}] [-d @var{depth}] [-f @var{fmt}] [-n] [-o @var{offset}] [--pattern=@var{pattern}] [-q] [-s @var{buffer_size}] [-S @var{step_size}] [-t @var{cache}] [-w] @var{filename} ETEXI DEF("check", img_check, diff --git a/qemu-img.c b/qemu-img.c index 480ef8d..c5e2638 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -3465,6 +3465,7 @@ typedef struct BenchData { uint64_t image_size; bool write; int bufsize; + int step; int nrreq; int n; uint8_t *buf; @@ -3501,7 +3502,7 @@ static void bench_cb(void *opaque, int ret) exit(EXIT_FAILURE); } b->in_flight++; - b->offset += b->bufsize; + b->offset += b->step; b->offset %= b->image_size; } } @@ -3518,6 +3519,7 @@ static int img_bench(int argc, char **argv) int64_t offset = 0; size_t bufsize = 4096; int pattern = 0; + size_t step = 0; int64_t image_size; BlockBackend *blk = NULL; BenchData data = {}; @@ -3533,7 +3535,7 @@ static int img_bench(int argc, char **argv) {"pattern", required_argument, 0, OPTION_PATTERN}, {0, 0, 0, 0} }; - c = getopt_long(argc, argv, "hc:d:f:no:qs:t:w", long_options, NULL); + c = getopt_long(argc, argv, "hc:d:f:no:qs:S:t:w", long_options, NULL); if (c == -1) { break; } @@ -3601,6 +3603,20 @@ static int img_bench(int argc, char **argv) bufsize = sval; break; } + case 'S': + { + int64_t sval; + char *end; + + sval = qemu_strtosz_suffix(optarg, &end, QEMU_STRTOSZ_DEFSUFFIX_B); + if (sval < 0 || sval > INT_MAX || *end) { + error_report("Invalid step size specified"); + return 1; + } + + step = sval; + break; + } case 't': ret = bdrv_parse_cache_mode(optarg, &flags, &writethrough); if (ret < 0) { @@ -3651,15 +3667,16 @@ static int img_bench(int argc, char **argv) .blk = blk, .image_size = image_size, .bufsize = bufsize, + .step = step ?: bufsize, .nrreq = depth, .n = count, .offset = offset, .write = is_write, }; printf("Sending %d %s requests, %d bytes each, %d in parallel " - "(starting at offset %" PRId64 ")\n", + "(starting at offset %" PRId64 ", step size %d)\n", data.n, data.write ? "write" : "read", data.bufsize, data.nrreq, - data.offset); + data.offset, data.step); data.buf = blk_blockalign(blk, data.nrreq * data.bufsize); memset(data.buf, pattern, data.nrreq * data.bufsize); diff --git a/qemu-img.texi b/qemu-img.texi index 9bffad2..ccc0b51 100644 --- a/qemu-img.texi +++ b/qemu-img.texi @@ -131,14 +131,16 @@ Skip the creation of the target volume Command description: @table @option -@item bench [-c @var{count}] [-d @var{depth}] [-f @var{fmt}] [-n] [-o @var{offset}] [--pattern=@var{pattern}] [-q] [-s @var{buffer_size}] [-t @var{cache}] [-w] @var{filename} +@item bench [-c @var{count}] [-d @var{depth}] [-f @var{fmt}] [-n] [-o @var{offset}] [--pattern=@var{pattern}] [-q] [-s @var{buffer_size}] [-S @var{step_size}] [-t @var{cache}] [-w] @var{filename} Run a simple sequential I/O benchmark on the specified image. If @code{-w} is specified, a write test is performed, otherwise a read test is performed. A total number of @var{count} I/O requests is performed, each @var{buffer_size} bytes in size, and with @var{depth} requests in parallel. The first request -starts at the position given by @var{offset}. +starts at the position given by @var{offset}, each following request increases +the current position by @var{step_size}. If @var{step_size} is not given, +@var{buffer_size} is used for its value. If @code{-n} is specified, the native AIO backend is used if possible. On Linux, this option only works if @code{-t none} or @code{-t directsync} is