From nobody Fri May 3 09:42:40 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=virtuozzo.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1518441428897496.57993857885265; Mon, 12 Feb 2018 05:17:08 -0800 (PST) Received: from localhost ([::1]:57865 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1elDyk-0004mD-0C for importer@patchew.org; Mon, 12 Feb 2018 08:17:06 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49142) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1elDwJ-0003Uo-Gz for qemu-devel@nongnu.org; Mon, 12 Feb 2018 08:14:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1elDwF-0008Bj-Dc for qemu-devel@nongnu.org; Mon, 12 Feb 2018 08:14:35 -0500 Received: from mail-ve1eur01on0108.outbound.protection.outlook.com ([104.47.1.108]:37136 helo=EUR01-VE1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1elDwF-0008Aa-3s; Mon, 12 Feb 2018 08:14:31 -0500 Received: from xantnef-ws.sw.ru (195.214.232.6) by VI1PR0801MB1997.eurprd08.prod.outlook.com (2603:10a6:800:8a::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.485.10; Mon, 12 Feb 2018 13:14:28 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=mnikJA2AcljD3FUU5laYfcUWKu+JFIZD5/Cfrq/V3hY=; b=NclsSHenP/2CYs8/XIAEbpXoYjqDaIJmpPRsnWWeq0660QWVJoCf+sa335j11EgN8GbXn5Gcej7/9mlJEBE3dOV2jiNsco9jtkM9yWwGmuu3804hhUy86GD465vTqyL+htQHzTfONTDXCkK9elh0MXo3cgrCUn4kaxl6A6tlSo8= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=anton.nefedov@virtuozzo.com; From: Anton Nefedov To: qemu-devel@nongnu.org Date: Mon, 12 Feb 2018 16:14:00 +0300 Message-Id: <1518441241-32557-2-git-send-email-anton.nefedov@virtuozzo.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1518441241-32557-1-git-send-email-anton.nefedov@virtuozzo.com> References: <1518441241-32557-1-git-send-email-anton.nefedov@virtuozzo.com> MIME-Version: 1.0 X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: HE1P190CA0018.EURP190.PROD.OUTLOOK.COM (2603:10a6:3:bc::28) To VI1PR0801MB1997.eurprd08.prod.outlook.com (2603:10a6:800:8a::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5dda6fca-aa49-4cae-57d8-08d5721a8c96 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(2017052603307)(7153060)(7193020); SRVR:VI1PR0801MB1997; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1997; 3:0lWFK4OL++r2DlRsy1LsMISasQzF/onkglf80annWmHzbSKo/3eZO4TK6M6peAh75XgXLSpQ3dcmMNZnDStnTWyLcylsBPVObGrIMTw10oUolnn9gUGMbLJLc4COJY8ybO93PJcHojKrt6ePiivoCVy56p5X7umW5g5d7X91NRBvOQEsm9zyv3wxsCCuvmvdIgnWVIXL/ZKdaWC6JNSOiIF906bHupyS+pyYhDkuxGk8ga1/OlfrAPs+8NJ5M16x; 25:oTMYzABpPKp1xktDBOdsCgDsXbWg0bUaN6S2nyPM5a90ir6V3jPXm8M2JQxk7pHkqcdTd08UULFpC/nSvhQHOrIrioJYf/bqKk/iO0diXjHXvKrFmzh7YyixbSlqd+hinJQuv2Pxgc3YegGVJhyD9GBMUBsOv6GhCQ9YeFam2AD61+ivEp1brETyK9YUorbRYcga89OZR99uzIx16eAnksEIjYA2OqNudIf9MezFqLOm0JlCSAzPDRQ9EMzd9oaxfcA+uyPGaO0P6X5AhhNITjSeDyPnYTMJILqIfiLndkINrOCsGRKXJNhl+P4e4tVMYKBJ8VtEnC8b2p9sO2zW2Q==; 31:t25UtqGuBXCOLfjw0FxrnHNdmpGvITria6ufz891mlYoLLcyDzyB0lfPihj+AjYSUbpm4qMLgf4Cw2Qh7/DQAMM9BoLYs33qIekAd1v+xF+sdWNJsVFkv7cokWURNnMx9hGPgX3HsbKYyY5yGil0K2luyv4T+Nn+Kt9ca9xKxQbXKH40nfG2I1pbvDKIUB9ZFDwBSFrshmY0Mkz5J+PifPCNpmnR30/ituGuJEcvL3E= X-MS-TrafficTypeDiagnostic: VI1PR0801MB1997: X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1997; 20:I48GvUWVyqVSbaD/xR51r5i5XBfXMq4E+4UDqQu8287z4zzfOfIdi5yaUYlQTuXVbsbaKT6MnJoe9eHUCFJLuv3BBGo55vaB1MRt0QVQ3Q0Vqc37lDJb4nZXSX4x0VBxM18nYwtMUNmuoVKVjIPE227NyOf3Hg3sBheRX4jhsJ9H8qn/HCMHvx5L9JxJT+xJJex+BG0S1L1bodH15RXhTUiwpZnwZjdXO1kQLnSB2PUTzeV3rC638oFkmVIxTnvkQHW7/8n/irg5sTp7CVn9Sx0+m5g/vUZ9pfiZeQvnlTLjtF3FyWGvskOAucXsxo9LimmJZBfqimkfLmlOFaGAg4pO5/PvPcAEzCzXoO0m0Yu66iPHWzBCbKVMHDqjBZBBZOohvH4jQybRbStFyrBZMBqyp8oHR5CpHlEH7cahqgFpaoxKjEin/SDRCm8pAi4CZE/hjp0ii34qqNyGIgcGbHKyD3+hOAbsToxKw0kBbjVbExSTLjKeQHkFh7orW+jP; 4:Dw0Ewtr4aBoTeKc5b9R1mIj7Rdu/7TwpD80nYUd0NmGVf7k0aRbOZkyWbOgCIwRAN8LpXe7K8pmpZZEQogXZ4JBOPBST8+IbwAnGFGK4kLXew94jawcK1SK99ZxThKjrLk+ZuwLw/YLKbBiE+6txRuh+7zwDBehhYIFHF5nMPzzU3G3sJJ8y09vzyli0PFDjrOaG0BRQTxjgCnQLmeFNMK3cyihpkaplL8hJ7E2E+LtkGAm25bpEViiTz6Wjy3UNxuZ/0f4AnhyUIGKJlGPlwA== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040501)(2401047)(8121501046)(5005006)(10201501046)(3002001)(3231101)(944501161)(93006095)(93001095)(6041288)(20161123558120)(20161123560045)(20161123564045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:VI1PR0801MB1997; BCL:0; PCL:0; RULEID:; SRVR:VI1PR0801MB1997; X-Forefront-PRVS: 0581B5AB35 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(346002)(376002)(39840400004)(396003)(366004)(39380400002)(199004)(189003)(16586007)(69596002)(68736007)(316002)(105586002)(36756003)(50466002)(53416004)(48376002)(106356001)(2351001)(66066001)(47776003)(2361001)(7736002)(8676002)(305945005)(51416003)(81166006)(6506007)(5660300001)(4326008)(2906002)(186003)(6116002)(50226002)(3846002)(2950100002)(6916009)(6666003)(26005)(25786009)(8936002)(107886003)(6486002)(97736004)(76176011)(86362001)(53936002)(52116002)(386003)(6512007)(55236004)(478600001)(81156014)(16526019)(21314002); DIR:OUT; SFP:1102; SCL:1; SRVR:VI1PR0801MB1997; H:xantnef-ws.sw.ru; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: None (protection.outlook.com: virtuozzo.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR0801MB1997; 23:8toQeoTB9pkMcKFr0wG21OskO7W0rhqFH95JEG/?= =?us-ascii?Q?0aROT4CbOLKegdXISBnYxbiYAFjqEIZ9rcYiwjufaUhlKyKvN3miLih6sI9P?= =?us-ascii?Q?FtLcXIaO/dc7QSnwHwR/tsxuYlLnLpheY0gyYtjAQxW/O7bmi4zXiFA09ttu?= =?us-ascii?Q?53n15ropTpQtIbA/aw5yrViukYITd2GqN4qQh+2VMKwMuQ/Aa9HOtML79ZMP?= =?us-ascii?Q?girCFSDkWGtjzbJ8JFMkV1f6FRK+RiGKiFl7w1YTXpREqgRFtAX808tk020e?= =?us-ascii?Q?FkD/JqhhX71MKrYvJVe/olS7jPcBWDiwdr/R5kGUvAJvdIr5sJ8BeAN7vDQo?= =?us-ascii?Q?yAC8nXplpHzFgG7ah9GLOS0cwkxBJNCcfKuy/8u1L1RiKukU+LoOAd1PNteR?= =?us-ascii?Q?1HYJfszjvYpS3piOzWuG0Hwp2tcI9hX/fI42ET/BDQqWd3A71QVoHfjY1m7H?= =?us-ascii?Q?20qT5P6WlSxny9oBxH9RnBrGVp/yoFt3OmLBBtPbMD/B/UPv/w6hpzz/JRP8?= =?us-ascii?Q?YUtEpEO8+krVztTCXp+Wsmwj4C+QGKszxGjnPxAxnCSFYfJ5vw9EiXEngqwd?= =?us-ascii?Q?YP37JOCO98v9JHe52p5bGP0/xeUDJb/j5z5bk2RbaD2/oyI8Gmn4wcYzQyKg?= =?us-ascii?Q?kqcbVrjgY98ZxjbIhdHbg6+n2wY0z8xNfhJlak33KafJLBUrO7E+w8x40K12?= =?us-ascii?Q?5EmODAAB50UTpk9hNnSDCJTkiFocEKElvwR+LlORBA7k83KX7RWBlliVnSa9?= =?us-ascii?Q?LCtR0X9qjMYAOU2nuMa7r+OadBdtMbUdI+XkjZ7R/uWj+oHJ3HEEj2wh7dW6?= =?us-ascii?Q?Ml4WEXbPEVcE1QMZAIhXQn0YpY6q5Hc6jn6DawoMYqCdDUHZQrFBSNLqhNWV?= =?us-ascii?Q?VQSKh2OF7uBF3CfnD9UhHERELO2nucsoVbMJtsrzSKdc6nJ1/VlBYZXX87GI?= =?us-ascii?Q?zomR3KioIuIwPhCJkC9/QGlHTCqE5JEzx3TUV0hz/T4qzic1E14PjfDTVobZ?= =?us-ascii?Q?/nIN8Rj/GoHo2ZuGUb6W0wKuf+K/v7y/GAl8sgAPJCeiG6pL19UwATP2En5l?= =?us-ascii?Q?rLRTJJEbYfoNyELCrbTg5DPHrrx/fsR57/il613AVhUMChe3tJlupIIPt39J?= =?us-ascii?Q?jRKcc9kI5YBxziMXFIMoQeBLVkGTpjSFnWRVzCJCbGa+dEF7PmJxx2SREvtJ?= =?us-ascii?Q?BBSqBLdcMWUEtU2kIcPKtKSFCdecWGjLcVp8lai1nxHP5O4vTppT1LPH+D6g?= =?us-ascii?Q?kKJC5fRVcGFfs21Pv1Ls=3D?= X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1997; 6:okMuBd850Y2gSVUAS9q/g05z3hfCEipPf829enhSHejtwt0dGTNrzK3vmWxC8wn5KXGT7zTKRfkCFyPnxgqfyDtba+lzJS9zOpecm0o+JwFZX7Ayo040piauJon6VK12umFpJrATqBHA/oUAP3aTnk1TNopJK1btD6ps0Fg3qHzLj3kFF27HP9GiaTKXinyBWU4PX1ZpuZqeYZYI/KCInioOtR+fjgV8k3Ka7ccfStPpDXbHAbyeXyiCkazqedKYZT5cFgNg17pe+Re/LffY+AVKe9aq3Hx4p37+4G+g0uQ/mJFkFa4q3/D6GcFvWslCnoQk0cV9RlQLB5S9j17cYv7/JTm6o12VgZfVuGrg4rU=; 5:1aefWrd36VuMnvsnlOjsFLs94BQLUhx3Nr2LNqj/pyX8q7EFD0+WEdsl6kjCSE8Zj2TWze1fNYNBfFYn/K9O9fKQnuwbZmALJudgwQOYl8pUPm87tDqImS1ZAh7OIldYZFx5YlgOgnDDBeV0/xAxtw85MIPS2jgba7uq0AMdUjQ=; 24:t+E1yo+q6LRrmf7WvDetBdBDvh4TdCtzCdRVsx0HRGfyg5adZr5wK/6J7/Rmx74E0Y40cutf8qaaDjoO+6qJvTBkxEHaC5opuX+6kfiTeK8=; 7:SInFc+0OUn+20XCM0F/PahPrpsm6zla2NgV0juaMgO/eI8LWGbjr2Sh53CfdLbvlEGmH1VCva+ma+c3U4bhg0pIRCsBu7L44ongbwtDQY23HpdEwM255h9q+5Q5AqcGifmisxIes0btaQe0o3Din5y/wvIJKk9Y/RTvz9/1EVPGc30Qjy0AA95TBNPaZRAnvVvcXFedyCCE4B11iQp/RUOGQZr5td+0GDoPps3De+NcMwyw6Pwvu/rdpOeg3qEqz SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1997; 20:62Bx1dW0ctw9jhvNMjOeNLET7wzS/pAoSIC8fsXZWVasJi8fNziR177Z13gQ4+OXjOoJSyI21bTggjqand58wn4H6o09P0Oq2q+zeTmAWmKdP/q6JGE+EvmMHyR+FX9WwkWu9p9xSfWspz3kQV96MuuiTp7K72wVxNvi7FccMLU= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Feb 2018 13:14:28.8203 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5dda6fca-aa49-4cae-57d8-08d5721a8c96 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0801MB1997 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.1.108 Subject: [Qemu-devel] [PATCH v2 1/2] iotest 033: add misaligned write-zeroes test via truncate 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, Anton Nefedov , berto@igalia.com, qemu-block@nongnu.org, mreitz@redhat.com, stefanha@redhat.com, famz@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This new test case only makes sense for qcow2 while iotest 033 is generic; however it matches the test purpose perfectly and also 033 contains those do_test() tricks to pass the alignment, which won't look nice being duplicated in other tests or moved to the common code. Signed-off-by: Anton Nefedov --- tests/qemu-iotests/033 | 28 ++++++++++++++++++++++++++++ tests/qemu-iotests/033.out | 13 +++++++++++++ 2 files changed, 41 insertions(+) diff --git a/tests/qemu-iotests/033 b/tests/qemu-iotests/033 index 2cdfd13..5fa3983 100755 --- a/tests/qemu-iotests/033 +++ b/tests/qemu-iotests/033 @@ -64,6 +64,9 @@ do_test() } | $QEMU_IO $IO_EXTRA_ARGS } =20 +echo +echo "=3D=3D=3D Test aligned and misaligned write zeroes operations =3D=3D= =3D" + for write_zero_cmd in "write -z" "aio_write -z"; do for align in 512 4k; do echo @@ -102,7 +105,32 @@ for align in 512 4k; do done done =20 + +# Trigger truncate that would shrink qcow2 L1 table, which is done by +# clearing one entry (8 bytes) with bdrv_co_pwrite_zeroes() + +echo +echo "=3D=3D=3D Test misaligned write zeroes via truncate =3D=3D=3D" +echo + +CLUSTER_SIZE=3D$((64 * 1024)) +L2_COVERAGE=3D$(($CLUSTER_SIZE * $CLUSTER_SIZE / 8)) +_make_test_img $(($L2_COVERAGE * 2)) + +do_test 512 "write -P 1 0 0x200" "$TEST_IMG" | _filter_qemu_io +# next L2 table +do_test 512 "write -P 1 $L2_COVERAGE 0x200" "$TEST_IMG" | _filter_qemu_io + +# only interested in qcow2 here; also other formats might respond with +# "not supported" error message +if [ $IMGFMT =3D "qcow2" ]; then + do_test 512 "truncate $L2_COVERAGE" "$TEST_IMG" | _filter_qemu_io +fi + +do_test 512 "read -P 1 0 0x200" "$TEST_IMG" | _filter_qemu_io + # success, all done +echo echo "*** done" rm -f $seq.full status=3D0 diff --git a/tests/qemu-iotests/033.out b/tests/qemu-iotests/033.out index 95929ef..57799cb 100644 --- a/tests/qemu-iotests/033.out +++ b/tests/qemu-iotests/033.out @@ -1,6 +1,8 @@ QA output created by 033 Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D134217728 =20 +=3D=3D=3D Test aligned and misaligned write zeroes operations =3D=3D=3D + =3D=3D preparing image =3D=3D wrote 1024/1024 bytes at offset 512 1 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) @@ -164,4 +166,15 @@ read 512/512 bytes at offset 512 read 3072/3072 bytes at offset 1024 3 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) =20 + +=3D=3D=3D Test misaligned write zeroes via truncate =3D=3D=3D + +Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 +wrote 512/512 bytes at offset 0 +512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +wrote 512/512 bytes at offset 536870912 +512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +read 512/512 bytes at offset 0 +512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) + *** done --=20 2.7.4 From nobody Fri May 3 09:42:40 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=virtuozzo.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1518441433423618.4547859467928; Mon, 12 Feb 2018 05:17:13 -0800 (PST) Received: from localhost ([::1]:57869 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1elDyo-0004r1-Ig for importer@patchew.org; Mon, 12 Feb 2018 08:17:10 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49237) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1elDwN-0003ZC-Ve for qemu-devel@nongnu.org; Mon, 12 Feb 2018 08:14:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1elDwI-0008Dx-At for qemu-devel@nongnu.org; Mon, 12 Feb 2018 08:14:39 -0500 Received: from mail-ve1eur01on0107.outbound.protection.outlook.com ([104.47.1.107]:13040 helo=EUR01-VE1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1elDwI-0008DF-0Y; Mon, 12 Feb 2018 08:14:34 -0500 Received: from xantnef-ws.sw.ru (195.214.232.6) by VI1PR0801MB1997.eurprd08.prod.outlook.com (2603:10a6:800:8a::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.485.10; Mon, 12 Feb 2018 13:14:31 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=3b7pLuKsf0cuoCRlGCUFNaK/Jhouf0JCAkAdJjslEJU=; b=b0GA2/iziiIEPz2b9aO4TqwPc2ElwXr02mOqgxV+P9AeYBIOnmsOAL6vpkZVhuc7jWs4aIJ50ELyw4qHOutraESU6XxgXy1Qn38CA7u5L/QqTuFHag3S5Mq9zUdXRuE91trlsinwilODx0gsSL0ePOz7czeR6DHJrbAT0itY4hg= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=anton.nefedov@virtuozzo.com; From: Anton Nefedov To: qemu-devel@nongnu.org Date: Mon, 12 Feb 2018 16:14:01 +0300 Message-Id: <1518441241-32557-3-git-send-email-anton.nefedov@virtuozzo.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1518441241-32557-1-git-send-email-anton.nefedov@virtuozzo.com> References: <1518441241-32557-1-git-send-email-anton.nefedov@virtuozzo.com> MIME-Version: 1.0 X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: HE1P190CA0018.EURP190.PROD.OUTLOOK.COM (2603:10a6:3:bc::28) To VI1PR0801MB1997.eurprd08.prod.outlook.com (2603:10a6:800:8a::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 47ff4a22-9c78-4c29-cf7a-08d5721a8e32 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(2017052603307)(7153060)(7193020); SRVR:VI1PR0801MB1997; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1997; 3:NQYoeM0GhMZXYbePDP8DdrDhTyULCVOtTtzxwVJiP4J2r4a6/psEg5AgkvoPCKmXRPumt+V9/NTxOsvUUZ3qHJie9cJkPmMkT7HoNa97i2+C5bHfyq313YrRwUYDWQ4r42yOBsXUAB2O0CXvIZNs+wZpTeWPClxR78m0mwIcDad/MLJUKwRKZXTBQjUg8JAjte1EyhpFBnANsKXxW47mHZ2lGI/v4xlnfM06YdiSRthKukM8R5mSAqFV3K8F//g/; 25:5qDiZ7XRsoEHY3QLpj73fiOy/WiBxy2mal0nbd/fazIazCP287pYMl89XljA4U2cnPicUU7B/7eYFtP+oRT5R0LIzxLcS+pRtW1bxqnVVnJr3YlltqVtMqvHiHLKVcfCQVhJGqUhBPSpA+7NMRhnYkzL9dVb96nr0SaSMlx+0HGS3Lfk3qkqqUPB/V44qJg7yP14VoFo9KYLpAGhhJ5c/O1Hv1ip4dlFYD4IXXlRNhEutu0WfF9jGB4/Jzh/oAaXLskDXSwtpIXnDmlYod9pK1LG4/s9X2xOc+IbOhmBFOCD0MEQz785nUV38OVH9ytlKcilpc1WL0okwgzRDBPh6w==; 31:rjPNfoBX1x4n4bYid020iM1of8A+skjgH/YDtMu70wflhnvkE/fi+kV5Vt/GRIfgB8CfUpxkzvy9HhV2be6aLhnvQQ9yNLe6+w/K3r6X9biSq7IDz2hIqpxJukrrvg8SfRAKihMsspcNXi64iuAhm9xNdLiN5D8aRY2JVURTlpLcLmo92en+kjeO5sJNBXoZuFJjtFioeCKyKerZcgzQ/dKQJmhIvkSAl/WZXE8q1Fw= X-MS-TrafficTypeDiagnostic: VI1PR0801MB1997: X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1997; 20:0Z1UfwCUCxxIo/7JrqdLq0UQZ5wzB3tVc85v5RLmfsPgCWjClA7r23KIb+V0zaLqgeO22ccMkkS0Rnl9qcDmszsryupk/fJQRZTdD0LfNHzqy0olSEgbPAQai5VStBriXu07qfV1bjX7ABuX19HisLyrGQ2Clk2ptvMbppRKNIHlf3VtihhBQQaY6H+s4kowkSZOeFoTFLW/+5YRVJC2biKh/2TA4JWb1yF2/luSpwE77GSTKJZqwj1PV4gq1wNSbR9WryOLbHJTUXDQWOiNd3FeTpWqGk4/mk/XNzDl1RC2ut/mcvsGxDSKhG4hIwCt9XVpvs27Sxpay+AAsu+ojfj8cZPvwT+R0NF9QmbTekfjMUeemxz/8Tf6XHTaFyaLWMhNI3erQ/dugmJlCtef1LZTdhbSe4qRmz/4fBoGXVxP8uzi8Infes1aoPjVYNc99KkbdCJi09flcKfw6dCKdLM5/V+sNPAufi7Lm5bV25WFEBwQ06tXDhyGLh9nFJ2P; 4:E8nkmdLFquiUO6v+CWhUQKR53AZm6svrp8Z7IKWJFnWOPXqqoUDdaeAKvCQbLOOOSH+415aR38wjmMTAmGWPiMWJui85urhMspQamajL0+2nWLzCwnTgjoT5yyo7IKc/jLOGTxyROdfeqyf8IwMACqCOeQfH2uDM5zXDODjkt8HqoQYZ4rzcIZ8zX8GoRTtVfDroSRmvRTlwYNfkUIdjT/tJ0z24PqCqO1YYNoK3mCXcLTWxzDtHh/B+Hrqif4hRT0TX9BvLcjCBcs4JyPZp3g== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040501)(2401047)(8121501046)(5005006)(10201501046)(3002001)(3231101)(944501161)(93006095)(93001095)(6041288)(20161123558120)(20161123560045)(20161123564045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:VI1PR0801MB1997; BCL:0; PCL:0; RULEID:; SRVR:VI1PR0801MB1997; X-Forefront-PRVS: 0581B5AB35 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(979002)(346002)(376002)(39840400004)(396003)(366004)(39380400002)(199004)(189003)(16586007)(69596002)(68736007)(316002)(105586002)(36756003)(50466002)(53416004)(48376002)(106356001)(2351001)(66066001)(47776003)(2361001)(7736002)(8676002)(305945005)(51416003)(81166006)(6506007)(5660300001)(4326008)(2906002)(186003)(6116002)(50226002)(3846002)(2950100002)(6916009)(6666003)(26005)(25786009)(8936002)(107886003)(6486002)(97736004)(76176011)(86362001)(59450400001)(53936002)(52116002)(386003)(6512007)(55236004)(478600001)(81156014)(16526019)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1102; SCL:1; SRVR:VI1PR0801MB1997; H:xantnef-ws.sw.ru; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: None (protection.outlook.com: virtuozzo.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR0801MB1997; 23:yMruhZsn+t0SrCvgvBsHLpq7tk/IIF9XGQE+gQK?= =?us-ascii?Q?tP2QU0BEf8lC1fYM8dMobqoqXKGN4WM7jjmQouAPSU+TDCTPopbWsPtN668Z?= =?us-ascii?Q?J9iN0LMvBZ9WiEi5YaUvqcI9DJc01UuEAZV9Mnq0gQ85KlqIFbQGjv7qmBBg?= =?us-ascii?Q?T7YbZXPGAGCyc7RJ8BEi3lGupLdZEeD2U1Dfk4unHgFx3VEr+pxGeDyC/RK4?= =?us-ascii?Q?MdhS5hh/LpD06QeQUclOIsnlFXoVGlLCJMv4EtdACZFJ/RpFZDI+JGievAVB?= =?us-ascii?Q?ZWXeTwVLy//p5SXr3tE/xsDGApaYuCJR+N5FKh8bvdHyj1IuZWjR8c9Yaiu6?= =?us-ascii?Q?7Hw1JJbGSNwCIoc4Gt21DAP/QqgFh2p3tVXkjPcirMaDAucedeRHL9o6J5vk?= =?us-ascii?Q?pV+WknF2VDtCKN0YNjudWM+ECpfX4wTIXic9sEQzRISzC7gpAW9AkpkEL3xm?= =?us-ascii?Q?/oK4Dc0sAAfwkFYPclYnbVQUuqMoxBFAcaxaGBki966ZxrlTIh+iZiWbp1Qr?= =?us-ascii?Q?tBMJPM0kbrzUXKzictVk6cI1ZxevSlRw64ZCIFTCydgrtaHgFcupu0dNKFEg?= =?us-ascii?Q?Ceya2uLybs0f4YiUl+GVg2T39TqWGes77LwgxAJ4sVGJyahH5JdbvtqQRHiz?= =?us-ascii?Q?DVBxfqtE5iFEMRkwgFr/Xhed89lLndXX2sizt1mPBk+Ibk8rs8eSzMEtUhxD?= =?us-ascii?Q?9sbZxdEIqSU40jLIbWmOcnHPmva9/u3cTPBgrLq6bpa32C7ztlImRkvLLiaM?= =?us-ascii?Q?GoQV70r8bOf51XioqnaeA7d7Hq5uKsIlG8dikxmO+M1U4KSi25XdLGCL7y0b?= =?us-ascii?Q?/5X91cdbqtOYfAKXYr/BtGAY/oDrj9mr6LoWTB/EWQzD5f8vQ/5W+rxyy8W2?= =?us-ascii?Q?X6HgqpznXXtLAaQWnzmEkUqFFqKg/iYQ3YpgJu4bbHymDIUsy7kX2LIUP4ql?= =?us-ascii?Q?qj/d8djYU/sQypEGgPGzj7ZTnXnaJTa7cDgDj+W1UmK577/fETtGhIxE0DaQ?= =?us-ascii?Q?fhYKz1uk7XLwB9NkA+fPMBU8/5/EUfKUpOa2PPvlH2sTE4k8vuZcXZPsythw?= =?us-ascii?Q?uV+BvCPD1fJdd1r5O2s9U003/9o6BTwuBqeve07gOvXjKQMXPnDzzF2F2Ztw?= =?us-ascii?Q?1EAfn0i7DkwMHl9vHPOeTBHpzAzFaCPQGrWhU7QCNMfIGtSP/JAAtfSSCPPT?= =?us-ascii?Q?P4/zBDM8LJIqnkE4iGPkXwafXQeDq/m2OJRjwieK6A8gDw3AHKlau74V34wy?= =?us-ascii?Q?mQi+oYlnttgBT/pSNHnkFh1sizmiO6YWyQydhkNLNYxEcWQ8KNdjC/+9GYel?= =?us-ascii?Q?b23B8GUeZ7k3TTfa76BDcxp6fOJFEM7IHHqV3aF8TFZtlIgcnSPUBzxjPjyk?= =?us-ascii?Q?Iiu9GWg=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1997; 6:moMC2bQbYAZLZjr4/Ar8pvoO1+wHxzy3dExUVLBvBp874yZiM0LjUu/eZos69UFj6MXfZlklHGTqlsbhu1TLkZ8ZiZZtcXXE6+8Wzdl19LChnmTsKFGxQhhBotmt6EChgpuTIICI5DGJCvxyG+NF1xR87vCZXSxYgQQSMidQYnN7Em4cU2AorUyFi19Zxor9klvWST3jWwgU748pY9yS8q5ELca6GjlXpGT52nhz+yTBfkVHbARCr7lR7nh4KzCvQTP68F0dCXGMo6XOzUAT1BmsNoqhrIkN/V8UJIKCFPClXKeFQBqdLqH4oKSFILKiX+XNXIA4w/GPsUA3m+H6Ofhj3EqR+e6/wG5eQJ/vgZw=; 5:lidxTcBYy1e7gOSpRy+lqpLGV/DM1SKqQfuo4DlLFa5oNDZ0+x2jYi37pnKq3No6yOEgsy6Dhm8p4bZlc0jTaH/lzGs0dTrSgtpkIG1vE4LnF6SzUm2fL355EC7HZAws+OGCRoFF5cWZtSjXsGPcwAfcjZmZ8L5nOYG683fGyb8=; 24:u55fo8QHonPX2p0pjVDMIE07H+Tn5UbBaA6I8ZfbPKiHMp2EPb5wt1Bai6Fu/9JKyg07zVBVHphEJUpWMLZOIgpAJ95g2y769UO+sUQsUds=; 7:XfSf31I1TS36KL7AvvgQeN/7lTSLK8hyipb5X0W3gtkZHViTnc3uVp+8JVE8o115NGmtHRpRHF4V1OtA2VOjdPGGfk6tbk9TR9rB8XQzkcC2B2r+rXof/OskY6QGkJZqZhq8Qxb3clARwSDtLBrl4y9jMmXsNQusCRbOhMv8yhe1VTFL3Zc/2awG744/W6LunHj+8g/EdSKcKuWw9Z7CFhYkEAGoWwskyNKP7mYqxPqXf/Tw6HUpeIL6cq6MIPdb SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1997; 20:WnMTLjg5wP4yQn6x+2hLF0k+TO7KGsSwbfiexkCsl+85dB35gVV6zsYNQK+wp3LzkODfTMvSVUTFNUdAUCjqENkAd3UWAydFHXkGztuvYLNd6TN3uskNOzq4CcQPsFB3IiSsMwpeGvIKYL1x2KpS29ca8unlwdXBhjNZRzI5AYI= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Feb 2018 13:14:31.5078 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 47ff4a22-9c78-4c29-cf7a-08d5721a8e32 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0801MB1997 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.1.107 Subject: [Qemu-devel] [PATCH v2 2/2] block: fix write with zero flag set and iovector provided 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, Anton Nefedov , berto@igalia.com, qemu-block@nongnu.org, mreitz@redhat.com, stefanha@redhat.com, famz@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The normal bdrv_co_pwritev() use is either - BDRV_REQ_ZERO_WRITE clear and iovector provided - BDRV_REQ_ZERO_WRITE set and iovector =3D=3D NULL while - the flag clear and iovector =3D=3D NULL is an assertion failure in bdrv_co_do_zero_pwritev() - the flag set and iovector provided is in fact allowed (the flag prevails and zeroes are written) However the alignment logic does not support the latter case so the padding areas get overwritten with zeroes. Currently, general functions like bdrv_rw_co() do provide iovector regardless of flags. So, keep it supported and use bdrv_co_do_zero_pwritev() alignment for it which also makes the code a bit more obvious anyway. Signed-off-by: Anton Nefedov Reviewed-by: Eric Blake Reviewed-by: Alberto Garcia --- block/io.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/io.c b/block/io.c index 89d0745..40df3be 100644 --- a/block/io.c +++ b/block/io.c @@ -1701,7 +1701,7 @@ int coroutine_fn bdrv_co_pwritev(BdrvChild *child, */ tracked_request_begin(&req, bs, offset, bytes, BDRV_TRACKED_WRITE); =20 - if (!qiov) { + if (flags & BDRV_REQ_ZERO_WRITE) { ret =3D bdrv_co_do_zero_pwritev(child, offset, bytes, flags, &req); goto out; } --=20 2.7.4