From patchwork Sun Jul 12 17:49:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Shinkevich X-Patchwork-Id: 1327581 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=virtuozzo.com Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4B4Z7F1cZVz9sRN for ; Mon, 13 Jul 2020 03:50:16 +1000 (AEST) Received: from localhost ([::1]:45216 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jug7B-0003BF-R7 for incoming@patchwork.ozlabs.org; Sun, 12 Jul 2020 13:50:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54416) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jug6P-000398-Nv; Sun, 12 Jul 2020 13:49:25 -0400 Received: from relay.sw.ru ([185.231.240.75]:60382 helo=relay3.sw.ru) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jug6N-0001lD-66; Sun, 12 Jul 2020 13:49:24 -0400 Received: from [172.16.25.136] (helo=localhost.sw.ru) by relay3.sw.ru with esmtp (Exim 4.93) (envelope-from ) id 1jug6B-0005LT-KT; Sun, 12 Jul 2020 20:49:11 +0300 From: Andrey Shinkevich To: qemu-block@nongnu.org Subject: [PATCH v4 3/3] scripts/simplebench: add unaligned data case to bench_write_req Date: Sun, 12 Jul 2020 20:49:18 +0300 Message-Id: <1594576158-75884-4-git-send-email-andrey.shinkevich@virtuozzo.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1594576158-75884-1-git-send-email-andrey.shinkevich@virtuozzo.com> References: <1594576158-75884-1-git-send-email-andrey.shinkevich@virtuozzo.com> Received-SPF: pass client-ip=185.231.240.75; envelope-from=andrey.shinkevich@virtuozzo.com; helo=relay3.sw.ru X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/12 13:17:17 X-ACL-Warn: Detected OS = Linux 3.11 and newer X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, vsementsov@virtuozzo.com, qemu-devel@nongnu.org, mreitz@redhat.com, andrey.shinkevich@virtuozzo.com, den@openvz.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Add a test case with writhing data unaligned to the image clusters. This case does not involve the COW optimization introduced with the patch "qcow2: skip writing zero buffers to empty COW areas" (git commit ID: c8bb23cbdbe32f5). Signed-off-by: Andrey Shinkevich --- scripts/simplebench/bench_write_req.py | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/scripts/simplebench/bench_write_req.py b/scripts/simplebench/bench_write_req.py index f758f90..9f3a520 100755 --- a/scripts/simplebench/bench_write_req.py +++ b/scripts/simplebench/bench_write_req.py @@ -58,7 +58,7 @@ def bench_write_req(qemu_img, image_name, block_size, block_offset, requests, image_name -- QCOW2 image name to create block_size -- size of a block to write to clusters block_offset -- offset of the block in clusters - requests -- number of write requests per cluster + requests -- number of write requests per cluster, customize if zero empty_image -- if not True, fills image with random data Returns {'seconds': int} on success and {'error': str} on failure. @@ -83,8 +83,17 @@ def bench_write_req(qemu_img, image_name, block_size, block_offset, requests, f'cluster_size={cluster_size}', image_name, str(image_size)] - count = requests * int(image_size / cluster_size) - step = str(cluster_size) + if requests: + count = requests * int(image_size / cluster_size) + step = str(cluster_size) + else: + # Create unaligned write requests + assert block_size + shift = int(block_size * 1.01) + count = int((image_size - block_offset) / shift) + step = str(shift) + depth = ['-d', '2'] + offset = str(block_offset) cnt = str(count) size = [] @@ -95,6 +104,8 @@ def bench_write_req(qemu_img, image_name, block_size, block_offset, requests, '-S', step, '-o', offset, '-f', 'qcow2', image_name] if block_size: args_bench.extend(size) + if not requests: + args_bench.extend(depth) try: qemu_img_pipe(*args_create) @@ -165,6 +176,13 @@ if __name__ == '__main__': 'requests': 2, 'empty_image': True }, + { + 'id': '', + 'block_size': 104857600, + 'block_offset': 524288, + 'requests': 0, + 'empty_image': False + }, ] # Test-envs are "columns" in benchmark resulting table, 'id is a caption