From nobody Sat Oct 25 21:46:06 2025 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1516297914038142.88003205293057; Thu, 18 Jan 2018 09:51:54 -0800 (PST) Received: from localhost ([::1]:44486 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ecELx-00065X-4c for importer@patchew.org; Thu, 18 Jan 2018 12:51:53 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52266) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ecEJg-0004Mh-Gj for qemu-devel@nongnu.org; Thu, 18 Jan 2018 12:49:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ecEJc-0004F3-0J for qemu-devel@nongnu.org; Thu, 18 Jan 2018 12:49:32 -0500 Received: from mail-am5eur03on0716.outbound.protection.outlook.com ([2a01:111:f400:fe08::716]:42208 helo=EUR03-AM5-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 1ecEJb-0004Ce-QE; Thu, 18 Jan 2018 12:49:27 -0500 Received: from xantnef-ws.sw.ru (195.214.232.6) by HE1PR0801MB1995.eurprd08.prod.outlook.com (2603:10a6:3:50::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.407.7; Thu, 18 Jan 2018 17:49:22 +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=dsW5Dvue9V06GEDP5Q82bTARDp3HcaDLxKkCrmvPaA0=; b=SbYvIDUDDXRQBt9Y+AP3NZ3igp0ToVtfPxJCGUEjP5zPe8v/82VBntQPCa4D6rYev0ts/FjUUboq/9hlLIckDPBoDxNuBJtiW5/beloLWiu2+kzNEFuc7GFgm39FpLus1jJdh/SoDbNLO+KUCN41I2yT5SL7MKWI6VN9st3HlWM= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=anton.nefedov@virtuozzo.com; From: Anton Nefedov To: qemu-devel@nongnu.org Date: Thu, 18 Jan 2018 20:48:59 +0300 Message-Id: <1516297747-107232-2-git-send-email-anton.nefedov@virtuozzo.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516297747-107232-1-git-send-email-anton.nefedov@virtuozzo.com> References: <1516297747-107232-1-git-send-email-anton.nefedov@virtuozzo.com> MIME-Version: 1.0 X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: HE1PR05CA0132.eurprd05.prod.outlook.com (2603:10a6:7:28::19) To HE1PR0801MB1995.eurprd08.prod.outlook.com (2603:10a6:3:50::8) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6d186755-db9e-4c85-6b5a-08d55e9bcf00 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:HE1PR0801MB1995; X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1995; 3:3LQe8emwCJ7KI/yIFyjyUMM3B+Yf6vzG/OdC3c6V7LGn0/qwApX2O5SC9JJ6YGCCgf1tRqt8f+qzFZiEmD90QpGyBUBH2Zp0+j3MV16H5mswWaKa69tBwvW40hnrmzk4s1ivFwAGovIUx6vI1dXCqJjWDWJZ4+HOZjLUc8rzONiUCdfUneduXumu6tGiLY5YgnV7zSgJf1GoaqDVa0b6vnipY9zZ5yJvoWFbvaNHDEW9pYsQLPnj9YDhiseVbp6K; 25:0ixhhsvK7i8yGAJ3j6bLT+gCDZq3MgvDuELJSz45Qeak1LiJ/gXe8FJaE4utGSxhrXs5qUGzlO7wZTv1xLPsaCHeM0plJsm1HRvQf/671nP9S1dZtirlxqY2IFVPqafMtXEzNL+RmY0Tc0DD77qujB22sZ+Nx0ZSZhVXDZiV8wS8hUQSDhOikPMIvEB0itgi3XiHPXm+EG8zerP7r579s3SJeqM9JTxfwba/VvC0tejW8BJGMvtjH9+arQoRy8seCDMRNNKas/kPPMCrqHNO/G/HDlWyZoVOanRuoosoNJx0XVt6Fqc+HPGPK2+cFP+MLrBLw+WzjgvimfYB9mjW7Q==; 31:+ySUO0f7WCQggzNgIGgRSrJqxTJ+2fK0D31aIYHLtA5ipdXnlBd/ZtKEgvStAk7GsCuxIGvT2ynHcZZF63QEwoT1BqmRz6JW4fZyud0MxBTt6Zo1GHbmD8pSCRooPDq4DT1HmzjCWEeB1EiIxP46C7mSyTu2Uaj112/iSq7YONZjFmvAg4FYszfrqXgpscVFEMg/7yDMNWr1e17y2WxgzcKxUcgjzkUPzMdmxiFHRLE= X-MS-TrafficTypeDiagnostic: HE1PR0801MB1995: X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1995; 20:ljboBWx85UmsVwDRowIwGSqszGyBQwfdTQoRMat8ldUdiDXRkBS9nTmSMoZ34GyrBFJSW8oWez3OMEOQwGJfuCHQ2tPfVE5oLjmU+qVfE1v2nOzvbvdjmslf0bvjK+ZirSkI7TSy7ALLOf2xexqi1cZLWOqzX4GY0k5raxTAUqcKWTn9vyrMsxfAICoB9pQcseOAG+SDsQ4HL2TS5WyQwgiGX7AyHOlfgXkk5N27sTReD+OXYpLDS71kJABdHoH7Ikq4VTJ4AK9bX2UhtZIgx2WDt71/Fld7lo+P/mhb+iluLpY3+t7X7CEglrE+gUTdSAvcQblrF35qyY8QEvp2e9sEpnp/XN7FGVvQe381tBA/OMKy9Cojm0nIsrTbTwPwrZp4VulcYN0Qa4PH8XPCvN+JvGg2svYjEUX0h056s8k=; 4:CVaBQcU6s5ncxPFbA3hk8bh64SHr149vOJxg4/7AkXGbrprqj6AwZOXTAgHyRoarGZZt7IMdSmnA3h9QdkYJXhcvGSTuDLv67ACvnUJED2jvG/i8XfrrlUmFwl2BmRNNj0m5JX/f2qb6Po/KP0u19Tp3IU9jxOGcBk+wmp8UoWloJMWsn65m0YgM3cBtBtZECw/b/59hWq6mBH4YGLHipjoVctH1nX4y7L2PIffErksVUaiDs+c0WAYIj7th8YPcd7qs2yblId7/wov8H3Ke+g== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040495)(2401047)(8121501046)(5005006)(10201501046)(3231023)(2400065)(944501161)(3002001)(93006095)(93001095)(6041282)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123558120)(20161123560045)(20161123562045)(6072148)(201708071742011); SRVR:HE1PR0801MB1995; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:HE1PR0801MB1995; X-Forefront-PRVS: 05568D1FF7 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(346002)(39850400004)(376002)(396003)(39380400002)(366004)(199004)(189003)(50226002)(6512007)(16586007)(316002)(2906002)(16526018)(53936002)(2351001)(6666003)(5660300001)(66066001)(51416003)(6916009)(69596002)(59450400001)(7736002)(2950100002)(86362001)(2361001)(76176011)(478600001)(97736004)(107886003)(105586002)(50466002)(6116002)(47776003)(68736007)(52116002)(26005)(8676002)(6506007)(305945005)(3846002)(386003)(36756003)(81166006)(81156014)(53416004)(6486002)(8936002)(25786009)(106356001)(4326008)(48376002); DIR:OUT; SFP:1102; SCL:1; SRVR:HE1PR0801MB1995; 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; HE1PR0801MB1995; 23:bq0UN95K3xEBuNHt9JwEEidTT7AOzgLWfgl5SCf?= =?us-ascii?Q?nJHy8jaQZTyH+C1JL+J3LT9v4hGZ+wpUzAf9QOqzmVNvOavbseEGK7Qa9649?= =?us-ascii?Q?DMSwD1GnkM+WZSCWKeV05i+5VKzDXffBXjJQZM925dJsg6H1hk0cKLjXTcNw?= =?us-ascii?Q?ZSfxwfSA7FXDBiEfcKxpVNwI6lhjYM/cN+/eOrWrWI2dL+6drs9lYCCUe33K?= =?us-ascii?Q?ewyNDJt49PQJVTd28MC9qriHuTxfnJEza/obVYPHs9Fh3x4ufelapek/PSDZ?= =?us-ascii?Q?qXQJJMb1Eg+Pqh11RiV2QNApMIT279xFlwDWS+iSC3KzzoqnzsXiVj5/ySoH?= =?us-ascii?Q?zk4r8JGz/CerME8hg/f3m3MtocRMcvpiCF3CkMSbEwqu+fViyUhrocdn1ln7?= =?us-ascii?Q?sVbEa0VdT0rs24NO28FnoDcOja7LINicVmBzvKwSxkLap4GJ3ehzc9HEocdh?= =?us-ascii?Q?YIorO8y/629x4ffz5rkiR0cVrAs5bcc7XRj3jC9QcjK1+ABdzWB+AqSMKdZM?= =?us-ascii?Q?mTAnuZM4GPnrbbfg2BGWWpbqgu0ZYK9GeUqt7EcWWVlfaIsXrs01EdJeW9wD?= =?us-ascii?Q?s7GE671YmfkE2HbKldmRHw0cY+pPfhYMkEXlU00x/Z3OV/uOHIWI+RI5Xicz?= =?us-ascii?Q?VCYMygR012Gicn1PAZqUesjCzWhSj4oCQcgWxZhaLALDuIWXWo1z00J28jmu?= =?us-ascii?Q?ElKeiz4MLoUq3xXkBdlmWjCxjdRFDQkN0HimJ65D9B4/aQI9azb40pUU2GiW?= =?us-ascii?Q?H+AECRVWLVrjFuntOQX8v+Cko5B/Eemvh7qdR2inzCbQXxTrFnigVLbU992N?= =?us-ascii?Q?QTea4ljiRFzwhea0uQ5/EzBqfx2l9VzE7ML+iORaK3AhQHQwF0QpKBlZuDXr?= =?us-ascii?Q?7flX87AwT4KDD2dfFNZZ2YXv9m+34w4ALF7qjxom7mO4ndPRH2hjXjv2sTMa?= =?us-ascii?Q?zr6Khqib/B6pC5yqx02nC516RU4zhveltM8ZJlQgPyiU9/1SaZ2x27ztcEqk?= =?us-ascii?Q?P14haBrFD5g5QtSz6oNB8yqTz2lQSRz3uSF0ijopY+PJSj8YYeo1b1GElkwT?= =?us-ascii?Q?YWHz5Alz23BSPRN8zGb/Ev3udn8V/ESHWNla9eHWBXxpuKXVeE3yOow3HkjW?= =?us-ascii?Q?dri9DC84UIGczHU77joYYV4UDOqSN4c05/285OYJy6/MaW9UA2zA7S/OCGDr?= =?us-ascii?Q?5IKSTRRLZghq/4KhBOVRxDDU8yb/b/5YV8JNJ?= X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1995; 6:pH3SSgP6VSyRCLtRAJODk6NNU9kzFAvKpwwo+NmwaPsnTeoLNlQCFpNW+U2+yCV3i5p75k7P2S5076DPjo5yqfVrFoAXlUj00WTcjSgbbXjIdK8lQu2y79JW0kRCoOeVa2No6hL4wZ8Fl4XQR1veEGaaTUbHerBuJqqzDxvB2CeZn5yGT8WCd3TC6q+HAVUnT0guMaSs+aW23xfhvbhWmD8qDlczMQu6giNBuGyCM0RxDvrocn9g4PIznSeJKDUvwDfmuvXyOw2r2IDDKxe2s7wOjoI9+/zmL5mNFRUZzYGdl29/nqe8bOy+DvzU8a4YgixAMkbgaYacSqmw9UVvafVQ7yl6MT6oYNbB1Iikbqo=; 5:GqOBuC75S9vizN+zJS2jZH/C2Ku2oZUnPTEH7Ye87tW393fz33rhN0wR0t3su0AO5AhOxH7OS5mOZn1dm9YMDUnCiw3pH1ci1kqfltsjJx3YtgljEZARKxvnwoSp4mok9U9etOdSDIQZ+gCbAcCxOvbSzmesUGztpQsQLF1ALko=; 24:9XIHkAMv6V7cRWqdGSaXN908IZNE16MwfC8x2Dt6xcwSgyq8jUysq/6x9l3VyAqiROX3Ip1Av7UYU3pB7P9oiX+gC4NcoMW8nNTytbmRS2Q=; 7:LvqQbe6BFtEZALmzJEwMvxAHPcmPHzp5oZlDNInh95921a2la7iAGGCM/CXB+GWFingACQRYRseSvq8/P42m2bQtu1GUfoQ0WcUmOyFtAOhtHemFlTPMoUlMANQQW15MSdlo6byr3uC+3fiEDvXdXrC90M4I03POyLDHAArFZrVkYyfL68SJuhBFTi5/vL8uSj4wjZPxCAd0ItzPa0jO4QAQ2BM67BDi8lPdnvmAPxeH1zprVbAk372XMwaW6yff SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1995; 20:8uNeT3YlPdbTQAjn75y4LU0ajT2nmN8ZalzsvVe3inkF1ACd9Ey7gaOsEjbK9rj3CtJVqAqFmTY/UQBBwyOH3WbW6WA/IbaU0LBzlGGbaSx/xMrDNECjXOpTNcNFseoLKGE/qpkzBR1rXTEU5LF3He3M0Aru6CWo3+GiryB+fBw= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jan 2018 17:49:22.5677 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6d186755-db9e-4c85-6b5a-08d55e9bcf00 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0801MB1995 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 2a01:111:f400:fe08::716 Subject: [Qemu-devel] [PATCH v7 1/9] mirror: inherit supported write/zero flags 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, den@virtuozzo.com, qemu-block@nongnu.org, mreitz@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" Signed-off-by: Anton Nefedov Reviewed-by: Eric Blake Reviewed-by: Alberto Garcia --- block/mirror.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/block/mirror.c b/block/mirror.c index c9badc1..d18ec65 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -1064,6 +1064,11 @@ static void bdrv_mirror_top_refresh_filename(BlockDr= iverState *bs, QDict *opts) bdrv_refresh_filename(bs->backing->bs); pstrcpy(bs->exact_filename, sizeof(bs->exact_filename), bs->backing->bs->filename); + bs->supported_write_flags =3D BDRV_REQ_FUA & + bs->backing->bs->supported_write_flags; + bs->supported_zero_flags =3D + (BDRV_REQ_FUA | BDRV_REQ_MAY_UNMAP) & + bs->backing->bs->supported_zero_flags; } =20 static void bdrv_mirror_top_close(BlockDriverState *bs) --=20 2.7.4 From nobody Sat Oct 25 21:46:06 2025 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1516298071812954.3128234569045; Thu, 18 Jan 2018 09:54:31 -0800 (PST) Received: from localhost ([::1]:44518 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ecEOV-0008UI-22 for importer@patchew.org; Thu, 18 Jan 2018 12:54:31 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52265) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ecEJg-0004Mf-Gd for qemu-devel@nongnu.org; Thu, 18 Jan 2018 12:49:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ecEJc-0004Fe-EO for qemu-devel@nongnu.org; Thu, 18 Jan 2018 12:49:32 -0500 Received: from mail-am5eur03on0716.outbound.protection.outlook.com ([2a01:111:f400:fe08::716]:42208 helo=EUR03-AM5-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 1ecEJc-0004Ce-7W; Thu, 18 Jan 2018 12:49:28 -0500 Received: from xantnef-ws.sw.ru (195.214.232.6) by HE1PR0801MB1995.eurprd08.prod.outlook.com (2603:10a6:3:50::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.407.7; Thu, 18 Jan 2018 17:49:23 +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=G4LG5MlrMqP819rLlJ1ysv6IMR6RTYB2P+hO7kJUPgY=; b=BboiCxoaCgFKQ8XPFR820RJwHOnjqATOxDzVkeyznEd2L0MA57hvmCNXgJqScpXCAlPZJuLvOc8/d/kMJv/OtpIukp3wEmo5geDD/YY9KpKy3vm2wOPwqqKBKsyB1+uOVbz+gTA4+mAp4G+J8Zrx0qJTpPu1fKls1c4wSWQdgG4= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=anton.nefedov@virtuozzo.com; From: Anton Nefedov To: qemu-devel@nongnu.org Date: Thu, 18 Jan 2018 20:49:00 +0300 Message-Id: <1516297747-107232-3-git-send-email-anton.nefedov@virtuozzo.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516297747-107232-1-git-send-email-anton.nefedov@virtuozzo.com> References: <1516297747-107232-1-git-send-email-anton.nefedov@virtuozzo.com> MIME-Version: 1.0 X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: HE1PR05CA0132.eurprd05.prod.outlook.com (2603:10a6:7:28::19) To HE1PR0801MB1995.eurprd08.prod.outlook.com (2603:10a6:3:50::8) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 681915dc-211c-4419-8e4c-08d55e9bcf64 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:HE1PR0801MB1995; X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1995; 3:+ed7dEE+L729bZlg3DL2r0NDgOciLmM2AJTN61hUhUwt10NMUdEZ5MtzYCHj9k7LH/q97zivG7XHwrvh3q8/bDDjWK3fgWwBv15oloLreVkykijdJ8Jxbb8OHOtVls3SoaIdYECbU6Lkn+/mbnojY6jPziUjE8pVSF7eiMzmC3WTwOThH53eZtjoPzFPjGX3OljEkYSAt2i9zVDru4FyPHKf1l35ZP4XvBLk4fGN4AIzQCDyJ1lsJ2mGXcQ1SgZc; 25:J5Njd9d3Vf4CZdDpemF1zceZIhcwAKooot6wqEWxMfEAkQGzhR6wTMgLjiYghOtzkSyjTjH5Hs40YL3ex7X8Dmpb+Tf5TbX/546E4ZIgkYXdgHn1NrJDnfkidVvm7vR4ZWUuBr891riyrP0BBFaiuf/wVCVALYyjCSjxzZtC6aPaYdqRFnA88GGbfrGZSWVQHqzZrne+J1Wz2t5VqUztDxq55mVXSeLhlbxQdOQFyWus7qLT1XZNz0VKx3I+E1Q+H75/zOage7RKsJs77KnYE/93ib8yg5z7/8lKQW+8GNA80/+fWJuVRz/KeCGAyTADdBwMIjIvxI1MOL3xapY8yQ==; 31:TJRCuGb7FfvdPhQkwG1GhyG98ocysBTwaKPsYzLryjophJPNZ0hmY5zvgmnyk2ZC88/RGpUEU8yhcsk3D3U3/jhRgjtJYi/o9d3vGQcPfgMTTZKoVqiWL418eOlK6oxqQxvAx0jFlzn7//Yz/2yeVePbFHPbPzHPuaVbrW8cqaGFRUu4po1xq/VCCmcqmwRfeBjmCiAitSLFyQEEKvSGAAaS47/emH7ZxXRosSx+Ah8= X-MS-TrafficTypeDiagnostic: HE1PR0801MB1995: X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1995; 20:qjqCGHPecbptadnwNirA87SQNvuoX4pK0Ncay5AzaxfPM655X5ywKjgVYhqoRCqCIc7dpAspDxiLcDYvLUoXv/Z4uenEag1abwYgDonOeNLUcN5bqaMVTAbpETubxCGIqc23EZvVZAc0qUtofCi2sPdNea5Q2G09nSdo3SEp4NIkewBRFn5gZZBpW6SZHCw8bLPCVLLUjzwElgo0dP9mQX1ol4FiHG33pHv9VgWnHVBRu2PThKBVfpozpYFBILtHkTrXMRDgmXhPdrLlU3NZdGjyhVhxMoDBBxTz8kKK6uCbb7RmBldyRaaK6TP1zsRV2bmkemCY4hKfNy1pPRg1NMkLIDU7P9GGPdzjbOu+33SUs2/aOYpQVq9oCbY0uUN4cn6VCietcOCoww0bSmZVbHN/HS0rrHrS4qdytgv9N2Y=; 4:mv3ukl02NE9tU7rVOdGtw2/OAQMloHDQsLis2proi3eFv4WYORdqoK/teAxA1cUf92WCsbpdBBo/5xmPIAdDdjbm/WhGm2dsBbHaNCdE8ABpVXHjcqmFGo+GSqRsmMSXIEXcxdKJAjoGzI0PuFqoNpJFkznVlRB+AoFwmYRNpaotHUNUjJ2VsCDuEZ3BFLX/Q0qf/jGAxLO828seZdWsaUKod6ktJszmuINO8ZtHbdmKmJE1uP8DhU/w4umpZhrcohiHI2d3K/scGTm3DFi3WA== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040495)(2401047)(8121501046)(5005006)(10201501046)(3231023)(2400065)(944501161)(3002001)(93006095)(93001095)(6041282)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123558120)(20161123560045)(20161123562045)(6072148)(201708071742011); SRVR:HE1PR0801MB1995; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:HE1PR0801MB1995; X-Forefront-PRVS: 05568D1FF7 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(346002)(39850400004)(376002)(396003)(39380400002)(366004)(199004)(189003)(50226002)(6512007)(16586007)(316002)(2906002)(16526018)(53936002)(2351001)(6666003)(5660300001)(66066001)(51416003)(6916009)(69596002)(7736002)(2950100002)(86362001)(2361001)(76176011)(478600001)(97736004)(107886003)(105586002)(50466002)(6116002)(47776003)(68736007)(52116002)(26005)(8676002)(6506007)(305945005)(3846002)(386003)(36756003)(81166006)(81156014)(53416004)(6486002)(8936002)(25786009)(106356001)(4326008)(48376002); DIR:OUT; SFP:1102; SCL:1; SRVR:HE1PR0801MB1995; 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; HE1PR0801MB1995; 23:53m++OAbeqV74YQAfWqYCXTKsNGTMPNBh56KmTN?= =?us-ascii?Q?0Z7FvZYIBBnDhyKQ5zJDFuN3xL9uh5Qn+8HiFnk/4kxUq902VU+uMeS/Mgt4?= =?us-ascii?Q?yLyPliVVjm54t84ZkOIyv9uzhA+UYYHzooU70yO600uCeRMZz4ggTYBCzOIp?= =?us-ascii?Q?a+Nxi7EMrpXu5CH2oRKf/o8sWE4GB5rWT8nMujuJKgiJbiZTNSFGSU/+gSw8?= =?us-ascii?Q?Ag1tjMSrhE767UmLUgyKMLWzHjhAjLwkNauG6bTRj99utiOV8eoASgjVMrHh?= =?us-ascii?Q?BRSMwybkSgX7M7tzlWANHF0Zg8fXXoMdaDuZ7n1d1UsMuQeP9vSDtXXQiTWc?= =?us-ascii?Q?cYmdki4Cb6VuaCUVGcHpChEQnKuy/Z1kMGXpKId/FtTiPt4shZ7B1DLtUUCX?= =?us-ascii?Q?OmSMZtudjrn806Pv4MWZbdXK9vNJ7/9yapq47bKJ1eyEyZ2ay1tbzAQ1RBrD?= =?us-ascii?Q?mFJjl9r7+uhQt7mvXOJaL+0BVusLtAko0KpbiDT1dsQLYSYsPEm/ssbC+IpX?= =?us-ascii?Q?t1HByzGVFFMnYIqDRvqSJzqmwP8J9fN9NMB+7uFJgsvpNnvXJTK3h3rhK+et?= =?us-ascii?Q?AQJ9EAcxVZFHFKoz9DKQgyu9q2oBuGDhfpj6LqaYv7K2llb7e3hl5FMZ6UqC?= =?us-ascii?Q?MNEHN1rHI/T9dMSi6rkvez77SHqqFhy454yukoCgWm4yC9x9oAYRNIRkvrMM?= =?us-ascii?Q?mfePbN5UJvmpQ33WUNgzHlSSCEyH9TCaOfo282SHxBYqYQJGKEkljExxtzkV?= =?us-ascii?Q?dtVrN3WKvyvTHv/0R5txZyK+09Nh0xuh5FEaw+71aaaOYeQAwjsYjDXt4PW7?= =?us-ascii?Q?vVIWtki45OJczLNKnOl91JzpT5dmw1WLQeGnDIJLNSSjEMJndm1xw0AAhN5r?= =?us-ascii?Q?hTP9ncynzn0JiQ4PkfMNZ9ohxY49RYxRTJYhXJwjwb8z/B25Mk+rilnGKJEr?= =?us-ascii?Q?JSkW9UxZrjYRbe7OlAqjVZv8WHJcr4aVRQxwoTBqcGkLIfUai+Gh6xl2MoLn?= =?us-ascii?Q?b/My5YOQJ7AdgKqvRjQyWaLnN1fnwUVY8I+ubiq4rm/Y/kj14qAVhdIbsKRA?= =?us-ascii?Q?lYYwUpjo6EIfb0ZY5S8VHglUfRwKaW04xuedUYW0wnGTRS/n5TcCH94Q6zjz?= =?us-ascii?Q?Um74Cxkxdspq8rC4WMlxKCfCDOrxf+sPl+7lng+LGfsm7rWe56LCU2hknOjq?= =?us-ascii?Q?IWjorizRLVV6a4Qk=3D?= X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1995; 6:osh7bCshmeRcv0ikxcvHEjxYoMfOw22OAZ/DmPb2B+ZtmiiOGQokkDvcRyQfyncjR8EUxVDCbFGySaV5eLSgIfPY/g5svh2ONiCQEcym9hrF+UIrjQ9iUz+USvh8e3BVAFdU8FNXzlAVcaPM4koG+LWF8ecZ3BXdctabjdQEdWfbEIqKsSqiPUKrWYdP/h5gyLXKbq4HQQsopWy828k6LPEgmPsrtQpwT9nfJdZC0q+8se4wahOnjhS6p2OrC52cNRA/sH45ll7PKw6be/bL/xnctVCFHD6B2ZKXY94xkAHX8O5+jCKhEddpMnraZHk4Go6FNuKxAYNyJbmrqDhN81GD9cfFWQ7nQAZftk+j7ok=; 5:nhUP9mxcwddSYECZoDK6k/R+neGmi1XBeJcQWAfxTBFbhAf6Y57J+kqGNPr2bC0GYjjnAWRDjv5uZVR7IWdC9i97NyeWhhmhgqXGJ8Db0v959P8C6zSMvlJOe8SJ65m06LdLq5nRS3JF6Gb3azRdNGDFCvyHlOgPtqXqYYhEtes=; 24:luVyFbgV/c8lLlEwdjPpfynbhWxUjKl750/yLmz8/+3IVOoxBP87l9/MLe3nKlHuT3d+5ZiOQ64DhMjseH8V8KR+C7jKeSFbsYrO38CvoxY=; 7:lq0s0BdRT8aDp1NkQCjHU4PSpFJP9TSkYvOvqiqnPgG3xZy6K0ZFH9joGyoq0CV9Ir6yO8BebofwoHPkpuabsoujSr0Au9u/HJFEEqdbIYOozyvuXOGhsrUD7aD3oA/kfko4e9/Dv5InEu9VUtQQhIj813ZJdotl6xScx/eDknRyAScNpV27w82WrqsJLlUwMRqdLufOjdIsi2kN2hObxoi9Vxnb13Wj3uBjLN4ZIaWQ+dKHa2hqvON8YMy6Lqr5 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1995; 20:KLClUJpMFmfp+49x8SrCVv+ILo4JF23rWeK1Z6oXd3H4jqTlJLF9MNsioJy63tAgVcgoWoCCNT5SPTXeGAidPU05/wFTVhyMYtKgvGjZ47PWlrQhlmtJJNqBiEsyJguNt+O44W9aw5oMSD1a9cIvW2Cum4gcxrftAJNolvz7Bws= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jan 2018 17:49:23.2240 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 681915dc-211c-4419-8e4c-08d55e9bcf64 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0801MB1995 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 2a01:111:f400:fe08::716 Subject: [Qemu-devel] [PATCH v7 2/9] blkverify: set supported write/zero flags 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, den@virtuozzo.com, qemu-block@nongnu.org, mreitz@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" Signed-off-by: Anton Nefedov Reviewed-by: Alberto Garcia Reviewed-by: Max Reitz --- block/blkverify.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/block/blkverify.c b/block/blkverify.c index 06369f9..9ba65d0 100644 --- a/block/blkverify.c +++ b/block/blkverify.c @@ -140,6 +140,15 @@ static int blkverify_open(BlockDriverState *bs, QDict = *options, int flags, goto fail; } =20 + bs->supported_write_flags =3D BDRV_REQ_FUA & + bs->file->bs->supported_write_flags & + s->test_file->bs->supported_write_flags; + + bs->supported_zero_flags =3D + (BDRV_REQ_FUA | BDRV_REQ_MAY_UNMAP) & + bs->file->bs->supported_zero_flags & + s->test_file->bs->supported_zero_flags; + ret =3D 0; fail: qemu_opts_del(opts); --=20 2.7.4 From nobody Sat Oct 25 21:46:06 2025 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1516298070262501.1794039422198; Thu, 18 Jan 2018 09:54:30 -0800 (PST) Received: from localhost ([::1]:44517 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ecEOT-0008S0-FF for importer@patchew.org; Thu, 18 Jan 2018 12:54:29 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52267) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ecEJg-0004Mi-Ge for qemu-devel@nongnu.org; Thu, 18 Jan 2018 12:49:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ecEJc-0004GQ-VV for qemu-devel@nongnu.org; Thu, 18 Jan 2018 12:49:32 -0500 Received: from mail-am5eur03on0716.outbound.protection.outlook.com ([2a01:111:f400:fe08::716]:42208 helo=EUR03-AM5-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 1ecEJc-0004Ce-LA; Thu, 18 Jan 2018 12:49:28 -0500 Received: from xantnef-ws.sw.ru (195.214.232.6) by HE1PR0801MB1995.eurprd08.prod.outlook.com (2603:10a6:3:50::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.407.7; Thu, 18 Jan 2018 17:49:23 +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=yBFMpInOPdYlJ4w7940vHgaPI05D8gSiQd6JttTBU8s=; b=AvoN5taOrNqry2drTJmnzK4/Un1mFZWFMkqQnL1WEAok8Za6a+gDnoy2tK9rpL5FSsKeHlltTEs+FD2tAtrpc7kuU2wZF/9ABKaBsMqy+DufTXve//P1qocHhOV57B0ij4sIbhZToIWF7QVerS6rSlC3O7gm7o3lDwMdr9WIfTY= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=anton.nefedov@virtuozzo.com; From: Anton Nefedov To: qemu-devel@nongnu.org Date: Thu, 18 Jan 2018 20:49:01 +0300 Message-Id: <1516297747-107232-4-git-send-email-anton.nefedov@virtuozzo.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516297747-107232-1-git-send-email-anton.nefedov@virtuozzo.com> References: <1516297747-107232-1-git-send-email-anton.nefedov@virtuozzo.com> MIME-Version: 1.0 X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: HE1PR05CA0132.eurprd05.prod.outlook.com (2603:10a6:7:28::19) To HE1PR0801MB1995.eurprd08.prod.outlook.com (2603:10a6:3:50::8) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3749c493-db08-4420-75f5-08d55e9bcfcd X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:HE1PR0801MB1995; X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1995; 3:TpKsXc5Cx2AEzCpkmCuFr4rvDre4LY2f8Ivo3//O/YBEIw68vi7DNiziNAl3YZXtg6hZSerEMld9tdlxq3U+YeKTlwK/i5pTPfdCJBQOZUc3EGFoO2bYFpnX40oB4aTKgI3b1Mgn0RE727VWeDZwh3JA6vZvNOYomAHal6ZSoEVVayRnGi/oimJLBuiA/GcRfOVgUWZ8uPp2r+sgjeP9akWvTQxXHAflZNmfb81ZirztV30IlB3e/masBjzao62C; 25:iogC8+cqOd1IMV+ei8uyL3hAQJHN5T2FkU8+H2iW/50LI2rzSkY5c0dv6pp07JXnXkuMOUUgYszhSlFhvz6pbZwY8uRm8LaSkZqUpLlDugmoqqs9zKslyMWesE+97qA7FeOLV1lkual6u4BpGGmMjAwzDi/CZL84A+5OAaGD+1xmXh9GEnksjSIDeluXO9vO+cko3cGTqZ3d8hmxcQWZnicgY4B8wO3VsDqejw7FxVUejylkEpFdpvkekBnVLCBeu0wNbB4YV4boORnBQt5oacNc1kcV6gYm2lKJ5/cmi3v5T/eCw/R1uIPChqyotpPVVIRyWz8eGnEYKWiIUMRc+g==; 31:FIO3pWafxlrhToVzKODvHpXwTazve0Wx48cAYQWHzYx0pcUwO6hP9BeFOsmeg9K7RfTC7v02HjUffG/Qi5WjNTZqTnq5rv01EOhTcss5FOvmZoqJ7LYGQ/S1zt7iFGzUsgysrKzzdbwvA+Iyl6sxeXjav/TQT5IIJp1paLbGkW2l1kYL0WIopN9QCtlGD2vhfw35PMplxNsLbsh4NcLRG1rrzhD24kBLU4TB/6wURBo= X-MS-TrafficTypeDiagnostic: HE1PR0801MB1995: X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1995; 20:Td/F/KDpj24KRJuLKas3fng4GTHm8VPXh9XJuUtUOKrKKsKWAOkbKtycuRtySeqVYLR2pO+DzXeN29ktr3dL5GhWp/hJvOpNtuQ+NXShcBhieGeqpwMpvikgpAxRtF2wh5/gMGomh73XqyJ0Y2zh9jhS4OmWV+FmQ70bad+ldsqYBuk8JYBL+iplx07yKQh3yVLf8qNU4N4Rzc3JsN8/rUjQzIeYd1iWbnf5cvKSWKCC2NkuY0ftScaxrmQVImg8fEoW1MSc+Dlorws8ykFWlAjgZvAwwLmjPabotxXFufHoY/ki9CuXRsewhJTBAkLHMul2GRU6TCRWn/2im2zVOaKVCAKHkYieCjO1YIkdkQrXdi5110XR1QhDSISBTxdJ7x3aCrCDey5NcBiHYeHd3piIP3E3rSkun+DzF+bw9zc=; 4:8e1hV19VDGwkxKTPlxiCW7QAelkOgpBZXWobg1l7K+Lt2jW2nJXOsLQL82dE52koodg35XcxX1oaFSX49CyQRCDKFY8nhX18IUcKEVBQBmbibraxMjYudDk1idSKNksbrRH15Tz+ZsnKx7GQJVFMd0jKdMMX1mIo1S5rM1+uxFTL2qxCzBvZSzZ08EbFzFVBYE+jJ3UvlyBq4oq68dJWfohiofDhZ4caQwNuleTLvtzTGq9TBfnZqZt4X9s3IPDS1p20+hnMG/5Asc6LNVoTfA== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040495)(2401047)(8121501046)(5005006)(10201501046)(3231023)(2400065)(944501161)(3002001)(93006095)(93001095)(6041282)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123558120)(20161123560045)(20161123562045)(6072148)(201708071742011); SRVR:HE1PR0801MB1995; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:HE1PR0801MB1995; X-Forefront-PRVS: 05568D1FF7 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(979002)(346002)(39850400004)(376002)(396003)(39380400002)(366004)(199004)(189003)(50226002)(6512007)(16586007)(316002)(2906002)(16526018)(53936002)(2351001)(6666003)(5660300001)(66066001)(51416003)(6916009)(69596002)(59450400001)(7736002)(2950100002)(86362001)(2361001)(76176011)(478600001)(97736004)(107886003)(105586002)(50466002)(6116002)(47776003)(68736007)(52116002)(26005)(8676002)(6506007)(305945005)(3846002)(386003)(36756003)(81166006)(81156014)(53416004)(6486002)(8936002)(25786009)(106356001)(4326008)(48376002)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1102; SCL:1; SRVR:HE1PR0801MB1995; 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; HE1PR0801MB1995; 23:Coq5EV0yd74cEwvOrjbuKD+qKGd/wDObBMevnoc?= =?us-ascii?Q?GVySmfGuUEvvgFoyw3SDuhv7W4QRywqU1/uOxACnkvgsEeXV7CvqXBOhCvQT?= =?us-ascii?Q?+un+Yu0zmaAD+I99a5Fp25zK4GlnnlpQ9/CAdgQ1ZLTeQSrndvlE0bVXIlRO?= =?us-ascii?Q?BYt+YfIvFZdhrCla/ThkN0ckowdpibgpND9BpJUO7tiuVmOVaA1TiUzEZbDe?= =?us-ascii?Q?HGSCqp4csbVW3X2h+KcrEVmD5VRtY2KuHb6b8VoO1P3oSjK7iJXctJ1eDZEr?= =?us-ascii?Q?ftm6YKkSoxVTikE+dto86Ldb+0439+dxCys8FMs79Z3Ll6uwkvC/48FgPIcc?= =?us-ascii?Q?vAv+KZFrBBuEW+6QrtBxg+Gy9SrNO5HrGO1VGHxYk81Uz702Kk7dWuTSny1S?= =?us-ascii?Q?+wtR+ftxEMyY7vI6cCKcsD5dEOPYD2FgPOgdaKTAoMexME0aPETpICtTtdbj?= =?us-ascii?Q?zsKYjz5yid5LCwJSlr7vyvgckrPLDmv8j4r7SQnMFZscQGLRj0o6XERa6l58?= =?us-ascii?Q?DalBU0YQIIY13rX6U/HU/9zxdSRZ97L9iPmNwhdHHF0CPIItwGFUHJ7YqcuA?= =?us-ascii?Q?miPlU7Ig9WR3Xqs2F2WI4USg+HU60Kq3DuecxAbyOIbwOi9Pp2eTvAWyjAUw?= =?us-ascii?Q?vVjNxmJWW295fJG4oAhi/qETqSqpM7VR6KhgQwJQ2iuucjecafhdIoSzG0Ju?= =?us-ascii?Q?7ydTy2Jf2WbwG5ZYaQcj37YbgrmaxBwbWqEotAMfLfv3jQ/xcoiD3DGtVTz1?= =?us-ascii?Q?ZOu+EIxPQbbwctY14qbL5RFOke38nNOLEkfrzhrOr6gnQgKYIZfr7RbYJvEA?= =?us-ascii?Q?l/X3CQ2nYLdtmnBnNGPpxetSftL1j/bFLmt71xtvDGy2aF1uXL7ipTzC7HMO?= =?us-ascii?Q?ce02CIXh+JYiU/ckpa1JaKVbLpmOwK47TwFRRwDWxrmcI8+hn2uYKmNhNxo6?= =?us-ascii?Q?MEXLWyTXDtlYlFjgMpLF4kP2Fmu8EsXcWGOiBBatWI1bR+JUH0i/F3ZQQ6XT?= =?us-ascii?Q?ZuYZVu5yVA901nq3Q79o2vTBmUIm++/r2KU4ycXcz3WpyhtA66AbITbDBYKI?= =?us-ascii?Q?ohoeJGLltqheZrAlewTvzw70Wt4cqa4ewmjD6SOS1ZJn6Q9MYbY3x7nyJT4Y?= =?us-ascii?Q?CdGib87qgx9lTxKTR8xbnWJLsuv2MBs6XiPwUerTVDGfpqFed7AWarNmvBUY?= =?us-ascii?Q?mg3KXiuY/OpfbByeviWKLfCalxK2/1tFmKW5WVvv6cOh/e2v1djk/DnQQqMR?= =?us-ascii?Q?dX/FLy/IH5F8Gb4hrEssqdApZ/OwWxwzA3qHey0VCWQmAjtwvtEyiqCXTlL0?= =?us-ascii?Q?zsli7ig/NDUCYgunirh6IBHw=3D?= X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1995; 6:IXnRuVQEsxBxqWYPNgXHaWWHKCcSDGamx1Fm3Fj0Q6cMW+dG11zIx5sIf/U5OOofbEYLde5mJViikTrqm7bNxFdXeAacitIuCJSjVdvzr+uLUyulZqRIuLMMdgycAcfDMXA3inIdIzTpoRJRgc87lFY9qu6NvehI46H4mYxoU7F/hooZtncl1uSwnCCk9s2gscd3qot9hbIB9WzXrRClBa60nSbLuVstPjb3T5xUHoxoL4yN/CvIczIuRJjPzNyXUxvG0qnLWwJIRv7EtYV7S/MZz3HwE1yF1EUA5vfDJ3sgBIMzfcXhQrikrNHTVo3o9N3LDVo6EnbJ+nAkePenXV+y56tQtmM+Wok4VoPGAwA=; 5:aUKwnBb8afA9uh/7+vKsidUcm2UOyCiJgUOGl6u7IKFgYuQhI38LzULPAPTtHy1sTGsTngod0ruVq5QuVLKfaYalckmLWV7TnkEZUQG8juJkX+H8dKA1MHvW2VJGlwsQTtYr/VEjaxKzybGpdUwloiMCskaUsWc8wYNqEV5NjUw=; 24:w41RpaIOQv4TIgFDpSulJHOXdLsNW7aWQpDogoMjDqHtdKhNageaoDtOcQT2lygT/LG3Yqb3RhDc35iltR9Vopc1irukcCF9UUdAurq5rbw=; 7:j9IiX9fGZZ+mfnR3jMF/K6e0ca7J4aMVxXumjyuH+c9KmT4k9s8kBNMj1mHqG2CI9ACHirw2spWvJIQo6YQtnnFgYLWspnoJb8ebhu37GNPr64qpn6xhqxjyoirBQGrprowKg4BddQb+EBJYYb/zUBlmqqtq4i8+tJ+L6ttVuE0TyAdPBblHSRMRvw5uXXmGQvAwNuDH+B9fejLRCLUHzLiRICiU4xjLJAMTxYoTNgoac3e+bSmrODLsU65iG4/1 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1995; 20:SfcKTNeJHivHvG1InjAmlPBEt1YQg5SOg5Whh11qTQdfBh2YeumngtwazgiQNfEihvoMx6Bf/VLHJPSD7Q4yJTmf5Zf2lmQCXYaaccbiO7kJlwZVzToDX5zYVenFIXyove4zSohfvMWbpv9IGbvT02P9hAaL9sQFEFx5bkjdGEM= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jan 2018 17:49:23.9115 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3749c493-db08-4420-75f5-08d55e9bcfcd X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0801MB1995 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 2a01:111:f400:fe08::716 Subject: [Qemu-devel] [PATCH v7 3/9] block: introduce BDRV_REQ_ALLOCATE flag 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, den@virtuozzo.com, qemu-block@nongnu.org, mreitz@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 flag is supposed to indicate that the region of the disk image has to be sufficiently allocated so it reads as zeroes. The call with the flag set must return -ENOTSUP if allocation cannot be done efficiently. This has to be made sure of by both - the drivers that support the flag - and the common block layer (so it will not fall back to any slowpath (like writing zero buffers) in case the driver does not support the flag). Signed-off-by: Anton Nefedov Reviewed-by: Eric Blake Reviewed-by: Alberto Garcia --- include/block/block.h | 6 +++++- include/block/block_int.h | 2 +- block/io.c | 20 +++++++++++++++++--- 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/include/block/block.h b/include/block/block.h index 9b12774..3e31b89 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -65,9 +65,13 @@ typedef enum { BDRV_REQ_NO_SERIALISING =3D 0x8, BDRV_REQ_FUA =3D 0x10, BDRV_REQ_WRITE_COMPRESSED =3D 0x20, + /* The BDRV_REQ_ALLOCATE flag is used to indicate that the driver has = to + * efficiently allocate the space so it reads as zeroes, or return an = error. + */ + BDRV_REQ_ALLOCATE =3D 0x40, =20 /* Mask of valid flags */ - BDRV_REQ_MASK =3D 0x3f, + BDRV_REQ_MASK =3D 0x7f, } BdrvRequestFlags; =20 typedef struct BlockSizes { diff --git a/include/block/block_int.h b/include/block/block_int.h index 29cafa4..b141710 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -632,7 +632,7 @@ struct BlockDriverState { /* Flags honored during pwrite (so far: BDRV_REQ_FUA) */ unsigned int supported_write_flags; /* Flags honored during pwrite_zeroes (so far: BDRV_REQ_FUA, - * BDRV_REQ_MAY_UNMAP) */ + * BDRV_REQ_MAY_UNMAP, BDRV_REQ_ALLOCATE) */ unsigned int supported_zero_flags; =20 /* the following member gives a name to every node on the bs graph. */ diff --git a/block/io.c b/block/io.c index 7ea4023..cf2f84c 100644 --- a/block/io.c +++ b/block/io.c @@ -1424,7 +1424,7 @@ static int coroutine_fn bdrv_co_do_pwrite_zeroes(Bloc= kDriverState *bs, assert(!bs->supported_zero_flags); } =20 - if (ret =3D=3D -ENOTSUP) { + if (ret =3D=3D -ENOTSUP && !(flags & BDRV_REQ_ALLOCATE)) { /* Fall back to bounce buffer if write zeroes is unsupported */ BdrvRequestFlags write_flags =3D flags & ~BDRV_REQ_ZERO_WRITE; =20 @@ -1514,8 +1514,8 @@ static int coroutine_fn bdrv_aligned_pwritev(BdrvChil= d *child, ret =3D notifier_with_return_list_notify(&bs->before_write_notifiers, = req); =20 if (!ret && bs->detect_zeroes !=3D BLOCKDEV_DETECT_ZEROES_OPTIONS_OFF = && - !(flags & BDRV_REQ_ZERO_WRITE) && drv->bdrv_co_pwrite_zeroes && - qemu_iovec_is_zero(qiov)) { + !(flags & BDRV_REQ_ZERO_WRITE) && !(flags & BDRV_REQ_ALLOCATE) && + drv->bdrv_co_pwrite_zeroes && qemu_iovec_is_zero(qiov)) { flags |=3D BDRV_REQ_ZERO_WRITE; if (bs->detect_zeroes =3D=3D BLOCKDEV_DETECT_ZEROES_OPTIONS_UNMAP)= { flags |=3D BDRV_REQ_MAY_UNMAP; @@ -1593,6 +1593,9 @@ static int coroutine_fn bdrv_co_do_zero_pwritev(BdrvC= hild *child, =20 assert(flags & BDRV_REQ_ZERO_WRITE); if (head_padding_bytes || tail_padding_bytes) { + if (flags & BDRV_REQ_ALLOCATE) { + return -ENOTSUP; + } buf =3D qemu_blockalign(bs, align); iov =3D (struct iovec) { .iov_base =3D buf, @@ -1693,6 +1696,9 @@ int coroutine_fn bdrv_co_pwritev(BdrvChild *child, return ret; } =20 + /* allocation request with qiov provided doesn't make much sense */ + assert(!(qiov && (flags & BDRV_REQ_ALLOCATE))); + bdrv_inc_in_flight(bs); /* * Align write if necessary by performing a read-modify-write cycle. @@ -1822,6 +1828,14 @@ int coroutine_fn bdrv_co_pwrite_zeroes(BdrvChild *ch= ild, int64_t offset, { trace_bdrv_co_pwrite_zeroes(child->bs, offset, bytes, flags); =20 + assert(!((flags & BDRV_REQ_MAY_UNMAP) && (flags & BDRV_REQ_ALLOCATE))); + + if ((flags & BDRV_REQ_ALLOCATE) && + !(child->bs->supported_zero_flags & BDRV_REQ_ALLOCATE)) + { + return -ENOTSUP; + } + if (!(child->bs->open_flags & BDRV_O_UNMAP)) { flags &=3D ~BDRV_REQ_MAY_UNMAP; } --=20 2.7.4 From nobody Sat Oct 25 21:46:06 2025 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1516297903099992.2296705177956; Thu, 18 Jan 2018 09:51:43 -0800 (PST) Received: from localhost ([::1]:44483 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ecELm-0005uU-4j for importer@patchew.org; Thu, 18 Jan 2018 12:51:42 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52268) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ecEJg-0004Mj-HX for qemu-devel@nongnu.org; Thu, 18 Jan 2018 12:49:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ecEJd-0004HS-Es for qemu-devel@nongnu.org; Thu, 18 Jan 2018 12:49:32 -0500 Received: from mail-am5eur03on0716.outbound.protection.outlook.com ([2a01:111:f400:fe08::716]:42208 helo=EUR03-AM5-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 1ecEJd-0004Ce-5X; Thu, 18 Jan 2018 12:49:29 -0500 Received: from xantnef-ws.sw.ru (195.214.232.6) by HE1PR0801MB1995.eurprd08.prod.outlook.com (2603:10a6:3:50::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.407.7; Thu, 18 Jan 2018 17:49:24 +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=+mhcy2SKFQOkThyHlH0r3qSgqwyIoO1NmnMfck57ymk=; b=J8a2bbCmGQNqLWO4KoNPsul4iOLHDr8EUiQdQybbq2f7Jzgw5ZnmfIEPFr3M0AYaSbyey0pMfX3DdA64fQALgsZHi87H+DbTnRWQnLF7q2whC74n74u9tm3uz0OcSlUHt+OcEy0g8ZjBAGhczzSZp3g8OLDH4D4tBNbIbTjzShI= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=anton.nefedov@virtuozzo.com; From: Anton Nefedov To: qemu-devel@nongnu.org Date: Thu, 18 Jan 2018 20:49:02 +0300 Message-Id: <1516297747-107232-5-git-send-email-anton.nefedov@virtuozzo.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516297747-107232-1-git-send-email-anton.nefedov@virtuozzo.com> References: <1516297747-107232-1-git-send-email-anton.nefedov@virtuozzo.com> MIME-Version: 1.0 X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: HE1PR05CA0132.eurprd05.prod.outlook.com (2603:10a6:7:28::19) To HE1PR0801MB1995.eurprd08.prod.outlook.com (2603:10a6:3:50::8) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7203ff00-aa3a-49ea-0f82-08d55e9bd028 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:HE1PR0801MB1995; X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1995; 3:Ub3t05Tk4dTPGzQ7R93SGYuHPlS91YEBtX8AgVc3UHRfAbCizHUjbp/HADIdIpVVvxK4g+qWYE0j0hA7s9RDM72rR7lfTgQ2GVuRXP6Xdm9UiTyy/oh3QcOsj1qKXTkTJPq9W4Jl9GeVZg8SBRQM6byBqO+Q9Hca83szt9CcjFuvwo6WKm8yT8rn/v64inzZ5kncFIJaUL1pWUNZh36BOI8NnqjdjqB66IGr2AGCEMk0UCEZMbBpymc76XVcH5F6; 25:FUDtxlnqXqffpiDRhgO/E/YPwdPKekAHzQtrhmYA6b+B8FXPXFxd7uI+dkSL3dk1ZsCgVTaFtyLginzaAHzIOWTS4VAR6z4VFKe5PlrGUKW0zaXFFkDx7XTrrQyxa5AMCsSJfwgEDg4sZtqbW8OKWn+HIj9qfRt8x73Ji6n6oLVRfTWumSqXBUUWHzPaw63D7ypgg3t9bX/O7rPOGgDIZNkCUYLggx7OOsmv+hTlhbFag51ZEq9aRPYr2rf+TKowKHOUv4MkUZYSAw/Ky3ywIy0x6f0egysJu+lO6Frq6Wsz+onX4iNCLr1FkVotkJ7wuueiajXo0A1ZQPiKfc0LRg==; 31:V18RFNKrW3aDQFnygP27+uOimIvUfA8qrFXPZ5pBlOiXGU3Sl2XHKwlc21TJGlfsqxThxUW1qF8sxm9ynbdm7R3bmZuyxKTFseaT+WKi6Vm3lEp8q9CFbrUsSZVpOfTvRab1YiUargVZqP3MVDCs/cUm6Etcej65vuWe1EDTE3n/rGuXI8gCjhUf7ckus1M+36262qj80OMB7ZQHcHY68uDp5c9REFoRm9Jd6e5J37o= X-MS-TrafficTypeDiagnostic: HE1PR0801MB1995: X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1995; 20:FvnY7UOWB5qfyNkK4ELojzNagdwdmqg0H+YIqsSatSrcICbGzJVu/yElSm6goqwo/l58ZZBKX6Rw1IhYatRDGivkkjpGoCaZMXyDcbvehgmPJcdWGHzIGzbx6k7pFS4SZ+Ly2aBms2NSWJT+I/jrjUiX4B8XqBQy448SA/xLzMGpt759VzU24usdg0vndbojLXdTTDEv0JeeIpJBx4QRvEm+AdlgEjsPFl/uYn1GiUUC0zkhgLqhr06JK8ZwijROQqnb0UuDwxKqfkv3Q4EwEv2ulvx93iw0yd4x9WcxYnuO+/nDYmxSUzCSIqNgVP85WcZXCq6Y6s1Z5cc+W4o+9DR+1G+qDWLTRHzImIPDWOFmoj2erqH5TxBAwGU4KyqgFUAJrq6dh+P+GTKhy31F0iTG2UVnmZ2/5GTPwR2mVgg=; 4:atew1ZEZfElBLMxFF0AJLK5vkkGD0F7pwYkKD9QUBMrgtY4MjmOfJKJiEC1qKbWlNyBLeY8bDiGmNUH7Yd5YPkOwBUFVUzpcVJ15UxlVaCBB/hMds5rQA28fz5F2wSIalHaqvNLFrmwmzohKhSeg/jltZ3SBJoWHTC2XfthQfRwvOMhIQFr9rqCcyt+FtTAvn/FYT2kt97CgrM9C6ODPjVTQsvdjOusOYifASqr1SRRO4UbqSQAy1KujXNUSSZc4uvkDVbHsAQBY4AXWtoPbhw== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040495)(2401047)(8121501046)(5005006)(10201501046)(3231023)(2400065)(944501161)(3002001)(93006095)(93001095)(6041282)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123558120)(20161123560045)(20161123562045)(6072148)(201708071742011); SRVR:HE1PR0801MB1995; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:HE1PR0801MB1995; X-Forefront-PRVS: 05568D1FF7 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(346002)(39850400004)(376002)(396003)(39380400002)(366004)(199004)(189003)(50226002)(6512007)(16586007)(316002)(2906002)(16526018)(53936002)(2351001)(6666003)(5660300001)(575784001)(66066001)(51416003)(6916009)(69596002)(59450400001)(7736002)(2950100002)(86362001)(2361001)(76176011)(478600001)(97736004)(107886003)(105586002)(50466002)(6116002)(47776003)(68736007)(52116002)(26005)(8676002)(6506007)(305945005)(3846002)(386003)(36756003)(81166006)(81156014)(53416004)(6486002)(8936002)(25786009)(106356001)(4326008)(48376002); DIR:OUT; SFP:1102; SCL:1; SRVR:HE1PR0801MB1995; 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; HE1PR0801MB1995; 23:tM9DfpPGqDTMtZz6DYuMsx3dUQK+yf4YjitUA72?= =?us-ascii?Q?u2WL9T3XO6DrqewW2B1ZrlgzdcM82cbkKNvXWLIyB08mtt3SkAbtpLlqiePr?= =?us-ascii?Q?wqJDXg6D/3ixBnR5jOpRvDImH5is1G7/EZjgK61orX629biJlcDAgqH8/579?= =?us-ascii?Q?ZGINgiKFSUuAizuOdg2hr5ezJaIcIX653KR+m4+Ozi4YP925NIdmUvgCbn++?= =?us-ascii?Q?Sou6chJtpoWE8+dPq4P4nfkv4Hn8dEp08TdriB9+oZFEgen6cofn+KmBZ/L+?= =?us-ascii?Q?ULuUWwkbKYzpdrl/G4HzTEj1B/FHnQ9oRRqdJW1mCSYtg0tOEWxxBFhqNLyt?= =?us-ascii?Q?ldfVFx4ZO/msouTfGszbe0oSWTMcPf0+sz8Rl9bvWXMn5HUYhJSnpoJpcGmS?= =?us-ascii?Q?pUCB/bnwBjbe3AP8NpNjdFwPiqkho9gxbwTGDs1lzeaejcQuBiQ4dtHACfk7?= =?us-ascii?Q?wneT+yy6k0dzHPVp4PYlDIL2jUmDoKxltSTcEsR1LcROu4nEkdRIccuCp+r7?= =?us-ascii?Q?O8zVRqT9PsKCckYpBiSDOgE5BWEUfEmRx20zJMYFwmgxePcmcrT0jtUQR+Bx?= =?us-ascii?Q?vJmM0NdSEfDt9eUv9Z7dlkBHek78nhx/IBKmJA89ieNE2Aa7vwcLYIPMG7cp?= =?us-ascii?Q?sPAFqBwq3ehLdA9hxalFaYNBvJyLoPEYtfRQ9WRQrEk2AA/28OWF6J3BUTE2?= =?us-ascii?Q?/WoSVAjZS0YCNmjL415skkTRtSsOd/t6fluo84rmXleFTKxEzwBJqapzracT?= =?us-ascii?Q?LwVcK3oMpd9d5sHfu5g3hTnW3m9JIL7ihjzRqGQ+ACoP/fps5rVESYZou46K?= =?us-ascii?Q?D69ULTFChSEnZH0d+swKpzKN597pzRz3+06kN8HC41xBxICJQN+C11O+HT2P?= =?us-ascii?Q?eiQcXP7o7CIGgpMJ3n6dEGqhYD0djsUS6khD9kp8o8VrWcfHaLnpYbttLSRZ?= =?us-ascii?Q?FU45mmpmOY+W+eDibBgrlg0nSOZA8mesA3x6kVfoMCuBH6ZeSvVbHuyUNh1h?= =?us-ascii?Q?XnEYuRfKdZv3LE6WJ/yAnMvTMMZ74UqusLoEpStyhwJM4LFrRTdZjlI4yL0C?= =?us-ascii?Q?+923KtgNabq6TnLGgtOaN0q1rmaMrs/PHqa0uIQHXT6HCOMQ8OKhA8xxjgTy?= =?us-ascii?Q?qf2yfgbA7FfA8qySOvS6tnQvJDAbpy7dT5oFB5CkOXCK7jFOJOx38ccc/ucL?= =?us-ascii?Q?HBG2KulLfkGXz3H4hJF3zjcLHm1OmUOUtde+XR+SkFJqIVAM0vCmgWpfzQg?= =?us-ascii?Q?=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1995; 6:JZFb/R/yFLVT5PK4Babga9yH4xC2CVd0UCvA4iihNZepCMkOiuBhwH/B7vCA5ZXq8HcXsu909hjIfT8i3+chMVDnqTt8aVgfr550Etq8BMGxZp3LwAtl6/8Iktml2EFTnnu2QWSInPGe40HbNYYOuH6D6QUzRzimDJMkMhyHg1NW5zYbAjI0TZHUI8Vef13xg6V1AKvKubjCJr7LWrp8OR3uu2evvXCdtmLOE5R3xe59DNgvRIW9JZo0wPfFiW9LnAPE4nElRCdzXcVqjV1WyF3PwLgXr7AYZzM+4wmUzD0JDsRI7tQBSP3SBLdubOc3uzxCl5tIE/3D3Y30k8I3BJ1DLySv/FLYG0dAnNXfrR8=; 5:sURyQ5zE+yzmFvjbbFffax016kGy9O+fVfj4yoLUjidjpM++JdOpmniBo+5Wa5R4YpM9M7wUgenqeqJOztyYKtBzr8EPki0sKKs++5McbwFlw7UidqQnbPLAxnAH3OWYdNYGbsYU810/uH7FtlppaZ6mAOuXs3ua+513hbpL7pA=; 24:UTL1dKJ7BPE2YRucxqKB20bAtUBjNNovtxPBiMviU3tT2L8lTSOVNdp7OS9+kw7NBd9Dz7QGL1/Wv2+l4btPR2UoPmIwzhEQfHcbGyWdDfE=; 7:ZjUi8mQFguDunF2uYIoZQYwSQtqfbeuWzJytQp0Z5o/qy5PnaJY+26mjcKwa9GxfrA76y6zzAYlgFKZm5WMVhpPObpidm78GfOoeFIm8kr5yUC0JZFD5QGzlarqPA4rHbC+cUQRgo3TbpH/MGUOBZzRnNU4qgmMHFr05qe16zzSO5t/yH5pCbNQQ+ODuNCg0yY2plZBPD6GnQqe13IWlpYHO+PXnUeeMkHUm/fJrF73K/kX+g4lpfLhHRSmsvhM6 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1995; 20:MVpEhmM8WhY6TglYToBjwWb1v1U678MZoZ/BkvMcupVRPQYWK/Cj/8uFmyb1lYwTUF54jngpU+vr1vd+yx3y8n1De3KxQpTD+HZGM1W474XDwGNym64X0Rrg0m2xNMppcDOruL7CqbPERjrobc/h/wjAj64prjLXSIR0zyNBYOE= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jan 2018 17:49:24.5052 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7203ff00-aa3a-49ea-0f82-08d55e9bd028 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0801MB1995 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 2a01:111:f400:fe08::716 Subject: [Qemu-devel] [PATCH v7 4/9] block: treat BDRV_REQ_ALLOCATE as serialising 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, den@virtuozzo.com, qemu-block@nongnu.org, mreitz@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 idea is that ALLOCATE requests may overlap with other requests. Reuse the existing block layer infrastructure for serialising requests. Use the following approach: - mark ALLOCATE serialising, so subsequent requests to the area wait - ALLOCATE request itself must never wait if another request is in flight already. Return EAGAIN, let the caller reconsider. Signed-off-by: Anton Nefedov Reviewed-by: Eric Blake Reviewed-by: Alberto Garcia --- block/io.c | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/block/io.c b/block/io.c index cf2f84c..4b0d34f 100644 --- a/block/io.c +++ b/block/io.c @@ -605,7 +605,8 @@ void bdrv_dec_in_flight(BlockDriverState *bs) bdrv_wakeup(bs); } =20 -static bool coroutine_fn wait_serialising_requests(BdrvTrackedRequest *sel= f) +static bool coroutine_fn wait_serialising_requests(BdrvTrackedRequest *sel= f, + bool nowait) { BlockDriverState *bs =3D self->bs; BdrvTrackedRequest *req; @@ -636,11 +637,14 @@ static bool coroutine_fn wait_serialising_requests(Bd= rvTrackedRequest *self) * will wait for us as soon as it wakes up, then just go on * (instead of producing a deadlock in the former case). */ if (!req->waiting_for) { + waited =3D true; + if (nowait) { + break; + } self->waiting_for =3D req; qemu_co_queue_wait(&req->wait_queue, &bs->reqs_lock); self->waiting_for =3D NULL; retry =3D true; - waited =3D true; break; } } @@ -1206,7 +1210,7 @@ static int coroutine_fn bdrv_aligned_preadv(BdrvChild= *child, } =20 if (!(flags & BDRV_REQ_NO_SERIALISING)) { - wait_serialising_requests(req); + wait_serialising_requests(req, false); } =20 if (flags & BDRV_REQ_COPY_ON_READ) { @@ -1504,7 +1508,10 @@ static int coroutine_fn bdrv_aligned_pwritev(BdrvChi= ld *child, max_transfer =3D QEMU_ALIGN_DOWN(MIN_NON_ZERO(bs->bl.max_transfer, INT= _MAX), align); =20 - waited =3D wait_serialising_requests(req); + waited =3D wait_serialising_requests(req, flags & BDRV_REQ_ALLOCATE); + if (waited && flags & BDRV_REQ_ALLOCATE) { + return -EAGAIN; + } assert(!waited || !req->serialising); assert(req->overlap_offset <=3D offset); assert(offset + bytes <=3D req->overlap_offset + req->overlap_bytes); @@ -1608,7 +1615,7 @@ static int coroutine_fn bdrv_co_do_zero_pwritev(BdrvC= hild *child, =20 /* RMW the unaligned part before head. */ mark_request_serialising(req, align); - wait_serialising_requests(req); + wait_serialising_requests(req, false); bdrv_debug_event(bs, BLKDBG_PWRITEV_RMW_HEAD); ret =3D bdrv_aligned_preadv(child, req, offset & ~(align - 1), ali= gn, align, &local_qiov, 0); @@ -1628,6 +1635,10 @@ static int coroutine_fn bdrv_co_do_zero_pwritev(Bdrv= Child *child, bytes -=3D zero_bytes; } =20 + if (flags & BDRV_REQ_ALLOCATE) { + mark_request_serialising(req, align); + } + assert(!bytes || (offset & (align - 1)) =3D=3D 0); if (bytes >=3D align) { /* Write the aligned part in the middle. */ @@ -1646,7 +1657,7 @@ static int coroutine_fn bdrv_co_do_zero_pwritev(BdrvC= hild *child, assert(align =3D=3D tail_padding_bytes + bytes); /* RMW the unaligned part after tail. */ mark_request_serialising(req, align); - wait_serialising_requests(req); + wait_serialising_requests(req, false); bdrv_debug_event(bs, BLKDBG_PWRITEV_RMW_TAIL); ret =3D bdrv_aligned_preadv(child, req, offset, align, align, &local_qiov, 0); @@ -1717,7 +1728,7 @@ int coroutine_fn bdrv_co_pwritev(BdrvChild *child, struct iovec head_iov; =20 mark_request_serialising(&req, align); - wait_serialising_requests(&req); + wait_serialising_requests(&req, false); =20 head_buf =3D qemu_blockalign(bs, align); head_iov =3D (struct iovec) { @@ -1758,7 +1769,7 @@ int coroutine_fn bdrv_co_pwritev(BdrvChild *child, bool waited; =20 mark_request_serialising(&req, align); - waited =3D wait_serialising_requests(&req); + waited =3D wait_serialising_requests(&req, false); assert(!waited || !use_local_qiov); =20 tail_buf =3D qemu_blockalign(bs, align); --=20 2.7.4 From nobody Sat Oct 25 21:46:06 2025 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1516298206755561.2415158960487; Thu, 18 Jan 2018 09:56:46 -0800 (PST) Received: from localhost ([::1]:44621 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ecEQf-00022R-Ut for importer@patchew.org; Thu, 18 Jan 2018 12:56:45 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52275) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ecEJg-0004Mm-IP for qemu-devel@nongnu.org; Thu, 18 Jan 2018 12:49:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ecEJd-0004Id-SU for qemu-devel@nongnu.org; Thu, 18 Jan 2018 12:49:32 -0500 Received: from mail-am5eur03on0716.outbound.protection.outlook.com ([2a01:111:f400:fe08::716]:42208 helo=EUR03-AM5-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 1ecEJd-0004Ce-Le; Thu, 18 Jan 2018 12:49:29 -0500 Received: from xantnef-ws.sw.ru (195.214.232.6) by HE1PR0801MB1995.eurprd08.prod.outlook.com (2603:10a6:3:50::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.407.7; Thu, 18 Jan 2018 17:49:25 +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=3AbMClhLwnoHBt0Mhec5U7i/+zH9R4XFw+hObujukmo=; b=iprzFWxJCTOoO8hcFUuRDhnLVlRxi17ot33Is8ws5+vNzBC79mya4K52m1FFgv8yNX6UsSrcxX7YIltXMxefIAWwwuBYlIPCOmm1qZD6rbHizHcjUTswhcZ6dKplCEUGre5TyPFU+yuqicbRcNEKuq5cWxEGOka4qOtDvOLAAmo= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=anton.nefedov@virtuozzo.com; From: Anton Nefedov To: qemu-devel@nongnu.org Date: Thu, 18 Jan 2018 20:49:03 +0300 Message-Id: <1516297747-107232-6-git-send-email-anton.nefedov@virtuozzo.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516297747-107232-1-git-send-email-anton.nefedov@virtuozzo.com> References: <1516297747-107232-1-git-send-email-anton.nefedov@virtuozzo.com> MIME-Version: 1.0 X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: HE1PR05CA0132.eurprd05.prod.outlook.com (2603:10a6:7:28::19) To HE1PR0801MB1995.eurprd08.prod.outlook.com (2603:10a6:3:50::8) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6119d610-c959-469e-d01e-08d55e9bd089 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:HE1PR0801MB1995; X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1995; 3:V7p0vcFdCsNBqVwYKYGwmwEW79Gm7bSucNaOdUqlv0bl6PW9sz0vWRugG+og+xnIUA6oeg0JI4z/h/fiTy45LCsiEzP3h7VC6CsDAhX0G14JDsV0HKwjXqDhRP9PvvqEVQKKQPNzktUUEeTdM3c48ycPJTxcfAFJkVIxZp9QyOqy4TOQVx7TUjJvRVVTSTcH7zfW7jXzabnv0z4Pmj5W532VYvC3KhckThRzyi4ne6HwJMtAqOQ1rNeUCtBY3705; 25:LGfgVUxZlq/kNQQVyI4/SX7Sf6duHOTu7x9l3bNy0CvR0JQkj7x6vraoyv7zR+d7u8BzOQSnGV8guVipLHa4Yi+BP0T2hmO9C1qom8Ur+1B4+dXuKiFucbXA5bx6kodZjRL++gOa5w0e8QYcCtVfqYH5ZVkF9kXOCaXh3D2n6e3Id6nrF0QpCIezwD9qxnO8IiZQxxxnofe7FaMTZn40hAE8yYnd/7Bkgugp9Yjl4sDDFLlOCwRgGgfmvU89Mg6SeO5eg0cEhwZTgVBs9Uwc6Va2sVszdFRbNugPkpN66AXe1YcXOfzv/K3WwpUIXcL5knb27c2AS15bgjU23CqrWw==; 31:WvvuDNZ5yyeXn4QbNsFlj68G26Zjs3ShBjUlm3oImDvwwPYSYCTagVQENvbvysLSeNO4nvDYlmlCgLGZJ+4si5PsmyacP5de2MDppEsLTw52YOhmKclutr5ZkWMZNO+YwpZa8SrPdZ9aFIMgWbjERC3cj2VjT7aK5P5Sr7nXofq5iVup6iNPIR7or5opu1JMT6vNJaSp02c8xuqQiZ/wxHUu23HEQuU6FnHfpZz6e88= X-MS-TrafficTypeDiagnostic: HE1PR0801MB1995: X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1995; 20:iXUBjYuHea1gvE4Ka8aGBiCVYRiqaDsx2R0vJ9nP1cKJoZK+otE8wo2JvYnsOy+6LexYqaqIIyBzIYce+oQqDI0Ex+DYvihvIdtvY2OizD99AAJrqmb8zyhPpm+FHyjRjRC4kb29I0HdgwErKh4dVOGESJ5zTicerf3Y1TO6GmF5wZ/5PKj15EcT9yZyVsNIdRUJ8xNhmsLhLEChwW17EZ8a8Z/jn1IsiGJ5KaBtY7VPT4cFcsGWsz3LlbDv4vZR4YxjsMsHcpkLEpqg4V7tp5/dCKppTY8mw1aH7muUDcitYyqTcW/d1j4CuNYslGBt6/fBuQQ10O13wcQ0JXVyE93wxATUYQeCJufGr5UkyQ1s8pvD0j2Q8O9CYFzX49uGt/7jPoGMHK3SPj2wjY0H6Bh3EVcabPRoUvQPcJ+B2jU=; 4:IVaIJ8KEQtECd4v+49U1uQOOXIBO3mkN9jnAzVZdmSa4UWtNI3ayCLDwJ2JCFcJIvhAIm/mEGr5z3TgXGvL3jHcNy24z7W02yVFzK2kqx33E+ynBXHe1up8TODNyb04AaAWP6804j7OaRCfJq44sGTk/5EVus3U1+C4a9odPhvfW9d+6gw81aqVezIl21ril4PloTvXzwYTXIBFU6qSty4pudziPOVOGj5FsP5gBJrBArWSHkQWlKCX4gxHarSbn1f9qYLt6wxwPa/B1bVtaBQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040495)(2401047)(8121501046)(5005006)(10201501046)(3231023)(2400065)(944501161)(3002001)(93006095)(93001095)(6041282)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123558120)(20161123560045)(20161123562045)(6072148)(201708071742011); SRVR:HE1PR0801MB1995; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:HE1PR0801MB1995; X-Forefront-PRVS: 05568D1FF7 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(346002)(39850400004)(376002)(396003)(39380400002)(366004)(199004)(189003)(50226002)(6512007)(16586007)(316002)(2906002)(16526018)(53936002)(2351001)(6666003)(5660300001)(66066001)(51416003)(6916009)(69596002)(7736002)(2950100002)(86362001)(2361001)(76176011)(478600001)(97736004)(107886003)(105586002)(50466002)(6116002)(47776003)(68736007)(52116002)(26005)(8676002)(6506007)(305945005)(3846002)(386003)(36756003)(81166006)(81156014)(53416004)(6486002)(8936002)(25786009)(106356001)(4326008)(48376002); DIR:OUT; SFP:1102; SCL:1; SRVR:HE1PR0801MB1995; 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; HE1PR0801MB1995; 23:/LFiMYqUDNL5XKYeEqcAmNkmmcqdRrIDJWcj9bT?= =?us-ascii?Q?5n0XK45Zgvjl8I58AH+8uc9SssiXXAyFIfXtDlfPAYHSvuZe33836cZZViCX?= =?us-ascii?Q?gp9Lgg2MlvCaVKjSqWMrlYbM22B/mf5Hwbb+0KX+M8zXxgQ5NHdIea+N70TW?= =?us-ascii?Q?50JeZRCbCDxeeqCrr4WYjLgQ0dU6oq7W1IWnQKJzI4/85E4R5cslEkkxjUVF?= =?us-ascii?Q?vk+EPPcDgvMrQsniFj1M9z6tNffZFqVCyQ5GetDIucc80Vd/Gm75bzge5Qkt?= =?us-ascii?Q?mYWn95Pm9qnG0Q9Q/04XT0vK4xccobtZInafpJjWeN+3LxmI9pElgHfoZtgl?= =?us-ascii?Q?ZF6wLq5olNIrNkatuSqikoMPFOyrKrU6Nmp4A1/+Nxq9W/RmhI92iUChb5XA?= =?us-ascii?Q?THPxM4Tu/4S/gB4gIye1Y7mEyfUE0mm82DuTbMMgnTwyUkEeTxNIJvhbQQHZ?= =?us-ascii?Q?kx7GQR3lsQW0U3vwn3AmhUPFPHxBUF+gDv5JzmuS3Up9O8eUtwoBzWM179a+?= =?us-ascii?Q?2zbuOwO4oN7N70gn0dkYUpg7H8R13YErt1+CCnFCDiQ/PtJryJjjs8euX5eV?= =?us-ascii?Q?jFetv3Uy6KCndCiuMrTW+Gmmg8KC5k/CYZOI2bKj5oA8kWiFrSCIIHj4iZco?= =?us-ascii?Q?GPVJCD/ri5Fd06/tifu8xYPlYVfHrDGicFMC7x1ZBczl0/WtXj+Vu6mYPiKw?= =?us-ascii?Q?U7uWGYSqQ+MFgxejCLfWtFdUhKFflg5KL//Jdg6uGZPTR9KVLSJ+Vk1FT1EG?= =?us-ascii?Q?Hw/KnfwIOpJsn+NoghvZGSiwIM7toB6VuLyj8K0rCqSJPB6jnXeQvloblxI0?= =?us-ascii?Q?hJV8BhEqP2dp/c2ENAYPdIiFIZrIG23ayUQVNVhARCZlJRGuN1Z0QkIGdAzG?= =?us-ascii?Q?9qKWlUK7j5Tx+BVNUCNVG8iuh8wqL3vkj9yIFrFpkdM+fjbJftlmGUkjt/7s?= =?us-ascii?Q?ln2YmeGoFb3EVylPIdwP6pnKy9JvndBVFvWi/0ggPqvqTTH7xqMz/bLL1xry?= =?us-ascii?Q?z1e2Sk2W2tZg/bJoT8ugemaRCVfCIKotpXWzlrqrMNYte/DEUualyiwtggEE?= =?us-ascii?Q?luMpJy5AQKYP1FDb3A1/g7ynJ6TKWFrvtfdQs3mL3cEQcyiGpnsZ7AWn5Et5?= =?us-ascii?Q?ro0rchJSiwv5IYy3LkxUztcg+bAbr8I2Eg9WRA2EacmIDTAd3O4jLqOqLn0q?= =?us-ascii?Q?xqhivMruPocGLK5k=3D?= X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1995; 6:Oi1rEBiN7yPI3vKLoYxBSArnT6dgRtxlqlirIVqm2KL5HpV6IM+UUSmhtOxuia9ToyRgMf09tkzfpuvW3JFwCwnPlgZyEaiiugJ56NnbJX5DKZheBvuYknOxVwLGoOlIfnV+tDPe1UyXwCVlO1BJ18j0PQNpYm5myNpxrh7hcxKJkw2M8Vs4Miej1quxted3/lBme3KFypxu+K6ZCP9zB15uDhTBTiCxl70Naec6263AgLl9IS+UG4tmz4zummadQ+EA4l1OAPYvnBuDc9BblK5M+wWTQsgFqXTCy8ASF6mmYsPtz8dhLbnBc6xZknb7Riv64xNiuP406PgbGBFNoxUKqjKY3TLgCLESzuim+Pg=; 5:IQNJ27v8APsKn8cPeReSDXCbW2D5Mufgff2ELDbGgQAl3sLhP9rAi7dQqltt4Xtqd+cH89onHQ3d+qpPeJkBjqW0jH/aGlowkrYXQu516xjI8qMj91RnHG37pc5LbNOFhUVo/hkhMh607bNo1o5vuXNgnL9IdWTYrrrBsq4rnms=; 24:iqVxSsrU8GuA3SsuPBAsn4P7t8KARJ8d8n6c6sRhfbJ/6ANuhDKj+FkCJrUn4DRPQbPF1a4Nw/ZJ4IYMaOmR2wQLtKbm0PZqp+2+8kQrxxM=; 7:dqtFiRDlBAeKByyuNnfguFPeVk9u4uX3KM6pk+gBEaRur0UI1qPFRtzUHAvGxYh3C/H0HBAchEClbWZpF0HcOpduR1/qE/0rGlY8CKxdbzh18Vhu0oS355C95A/4ZUbCxV686f5ZsnMCMTWZt+y6mLjzScnrlr/zGyQum5jQZzv7h5bbkvUcuPrMEDX+CzClYSF3qkLSNBuao2QPubg75m0ADtcpeIVZOWWgBCkxy2qVuDIHc/dZ44KBdUAxqypi SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1995; 20:wBHecVCESkjX5XIqUVsWY54q6CgYOLYKl/QXiABVxzcyqDjuM5+XdhTpC4eGn95eVBAjZha39QcHGlPx6ylx/0rHv4oGE+3H4PoTButD6+jxRnNYSdO6FNgNmvk0uGAJyaabyf0kz9y3SOpntvJeUD1xQcLShvXMQk+CZdTeCdk= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jan 2018 17:49:25.1615 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6119d610-c959-469e-d01e-08d55e9bd089 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0801MB1995 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 2a01:111:f400:fe08::716 Subject: [Qemu-devel] [PATCH v7 5/9] file-posix: support BDRV_REQ_ALLOCATE 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, den@virtuozzo.com, qemu-block@nongnu.org, mreitz@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" Current write_zeroes implementation is good enough to satisfy this flag too Signed-off-by: Anton Nefedov Reviewed-by: Alberto Garcia Reviewed-by: Max Reitz --- block/file-posix.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/block/file-posix.c b/block/file-posix.c index 36ee89e..c36e156 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -558,7 +558,10 @@ static int raw_open_common(BlockDriverState *bs, QDict= *options, } if (S_ISREG(st.st_mode)) { s->discard_zeroes =3D true; +#ifdef CONFIG_FALLOCATE s->has_fallocate =3D true; + bs->supported_zero_flags |=3D BDRV_REQ_ALLOCATE; +#endif } if (S_ISBLK(st.st_mode)) { #ifdef BLKDISCARDZEROES @@ -593,6 +596,7 @@ static int raw_open_common(BlockDriverState *bs, QDict = *options, #ifdef CONFIG_XFS if (platform_test_xfs_fd(s->fd)) { s->is_xfs =3D true; + bs->supported_zero_flags |=3D BDRV_REQ_ALLOCATE; } #endif =20 @@ -1413,6 +1417,10 @@ static ssize_t handle_aiocb_write_zeroes(RawPosixAIO= Data *aiocb) } s->has_fallocate =3D false; } + + if (!s->has_fallocate) { + aiocb->bs->supported_zero_flags &=3D ~BDRV_REQ_ALLOCATE; + } #endif =20 return -ENOTSUP; --=20 2.7.4 From nobody Sat Oct 25 21:46:06 2025 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1516298153571298.31590260340556; Thu, 18 Jan 2018 09:55:53 -0800 (PST) Received: from localhost ([::1]:44609 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ecEPm-0001Hw-KV for importer@patchew.org; Thu, 18 Jan 2018 12:55:50 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52272) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ecEJg-0004Mk-Hn for qemu-devel@nongnu.org; Thu, 18 Jan 2018 12:49:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ecEJe-0004Iv-AE for qemu-devel@nongnu.org; Thu, 18 Jan 2018 12:49:32 -0500 Received: from mail-am5eur03on0716.outbound.protection.outlook.com ([2a01:111:f400:fe08::716]:42208 helo=EUR03-AM5-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 1ecEJe-0004Ce-2z; Thu, 18 Jan 2018 12:49:30 -0500 Received: from xantnef-ws.sw.ru (195.214.232.6) by HE1PR0801MB1995.eurprd08.prod.outlook.com (2603:10a6:3:50::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.407.7; Thu, 18 Jan 2018 17:49:25 +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=wSDcWIWKcj5APoSYHWxJghyyqCiJF2bnWFE0iQsN+m4=; b=CyV4ePE4KWjODykUENCi+VrOEj3HB6oRCbA6u9CptZON8azVlURjzYpY08K7m8JDcJm9/bDpLDW06H5wryRsXOVkJOT/bk4mcNLz+Y/6Z4OtfPSq2wmog3Qa7LEEGtxR3vIRgD3asnj8DMEONzT50qJdsiFUuFC3a5wzo/A03ms= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=anton.nefedov@virtuozzo.com; From: Anton Nefedov To: qemu-devel@nongnu.org Date: Thu, 18 Jan 2018 20:49:04 +0300 Message-Id: <1516297747-107232-7-git-send-email-anton.nefedov@virtuozzo.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516297747-107232-1-git-send-email-anton.nefedov@virtuozzo.com> References: <1516297747-107232-1-git-send-email-anton.nefedov@virtuozzo.com> MIME-Version: 1.0 X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: HE1PR05CA0132.eurprd05.prod.outlook.com (2603:10a6:7:28::19) To HE1PR0801MB1995.eurprd08.prod.outlook.com (2603:10a6:3:50::8) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1bb29a77-832c-4062-684d-08d55e9bd103 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:HE1PR0801MB1995; X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1995; 3:AYXm/vFMwMiwSuSLjJWkCHziCJo4LxOQif02kTIwu43Y2kMf9n/YWBtFKqF09sLltvh5ycvOqoy5EWdsrw1Acog/p9dAjdGOBpWPc2DRX34OO8lCxAkXYDEpm23nDLhSjnyrTd8ALJz9F9P6SUoo1cB5NSYm4R7OaiUt3ZBSSjCPgjjTasTxfw4seZCgQoB0FHwDM8NXPKUkLXmLt81PED00ezgw91KTjsvRKsiwTzLHFvkrK0TmK5ZMAZKT/mFP; 25:nKXF/56axoGJixSd0AwSH4tVBwR9PRo3JfRQ27awIDDDt2LYf+YcfnuCzGuPmXJC78I0j6RBzNV+zq16XCidwuaOVgYcjyQ7DPS3RAgF6hkNYk/gdEMK1DbxiSpvLBcuEWN0PDApY1aW4WPIFs02upt859FWIH/VIpFYsAhSOCptMIn1kMBITg/2OKt6o6k9dWFhxhsiQHqA/Hr2h5+49PKEueUlnNwjKU0WenakaKftrPt3UaKzIpCbokC/nDwpeFwlM01DAT0oFxKuWy2VDwlwesZ1kJeW0rFFXu8Fru690xX3nG/p8BoELwrVWi0dnHiMD8jn1zsOo70zisPm2Q==; 31:sh4mu7Tbsz+f/YHCkrt/n9IQmSuQv2ua+9UsE9k3CAnru0MRIZIhQN336gA2k+TVZuIIEng9Z2Ysg7nucyQB0BlZGkZmlsL1+6DK0kRBEb8LDiQLY7nLkTOXfPJAiDR4EX0X5W7/bPYBeXBN1V44ue87lfL9pavqQookoB2O9RrTYNJGRM9iV1MWZsu+M1bgfkYLVQ3Sc6zReBKNGQSQiO3zmLB8gIvKUEHjcoyRpzE= X-MS-TrafficTypeDiagnostic: HE1PR0801MB1995: X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1995; 20:WBNz8O6HSIThnXh/lrNesu0tIqHHoQ2SNaG6a459Bo7Y70l8zmL0m8QoiKr3QrC1wTfHOirtwg7PMk99wraycv3kYB08och7OYctANZM482PSGKDLBNrj0CHXBEbk7LQ+ZKnayiTofTa9JCaPgVUD7LrcHY8/70aLeV1ddobG6HjHSuiky5Cj3zFLTksTOMcLX10OMELZ8zPUCeM6g13L0ipvDteJ30kbjhVu7IeFOAcxTXZyevFwBCZwK+1Du+LUxaeBFl5s57cv1LWMY1tGUmh5myiziXS3wOY7otkzAoRkBTrucnxYbdLVFQE5pWhbO8m1xHzj3C7PVzQbudVJOK3g9OJHZ0UaXDkgvOB3mLjvgIpEdl7bHKkgoQ6uqSNY46csV5D6045rwb6ZgwzGjyrp74M+u7I2YvD83F8Zw0=; 4:sxQbb2QyeMiBz87ckdS5s2VOYxOxG0GorQ65phOGRKChJs+uTvSFXCdndzypO+NlPxm2wUOSTpxfbzzawc86O347qVbEkqbGto/wQUw3pLegT0UnBeACXe2rOIZJJdyz5Njqil0G6nK9BEEkP/3hZYyhJ2s1/Bq6UYimfjWYpx2pSFbuhssmXDiclLkTNFOKSUaf/Ii4SmCJk1IJTGzjmUa4SAfayWJNladVoPo1nFsTZY8CpHzZU5GBfOOBBFK1NZxA2YimImokfx8NwVjvTA== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040495)(2401047)(8121501046)(5005006)(10201501046)(3231023)(2400065)(944501161)(3002001)(93006095)(93001095)(6041282)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123558120)(20161123560045)(20161123562045)(6072148)(201708071742011); SRVR:HE1PR0801MB1995; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:HE1PR0801MB1995; X-Forefront-PRVS: 05568D1FF7 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(346002)(39850400004)(376002)(396003)(39380400002)(366004)(199004)(189003)(50226002)(6512007)(16586007)(316002)(2906002)(16526018)(53936002)(2351001)(6666003)(5660300001)(66066001)(51416003)(6916009)(69596002)(7736002)(2950100002)(86362001)(2361001)(76176011)(478600001)(97736004)(107886003)(105586002)(50466002)(6116002)(47776003)(68736007)(52116002)(26005)(8676002)(6506007)(305945005)(3846002)(386003)(36756003)(81166006)(81156014)(53416004)(6486002)(8936002)(25786009)(106356001)(4326008)(48376002); DIR:OUT; SFP:1102; SCL:1; SRVR:HE1PR0801MB1995; 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; HE1PR0801MB1995; 23:7DGDMUCe/+zDip8I97pgJM/AHae040jNOJzrXhf?= =?us-ascii?Q?eo5lFEl0iHQKU3Mc5c74mSGQ1tRi6kNtGQF7mc5qvplk2GYjR2m8KA4Ko36k?= =?us-ascii?Q?AiBvESWeunHJ6IpSH+XI3TCiz2KhrmXi6IsK4hE399DFaRLoXliZXaq+kKUn?= =?us-ascii?Q?HFWcX10U3f3oI2pwqO3hA/Jwcw2HWADv2DyGQTwVQPQXXlaLWZuDTU9InTBV?= =?us-ascii?Q?OpkHAYmIv/vWFueoAe+cfzbv9z4+C6auepHKoSNBIKCnmRyyoMD4kCqGfTNz?= =?us-ascii?Q?MnP+3DbmYNy0U7SolHeXq3ftnvGwSIFU/wXkKJy8WzYQHDIDSWmfBwhtGIV5?= =?us-ascii?Q?UyvCoyCraaI3Rjkw6GfkK5si25aaX5RGHepdG7rpRjqhwJNPNAi7qlQG5mZR?= =?us-ascii?Q?xxe1b+e0f18jE7T98iV4GYGNbeqUhlyu3xWnR30lUCTBO4WSz+i4ZD70cr3H?= =?us-ascii?Q?b4I1RFUWKhtvz4iTiH5YrW//wN8nDxSUuL98TlCbOzKp4Ial8BqUnhj9j8QL?= =?us-ascii?Q?Dy042pNNI0DzwGol5DxdV67uvMQLaTVdpeQHJCBHUQ4lTBeNfIQJA2mmJsRJ?= =?us-ascii?Q?Q7pdPaJEFOGU5uH/F03FnGolfP50H3LK4r1QMdDkrHaZv053+1y3xbJPESd4?= =?us-ascii?Q?JbGjBCsYkTzYYQRvuTJsPzJR1XH38oxxX7myXX53aTw+gzloZyJq4vDLmjhG?= =?us-ascii?Q?+elTnHYBKwDKeABCLndCorDjdBkqotfmntjtPiJ+63xUVnuPFzBzefveoD4E?= =?us-ascii?Q?U1Ry1pBov7L3EzN12KNmVxno/V+FrrWFtZgUgpx0/CBORLhkDbyY3U1CblW6?= =?us-ascii?Q?gitYyaUsKfjqHMTpqNMzGTnfHXUJTNciyE8bZ98J50ueFqWZ7OqbGpS18oAw?= =?us-ascii?Q?x1sawFSFBwIRkfFMnZF+m1EyHRsfTD2Qv3XsBMKlW99FIB/B8Lba8tLQB3gQ?= =?us-ascii?Q?HCGQ0PB0ZLhWZ5902YhCxDsKVmEqfjHzfw/sufI98dtS+F7gOO2toAIkEkpC?= =?us-ascii?Q?sn/dYE4XzqbABL7GAUSHmGyGmi6DGg4FIADCuoqgUvFgNfJ2wNSTIncA1Aws?= =?us-ascii?Q?ErZE4uXdItSuQaTEG+1HLiFxjb/232/6T8tUjUT2vO9wxE/f/3YROrsJunoZ?= =?us-ascii?Q?RnVzJsmczPgWWZ2EK1SEzg68ULadhipaq63mYbZkA5QeEmyHz3U62DaMh/Uj?= =?us-ascii?Q?+2VUoU4YT2ML0PD8=3D?= X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1995; 6:Yctwz/6SMA8MOXmk571uIkYEJFiajwGej12dcUldYjgYoem7tbyyJU9KMNjW0T7+9+DmuLS4tnIv3kOvpuz6QvBj2+mmPbqG4jRKkiC+qNu+efbSJr06YLlhju1Me2W+EVj5bJ7mzCaRpFW/PFoEh9e8J/IxHdwWS7n1cKKpuBsKX8Gmxu8zYbRcsNZvhsAg+DTEngeww3T6AtgPMCEDVlCNqVGp9NYQcC4rcJsugbcntbNO8KuOWErSTuspBH8kgPUCkoQEuJdl+N1hVCphqgK1ef97eTnNb/z6RmFGzVcZtSrMzvVyhTjT5n8vsA2G5o1fdbCN2uQr3aAbyOkucKoI/Uv+U+FgeicJuvUGfbA=; 5:e1qVH/RBhhi/UPMpNaNdovQWvCh57espfJnliRSJnD3jx1ssasDjgMK4Py/cIrAsZOs4YLpdZTG9WilPW5oP8ZFPReFODYF5YS4N/E2T5hRt37er/OV9ghyGhRjs5SIXUSz2gCr8Ue0H8m3dhgtxPGlSomCzuMbRTeCbtSkaBwI=; 24:cx3bPhWOIhJTdCBId5qfW8RYotkG67lg46H7McDsMMU6LIxJiyocdPVZURN54Pkdz7XJ79xJcwW/CbuHKwiciNi9B8vqdiWWEr4voXWlYCM=; 7:9cpJZbtf48cz2rr+avT30iTdN4ZViqAKCMGM2xTDe8zqgtIX+Fc+FOgVX02w/zcwPwdv3bEOpVfx2X/rGZjfsp4ruo7P0ukheLu0nZvq8i8nxZj2a7KWqq9v4jl9T5570Suxv4Klk3PME/PcK+a2+1Omy1nW9RUaE9mLqw1vs4rBzSDN6e1/nFbord6zAW1PFqJ37kuqxHRO9uQmLizIipK0YynHlsLxKD5DqNsTzjNtjyKrzl2e52XVr5zaS1Mr SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1995; 20:kX5lEISvJ7KCR6SivtneARVo2A/NaDEdgbLGS15jQvueutuhhdb66ZrciZU9Bn4dccdEveCroLVlVCoKxhXCvM0e9bJ8FSNWLdbcxC6FsIv7tfQHOQMVLZjfFW8MShOJyE/avqK1yJG9LEjjnWXZzS+YISrSa9edljAKpsGB/i4= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jan 2018 17:49:25.9583 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1bb29a77-832c-4062-684d-08d55e9bd103 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0801MB1995 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 2a01:111:f400:fe08::716 Subject: [Qemu-devel] [PATCH v7 6/9] block: support BDRV_REQ_ALLOCATE in passthrough drivers 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, den@virtuozzo.com, qemu-block@nongnu.org, mreitz@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" Support the flag if the underlying BDS supports it Signed-off-by: Anton Nefedov Reviewed-by: Alberto Garcia --- block/blkdebug.c | 3 ++- block/blkverify.c | 2 +- block/mirror.c | 2 +- block/raw-format.c | 3 ++- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/block/blkdebug.c b/block/blkdebug.c index e216699..7d5773d 100644 --- a/block/blkdebug.c +++ b/block/blkdebug.c @@ -400,7 +400,8 @@ static int blkdebug_open(BlockDriverState *bs, QDict *o= ptions, int flags, =20 bs->supported_write_flags =3D BDRV_REQ_FUA & bs->file->bs->supported_write_flags; - bs->supported_zero_flags =3D (BDRV_REQ_FUA | BDRV_REQ_MAY_UNMAP) & + bs->supported_zero_flags =3D + (BDRV_REQ_FUA | BDRV_REQ_MAY_UNMAP | BDRV_REQ_ALLOCATE) & bs->file->bs->supported_zero_flags; ret =3D -EINVAL; =20 diff --git a/block/blkverify.c b/block/blkverify.c index 9ba65d0..b249636 100644 --- a/block/blkverify.c +++ b/block/blkverify.c @@ -145,7 +145,7 @@ static int blkverify_open(BlockDriverState *bs, QDict *= options, int flags, s->test_file->bs->supported_write_flags; =20 bs->supported_zero_flags =3D - (BDRV_REQ_FUA | BDRV_REQ_MAY_UNMAP) & + (BDRV_REQ_FUA | BDRV_REQ_MAY_UNMAP | BDRV_REQ_ALLOCATE) & bs->file->bs->supported_zero_flags & s->test_file->bs->supported_zero_flags; =20 diff --git a/block/mirror.c b/block/mirror.c index d18ec65..eb41deb 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -1067,7 +1067,7 @@ static void bdrv_mirror_top_refresh_filename(BlockDri= verState *bs, QDict *opts) bs->supported_write_flags =3D BDRV_REQ_FUA & bs->backing->bs->supported_write_flags; bs->supported_zero_flags =3D - (BDRV_REQ_FUA | BDRV_REQ_MAY_UNMAP) & + (BDRV_REQ_FUA | BDRV_REQ_MAY_UNMAP | BDRV_REQ_ALLOCATE) & bs->backing->bs->supported_zero_flags; } =20 diff --git a/block/raw-format.c b/block/raw-format.c index ab552c0..b1deb93 100644 --- a/block/raw-format.c +++ b/block/raw-format.c @@ -416,7 +416,8 @@ static int raw_open(BlockDriverState *bs, QDict *option= s, int flags, bs->sg =3D bs->file->bs->sg; bs->supported_write_flags =3D BDRV_REQ_FUA & bs->file->bs->supported_write_flags; - bs->supported_zero_flags =3D (BDRV_REQ_FUA | BDRV_REQ_MAY_UNMAP) & + bs->supported_zero_flags =3D + (BDRV_REQ_FUA | BDRV_REQ_MAY_UNMAP | BDRV_REQ_ALLOCATE) & bs->file->bs->supported_zero_flags; =20 if (bs->probed && !bdrv_is_read_only(bs)) { --=20 2.7.4 From nobody Sat Oct 25 21:46:06 2025 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1516298206672179.41720669951792; Thu, 18 Jan 2018 09:56:46 -0800 (PST) Received: from localhost ([::1]:44620 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ecEQf-00021a-BS for importer@patchew.org; Thu, 18 Jan 2018 12:56:45 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52273) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ecEJg-0004Ml-Hy for qemu-devel@nongnu.org; Thu, 18 Jan 2018 12:49:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ecEJe-0004JM-Ns for qemu-devel@nongnu.org; Thu, 18 Jan 2018 12:49:32 -0500 Received: from mail-am5eur03on0716.outbound.protection.outlook.com ([2a01:111:f400:fe08::716]:42208 helo=EUR03-AM5-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 1ecEJe-0004Ce-Gc; Thu, 18 Jan 2018 12:49:30 -0500 Received: from xantnef-ws.sw.ru (195.214.232.6) by HE1PR0801MB1995.eurprd08.prod.outlook.com (2603:10a6:3:50::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.407.7; Thu, 18 Jan 2018 17:49:26 +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=dzrJ6E1TLwhjhu9GHNeyMFsPVECKfM46zlwMqw6O/t8=; b=FrURudwleB2MOUYPla+1rid+Tvrxdnr8W1ScDtmkwz5PgurOWOiNIN3A4VfLtmJyiIen2nIXgcgvUDuQRHRHGCDiZPLKXiOQIBttYgxMa5k0kI5HdAw4IgFPj0ltMBGAQW4KDNy42j4nzJuzJtX8GgskTrtbtUUpocmrOQr28mM= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=anton.nefedov@virtuozzo.com; From: Anton Nefedov To: qemu-devel@nongnu.org Date: Thu, 18 Jan 2018 20:49:05 +0300 Message-Id: <1516297747-107232-8-git-send-email-anton.nefedov@virtuozzo.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516297747-107232-1-git-send-email-anton.nefedov@virtuozzo.com> References: <1516297747-107232-1-git-send-email-anton.nefedov@virtuozzo.com> MIME-Version: 1.0 X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: HE1PR05CA0132.eurprd05.prod.outlook.com (2603:10a6:7:28::19) To HE1PR0801MB1995.eurprd08.prod.outlook.com (2603:10a6:3:50::8) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7fd6824c-96b4-4bcc-01ce-08d55e9bd15e X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:HE1PR0801MB1995; X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1995; 3:3mKIH736mtmmVRwHYLLP03zNkGBWl0cqTFuzMyXIuCodAnxl3Iwd8KGNi0Wb23Wo8XCG4JM1WYWyY+ln7FoILrnBh8CfpRLaL1zMUaSWGpNSjizlZVy3kUHcXxErE8/JOBmCyIH9HFPtXeLYWTe8HmQQX3HA04+bxibth97zl/xWmDkpyvyBXrLTKzsjXiD8j52/RJo2KhRv3zSJ3C7HvvWtvcCB0ynN7AjSkaEWgTtstf6WONa14kNOxYE52rxn; 25:yTdfzCJOJr/SGbQlo8As1bvYeabNAisfELTddtOhxxoMNH2gyjXYcmwF1B3fYsb6AkG5v4jS0v1bpQXCFYd0DEKPLvxGrrMjfye9VTkth2WP6onf8F8J10gJHFfaiq97fr9Qru7gvFKEWmRuiwSUh3/FO9bbMoPPWwA9GWs0ai/ExQwIi3firS7IziSIirGOtP8cIIpzeR+29hmklW+lwM9f3QU9d4BMAvbev5oBkTiNQVqlumY3AgI2v0+iY5ZXHs4rfxwTFxmp8ZnM4CuyEB26PFxTcVfcC8XeRue4kEMFg6h7aX7rPamyCgzFuclsPwOIU13ek1v1x1477n2k2g==; 31:3CVciJ4cQiwvlNrURQ4uyiYg6DhBs8waAWyaSqmWABiQanVLy20RziuvrscG127aBtH7jxLp3HWWvuzKmQKMVrexAHZt5VezWo3oEMU/56ZF4/Z8t/4FQj56JMz+yOI/1ooaeLPNRWgbSSbGm5NV6/938Xy1iVGAk5twyJ/cROjUzG96hiFwHK2G5VhyNwv44e2K/D+t484d5fdv9nwzO1jcdkXTUm9rjo7SRKY0/Ts= X-MS-TrafficTypeDiagnostic: HE1PR0801MB1995: X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1995; 20:DWhskCoOhkkyZ1VouWB4zI80E50OBDTndTliEn3vnkZxiGUd48pCEwntybGSefy1sXO9forn8JrelAa+YKI3bH61AD+GYmX9liY7cbBHflwtRI4cr4EzvgUWrTp+lh/7fjWpVnhRTcMeCeUzLqjGPGvSGwa3g68/zZ/iqdImr6+xqnS/Q1eO5nDgxtPqH6P1pmDnl6o+SZxGU0Z0g8F6k5N4f+CJxlaGP+HA5UKaqtdMlNVfO+96xDGw6FBgRuW2uy3jCItZG2Sqrv91UT4NFil4ZHCSeNYzCHH8TBMgrIeqAfgbB+S0UJA568WMDmxE475tZvrrGehvGFtEtgUB/llTamAfXY5Z1cHLJsNkWEq76bnJpbpU537STpXGM10swr7IKLkAVOmfikidsvfKdf1ao5y3pPpGCkPa416NO/w=; 4:bwj6jQZ1fYRXNpIvIeQifRD3tGkRf1Xh25v2wDeEpNPqbkcxk4m/3bqaIrT3gQ4RWSrUAG1DCLnLICWXjJzxUnDJiFInJqYV5v9gLuxHFoLPyleLOAtBe7RRQfELy4IZVkKxkCrZA1gcJUB855UwM23SuPWxUxA1TvUdUJSLGzN34TL25+SsA08LgDMPn62x++jAtL7tK+A1pvyc8Vie3I55794+ga/UXap1GcPdeAiR6hsEcCIb/0eMDrM0aqlS3NdwkeEW7y7CRRx4USUwJg== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040495)(2401047)(8121501046)(5005006)(10201501046)(3231023)(2400065)(944501161)(3002001)(93006095)(93001095)(6041282)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123558120)(20161123560045)(20161123562045)(6072148)(201708071742011); SRVR:HE1PR0801MB1995; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:HE1PR0801MB1995; X-Forefront-PRVS: 05568D1FF7 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(346002)(39850400004)(376002)(396003)(39380400002)(366004)(199004)(189003)(50226002)(6512007)(16586007)(316002)(2906002)(16526018)(53936002)(2351001)(6666003)(5660300001)(66066001)(51416003)(6916009)(69596002)(7736002)(2950100002)(86362001)(2361001)(76176011)(478600001)(97736004)(107886003)(105586002)(50466002)(6116002)(47776003)(68736007)(52116002)(26005)(8676002)(6506007)(305945005)(3846002)(386003)(36756003)(81166006)(81156014)(53416004)(6486002)(8936002)(25786009)(106356001)(4326008)(48376002); DIR:OUT; SFP:1102; SCL:1; SRVR:HE1PR0801MB1995; 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; HE1PR0801MB1995; 23:+FLbRwtwWnKBACY4Q/5g2UDkVMyIaWKqS81EqBO?= =?us-ascii?Q?JaZtil5N8DSU00XMzbDS7B00Tkr6XCg9LH9p07L1EIp65byTk6JorzJAeCv2?= =?us-ascii?Q?Feqg00XF969jx41JCn1ES4k46dPustDzHddHaQrxANrLwo1H1Vh45yW1SjNR?= =?us-ascii?Q?u7Hnw0SQoUS1fb7SJ91UgZ4xPEGUT1WKgoiiHZRkdgrr/kgGYvxwFh4Xi3Ju?= =?us-ascii?Q?q/6pmNqry6Fe+QvyghulP4Wy8Y0LqhvpvGGMJR1DnyYtT430gby6oOs2jFUh?= =?us-ascii?Q?j5OfpDuGGSHXzJsBqqDGyMjqPEcBqarhiQZ/vS2fqvkK8UTJsSv2A6cU7ZaD?= =?us-ascii?Q?PtG/bJ0QH9HD4bq4TEbEBP0lPcx9ZxsC3NZurEsBkZ4AP2eFqAWcigHFHomK?= =?us-ascii?Q?cIRRStazFvLkNSLSShxXKW/nRajPkhviNdlwBu/yk+cW7GTXVP06yGAsynrI?= =?us-ascii?Q?BZwr8qB4q0dcHTcifQL3a6BockaGoYPO4XwScnG009iNKfwzOqKvXQoianaT?= =?us-ascii?Q?gUDY/qsR0XA8em3we8F0sztyMho/Vt5rbefzMGAkTmXGY6Iyzuzx0stabjW+?= =?us-ascii?Q?I0gz2Jjns9eIZhbub1TzX44u6DyLKkgKw7kTEFjVQHtWQQ7F55nOgKz0yNZH?= =?us-ascii?Q?P/5r7l2o0XeX5CAMP3TrLDs+AkK6of6BMFZZ1HJsPOQyWGLC/xsAMFJLlvIb?= =?us-ascii?Q?Ew0u0ToDr6bVXfcoCX2t1IrNFs2rif+fEgM/G6HBGhQvMgLjOd5T50Y61ZhK?= =?us-ascii?Q?6GprWwp9CEqaJt+ulGEaQzj/yR42P0DWEwHoqC1s/FlGG6up5dBE5Dkr/XLD?= =?us-ascii?Q?qoQ1x1HbJF46sZFUz5XvuX3Hu4oDEGcB4Z9TzlmguKG7iicDhgpE/teT9FGg?= =?us-ascii?Q?4Usnvit0Wiz3LeCUJduSnhgjwbbo57DqpyGB64+548uUC4pj+46lyK44e/w1?= =?us-ascii?Q?uxG+YWJx0jg8J2y3Oy5QBG+uY5nfNY0Gx4EF5HZVOu14KO6xqGHuBHITl4Aj?= =?us-ascii?Q?ceQqH8BOV3cfMwAHce2jUmC1sKEYIaZDYdjZ9+U82aiPHJfAaUfw4ThTGOGJ?= =?us-ascii?Q?W5+vFQd814esP29szt2Z9X3bsYnwbBH3GnODhZmT7N/TEqs5D12YwBb2wXyN?= =?us-ascii?Q?kTkaFTA1ggD1MCTOwAfnTQDmDCplzXZIF8qKQ8qPPAoZHr3mgYGSjPKd1geY?= =?us-ascii?Q?zTMoETrH8CBu/N3U=3D?= X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1995; 6:MpGc84wW5s/tYTec1pISIpB1izYrAbqQW/AE4N4qmmPmkSaShHsKD0cqYGj0B28oiiq2MfleAK13GFfNkdhpTW7xrYYtmItY8uWnQ2BRbWRmTgMn/Ou53oRa+9LVgfXf7bjHPisrFf8BR/tUvxWIgh4HVb4p2YzxKPHIBLx/ykHkr17xqsSphet9X0bkGu+Q7tw/hSh41HCKo2GYYL9IkUj/KX0FQSawtbMrJRTE8hhzPOgO8jDd3qVre9QE5kkk4CV8MVu4ED63vZwwH4PBo2I+mMdDQEo8b9z4FX1aBVEesi8dGVRp3Iu2JFF4ioWs/bOQybOzM5Kz7mzpR3OlAODKarlQx7/k/ZRsLlRkG2U=; 5:9Y7yLFEzSkcxtKb8CMqjyUqZY6sHv3JMnjMyoGtMWKPidrz9u6af+hc4IWTdu2OGERMiTFobsif7rb0xcBDyYleHA2OlLcxz9dzQt6nJy2A9orSaYR9B/Y2vFG7RyKf1ajOVU3yGTCWFDROouQ1ydKAVasBkvnw1DYSBXpvYprw=; 24:RQ0CwCBSE6/7zoJ+FVV2pfwFc8lfoz9WR4B6JKFJzHaDqbxyr+kuT/mfzJCLVvag90fsM5cSt4T2L/5qzsGOVX9UGkms4U1sK4kJGSaj/KA=; 7:Q0dBEs0NMrcp7ngLmyl6g0ToTYY5k5a/OD1hycb1nFd0HE4NVsZ46risyK/ST7BdHsP62Lym+QO1c9OwbOliFCVmBGA2lQaqbR7J2cJclJ3DQClOOukpyoJSKfPPLxAUN3uUuiawR/5dwClzPsVBMCBrodk0fqFd1pvIUOciNyoSAVKLJecSbqm9rUt7fRSsQkhqUXtJ1wmyFqEe+sDry0h0FQqRl1tNsky+KdlQD+oxu4Y7OYJGDGdJu+b4uzet SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1995; 20:LeUDQAqSrLQ4HnuBM1xhGj3EE4+mTWnqAA2UcITXbUFGGgVHjYfpLbvs3E5KxxX5dSFhf1IfXK7Z0I3k5ZzCUV7EfihdgfMUQFLm3yW6EpT6lgIs0D5B6DjmvUz1W3jp3EnrXK2TuC3WuO9lkaqYAk6cD+yyAVqw7NN9mlY4ozg= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jan 2018 17:49:26.5521 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7fd6824c-96b4-4bcc-01ce-08d55e9bd15e X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0801MB1995 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 2a01:111:f400:fe08::716 Subject: [Qemu-devel] [PATCH v7 7/9] qcow2: move is_zero() up 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, den@virtuozzo.com, qemu-block@nongnu.org, mreitz@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" To be used in the following commit without a forward declaration. Signed-off-by: Anton Nefedov Reviewed-by: Alberto Garcia Reviewed-by: Max Reitz --- block/qcow2.c | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index 4348b2c..2ed21ff 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -1858,6 +1858,23 @@ static bool merge_cow(uint64_t offset, unsigned byte= s, return false; } =20 +static bool is_zero(BlockDriverState *bs, int64_t offset, int64_t bytes) +{ + int64_t nr; + int res; + + /* Clamp to image length, before checking status of underlying sectors= */ + if (offset + bytes > bs->total_sectors * BDRV_SECTOR_SIZE) { + bytes =3D bs->total_sectors * BDRV_SECTOR_SIZE - offset; + } + + if (!bytes) { + return true; + } + res =3D bdrv_block_status_above(bs, NULL, offset, bytes, &nr, NULL, NU= LL); + return res >=3D 0 && (res & BDRV_BLOCK_ZERO) && nr =3D=3D bytes; +} + static coroutine_fn int qcow2_co_pwritev(BlockDriverState *bs, uint64_t of= fset, uint64_t bytes, QEMUIOVector *qio= v, int flags) @@ -2975,24 +2992,6 @@ finish: return ret; } =20 - -static bool is_zero(BlockDriverState *bs, int64_t offset, int64_t bytes) -{ - int64_t nr; - int res; - - /* Clamp to image length, before checking status of underlying sectors= */ - if (offset + bytes > bs->total_sectors * BDRV_SECTOR_SIZE) { - bytes =3D bs->total_sectors * BDRV_SECTOR_SIZE - offset; - } - - if (!bytes) { - return true; - } - res =3D bdrv_block_status_above(bs, NULL, offset, bytes, &nr, NULL, NU= LL); - return res >=3D 0 && (res & BDRV_BLOCK_ZERO) && nr =3D=3D bytes; -} - static coroutine_fn int qcow2_co_pwrite_zeroes(BlockDriverState *bs, int64_t offset, int bytes, BdrvRequestFlags flags) { --=20 2.7.4 From nobody Sat Oct 25 21:46:06 2025 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1516298003865687.8260185286232; Thu, 18 Jan 2018 09:53:23 -0800 (PST) Received: from localhost ([::1]:44502 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ecENO-0007MU-VR for importer@patchew.org; Thu, 18 Jan 2018 12:53:23 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52320) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ecEJh-0004NL-MD for qemu-devel@nongnu.org; Thu, 18 Jan 2018 12:49:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ecEJf-0004Jq-6c for qemu-devel@nongnu.org; Thu, 18 Jan 2018 12:49:33 -0500 Received: from mail-am5eur03on0716.outbound.protection.outlook.com ([2a01:111:f400:fe08::716]:42208 helo=EUR03-AM5-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 1ecEJe-0004Ce-UE; Thu, 18 Jan 2018 12:49:31 -0500 Received: from xantnef-ws.sw.ru (195.214.232.6) by HE1PR0801MB1995.eurprd08.prod.outlook.com (2603:10a6:3:50::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.407.7; Thu, 18 Jan 2018 17:49:27 +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=0YDdoIOMYPLlybNFNwHNAEPiHCI6Ff2T7f++shw9jyI=; b=fzD2oFXU502XeDTqfHGPVQbOUmgg105ka6ukwAGBNwOj3OO0jzAQQGlM+Z6nkNHI+Ub13EpLK2LX4/wiqLW9smigzDy1unax4ssGZlKMf8MMjSOVm1LZmPW1V1HkU3NbsIRHDH5GCJ2G+lUHIQZnG33KrGHoErm89j9IFzE0tfQ= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=anton.nefedov@virtuozzo.com; From: Anton Nefedov To: qemu-devel@nongnu.org Date: Thu, 18 Jan 2018 20:49:06 +0300 Message-Id: <1516297747-107232-9-git-send-email-anton.nefedov@virtuozzo.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516297747-107232-1-git-send-email-anton.nefedov@virtuozzo.com> References: <1516297747-107232-1-git-send-email-anton.nefedov@virtuozzo.com> MIME-Version: 1.0 X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: HE1PR05CA0132.eurprd05.prod.outlook.com (2603:10a6:7:28::19) To HE1PR0801MB1995.eurprd08.prod.outlook.com (2603:10a6:3:50::8) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7e489b09-c674-472f-8724-08d55e9bd1c4 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:HE1PR0801MB1995; X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1995; 3:AfZ8IeKYfVGYVIULOKZE0Wg9sW93kx+h62XVy32WJygq6dj7BgE6XeCKvUSOIUqudiR+e7VpcC4qsN0LbaOJedk2mokZC9Sd4u0PjU6rZ7KjaGuL2QP3GuKLvKgnZVq2jqnb3Cr6l1EpsMJjsOc1Kn1YeRZAieiHjGY8nDJZ1gBCVXd5hbCev5aPVNqfZkG9c9nJWFXs6CrxveqrX9Rg3VjVlcFanaWdaYwITds6PZ756Ko/Dr7zcgasFnJ89NxA; 25:HtpnM8lYYSp6qmvsDp8yZlJqLz1u49mzS8Z8UT1mZPdjX3rMyi+uwvQf7HD6nuLItC4HhErsu05X1K1awXbn/gnzIh6Yvqpcul6+41zjCB0yWyiqsVsgNr42jmZc6bWqmyJH4NRQtxyzGPflH0jr5oMrFZ3hif3IOj2JhZwKC7SQC+Ab5A50DHMXEth9f3HU8dC6sYNcimU4XVdgegOYSMLsNDoaLS8qc7wxzsMNAQsYMj2iIapNlk+xRrpU8mAkAeo1NfH6GJ5Mb075YtF4ow3uMhGnLPd3OvIYelR2SjBBvW/Heqw2Vl77gJTbGWnzwgfkOiNNLxFBsuQblwycoQ==; 31:MdvT3t7Vd3CUklY5wG9GbgOCwj1lsYtXMOW9Sl8RnAA5vMn83AEag3sSDwsedKNLU8f5KKYCvBMFiU5QZP9+8Nhtd+TjKyzjm7TVGPRImFpknluXU5e2R0K9DXN0QSb7//xtsB3ajvrY0rZlLRpi6IBsANxwTexgiBIT3Ds3gMJv5gUeOt91HXK7sDcx81Lf8FbLvRaepxrZDmqR2iLqt/jDNl6XvQ7mxHHREJdhL7g= X-MS-TrafficTypeDiagnostic: HE1PR0801MB1995: X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1995; 20:vr+L3aVsCfB84BzW59SqCvsOiLCd0R7zE/2CiySrwqtiJaaHeooURV+gM+hBhtw4reOsdjytghGGh9HGNEbg4891KRrXTHjSRORu/h3JonVIUZe5TdF7PA6Ni7brUpXTHls1+K82EAuEPs8vHEfuk4tkuJzHWWOBQHiJ7CvXbABYlDe0mJJq1NmNGI3/qNAFvZafKDQmWykjIcDXyScMM7GdX+MQfdzEEjVKp1QkNOM5lRR/rC4/Kt6NlkuI3BKn4Wwg14R2bnD58iIsMlHmnWEWsIRB7YqdRNhyNrVCD8QQ8tJdQU7noR+O+w8d+kEBdZXuti60a0dh/4V2RKXYsZWmAmOByR07kYp+Kendh27QkJ0n6QQT2ngXVU1GJAklRTbbs/ZEBRgwJJohtLgUoTFvnd77DygjKKXv/AX3Kvo=; 4:HsQbyD8A5oMVqHejSmlrF6LlumGuue6vcgztCmYSPEbc+vQGaES0hvqvDfDL7p+mmdTQi8JuM6ebY2SKhxzfE7o4Jafn+8jUI0eufnGQgtFSRuZaDzHWWf7kG/PoxYHB6IOxZGOmsj4WPsqfPVLRRv7lH2qYWesFt0S3/I5mmflvS/e7YC2xSFHPMmAiG0G7+9mZgVFK7jXbF5pxJ30UaatcvHxCATo1gcZ4nHwPmbS3cnx5hsc9+ukTwlFauOdpnGREmBs76PbFZjaHwZarkg== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040495)(2401047)(8121501046)(5005006)(10201501046)(3231023)(2400065)(944501161)(3002001)(93006095)(93001095)(6041282)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123558120)(20161123560045)(20161123562045)(6072148)(201708071742011); SRVR:HE1PR0801MB1995; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:HE1PR0801MB1995; X-Forefront-PRVS: 05568D1FF7 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(346002)(39850400004)(376002)(396003)(39380400002)(366004)(199004)(189003)(50226002)(6512007)(16586007)(316002)(2906002)(16526018)(53936002)(2351001)(6666003)(5660300001)(66066001)(51416003)(6916009)(69596002)(59450400001)(7736002)(2950100002)(86362001)(2361001)(76176011)(478600001)(97736004)(107886003)(105586002)(50466002)(6116002)(47776003)(68736007)(52116002)(26005)(8676002)(6506007)(305945005)(3846002)(386003)(36756003)(81166006)(81156014)(53416004)(6486002)(8936002)(25786009)(106356001)(4326008)(48376002)(21314002); DIR:OUT; SFP:1102; SCL:1; SRVR:HE1PR0801MB1995; 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; HE1PR0801MB1995; 23:p4WmqaaT1BR63uiQDdt7AS9rQRPbIn9rki9xaBs?= =?us-ascii?Q?psL1FsbOq+K971tdA4XfdZG08fClv2sy06GJcnZ4RNKxjTsHnrGbnh0d1NU1?= =?us-ascii?Q?jlefUSegKmrsxRJzws4LfUFeMygvd1JRxhHsWx2/wu82Wp4DJH1TwaOhVvwa?= =?us-ascii?Q?O/NyKIeZjVB0U77GwDVDXwHSSNedqC+2rzrDInzpagQ5RUYK6dJP14FwKBqL?= =?us-ascii?Q?OE4jKlVsNTiYW3qN/wjLRY2DQdgI36c17tIph7Kuc8BBzhKRn9Z103KOG6Ug?= =?us-ascii?Q?8BVcLKCsb2XqoVLoaajMmiRDqg4ls5wobG4Cxz2wdrsNaCjXQw4/zus30hp5?= =?us-ascii?Q?rwQeQ2kw7aLFDyOYtBcXlTa58Fya4AbDyUY+4+qH87oMnEydx9Xau0W4710J?= =?us-ascii?Q?bL7ItpVchCU7JvbQkDnu3O5Hp828YEhnGRTnH/yB633zuu13WBwjh0WXJ1pp?= =?us-ascii?Q?u2YZidSAOib2Vw9Zu9QuC8s+weDSdD9VRch5f0FipgFY1geLHyLpCwUmRVR+?= =?us-ascii?Q?NJf7FrB+KhOr5/peDSdHl4d1iWP4G0soqEJga1TX7bIMjUTsZAPd0fWDLlUU?= =?us-ascii?Q?mRUukQMVJoq8xxjuS7SC3VAGYKJX6ZFVIzfDyu8S1MK3c2yJ9GweOGjBCKiC?= =?us-ascii?Q?BT5wvx13WzJVgg82ealSrvi3X2b83ZXTtpEFYk7BAhbHe+2Fe7s66iAx1gmY?= =?us-ascii?Q?PkNkrFhMQl4Fo2jzBU/YpdqpeT2FC3dBMXi9iZFVUdTvSVIGAcIDxgtsulqI?= =?us-ascii?Q?fZrpIqQNpOx43Qj/W5CaO3OlJ3/aoLVXChCNHjCdtgbhWZzz5izb/IfDLKvB?= =?us-ascii?Q?YDTTLxynpTWYK/T1t/dJ6gpd7fcBcXgyxz1/B84Eb7QaI6OqEFOoZZJ2ol7K?= =?us-ascii?Q?AnZHt2VZeZPj3SIjNdY6E+jnoweIJlz/n/+MTSLWxINc39mioLco49+EILb6?= =?us-ascii?Q?+tOFOdDs+r2N0RDtzya+iue6tIpg1WxS/ZSiN0eMs4SqsIlkwqSvkaRyO+cn?= =?us-ascii?Q?6xMpWYMjAJqlaEdfzrATaxDKfGK/4hw+q2AUI0LbRG7QD9rpOqiUH6V3k4zS?= =?us-ascii?Q?GwLsMZXuvJ1vNWMhlye45mJguZjpIA4+ABBBk3FxKpN9UULoerzC+qsJndRl?= =?us-ascii?Q?zyYrSHNXe9spwt7D0UpOw8eBoy+0MVe6sGTP6sZP/NXnVpTxrPRjL5lpVnSc?= =?us-ascii?Q?LVs9vCb7g8Kl5ZyrB+wVBUa9s/+4IdDjcnDezie+DfgTypMn9FrlDPSmBPQ?= =?us-ascii?Q?=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1995; 6:u7jtbKZ6UNwFtL8JQ2Ppz4JKC2hh/4UEam8SsmcbGH5BixVXxVzkxz8LGzgjexQf4w2jf2vknalRMLp/JBftVPLOVAqSDOIJbxYOTytZeytPfh4AC6K+MjXuZxk2HhAX8+P81Jsf2Nh494wm7h2O/QDJioqnJo2CfQj5IQv+k32E1FV5WOIYE8c6TznF5UZ5RzzV5EPpuY2YBL8Z1whfF+PpMDAq3jLFFIPHlRrGS1boW7TjJy1ffBr/e/rnIz5/4MWd6YlTXAwo4GzhTGkaqmViNhnr4d5faCajnVIuOEfyvkxAxV6JcHy/ZoUlvrsZC8isFzCdwMULiEt40xBWUAunbfnS9nVFFLOyv2L4NJU=; 5:VA1h766XlqBxdvKPlv5pNXP1b+y3svjwyIMIsWHffMcK6/VdxNbS6CrcQaOaKE/pXyGbMCwMikSPUSawCOvwMLIEFdQ9bxLVUyETE5QZuokM+abWAQe7FanDIuZgERypuKLes2Kwc2cvIveXIn9PnKGb5eBk7LI65N374QjNFQE=; 24:+L8zBCWlRECbcnVV88el6KbLK3ZgETJjbj45BBdnrgOW0z0Yf/aqQqCyuJ+8QVNKcblWwXNQt709NJsQJo/whkitZiA1f6cHy+aJN+QqOFY=; 7:QzYACQn3fh7Y2SPJG7h4T4HBCF/oQS8Pd1E9Jcnb6DPaKki0JWcFC3ehdICJ6hzYDS7m6ILiixIjxGDLawkCWabDn3FKquZ78xREEx4hKlP6W0UcZitlvpX/UFYomHVgp8dn9tkXLURXHz8su0WXrhFDKvAWUzU9kqXohSbJSrFG0sEK/iEWretUUNVEEa0Xdo1PyG1h5VzkSTgkoJaVclDX3ERiKqVXuHwf6CPmFQa1yGU5MnlbocEiL6I7oNac SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1995; 20:Bv7tUEWJhv3jgDZ7L1X2Qp4hgCeLyLDVq2Yxxn0vrKBO0aqdP4+GFZsoMKuZ1mVUCF5pY4P2jtLqYjwgokya7cCwkiijb0De7nbgrLjul0ApaCNfXuonHgI/v9YwiG44+o/GoYr0GHA56rT4q10Czaa02V6vB/Ud93ys2lhR/yY= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jan 2018 17:49:27.2084 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7e489b09-c674-472f-8724-08d55e9bd1c4 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0801MB1995 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 2a01:111:f400:fe08::716 Subject: [Qemu-devel] [PATCH v7 8/9] qcow2: skip writing zero buffers to empty COW areas 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, den@virtuozzo.com, qemu-block@nongnu.org, mreitz@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" If COW areas of the newly allocated clusters are zeroes on the backing imag= e, efficient bdrv_write_zeroes(flags=3DBDRV_REQ_ALLOCATE) can be used on the w= hole cluster instead of writing explicit zero buffers later in perform_cow(). iotest 060: write to the discarded cluster does not trigger COW anymore. Use a backing image instead. iotest 066: cluster-alignment areas that were not really COWed are now detected as zeroes, hence the initial write has to be exactly the same size for the maps to match Signed-off-by: Anton Nefedov --- qapi/block-core.json | 4 ++- block/qcow2.h | 6 +++++ block/qcow2-cluster.c | 2 +- block/qcow2.c | 66 ++++++++++++++++++++++++++++++++++++++++++= ++-- block/trace-events | 1 + tests/qemu-iotests/060 | 26 +++++++++++------- tests/qemu-iotests/060.out | 5 +++- tests/qemu-iotests/066 | 2 +- tests/qemu-iotests/066.out | 4 +-- 9 files changed, 98 insertions(+), 18 deletions(-) diff --git a/qapi/block-core.json b/qapi/block-core.json index e94a688..1579a77 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -2546,6 +2546,8 @@ # # @cor_write: a write due to copy-on-read (since 2.11) # +# @cluster_alloc_space: an allocation of a cluster file space (since 2.12) +# # Since: 2.9 ## { 'enum': 'BlkdebugEvent', 'prefix': 'BLKDBG', @@ -2564,7 +2566,7 @@ 'pwritev_rmw_tail', 'pwritev_rmw_after_tail', 'pwritev', 'pwritev_zero', 'pwritev_done', 'empty_image_prepare', 'l1_shrink_write_table', 'l1_shrink_free_l2_clusters', - 'cor_write'] } + 'cor_write', 'cluster_alloc_space'] } =20 ## # @BlkdebugInjectErrorOptions: diff --git a/block/qcow2.h b/block/qcow2.h index 46c8cf4..e6e3a22 100644 --- a/block/qcow2.h +++ b/block/qcow2.h @@ -377,6 +377,12 @@ typedef struct QCowL2Meta Qcow2COWRegion cow_end; =20 /** + * Indicates that COW regions are already handled and do not require + * any more processing. + */ + bool skip_cow; + + /** * The I/O vector with the data from the actual guest write request. * If non-NULL, this is meant to be merged together with the data * from @cow_start and @cow_end into one single write operation. diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c index a3fec27..511ceb8 100644 --- a/block/qcow2-cluster.c +++ b/block/qcow2-cluster.c @@ -791,7 +791,7 @@ static int perform_cow(BlockDriverState *bs, QCowL2Meta= *m) assert(start->offset + start->nb_bytes <=3D end->offset); assert(!m->data_qiov || m->data_qiov->size =3D=3D data_bytes); =20 - if (start->nb_bytes =3D=3D 0 && end->nb_bytes =3D=3D 0) { + if ((start->nb_bytes =3D=3D 0 && end->nb_bytes =3D=3D 0) || m->skip_co= w) { return 0; } =20 diff --git a/block/qcow2.c b/block/qcow2.c index 2ed21ff..087cb26 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -1833,6 +1833,11 @@ static bool merge_cow(uint64_t offset, unsigned byte= s, continue; } =20 + /* If COW regions are handled already, skip this too */ + if (m->skip_cow) { + continue; + } + /* The data (middle) region must be immediately after the * start region */ if (l2meta_cow_start(m) + m->cow_start.nb_bytes !=3D offset) { @@ -1875,6 +1880,52 @@ static bool is_zero(BlockDriverState *bs, int64_t of= fset, int64_t bytes) return res >=3D 0 && (res & BDRV_BLOCK_ZERO) && nr =3D=3D bytes; } =20 +static bool is_zero_cow(BlockDriverState *bs, QCowL2Meta *m) +{ + return is_zero(bs, m->offset + m->cow_start.offset, + m->cow_start.nb_bytes) && + is_zero(bs, m->offset + m->cow_end.offset, m->cow_end.nb_bytes); +} + +static int handle_alloc_space(BlockDriverState *bs, QCowL2Meta *l2meta) +{ + BDRVQcow2State *s =3D bs->opaque; + QCowL2Meta *m; + + for (m =3D l2meta; m !=3D NULL; m =3D m->next) { + int ret; + + if (!m->cow_start.nb_bytes && !m->cow_end.nb_bytes) { + continue; + } + + if (bs->encrypted) { + continue; + } + + if (!is_zero_cow(bs, m)) { + continue; + } + + BLKDBG_EVENT(bs->file, BLKDBG_CLUSTER_ALLOC_SPACE); + /* instead of writing zero COW buffers, + efficiently zero out the whole clusters */ + ret =3D bdrv_co_pwrite_zeroes(bs->file, m->alloc_offset, + m->nb_clusters * s->cluster_size, + BDRV_REQ_ALLOCATE); + if (ret < 0) { + if (ret !=3D -ENOTSUP && ret !=3D -EAGAIN) { + return ret; + } + continue; + } + + trace_qcow2_skip_cow(qemu_coroutine_self(), m->offset, m->nb_clust= ers); + m->skip_cow =3D true; + } + return 0; +} + static coroutine_fn int qcow2_co_pwritev(BlockDriverState *bs, uint64_t of= fset, uint64_t bytes, QEMUIOVector *qio= v, int flags) @@ -1957,24 +2008,35 @@ static coroutine_fn int qcow2_co_pwritev(BlockDrive= rState *bs, uint64_t offset, goto fail; } =20 + qemu_co_mutex_unlock(&s->lock); + + if (bs->file->bs->supported_zero_flags & BDRV_REQ_ALLOCATE) { + ret =3D handle_alloc_space(bs, l2meta); + if (ret < 0) { + qemu_co_mutex_lock(&s->lock); + goto fail; + } + } + /* If we need to do COW, check if it's possible to merge the * writing of the guest data together with that of the COW regions. * If it's not possible (or not necessary) then write the * guest data now. */ if (!merge_cow(offset, cur_bytes, &hd_qiov, l2meta)) { - qemu_co_mutex_unlock(&s->lock); BLKDBG_EVENT(bs->file, BLKDBG_WRITE_AIO); trace_qcow2_writev_data(qemu_coroutine_self(), cluster_offset + offset_in_cluster); ret =3D bdrv_co_pwritev(bs->file, cluster_offset + offset_in_cluster, cur_bytes, &hd_qiov, 0); - qemu_co_mutex_lock(&s->lock); if (ret < 0) { + qemu_co_mutex_lock(&s->lock); goto fail; } } =20 + qemu_co_mutex_lock(&s->lock); + while (l2meta !=3D NULL) { QCowL2Meta *next; =20 diff --git a/block/trace-events b/block/trace-events index 11c8d5f..c9fa596 100644 --- a/block/trace-events +++ b/block/trace-events @@ -61,6 +61,7 @@ qcow2_writev_done_part(void *co, int cur_bytes) "co %p cu= r_bytes %d" qcow2_writev_data(void *co, uint64_t offset) "co %p offset 0x%" PRIx64 qcow2_pwrite_zeroes_start_req(void *co, int64_t offset, int count) "co %p = offset 0x%" PRIx64 " count %d" qcow2_pwrite_zeroes(void *co, int64_t offset, int count) "co %p offset 0x%= " PRIx64 " count %d" +qcow2_skip_cow(void* co, uint64_t offset, int nb_clusters) "co %p offset 0= x%" PRIx64 " nb_clusters %d" =20 # block/qcow2-cluster.c qcow2_alloc_clusters_offset(void *co, uint64_t offset, int bytes) "co %p o= ffset 0x%" PRIx64 " bytes %d" diff --git a/tests/qemu-iotests/060 b/tests/qemu-iotests/060 index 14797dd..92beff4 100755 --- a/tests/qemu-iotests/060 +++ b/tests/qemu-iotests/060 @@ -143,27 +143,33 @@ $QEMU_IO -c "$OPEN_RO" -c "read -P 1 0 512" | _filter= _qemu_io echo echo "=3D=3D=3D Testing overlap while COW is in flight =3D=3D=3D" echo +BACKING_IMG=3D$TEST_IMG.base +TEST_IMG=3D$BACKING_IMG _make_test_img 1G + +$QEMU_IO -c 'write 64k 64k' "$BACKING_IMG" | _filter_qemu_io + # compat=3D0.10 is required in order to make the following discard actually -# unallocate the sector rather than make it a zero sector - we want COW, a= fter -# all. -IMGOPTS=3D'compat=3D0.10' _make_test_img 1G +# unallocate the sector rather than make it a zero sector as we would like +# to reuse it for another guest offset +IMGOPTS=3D'compat=3D0.10' _make_test_img -b "$BACKING_IMG" 1G # Write two clusters, the second one enforces creation of an L2 table after # the first data cluster. $QEMU_IO -c 'write 0k 64k' -c 'write 512M 64k' "$TEST_IMG" | _filter_qemu_= io -# Discard the first cluster. This cluster will soon enough be reallocated = and -# used for COW. +# Discard the first cluster. This cluster will soon enough be reallocated $QEMU_IO -c 'discard 0k 64k' "$TEST_IMG" | _filter_qemu_io # Now, corrupt the image by marking the second L2 table cluster as free. poke_file "$TEST_IMG" '131084' "\x00\x00" # 0x2000c -# Start a write operation requiring COW on the image stopping it right bef= ore -# doing the read; then, trigger the corruption prevention by writing anyth= ing to -# any unallocated cluster, leading to an attempt to overwrite the second L2 +# Start a write operation requiring COW on the image; +# this write will reuse the host offset released by a previous discard. +# Stop it right before doing the read. +# Then, trigger the corruption prevention by writing anything to +# another unallocated cluster, leading to an attempt to overwrite the seco= nd L2 # table. Finally, resume the COW write and see it fail (but not crash). echo "open -o file.driver=3Dblkdebug $TEST_IMG break cow_read 0 -aio_write 0k 1k +aio_write 64k 1k wait_break 0 -write 64k 64k +write 128k 64k resume 0" | $QEMU_IO | _filter_qemu_io =20 echo diff --git a/tests/qemu-iotests/060.out b/tests/qemu-iotests/060.out index c4cb7c6..15d95d5 100644 --- a/tests/qemu-iotests/060.out +++ b/tests/qemu-iotests/060.out @@ -97,7 +97,10 @@ read 512/512 bytes at offset 0 =20 =3D=3D=3D Testing overlap while COW is in flight =3D=3D=3D =20 -Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 +Formatting 'TEST_DIR/t.IMGFMT.base', fmt=3DIMGFMT size=3D1073741824 +wrote 65536/65536 bytes at offset 65536 +64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1073741824 backing_fil= e=3DTEST_DIR/t.IMGFMT.base wrote 65536/65536 bytes at offset 0 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) wrote 65536/65536 bytes at offset 536870912 diff --git a/tests/qemu-iotests/066 b/tests/qemu-iotests/066 index 8638217..3c216a1 100755 --- a/tests/qemu-iotests/066 +++ b/tests/qemu-iotests/066 @@ -71,7 +71,7 @@ echo _make_test_img $IMG_SIZE =20 # Create data clusters (not aligned to an L2 table) -$QEMU_IO -c 'write -P 42 1M 256k' "$TEST_IMG" | _filter_qemu_io +$QEMU_IO -c "write -P 42 $(((1024 + 32) * 1024)) 192k" "$TEST_IMG" | _filt= er_qemu_io orig_map=3D$($QEMU_IMG map --output=3Djson "$TEST_IMG") =20 # Convert the data clusters to preallocated zero clusters diff --git a/tests/qemu-iotests/066.out b/tests/qemu-iotests/066.out index 3d9da9b..093431e 100644 --- a/tests/qemu-iotests/066.out +++ b/tests/qemu-iotests/066.out @@ -19,8 +19,8 @@ Offset Length Mapped to File =3D=3D=3D Writing to preallocated zero clusters =3D=3D=3D =20 Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67109376 -wrote 262144/262144 bytes at offset 1048576 -256 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +wrote 196608/196608 bytes at offset 1081344 +192 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) wrote 262144/262144 bytes at offset 1048576 256 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) wrote 196608/196608 bytes at offset 1081344 --=20 2.7.4 From nobody Sat Oct 25 21:46:06 2025 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 Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1516298333300982.6341336384282; Thu, 18 Jan 2018 09:58:53 -0800 (PST) Received: from localhost ([::1]:44897 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ecESQ-0003ot-7h for importer@patchew.org; Thu, 18 Jan 2018 12:58:34 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52280) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ecEJg-0004Mu-MG for qemu-devel@nongnu.org; Thu, 18 Jan 2018 12:49:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ecEJf-0004Kj-KC for qemu-devel@nongnu.org; Thu, 18 Jan 2018 12:49:32 -0500 Received: from mail-am5eur03on0716.outbound.protection.outlook.com ([2a01:111:f400:fe08::716]:42208 helo=EUR03-AM5-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 1ecEJf-0004Ce-CZ; Thu, 18 Jan 2018 12:49:31 -0500 Received: from xantnef-ws.sw.ru (195.214.232.6) by HE1PR0801MB1995.eurprd08.prod.outlook.com (2603:10a6:3:50::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.407.7; Thu, 18 Jan 2018 17:49:27 +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=Zhknt/8UzvVxChRuLc/BwdR5Fadkzg21OOFPSB0IPZI=; b=OMxVunCEsXYRFcnQ32RFNIoxlyUm8r6USDT2MuPlR0pBkjVPA5oFeDjRjnwvKqp7w8dMzm6y2CySCzE4oNhRA1bWU26ETo4PREqbmWCdnS0rKTubqVYdO4WoamBUIy88ayO99TrcVlTX5vbq1p9vwjmZs6gGmwwx0pQG0Pht500= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=anton.nefedov@virtuozzo.com; From: Anton Nefedov To: qemu-devel@nongnu.org Date: Thu, 18 Jan 2018 20:49:07 +0300 Message-Id: <1516297747-107232-10-git-send-email-anton.nefedov@virtuozzo.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516297747-107232-1-git-send-email-anton.nefedov@virtuozzo.com> References: <1516297747-107232-1-git-send-email-anton.nefedov@virtuozzo.com> MIME-Version: 1.0 X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: HE1PR05CA0132.eurprd05.prod.outlook.com (2603:10a6:7:28::19) To HE1PR0801MB1995.eurprd08.prod.outlook.com (2603:10a6:3:50::8) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 01a78f33-fac8-4d44-8309-08d55e9bd221 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:HE1PR0801MB1995; X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1995; 3:D/970s7/e2xh7kTL8l4diokv17infEEP8LI2xICgkh35hV5nZaFUp1RVUkjjryQ6tc2yz3N/FUae+qGjXsw4di9TxqdCOLOBCPGwle7HrG7Yhm44GID8BTBOu/IS3nh9jSCdL0QCC+kgYSjy1Iea+B4n+XETrpHV8EPf3xNGpEii5mzfcRDxwwfaQLatsniBTNA9YoqYNhhhxqnYBn/+3lpJ78mgisH5gRGzRhBdqqw7s2DiB7efdDa1J1j21qy1; 25:MtCasa+wVclkUZo7o/O1W+aWERxY5sSp1xbU4XY3q42lXZ+LthZHlajJo84hQic7dzsL2l9UNs9IB3LxQSolFJ0etgJk4PMehediz5+ANb5UOPKFmvynnjq+DtL+ui+jTqYRYLoPw72s04HZYGj0I604OzBn13IQoFHuRqd80v684AoWgsccfhF8vvF3Kvp3svVbbPLr43vqZsZUAPTgff/GtXsAXyNqTXabwxQR4V7kX/h0dnjp4W/gXlqovB4t6oXzVAS3FIY768Vi+MZiqMkpZJYN49zrhEnc5CmZ59II5y/R93ss+Vovz8FuWGCbZPKeu1Ug/q9Y1ITl15MBHA==; 31:8QsiHePKuFaEjWprRdTxT5jneaANk1VdCYLsH6Hu1IyhhAuJNuMuraAfgO7Jy0cQUFhXalihuaH+V+4EaQFfwYgvqijLZfK/59USLzQWBbboHzbi9DBNZ0bbCY84X9yOJYK1HmHeBy8tbnwBC3cvIFNWRwlSwKoENLyP7JH2cpXH1Ov6eWAethKe3FharZrV/e6zMXecDnG74RXOjAZ39wkIFT6H7Q6BY7fFXr8vcHo= X-MS-TrafficTypeDiagnostic: HE1PR0801MB1995: X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1995; 20:utvsEPqrlCObhDAnQr6oWPzfUMH2fSx33H+hMFMsTv9x7yKYs0j794Ysk3VsQCZa8OQW+LFuR7SicspfAlxg34WF2XutSGkxMe0Wx6UYaI1e7xDcCk1EA8JGflQW/IkYX7PGsIL359VqGOIWjET7jz2Nl2VcekGIGDMFuiheFgnptN54hbvPANORPf33nE2U+ugVVopGrHgy5noHhm+eGLcxBV/TKJY+NK+JWNgbqWTDD5MditnrErfleRZ1Ths7tEv5daVV1QxPGGWhh9RSI9JNDCLOVlpeRWbN10yICphYpkMyAh2IW35fLoXo7gc5zBrZpV/jmQonWvsWYEPQDqBJJqQtd/T+kx9mx06Gd3/P5u5tm81a4zzW9mDLD7nvJ1vequUPmjO/leOYKfnCAlOB5oQ434KezL5pZgbJCTs=; 4:UDTkPZkjQ7ALhRI/gOOGAZ/tvFeNnOxnfBTKO49uMCFt9vVPGONPC66sCGGPagfHKfBTEwd7QdnMaHYNagjzT0ITf2fz1oHO37MK0u1HCXw41BeqQjjblmfcde++9eKWpvfiiWAACVsIYe2N+f04WWs/CrN/MtDNU0LKZOMKIo43tu4b4z0mEuJZi+rich5UMN0E0LYErT8wPEcCszlcaV2G1yk8XwBbXm8FT9s1xqPgWcbOrXHac2RyJuq6gf3tLpQ0DwV+8dXBUs2O0M0V5w== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040495)(2401047)(8121501046)(5005006)(10201501046)(3231023)(2400065)(944501161)(3002001)(93006095)(93001095)(6041282)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123558120)(20161123560045)(20161123562045)(6072148)(201708071742011); SRVR:HE1PR0801MB1995; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:HE1PR0801MB1995; X-Forefront-PRVS: 05568D1FF7 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(346002)(39850400004)(376002)(396003)(39380400002)(366004)(199004)(189003)(50226002)(6512007)(16586007)(316002)(2906002)(16526018)(53936002)(2351001)(6666003)(5660300001)(66066001)(51416003)(6916009)(69596002)(59450400001)(7736002)(2950100002)(86362001)(2361001)(76176011)(478600001)(97736004)(107886003)(105586002)(50466002)(6116002)(47776003)(68736007)(52116002)(26005)(8676002)(6506007)(305945005)(3846002)(386003)(36756003)(81166006)(81156014)(53416004)(6486002)(8936002)(25786009)(106356001)(4326008)(48376002)(21314002); DIR:OUT; SFP:1102; SCL:1; SRVR:HE1PR0801MB1995; 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; HE1PR0801MB1995; 23:4TadWQHz8f7Ji/+fUQnYB6towauPjv/S8fWU6pw?= =?us-ascii?Q?ew98k40fIDpNQWJmiF0zwRyQznnlBn9FsIK7xpI0W2ey5lhEi5dVbsJeBI59?= =?us-ascii?Q?yCUaxu+cWYYsdWAnr2JISY4IdA5+tvKi/LTZ8vV7GM4sW3T1ObVZ3ehO1GJs?= =?us-ascii?Q?y9uWSQ7o/NusqMXCI+yAqd98jLQoqFLLqGjKhHac0m3lSxqtWUMCNK2sHnEf?= =?us-ascii?Q?vhdkcCVtVMudYCj/Xf+/or89p2nPb3lDacTkK9qh+jgtReeuO07OHRovQpUr?= =?us-ascii?Q?Yft/6LyFAMdx8dGj2de9XCetyL6BTPnEFMTVJZi8d/2TRtmgs7tPZz1O8yLj?= =?us-ascii?Q?6vAUT0NprgxOyGRVv/LOGFTtfwzMrnfgw9LOD8mTAdm/bMEbe/1IVSgD/ahk?= =?us-ascii?Q?K32CEe5neme9qujqgTnbvSTuNxBp706yg7IU7kfDPpufyyNRo8So5Lc8+aXh?= =?us-ascii?Q?Xcre2rAZDOTe3AnIvNHV8g8Yu49tnUj0xjvm7Q/rp5EJLtByxE9uefu73bI+?= =?us-ascii?Q?xJraCLcdfzy+iuzxOwaPoGRSejnQ84ClZuSaDkKrs5aI8jgJE2pEaapuYPMD?= =?us-ascii?Q?1Jmey6i4RYDyp3bAw5YrpqLP5Q0QTijI8b1z6IMc4awshDt0IKysyzDiW3tj?= =?us-ascii?Q?VReAszlPjiEzv5Lb1FC3q4aP8sEQZsBlBPrAJG0cQCZO8a7fB6QemSN5XSF+?= =?us-ascii?Q?SSQag3Xoo65jcYCaNA7GwoxF5wV8sTaSfqt3tRS1G/05kBog/+EwOaIVfUyz?= =?us-ascii?Q?g4r2UT/8rpE8MA/yy/Zly1GzvAaKl7uWyULG89PejQiWgdNAH4LXcpNuSpJa?= =?us-ascii?Q?oa/pbJsSKQ1clVoLZIfw4D/wuWQj3vNzf3UukuUI999cZjlwqS5VMC31SsaY?= =?us-ascii?Q?S09/wOWw+VHhBJf4aB2lfcHmDrG0eOntgwP5FpyKVnqCZiTo9RvutBEvv3fz?= =?us-ascii?Q?DgfPLK+jT/NnfOsT3CEqNDDnarA3DMVBPkaiuPFnoD/rQzpnmGirXJPT8cvZ?= =?us-ascii?Q?NcAtnjIAAbOo23ese5fEFbbAtZDGqzrV4wF4bC+5L4ZVUJPwosxS96QaT6zH?= =?us-ascii?Q?WtfeygOvRH7QwJtDuGzdi9vQA/EXe8Pec+z6uEOXSNwZn3nbM4YZTE8Jx4/a?= =?us-ascii?Q?6jsBnt7Ajwy3jHiBWWKddGmyucYQpwKPYqMgt75NHw6pMtMKGlut+qRrmele?= =?us-ascii?Q?BqtAhKQBucE/6nvix5o0O6O6dHoQEUrSxU2PYEBCayARqnLF+bTOspLvcgA?= =?us-ascii?Q?=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1995; 6:9EqdYrgUd8/XKopAivgJl0SDxOkvgQMa5T3ksKpR+84wAx9PrnI8VJDPwGx0nsU31oHOJfgQ+ZhfM216ZX5Sr86DIVPE0zXHBFOUZt1jNbWvsFv4CO6S9GDyZsRqDVZ2mUQxlwS+5qglD8zlxw1WmkZmrc7SePFlBBqipkslo7C8Jz2Tbg4FzeK4FIMegIL773vApzWzLWK7QIlCYlW+alpxMXdL8fC9MpsCgnNPF1qr7i5GRDQ8w8ojVxRUCxNSxAqpZbXyeJSFtFpb7IuHbZ0bO+ax6XKda23aIRfO2pBSylD9rAx1/8HkZOJOxhv9qzdoJg6MKZn4O31pevEq5Ta6KzBed4E5h47qG/dUvPU=; 5:86fSb0UaGOg+dt/gxBVyj1quAIYGqkCDZHx0u95f42hEkLxOEEUBGRjzt+33+9Z6Yo9fqeshpFzqT4Ly7W4SemjUkdDE8fublXXJG7Rk8sNZFWAm20VRBPrHnF2/QeBzMd0LlksuIUWw6L1r7qaIrIzKUUyfaT4QIYtKyY9SW/k=; 24:0u3TyhmS/1VCZ2M08sj65OY3zLFMTbtAurQQWQAFkuQrfJariXHDo5yZJ0D7opjH0+UNf0anABNjcJ4Rlf9lxxAqnfrmxa3XC9HnNbVT2m0=; 7:Z5t3hA6hiwOjWioqlmwLOI3VtQjuYswc1nw7i6VN33vMBHtusKF3N9ohUVBjt0QB4sAsxScIS/A5G+Xz5KadjA0o97GN6TEb9HNQQ3nL8uBly/Xg/4kdOfK7+9BGhDlAEsINXGICHGnkT7V6n2W69Cn2jl6NyfK3yL+q+OI3DZ93xZbri5jupFRPPBomqWvSj5Kiw+lecMJU4wcs6EY10LyUttgaoXkvP7Ai1JagDL4Iw9nsdgzW8t/omiZkURLj SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1995; 20:YM7ZM1zQBNbmklCHc8A0bLL7KuolNFXDzPx8RNkAwWd9iADkl6yaZNltuWL3Tq+bGzO4g2aIygz6EwDbNkU6jwQtwpVGj0LVKWAottf29BBgjd66OgWlCPYgzTr7qidzn762bW9PQMpbE0NwW9ZUiUEiEBsYgz++Ggkkoenc0jY= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jan 2018 17:49:27.8334 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 01a78f33-fac8-4d44-8309-08d55e9bd221 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0801MB1995 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 2a01:111:f400:fe08::716 Subject: [Qemu-devel] [PATCH v7 9/9] iotest 134: test cluster-misaligned encrypted write 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, den@virtuozzo.com, qemu-block@nongnu.org, mreitz@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" COW (even empty/zero) areas require encryption too Signed-off-by: Anton Nefedov Reviewed-by: Eric Blake Reviewed-by: Alberto Garcia Reviewed-by: Max Reitz --- tests/qemu-iotests/134 | 9 +++++++++ tests/qemu-iotests/134.out | 10 ++++++++++ 2 files changed, 19 insertions(+) diff --git a/tests/qemu-iotests/134 b/tests/qemu-iotests/134 index 9914415..6083ae4 100755 --- a/tests/qemu-iotests/134 +++ b/tests/qemu-iotests/134 @@ -59,6 +59,15 @@ echo "=3D=3D reading whole image =3D=3D" $QEMU_IO --object $SECRET -c "read 0 $size" --image-opts $IMGSPEC | _filte= r_qemu_io | _filter_testdir =20 echo +echo "=3D=3D rewriting cluster part =3D=3D" +$QEMU_IO --object $SECRET -c "write -P 0xb 512 512" --image-opts $IMGSPEC = | _filter_qemu_io | _filter_testdir + +echo +echo "=3D=3D verify pattern =3D=3D" +$QEMU_IO --object $SECRET -c "read -P 0 0 512" --image-opts $IMGSPEC | _f= ilter_qemu_io | _filter_testdir +$QEMU_IO --object $SECRET -c "read -P 0xb 512 512" --image-opts $IMGSPEC = | _filter_qemu_io | _filter_testdir + +echo echo "=3D=3D rewriting whole image =3D=3D" $QEMU_IO --object $SECRET -c "write -P 0xa 0 $size" --image-opts $IMGSPEC = | _filter_qemu_io | _filter_testdir =20 diff --git a/tests/qemu-iotests/134.out b/tests/qemu-iotests/134.out index 972be49..09d46f6 100644 --- a/tests/qemu-iotests/134.out +++ b/tests/qemu-iotests/134.out @@ -5,6 +5,16 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D134217= 728 encryption=3Don encrypt. read 134217728/134217728 bytes at offset 0 128 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) =20 +=3D=3D rewriting cluster part =3D=3D +wrote 512/512 bytes at offset 512 +512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) + +=3D=3D verify pattern =3D=3D +read 512/512 bytes at offset 0 +512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +read 512/512 bytes at offset 512 +512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) + =3D=3D rewriting whole image =3D=3D wrote 134217728/134217728 bytes at offset 0 128 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) --=20 2.7.4