From patchwork Wed Feb 14 16:09:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Nefedov X-Patchwork-Id: 873419 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="Y3q9MRGt"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zhPhM2z26z9t3M for ; Thu, 15 Feb 2018 03:17:55 +1100 (AEDT) Received: from localhost ([::1]:35865 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1elzkn-00026r-8p for incoming@patchwork.ozlabs.org; Wed, 14 Feb 2018 11:17:53 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44271) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1elzcu-0004A3-9K for qemu-devel@nongnu.org; Wed, 14 Feb 2018 11:09:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1elzcq-0008IM-NT for qemu-devel@nongnu.org; Wed, 14 Feb 2018 11:09:44 -0500 Received: from mail-eopbgr20114.outbound.protection.outlook.com ([40.107.2.114]:53808 helo=EUR02-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 1elzcq-0008FZ-Eo; Wed, 14 Feb 2018 11:09:40 -0500 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=3A6Vs5IsrVturZsm7FWdlB7aSe3Hd4KVHsiTZ1Pkx1E=; b=Y3q9MRGt6TyZqP87+xZcIuLxmIW6Cp2JNPBKiSE/sL63AL6Da+YTOx9nSHyOcq1FUhOwO1InnqifaWHMLh40Y3bZGdJ+tnZ/nWaGpHElbMWIkdUyoA5LLBU2y//h/+0/u3Hpc39oVqUbO/YxXj5GUd55m+tkps+rj26XmfrW3Qw= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=anton.nefedov@virtuozzo.com; Received: from xantnef-ws.sw.ru (195.214.232.6) by AM5PR0801MB1988.eurprd08.prod.outlook.com (2603:10a6:203:4b::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.485.10; Wed, 14 Feb 2018 16:09:37 +0000 From: Anton Nefedov To: qemu-devel@nongnu.org Date: Wed, 14 Feb 2018 19:09:19 +0300 Message-Id: <1518624560-38060-2-git-send-email-anton.nefedov@virtuozzo.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1518624560-38060-1-git-send-email-anton.nefedov@virtuozzo.com> References: <1518624560-38060-1-git-send-email-anton.nefedov@virtuozzo.com> MIME-Version: 1.0 X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: HE1PR0502CA0009.eurprd05.prod.outlook.com (2603:10a6:3:e3::19) To AM5PR0801MB1988.eurprd08.prod.outlook.com (2603:10a6:203:4b::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cb48a70a-3e46-44a6-9dc2-08d573c558bb X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(2017052603307)(7153060)(7193020); SRVR:AM5PR0801MB1988; X-Microsoft-Exchange-Diagnostics: 1; AM5PR0801MB1988; 3:u6hceCyj6khgWZXUrk+94KRQcfJsvDIwaFrR3kF5zd1NXLik+ZH8g44Cny8HOAO7gVrusBHaPQMMntHZvPNhG4sp/9v5Sf+/3jutPugmy20tzkOp517W3ZeCDbOkMMaqHoPjXsO2lKDbpI4jZ4s/8fdzxBic4DFZJuCgzRS+cDMSUd+k3WAvdCDHci1V4xcVRAyiYo16Y0BeVfPX8/hzh/HkGQwABBFdNpz6YuBavB/tPk1wXJXuRj203f546+xA; 25:86cpwyKFszoU8AErzxM9cb9aYW/QAtgrcVDWCNBxm1pTVFA25AYj+86Zambw9aH1kgfvh8GTGQ++ZJUBavpDa+xKXFsOTEnP1xW+rLnBzfEKjgewyrYFUZWzxjMyK2TYSKyrbKmGnaNivfoBGumgwAQDtvMtSRQJOR3osJlPF7GKtwN92bbkyeXiU1F/MqQqLQIFax/gcA3VfVqo5sq+cGHOrs1KpzvMBxr6HX1BkL/PS7v7pPE89e+F3tM5ii7RTBsbCCFRqXrrzZN28p8Sp2vAJE9b2AQ87a10G0Ex3RexfcOvZgCKqt94yBbnfOspG4wuXeksbFWPRuwrb4fVIA==; 31:opn5dpoE7b2l8uUf9II9NSOkVOscvTPUTA78jhDfwEIk6hi7I0v9EEU26WSUtkuECEt5ECiV9R2D6QeJ6AzNlYVHzwSGoam/vJije23kwpbsmmUDaz4ZAO1mOMrU5fQnI510qzXHuu5xtJYB6puHU7mx4ywo1ESk+UK24tGFhfPWU/5KkA3KZr53wwZsBALS6QI7aFngfFL2OUMYLVlX2Ulz5b07/fyWGX/7aE6QO1k= X-MS-TrafficTypeDiagnostic: AM5PR0801MB1988: X-Microsoft-Exchange-Diagnostics: 1; AM5PR0801MB1988; 20:ePsuTDZ5jN717HH1qCYtzbbp2++aw/oRXW19xBcbFXO3paSFU0ybott3POdR8ceHCTLW8ewKVk4Errvpr4vl3gayF7SRE97dTSm1vIaBA8RVH7hHEUkZXVZGqZw3HaWcxH5Df6Hkso3A04hmEpXtdCJYVTNexCvnn+pMJ8pc818gFZchv0VxzgH1gDT+Ii4lgtoDbjHBOGfvKOGgq9Goo9rkHVuENLS36oJO6sB+trhF9P7Szsrb7UC/f+XsfgIX+/QuJa0lbOSdWkS3b/DkZJZrWJx04lLXfALuP2v+denqtoET8AzjFR+M8RfhsYIWWLiwd1sg51mtYSEl0BwQX9v25SayGWg4BXy5NujmCCAP0m7ZoLdAsNkwNzljBK/IqnotqJGFJmtVLVpBsuX0Yfg2lANGbqGjIXO6CvW8OH17FiJ+2ZMD43FcH0oNzQh5XC51+eNuGXbmkRIOEAAkR/RjWMxvblOHrdf7K2gKCdEq9x5FMuS6gnSi8p/22KNt; 4:YViJPPk4hoeZP9bAjkgjaXCNZA0nxnanpnYJu2dCura0Hee26gr/9m/+Y5OLZ4vaJHBnzj8yC9GJOKL/ORvcfprI4Pm5kiOIGLdaHgTMOsPnHBcl/Ltl/4mNgDryu+VGNCXwveLZWv5yPG3IRryb3RIzlJLRIfUaDvQaXtCvMVJLsBmVdIYgJHZpF1eKiakZLvfvEEycgXaGlCK+nCi298ImiugGmxyt1RNdwERPsyjT/ur4wldVEvPOYJ5rmCzi1nRkQV4UduxmMFDJYTnmvQ== 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)(93006095)(93001095)(3002001)(3231101)(944501161)(6041288)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(6072148)(201708071742011); SRVR:AM5PR0801MB1988; BCL:0; PCL:0; RULEID:; SRVR:AM5PR0801MB1988; X-Forefront-PRVS: 0583A86C08 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(39380400002)(366004)(346002)(376002)(396003)(39850400004)(199004)(189003)(25786009)(47776003)(107886003)(3846002)(5660300001)(50466002)(16526019)(97736004)(52116002)(16586007)(6116002)(316002)(2906002)(36756003)(386003)(86362001)(6506007)(305945005)(186003)(68736007)(6666003)(6916009)(8676002)(7736002)(2950100002)(81156014)(81166006)(55236004)(105586002)(8936002)(106356001)(26005)(53416004)(50226002)(6486002)(4326008)(69596002)(2361001)(51416003)(66066001)(76176011)(53936002)(2351001)(478600001)(6512007)(48376002)(21314002); DIR:OUT; SFP:1102; SCL:1; SRVR:AM5PR0801MB1988; H:xantnef-ws.sw.ru; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: virtuozzo.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM5PR0801MB1988; 23:zI0kmLI+670aNlQ1tFuSaGvPg/vsodGGJVZYAg6?= 54hOXIBrMWt6Q7opjANbKUart6HNdc8C2zdFMzgQjKZceVTy0FKXZYgnLQGICRfFs/FdOEetdjbT+rnbW11/O/kfgwEC+CcvFv9GIzTxAkOmN+AhQsvHhFgVa8iC5cIRKPF9pEf5c5ZJ1fp1mby3fcf+WemZ7dTnW+vAhVi6KLcD9S2MUVO43bH22HL5DSk/ZvcuQidHFAcgy4foPDYYpNcCfQCyXe5vCKmcLFXQ0QIM0kmBV0vzZcPn0ZMGv69rge22Qem9j1XBujVRLcp78UKE4fw0byQTuYbg4tw4gbwBVv7GYG3vNQ/WEhPVQ84L+IHoAcYHj1WZq2mY8cFPAXkS+txysfkGwdU7/0tdvvCUuO0dPqxp4EYKXXL2gp+Jkm1Jj8yHKmJnSTGTbf7pQyboU9whjP4v//Py1tMfQ7MRjZZwQe0NeLDD5PAhELpj+7MgwiT2VLHzKUvN3GtSOk2RvDD9roRkEpUSU/t0lOUGO6vkW6D6tDv87pCU1yRct/G/4kvOwBp5ikD7qqLEK8RNq4JshOBsaYdFmN66Laa6E9r/HJTUQh4XsPss6VrDlnAntgzLfaoYMipkLlBPXXBusZEZX6RTnNtA3521/AfC6wnRALGw+T0y9bjoncua/e+QBAp6dvNTR7WuNPvwVGK/Kj/BzACvOzNGCz7dYVmdA+CZGhDoFdtwO2V6iO9sQOZkstJh8mCkg8iAc+1Sv4a3PW31/G+MdU4t4qqdGIEusNaAinNrQUfLOp2HBIj1jYlMN0HrPwKN3aXGoeGGNOKXhbW/i/xwj2BRNq63CFApQCcE7xdjYWW+mDWQHPFPl0ihU4FWlauF7FHiB46oFhAmcXHFAZXDjhbRYqQAKFham+zw9AsFYKMRCGbJEoXMdKaiiT2VDRgtJhed5lLA70ZfaJAQX3Waf+HkMSje9UE5tcaP2jkCzUQ0Z9rGvh1I7olvsKyj1sFEIxnG1XyNTXfUizQB4KhlOQbgx2M1RQk2pc0r6Ts72W/iDfYt0EkuN1ATSenj0h+iH5LC/Nzz96NvbxjJoZJ099xOVeFeuzXOo4a7QSeHmSf/kJxAsVemZhy5jc0e8TkVosOCtewefhkIcMhpeke0lW0SEeXQcaaWT1xyV1RuRDFYaT3W6nSVBNjDO0teIXmy4DLFQvqoixCnNZ7WMokF7eZqflvM2+2smZQbMlTv3N/uneQfrxw7jYME= X-Microsoft-Exchange-Diagnostics: 1; AM5PR0801MB1988; 6:F5C5ZQaLEXz9rPVUHeoAPWITR3DZwpV7lhfaBYgwGwjMGWGz4ttcu40NNBubFSu3DL8AS2EEociQyF8ae3fJP5Z+qa9IVIsfb2Nyzr5FGh3pt7u+h9cr+3A2Uv4anzIENtGxbgItYURyEjVqxklt5DOdAv0ahBkEfMUoSxIolzPrYkESTZh6byIkaXm+YV4s00HWyQPY/cZEes5u2W1AJxc7cJIigUNLWnK5G7orKUt1ej7zs8i6SumaxzFHYHeFrnYwlWmuJ3RcP/+SdbXevS2xVCpyaRfQvmvooUcfKj571d4Ine2AqJHH84/B5VwHrPGUkp/f/MWpR2wz7nTEp/MjiIBpFgq7o4EVIJWXSeg=; 5:x1tX7mBelgiqBAy2e2nY48YkhiMMqTdLJFncHsrFMcGFXR2xuBrlcROZTSCyjSnMtF9t6OVUN7uhSwa6GkpecddOzyLw1DV5drm2fSwLnQ/rKrU2aY90dPpJKgGVktR7s+S/DEECVpjcQgojuhGS12rL5nRaS8yMjKYuBhTYock=; 24:Ts9uHThQlCPOS/tFIhtQEkCh/48VI99ZVnzoPp+VsJwWMaxS53CEOWhajrnsFRNjPfIXOFNBNGBunGsm7gyGcZGoGpTGZfaxbSkURjFd2EQ=; 7:LXtknzw0DacVL7AZP+72ZV8msA2dDN+zvZfAuNFhAHVFV+eHeJAJZl0xRYL80tL+U4jsluB9FlSl2Macd2avF0YwTXPDFqGN97EGbTO2Y5WqtidGuIvPpsVaMW1ya2my7yxFGZhwTNercHotcqFy19RcByR63w2qPsGbhhm1JMtvyYdxm+BVF39mk8t2VAYOn5OY1z8kawP/7xI2rBlRJyVBGBVlSRawvlbuUECYusuwVD6W3e1UrWNnpGfqnNTe SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM5PR0801MB1988; 20:MV5lVNPpQypZAy6/Jxqv0yDJC+pCZLl0JbxGHg9ixnNxc+eKj0CgV7yzy5tK9ce9PD9+B+2YTXGDaDrqBCs0GAms0DxkLcE0tkUthTLjxAdCl+CSKJzBSPdAoMQao+0EsnAhHoKcxBdSw6qXmAfAfhyReiBk1ZVBiUw+xDYVwRI= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Feb 2018 16:09:37.0672 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: cb48a70a-3e46-44a6-9dc2-08d573c558bb X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0801MB1988 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 40.107.2.114 Subject: [Qemu-devel] [PATCH v3 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 , famz@redhat.com, qemu-block@nongnu.org, mreitz@redhat.com, stefanha@redhat.com, berto@igalia.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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 Tested-by: Eric Blake --- tests/qemu-iotests/033 | 29 +++++++++++++++++++++++++++++ tests/qemu-iotests/033.out | 13 +++++++++++++ 2 files changed, 42 insertions(+) diff --git a/tests/qemu-iotests/033 b/tests/qemu-iotests/033 index 2cdfd13..a1d8357 100755 --- a/tests/qemu-iotests/033 +++ b/tests/qemu-iotests/033 @@ -64,6 +64,9 @@ do_test() } | $QEMU_IO $IO_EXTRA_ARGS } +echo +echo "=== Test aligned and misaligned write zeroes operations ===" + for write_zero_cmd in "write -z" "aio_write -z"; do for align in 512 4k; do echo @@ -102,7 +105,33 @@ for align in 512 4k; do done done + +# Trigger truncate that would shrink qcow2 L1 table, which is done by +# clearing one entry (8 bytes) with bdrv_co_pwrite_zeroes() + +echo +echo "=== Test misaligned write zeroes via truncate ===" +echo + +# any size will do, but the smaller the size the smaller the required image +CLUSTER_SIZE=$((4 * 1024)) +L2_COVERAGE=$(($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 = "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=0 diff --git a/tests/qemu-iotests/033.out b/tests/qemu-iotests/033.out index 95929ef..9683f6b 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=IMGFMT size=134217728 +=== Test aligned and misaligned write zeroes operations === + == preparing image == 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) + +=== Test misaligned write zeroes via truncate === + +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=4194304 +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 2097152 +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 From patchwork Wed Feb 14 16:09:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Nefedov X-Patchwork-Id: 873421 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="KA02+Kkf"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zhPmM20SJz9t3F for ; Thu, 15 Feb 2018 03:21:23 +1100 (AEDT) Received: from localhost ([::1]:36188 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1elzo9-000591-8L for incoming@patchwork.ozlabs.org; Wed, 14 Feb 2018 11:21:21 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44272) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1elzcu-0004A4-9N for qemu-devel@nongnu.org; Wed, 14 Feb 2018 11:09:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1elzcr-0008JV-6U for qemu-devel@nongnu.org; Wed, 14 Feb 2018 11:09:44 -0500 Received: from mail-eopbgr20114.outbound.protection.outlook.com ([40.107.2.114]:53808 helo=EUR02-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 1elzcq-0008FZ-UT; Wed, 14 Feb 2018 11:09:41 -0500 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=NJywj/z2v87UCBR2jeBvCEJyPioxQQSBoW/YHTkkWXk=; b=KA02+KkfxbzpOYf3bkLU3atFv/AhkM6yPD+icGlaL/WJKyxH9QCcWPhOFEAEboBJaMp+7FcamxSvsHNngjxrMQwsPfBvHDfAqKvH+/F9qPoLxWVFfslCS6ZvkQFqldwl6pyzrHb3740RrrttQ3dLzulu5qSmvVihwxlqQmafrMc= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=anton.nefedov@virtuozzo.com; Received: from xantnef-ws.sw.ru (195.214.232.6) by AM5PR0801MB1988.eurprd08.prod.outlook.com (2603:10a6:203:4b::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.485.10; Wed, 14 Feb 2018 16:09:38 +0000 From: Anton Nefedov To: qemu-devel@nongnu.org Date: Wed, 14 Feb 2018 19:09:20 +0300 Message-Id: <1518624560-38060-3-git-send-email-anton.nefedov@virtuozzo.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1518624560-38060-1-git-send-email-anton.nefedov@virtuozzo.com> References: <1518624560-38060-1-git-send-email-anton.nefedov@virtuozzo.com> MIME-Version: 1.0 X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: HE1PR0502CA0009.eurprd05.prod.outlook.com (2603:10a6:3:e3::19) To AM5PR0801MB1988.eurprd08.prod.outlook.com (2603:10a6:203:4b::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e117f7dc-4adf-4198-5770-08d573c559b8 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(2017052603307)(7153060)(7193020); SRVR:AM5PR0801MB1988; X-Microsoft-Exchange-Diagnostics: 1; AM5PR0801MB1988; 3:GSaHSePfMbKEMpx40nvt2lDquUKvNc4wZni52AzLgEaW914QS734r/MVlblNH8CHvTqke0z5COcyRK90/U4yYsxoc9x9Id2QOJv8CDTAeVB7otO1v3DBvISc57LPk2y9qFKNrrBNUlGJI1amIfDYKfS7OZP20gw/1GObjpDssSN+1eW2uXdQcnEfnU+xmVd+BBI2mfke9ilDZVdxMOhEKj4mk1EH/xphPlWXUlnbhQmM9nLEObX3XdjC4g5Blv6J; 25:FAq7RljWm1wJL6zLKh/z1XmR20GcE5T06nJ3ynLbDRJL6zP5orX2xRzVpQlSPc6JBKLaqY/1NPV9+pOEpX6eKduM9Mzhg5mBqZZhYx1BpTzSxzeB4lP0juXJj/07bb0OgUKJZT/AF9tXmBCdB1e+Y/HJW8iK8JTHOtn9BDyeTZbPS9qYqnzm49QYMDMPMCdpq8QMn2lscjDQJ4bISADkF2gcf3arBQoU2em5knxQ4n6CJnuG2Zf/dqUSt0IFM34BsNkcnvBIrplprArLN4GhwgGe9nESWVrZSmz8b3Wih/epe3Fx5nQV8rPk0CUKxPxJJ0ktFv4jxwPTHQ8JTSlasg==; 31:9BUckryDb9KjiTHAXEF6x/fS6Fked1x4vN3qfNDy6rtRK0ChWwElrm2VeBWZcG2hlznSyUQCTxyDtwcGgUrVFjAAiwzjJOJkG9AQi4pLA3kx6mvkGtIjOQA5HNxSrsmveeeTvmcTbVT83ijm5FezjUqOhiXBvmSz7S3I3H0hRTmMV8zbRkgeeUcKfNdWDZkXXhDAw6UR5PNbZg7MHmMadC6XEvbfRBMT+OVxIqMzrgs= X-MS-TrafficTypeDiagnostic: AM5PR0801MB1988: X-Microsoft-Exchange-Diagnostics: 1; AM5PR0801MB1988; 20:Mi7woGJTWlARFm5fmEEMyTGoU7d+Wb3BGajpziVDHn2/Q4cabmIoBIJpKm3/P6RDM5oYaQDOUNk2tSj0zI1RQp+dYjvEIEeSZbTu4yOpERV6r+DglLr8wGolDSKIcuMICz0b3JekNz6CPGCAnlwdRVsuYqPs8um7ARkC/R0xqnRPgul5fGxcep2ixDa3VqcikBJFteoeCgDo8QIKH4iS0g2PRK5YqYYg7MDLkYHfpghdf3S+CQPIJFNL4PtmywfLWg7OQA0gDY2kRvX6hNIDuAWrZ4DsxYLJPKxsNUDs2evuQGfA+oTnPshKZOTG0cWQju3QB3Zzn4EEwkZ0zOFUNvfNZyMoZOp7vawOzIizCKFF2FBpf2cVYBx/sO/y19nEmKW619d6kGeNUadKCv9jf+vzKZrRGI7qa5Eiq+G4R/iRC7bZcpamE9znZhzfvkivOvn+FD0fkUojyKvGakaQqp9P+k0J+9iYGg2e1Jbr7ADcPj4mmCQzQFjNog/bmmLm; 4:2vJ5K7LY0R3XC0+jamHOK2+S+F9RBB3zpOVAzwYSfpzj/qFLXxqYEkzCX0QKyr6VBlMUpGLYHkNVDUgP6yvXDCzVsZVib6xhSJGLZgNFmRdTO2UE49Pn9nAY8ElrdPltugzsrJZfD0ZscqioBx4Btqee+q4j8jfLGAk4weQTeC3VDAIT6XYMDGU9RejHZvfzpCaZjjHzsUPV+WYvUWlRspHCGN6vrQNIikvFoLJlQBUmwkF3QXAybUiga4cebVn0FfRskYiyvvWNtAjcY8VnAg== 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)(93006095)(93001095)(3002001)(3231101)(944501161)(6041288)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(6072148)(201708071742011); SRVR:AM5PR0801MB1988; BCL:0; PCL:0; RULEID:; SRVR:AM5PR0801MB1988; X-Forefront-PRVS: 0583A86C08 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(39380400002)(366004)(346002)(376002)(396003)(39850400004)(199004)(189003)(25786009)(47776003)(107886003)(59450400001)(3846002)(5660300001)(50466002)(16526019)(97736004)(52116002)(16586007)(6116002)(316002)(2906002)(36756003)(386003)(86362001)(6506007)(305945005)(186003)(68736007)(6666003)(6916009)(8676002)(7736002)(2950100002)(81156014)(81166006)(55236004)(105586002)(8936002)(106356001)(26005)(53416004)(50226002)(6486002)(4326008)(69596002)(2361001)(51416003)(66066001)(76176011)(53936002)(2351001)(478600001)(6512007)(48376002); DIR:OUT; SFP:1102; SCL:1; SRVR:AM5PR0801MB1988; H:xantnef-ws.sw.ru; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: virtuozzo.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM5PR0801MB1988; 23:rf+JoclNMsQ4no7fVo+3eNG9n4FF4RjVYn4koBM?= vN0tQSaPEYvIrhMmGpWgXBNdcz3KbVDjyAF2ZjTKhbBD8IhJ3QXAZeyo6P1PW2MwP9IYbsiZmeeXCKC9L4c3lGKeqUE6zqE4OHF2kN3Bv0cmmBvgsyBEZ3sAS7GhtqAeO9fOJfEco5+pb5iPSLcuIAdKK6cxD58rupc6GylIf86VJi/1/VSok3JYr2uCGZezpQBUGbqE6HOWWxIrb7rjte1LnO8v8VNk5aosDDWPx2dVe+MG+Cy5C0D3WF3cN7oin018qSv3JyQNd6w+67VRawhVjYJLZkIo0ZNP2l+H03Ja2+TT/zlCJ08Bxn78dufw8vDHmxDu1u6l1h5yBdSG0wkCGKco9AjTiR1qq5TqqWlPnQ+3TPtB/xDX5YXiSkJfLkiH2Z+WFUo5WW9WfI/zXQuILCu5t1LibaTrv9ntq38hee9K30ZrenVa4ga4WFaGag5H3MfhKmMKVYlWrx0cwV/ZSDigGqVzeG6rqeBNSQw7oQLLiI8TSv7PXaHvzavzcHdl629Dew0oupBRu1sBUIve3YjiM83tnhCXUeOSF/ON70xKogkgPeok5E/3tOqrbeDaEkqqTPScNTgiGQdckODZz+E3Gmod0+QfztMZfPUMGiv7/1/8MY7tntipOMbPFm6wt0ZSucHhCYBWjyk+W3O9+JhXSuoqq73fNYHqD0iirkAmuh0Mk+RUWvv6+xVwPjaUQvIVJdjihe4OAIUVd9yZUhBJAlJxwmCT7CmdhKhaov7nNaRS2l/JgoJoSGwbmhr1THc/TDTEsJW+q1NoZt6FBmWNOiQS1gYIQN6Sazp1Jv37j+mHpX23U0Y7D5Ud24WNX6mL2EwGDA/WNF/wWO0B8Hv3nkbKwisdHcLuYD0tvh14hpXc1QsQWRwhYQhApUdp04ZKhjfaigC5B+A8p92fJOATPTy8xZA/cmwKYBn5M0G1IrNE0INsDvfRFxWKXAaBmF9tflhVEgVfHTuqdYGxxGstOnO4qrXNJSZEYqn/4/SMCLBSVNhyDdKJOuYcpfhgAmhbsVrTkNtGKYF1+XG9uVybFNouC58fIAZm+iUaK0g9As8r4Kxkd1XoBGB3tEpLnMB7yfrsLlwH27bsEyQIRW954Fr8LoWvjHZAQGLpifXVfJzNrYFCCgt1N33v+aFBThOzpp7yixqTUuZdPSZvh+gwH9MYycFtzQ9NoiqiAyl/sxguB6Nrc83ngMh8l18Y= X-Microsoft-Exchange-Diagnostics: 1; AM5PR0801MB1988; 6:UaOcSg1Vvw1jTX12DOpW6jvEcQSmZN6w7EpUOx8nb6/lWN2xqeWXaSnyII/jxox+rATegxFrr/n7OiRqSggYHiWg0FFShoApo825XDsJVy7eLrla82oveh8Bf2Lli52iv0k+3sJUMnqbCF2Bqq+9hAN971dPSbofXK2NnkYC84ndBeYW+nkg7fnqTKvBwtSBNOWmMs4YyHk2TttHGf4agHBO9wfyqWWOhfZWkM4/cZSYHplsnNBhHnmapmyWBNA4iylKSfOOnm/GMEOs26O6fi1q2huYkq06OILyXgBV1DOzkBGdemVX5nkCSyHO/dlaBxbfNpwE0iibRFHORcDpMotVW1b+7X9FWEkqk1PuwAI=; 5:6NkAOv2NvqH8JEDoA/SpGXroiwYdVVy24sTYcf297daV/Qn5w99Z34+CViBjZGsfbLlzhPPYpFTRfFC7M0JZywtp9qBgfvr3QJJfLpluxkAOmQHvD8Lz6niC7nhZ2lmjAgYYFBhF/+WPjf1fMD69PWQXukwUdBTXpd7j/3J9LbE=; 24:c7H+7e/yZkX4EQYD9+2kWN6JGAm91jK/76Fgb+aLwmHELT3JcFpUfSHznLNfftGdV+UlLkklC2pey5NElxy0l0KRVeXpNleFPQE9JLz0F78=; 7:zR/jNjnniaLiP4JJMLWvKrU4YP8J5KPCYNM2GLAAozlbnDod7aBAMBxZJA2O3q+ddmzBTOITdZg4QAKg3B+wxK7+eCOeLnju9Aq8ynHSvovfJd+FmiT4GLAwAuTvaY2bb8ml0nJWmuZVUizwhcCdl9X2TxmHQGdNHnToc3gTkVB70ikdbZTrauE690Irp4Ji627QI7swmowbNU8JwRa6HppfMgCp2j72tb51V6MMEtQqxpxS0jzlZPjLY7BBqE8U SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM5PR0801MB1988; 20:3GJn7fIOKY42GegzptgDK9a2fDTX1JqGkw2WYBAs9CKzxlfWkMdeRVtdAIZhATrqKlFmnC90rwKzEmC88oKGbgW/Nbdutvx+CA6Zb9CQTjHo6hAViVqoXw5okwc1zL0ZIrSHKWqddps1jXxfkkZCUGyqjL1amOeVQ8ERBY3S0Ag= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Feb 2018 16:09:38.7235 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e117f7dc-4adf-4198-5770-08d573c559b8 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0801MB1988 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 40.107.2.114 Subject: [Qemu-devel] [PATCH v3 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 , famz@redhat.com, qemu-block@nongnu.org, mreitz@redhat.com, stefanha@redhat.com, berto@igalia.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The normal bdrv_co_pwritev() use is either - BDRV_REQ_ZERO_WRITE clear and iovector provided - BDRV_REQ_ZERO_WRITE set and iovector == NULL while - the flag clear and iovector == 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); - if (!qiov) { + if (flags & BDRV_REQ_ZERO_WRITE) { ret = bdrv_co_do_zero_pwritev(child, offset, bytes, flags, &req); goto out; }