From patchwork Sun Jul 12 17:49:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Shinkevich X-Patchwork-Id: 11658397 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7735360D for ; Sun, 12 Jul 2020 17:50:39 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 577FE2067D for ; Sun, 12 Jul 2020 17:50:39 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 577FE2067D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:49318 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jug7a-0004tN-KP for patchwork-qemu-devel@patchwork.kernel.org; Sun, 12 Jul 2020 13:50:38 -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 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" 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/bench_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']) def qemu_img_pipe(*args): @@ -45,7 +45,8 @@ def qemu_img_pipe(*args): return subp.communicate()[0] -def bench_write_req(qemu_img, image_name, block_size, block_offset, requests): +def bench_write_req(qemu_img, image_name, block_size, block_offset, requests, + empty_image): """Benchmark write requests 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, block_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 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, block_offset, requests): try: qemu_img_pipe(*args_create) + + if not empty_image: + dd = ['dd', 'if=/dev/urandom', f'of={image_name}', + f'bs={cluster_size}', f'seek={seek}', + f'count={dd_count}'] + devnull = open('/dev/null', 'w') + subprocess.run(dd, stderr=devnull, stdout=devnull) + 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__ == '__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 }, ]