From nobody Sat May 18 11:26:03 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; t=1594576296; cv=none; d=zohomail.com; s=zohoarc; b=Kr8zLh20cDWTf+PkCvpMFCLjzaqhdzYwGVGAoWCYI6FJ8FfoN9mINgxgHZ+BqcgnVYptr+hLqxvx5SVJy4YguRYo62j0nKZvfCcxF+pCr/CDNXZhtUSyjWAhz8Lpd6rFgGdPvWQHNh2nrTujNu+xA21kPkp8XSiqszzvlDcJb+w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594576296; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=JJJjtuYacqYhpjNCRdBYVfh2CNAMFOFfmb5BSvg0BIE=; b=ns3RDJG27UXGtl/pat8dgowsOtmQm/sv9x7HFhj3H1j9vKfjFvWkhu38PC/W13bIuwE6ZHYSTJKgk7Ftp1FqNHb1rSwFHAkXsU38KUrYHOoTjFWU99ozfgzWt27vX0dfZl2stc7DLsDJCHWz+3zQ2Dm4vMlAykn9jh3O6rG6IGQ= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1594576296899545.6780062589562; Sun, 12 Jul 2020 10:51:36 -0700 (PDT) Received: from localhost ([::1]:51190 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jug8V-0005iN-JF for importer@patchew.org; Sun, 12 Jul 2020 13:51:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54436) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jug6Q-00039c-VY; Sun, 12 Jul 2020 13:49:26 -0400 Received: from relay.sw.ru ([185.231.240.75]:60379 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-0001lA-9E; Sun, 12 Jul 2020 13:49:26 -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-Ho; Sun, 12 Jul 2020 20:49:11 +0300 From: Andrey Shinkevich To: qemu-block@nongnu.org Subject: [PATCH v4 1/3] scripts/simplebench: compare write request performance Date: Sun, 12 Jul 2020 20:49:16 +0300 Message-Id: <1594576158-75884-2-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 (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The script 'bench_write_req.py' allows comparing performances of write request for two qemu-img binary files. An example with (qemu-img binary 1) and without (qemu-img binary 2) the applied patch "qcow2: skip writing zero buffers to empty COW areas" (git commit ID: c8bb23cbdbe32f5) has the following results: SSD: Suggested-by: Denis V. Lunev Suggested-by: Vladimir Sementsov-Ogievskiy ----------------- ------------------- ------------------- 0.34 +- 0.01 10.57 +- 0.96 0.33 +- 0.01 9.15 +- 0.85 0.33 +- 0.00 8.72 +- 0.05 7.43 +- 1.19 14.35 +- 1.00 ----------------- ------------------- ------------------- HDD: ----------------- ------------------- ------------------- 32.61 +- 1.17 55.11 +- 1.15 54.28 +- 8.82 60.11 +- 2.76 57.93 +- 0.47 58.53 +- 0.51 11.47 +- 0.94 17.29 +- 4.40 ----------------- ------------------- ------------------- Suggested-by: Denis V. Lunev Suggested-by: Vladimir Sementsov-Ogievskiy Signed-off-by: Andrey Shinkevich --- scripts/simplebench/bench_write_req.py | 173 +++++++++++++++++++++++++++++= ++++ 1 file changed, 173 insertions(+) create mode 100755 scripts/simplebench/bench_write_req.py diff --git a/scripts/simplebench/bench_write_req.py b/scripts/simplebench/b= ench_write_req.py new file mode 100755 index 0000000..a285ef1 --- /dev/null +++ b/scripts/simplebench/bench_write_req.py @@ -0,0 +1,173 @@ +#!/usr/bin/env python3 +# +# Test to compare performance of write requests for two qemu-img binary fi= les. +# +# Copyright (c) 2020 Virtuozzo International GmbH. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# + + +import sys +import os +import subprocess +import simplebench + + +def bench_func(env, case): + """ Handle one "cell" of benchmarking table. """ + return bench_write_req(env['qemu_img'], env['image_name'], + case['block_size'], case['block_offset'], + case['requests']) + + +def qemu_img_pipe(*args): + '''Run qemu-img and return its output''' + subp =3D subprocess.Popen(list(args), + stdout=3Dsubprocess.PIPE, + stderr=3Dsubprocess.STDOUT, + universal_newlines=3DTrue) + exitcode =3D subp.wait() + if exitcode < 0: + sys.stderr.write('qemu-img received signal %i: %s\n' + % (-exitcode, ' '.join(list(args)))) + return subp.communicate()[0] + + +def bench_write_req(qemu_img, image_name, block_size, block_offset, reques= ts): + """Benchmark write requests + + The function creates a QCOW2 image with the given path/name and fills = it + with random data optionally. Then it runs the 'qemu-img bench' command= and + makes series of write requests on the image clusters. Finally, it retu= rns + the total time of the write operations on the disk. + + qemu_img -- path to qemu_img executable file + 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 + + Returns {'seconds': int} on success and {'error': str} on failure. + Return value is compatible with simplebench lib. + """ + + if not os.path.isfile(qemu_img): + print(f'File not found: {qemu_img}') + sys.exit(1) + + image_dir =3D os.path.dirname(os.path.abspath(image_name)) + if not os.path.isdir(image_dir): + print(f'Path not found: {image_name}') + sys.exit(1) + + cluster_size =3D 1024 * 1024 + image_size =3D 1024 * cluster_size + seek =3D 4 + dd_count =3D int(image_size / cluster_size) - seek + + args_create =3D [qemu_img, 'create', '-f', 'qcow2', '-o', + f'cluster_size=3D{cluster_size}', + image_name, str(image_size)] + + count =3D requests * int(image_size / cluster_size) + step =3D str(cluster_size) + offset =3D str(block_offset) + cnt =3D str(count) + size =3D [] + if block_size: + size =3D ['-s', f'{block_size}'] + + args_bench =3D [qemu_img, 'bench', '-w', '-n', '-t', 'none', '-c', cnt, + '-S', step, '-o', offset, '-f', 'qcow2', image_name] + if block_size: + args_bench.extend(size) + + try: + qemu_img_pipe(*args_create) + except OSError as e: + os.remove(image_name) + return {'error': 'qemu_img create failed: ' + str(e)} + + try: + ret =3D qemu_img_pipe(*args_bench) + finally: + os.remove(image_name) + if not ret: + return {'error': 'qemu_img bench failed'} + if 'seconds' in ret: + ret_list =3D ret.split() + index =3D ret_list.index('seconds.') + return {'seconds': float(ret_list[index-1])} + else: + return {'error': 'qemu_img bench failed: ' + ret} + + +if __name__ =3D=3D '__main__': + + if len(sys.argv) < 4: + program =3D os.path.basename(sys.argv[0]) + print(f'USAGE: {program} ' + ' ' + '') + exit(1) + + # Test-cases are "rows" in benchmark resulting table, 'id' is a caption + # for the row, other fields are handled by bench_func. + test_cases =3D [ + { + 'id': '', + 'block_size': 0, + 'block_offset': 0, + 'requests': 10 + }, + { + 'id': '', + 'block_size': 4096, + 'block_offset': 0, + 'requests': 10 + }, + { + 'id': '', + 'block_size': 4096, + 'block_offset': 524288, + 'requests': 10 + }, + { + 'id': '', + 'block_size': 524288, + 'block_offset': 4096, + 'requests': 2 + }, + ] + + # Test-envs are "columns" in benchmark resulting table, 'id is a capti= on + # for the column, other fields are handled by bench_func. + # Set the paths below to desired values + test_envs =3D [ + { + 'id': '', + 'qemu_img': f'{sys.argv[1]}', + 'image_name': f'{sys.argv[3]}' + }, + { + 'id': '', + 'qemu_img': f'{sys.argv[2]}', + 'image_name': f'{sys.argv[3]}' + }, + ] + + result =3D simplebench.bench(bench_func, test_envs, test_cases, count= =3D3, + initial_run=3DFalse) + print(simplebench.ascii(result)) --=20 1.8.3.1 From nobody Sat May 18 11:26:03 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; t=1594576267; cv=none; d=zohomail.com; s=zohoarc; b=jtaraYuUEPdvhgIAcux5CKlVMp6R7xjkCC9q7AWfV04YLmNGQWWd6cE7amSTYwIfbnVTiqOQ4GYzHW3DfikuxAiUIL5Us38qIOt+0WV6qcjobboTBOGMGSr9TUKxFUl9+M7S1kUQVvm23IL1cDTXIx9jAlmucGZSNlnn/EEYR2c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594576267; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=uFozjjy5YDKX6i1gwQDqv15WG8XzSWeGKQPnovWe4MU=; b=kae7ScExqGNBt54ERrO/rZv3ETAnF5vCUKSpwpCEjx9At4GF8vfhco6P+niPCjkkxwI46MMy2wtSNklZhtOqy++MngBRXmh2PB1+cm5OkoFgbXyFTZvPoVeBY3AaC2FXdQDUbg/Pa5ztfcm+13CX/tnF/bef+Oc0B4Q6Zz+JFuA= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1594576266946491.9762484709256; Sun, 12 Jul 2020 10:51:06 -0700 (PDT) Received: from localhost ([::1]:49318 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jug81-0004tN-HE for importer@patchew.org; Sun, 12 Jul 2020 13:51:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54434) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jug6Q-00039S-DK; Sun, 12 Jul 2020 13:49:26 -0400 Received: from relay.sw.ru ([185.231.240.75]:60378 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-0001lB-6e; Sun, 12 Jul 2020 13:49:26 -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-JN; Sun, 12 Jul 2020 20:49:11 +0300 From: Andrey Shinkevich To: qemu-block@nongnu.org Subject: [PATCH v4 2/3] scripts/simplebench: allow writing to non-empty image Date: Sun, 12 Jul 2020 20:49:17 +0300 Message-Id: <1594576158-75884-3-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 (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add 'empty_image' parameter to the function bench_write_req() and to the test cases that will allow writing to the non-empty clusters of the image if the 'empty_image' parameter set to False. Signed-off-by: Andrey Shinkevich --- scripts/simplebench/bench_write_req.py | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/scripts/simplebench/bench_write_req.py b/scripts/simplebench/b= ench_write_req.py index a285ef1..f758f90 100755 --- a/scripts/simplebench/bench_write_req.py +++ b/scripts/simplebench/bench_write_req.py @@ -29,7 +29,7 @@ def bench_func(env, case): """ Handle one "cell" of benchmarking table. """ return bench_write_req(env['qemu_img'], env['image_name'], case['block_size'], case['block_offset'], - case['requests']) + case['requests'], case['empty_image']) =20 =20 def qemu_img_pipe(*args): @@ -45,7 +45,8 @@ def qemu_img_pipe(*args): return subp.communicate()[0] =20 =20 -def bench_write_req(qemu_img, image_name, block_size, block_offset, reques= ts): +def bench_write_req(qemu_img, image_name, block_size, block_offset, reques= ts, + empty_image): """Benchmark write requests =20 The function creates a QCOW2 image with the given path/name and fills = it @@ -58,6 +59,7 @@ def bench_write_req(qemu_img, image_name, block_size, blo= ck_offset, requests): 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 + empty_image -- if not True, fills image with random data =20 Returns {'seconds': int} on success and {'error': str} on failure. Return value is compatible with simplebench lib. @@ -96,6 +98,15 @@ def bench_write_req(qemu_img, image_name, block_size, bl= ock_offset, requests): =20 try: qemu_img_pipe(*args_create) + + if not empty_image: + dd =3D ['dd', 'if=3D/dev/urandom', f'of=3D{image_name}', + f'bs=3D{cluster_size}', f'seek=3D{seek}', + f'count=3D{dd_count}'] + devnull =3D open('/dev/null', 'w') + subprocess.run(dd, stderr=3Ddevnull, stdout=3Ddevnull) + subprocess.run('sync') + except OSError as e: os.remove(image_name) return {'error': 'qemu_img create failed: ' + str(e)} @@ -130,25 +141,29 @@ if __name__ =3D=3D '__main__': 'id': '', 'block_size': 0, 'block_offset': 0, - 'requests': 10 + 'requests': 10, + 'empty_image': True }, { 'id': '', 'block_size': 4096, 'block_offset': 0, - 'requests': 10 + 'requests': 10, + 'empty_image': True }, { 'id': '', 'block_size': 4096, 'block_offset': 524288, - 'requests': 10 + 'requests': 10, + 'empty_image': True }, { 'id': '', 'block_size': 524288, 'block_offset': 4096, - 'requests': 2 + 'requests': 2, + 'empty_image': True }, ] =20 --=20 1.8.3.1 From nobody Sat May 18 11:26:03 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; t=1594576266; cv=none; d=zohomail.com; s=zohoarc; b=dtw8nmW/uoF7IidOlIxnq+VFRmJjzbvTcH3DlrWbkWqFfM/VlGOp6HBgBm0e81qc4PpWDpsqfzBhTPjxyykuUL7LA4fyO82yRRBWbo7xujf/+7q0fR6bNzzZbBzmm8uGLVvHwPWEFuPeXBYX7iUqLKco/w9rTTDuKLkmSm2uehg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594576266; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=yQF5z8+dYzhawDZPsM9m6yOYpg6LjOn4PCxm+gm7HZI=; b=O7i4gBcEfgPRbIiucfc1bFew7oRCL5rFPE7W3mCHBiQuhcB4ySL4hvdX8uNLiOLWCQ5RfGV6+35MNScUsILZ26NsJkBIIYzJAvHGIyYYv+XluaSP9M8zwRs0FzwxMDK7J6jIUz9fxB8QARMLGkuzF7dwnyjdceI1o5290L1Q1+E= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1594576266952838.2377705504904; Sun, 12 Jul 2020 10:51:06 -0700 (PDT) Received: from localhost ([::1]:49214 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jug81-0004qs-Ii for importer@patchew.org; Sun, 12 Jul 2020 13:51:05 -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 (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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/b= ench_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, blo= ck_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 =20 Returns {'seconds': int} on success and {'error': str} on failure. @@ -83,8 +83,17 @@ def bench_write_req(qemu_img, image_name, block_size, bl= ock_offset, requests, f'cluster_size=3D{cluster_size}', image_name, str(image_size)] =20 - count =3D requests * int(image_size / cluster_size) - step =3D str(cluster_size) + if requests: + count =3D requests * int(image_size / cluster_size) + step =3D str(cluster_size) + else: + # Create unaligned write requests + assert block_size + shift =3D int(block_size * 1.01) + count =3D int((image_size - block_offset) / shift) + step =3D str(shift) + depth =3D ['-d', '2'] + offset =3D str(block_offset) cnt =3D str(count) size =3D [] @@ -95,6 +104,8 @@ def bench_write_req(qemu_img, image_name, block_size, bl= ock_offset, requests, '-S', step, '-o', offset, '-f', 'qcow2', image_name] if block_size: args_bench.extend(size) + if not requests: + args_bench.extend(depth) =20 try: qemu_img_pipe(*args_create) @@ -165,6 +176,13 @@ if __name__ =3D=3D '__main__': 'requests': 2, 'empty_image': True }, + { + 'id': '', + 'block_size': 104857600, + 'block_offset': 524288, + 'requests': 0, + 'empty_image': False + }, ] =20 # Test-envs are "columns" in benchmark resulting table, 'id is a capti= on --=20 1.8.3.1