From patchwork Tue May 8 14:58:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Nefedov X-Patchwork-Id: 910237 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=virtuozzo.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="RnbjJLa4"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40gN1Y17Dwz9s27 for ; Wed, 9 May 2018 00:59:29 +1000 (AEST) Received: from localhost ([::1]:51627 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fG45O-0000Ex-Om for incoming@patchwork.ozlabs.org; Tue, 08 May 2018 10:59:26 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47803) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fG44g-0000E2-HT for qemu-devel@nongnu.org; Tue, 08 May 2018 10:58:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fG44c-0001Ud-DZ for qemu-devel@nongnu.org; Tue, 08 May 2018 10:58:42 -0400 Received: from mail-db5eur01on0097.outbound.protection.outlook.com ([104.47.2.97]:13120 helo=EUR01-DB5-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 1fG44c-0001Tv-44; Tue, 08 May 2018 10:58:38 -0400 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=gnalBcW9C48aOaMktgfMgUOu0Dmj+eaakbQNX4JTJa4=; b=RnbjJLa4/oLJ+9qYhEYFDN5PVfSQUPN234As+l5TxDztyism3kOJGW7zMn7xx3e1Pf3gZfuotEvZbWOaodPt3c1VzBh4MxY5k4g9LWUMYIxh9pnoZQlBxi5yhTvYWyPIhO6op/6EGOjvruop4rFWLdGmXc5hW8vxGpvzh5xuZ1s= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=anton.nefedov@virtuozzo.com; Received: from xantnef-ws.sw.ru (195.214.232.6) by AM0PR08MB3347.eurprd08.prod.outlook.com (2603:10a6:208:5f::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.755.16; Tue, 8 May 2018 14:58:35 +0000 From: Anton Nefedov To: qemu-devel@nongnu.org Date: Tue, 8 May 2018 17:58:08 +0300 Message-Id: <1525791496-125188-2-git-send-email-anton.nefedov@virtuozzo.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1525791496-125188-1-git-send-email-anton.nefedov@virtuozzo.com> References: <1525791496-125188-1-git-send-email-anton.nefedov@virtuozzo.com> MIME-Version: 1.0 X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: DB6PR07CA0020.eurprd07.prod.outlook.com (2603:10a6:6:2d::30) To AM0PR08MB3347.eurprd08.prod.outlook.com (2603:10a6:208:5f::20) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(5600026)(2017052603328)(7153060)(7193020); SRVR:AM0PR08MB3347; X-Microsoft-Exchange-Diagnostics: 1; AM0PR08MB3347; 3:96plPnL2HxKKi9QShd0Bk7DlyhmwLkXOZwG1/XZsb4lK0aObINZESuz3uNm9/oXA4pHAp1KkQWiQVplD44WJFTDagvBvQImKt2HLTOUP/m2jNQkypDWQTQNKD6Q7Qr44Gr6D/Bb06dTZnIPsGhR2SQ9XNIJbjvWY1fSpecWZMyyyZS1bb1MBbc71rLJVjRwB6vurQ+IxQVPJ5Bs+bcqmmKO3wGE0OICHvc0p24NcuIc++BdDrzjSQ0isGNHHucyx; 25:RBXo1EjYQ/n7uoCqN8TxiHotJOECTOpZUtRzHPx6uIGUFPTaobuLNrarcUgqLp55lipkndJer9USkF2b3Fq4jzWLQ1UFDprXJpQuvofSvrue0CO3/22rv5C00pUHiBHLkLLyyCLyUNGbmI5ZkEa/DatPlughY6PBfK67WxxYEQ3WHKDouYhybnB6g1Qqrh52oMQmPTUInbkcRnlY/9VyaUqeNMC7+gBY22MuGjtDT7rSg9Z63KGCaonppZ+uyzoFPjzFaOOXLTcIWyTmRKqCRZdzj1xpKOOmfq9BF3Tg/lC8MuiB0E2Tte/foQZDVibS5iO76atd/uuZciCTM1QQ+Q==; 31:FlgoitBuJDVKl15hfN0sIgnbxtgN+SIhDD6Vn9Z1PwSzON1DtKOtpVV3MYtF8v4Gjx3FjAkwNkNKVNjmT+ZnMrfOz/bN336xmjW+vDduXnZV8BFaUfSkXONFHdyEsdYLyJhwowiEqI2VMZHXv9iHSLDeWZVaUnvoclCjrhu1Xx1RdUFx2P9MH7nJ8jgkCtVxOuNtw+aYpnDJpoaYaBgfqJjzB96W93fW5leel+DcAws= X-MS-TrafficTypeDiagnostic: AM0PR08MB3347: X-Microsoft-Exchange-Diagnostics: 1; AM0PR08MB3347; 20:+DyOVkPif0HnezaY5WYhRRNr4DZwopIERH966+K2F6eT/9fLnRWs3SUI+EZ7h746nrSixBD1Mjtzt9gUByunSA077Rok9Oy6m273diJ3rtS4bZAiW08qAZu8Zxn1zpltTwjxCFvfIIfFc+iEVX0GSYEyl9P4SY6HDgYadJt36azi3pw1EDpxcyrypBsVLDQoTqa/7kntSwgKXL5YKCTyzNPSTmoVri0qauiSCPEDJeJ6NOy+hZAcYZvt2TK/QRauo1btsGkDkrt3vdETbGHAZc5YQXd9QXad7q27/xpRwe2Z4Uxe7daRgny4aDwOvYOascKMlDuXzCgPOYuO5G55r3letQjWFzCJz3KwgnvshxpskViVrNg5HmidbyNUrNhjRKzVVlGrrW1hLqMi1rsrYaAg/y4rvzEO2G8p7naZXab+TbJcm7bW5kylKQnpIUOfJaqY++cT7o0E2p1IwAfq4JO7Zm0NA/e2Un0cI7EUyDfA9t5r4ebY30bREGKHgSng; 4:NlHIn70xIEA0rtO4VScpnG2WSyrLfj3oF+AYdTQnp+C/gorqfTlGZoyA/kEmy8Rxfp49ajRMYpkVdB23rLkJqPIBn9lem2B033CfBzjtvhD++SNdvPnBp/usTMcPUDo2Mr0DRL2+lCGpt7R4WR1xW+a425n6EcZ6Cbg7A/hnQ7r85ej1tGNVrp+qz/2YcN9iuFCJFsYV8jS3hm8Dsx83If27h2WO4sOHW9Sh80rPkMu1zKvjBzilvU2U+gayksvLBDGKPgPyKADCCiNo57FhEQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(10201501046)(93006095)(93001095)(3231254)(944501410)(52105095)(3002001)(149027)(150027)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(20161123558120)(6072148)(201708071742011); SRVR:AM0PR08MB3347; BCL:0; PCL:0; RULEID:; SRVR:AM0PR08MB3347; X-Forefront-PRVS: 0666E15D35 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(39850400004)(366004)(376002)(396003)(346002)(39380400002)(199004)(189003)(5660300001)(6486002)(81156014)(8676002)(81166006)(97736004)(2361001)(6116002)(3846002)(2351001)(446003)(2616005)(44832011)(16586007)(956004)(486006)(316002)(305945005)(476003)(86362001)(11346002)(25786009)(68736007)(6916009)(6666003)(36756003)(69596002)(51416003)(66066001)(47776003)(386003)(6506007)(52116002)(8936002)(26005)(53416004)(55236004)(76176011)(105586002)(186003)(106356001)(16526019)(107886003)(53936002)(4326008)(7736002)(50226002)(50466002)(48376002)(478600001)(6512007)(2906002); DIR:OUT; SFP:1102; SCL:1; SRVR:AM0PR08MB3347; H:xantnef-ws.sw.ru; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: virtuozzo.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM0PR08MB3347; 23:cG+wydW+dVW4H21lOlnh/bGhKKmHu7TJ2r+/LGlT5?= jt+0WLp2bEc3E+956cbLn53cjXExifCsFgjsvqNe/bUz3OHhOdhM9f3PWW2Gq8e70ZKjmrmpRgnRrWFxZlw1HyGZowDDS14OjtFajeX4uBXGxMPM8JIHO6tDPyYVv7IslD0ES7cR3R/ueo+ME2OhDN4uLd9C8DV/+U9qP5rYe2jPcyIfmwKGd6JdvaeOVxOIMnakuq4rj9QWIbGQo9hP8uaKJg2hvHEn9Bt06tR3ixo1cJ6PVsFvXcY9jhY8HtgGUloILJLkrHF9Jez+6nEE+xdfbh72LKc3J5/FvLKhUrl9QfK9GQWwp1pBwPSfhu853LVTsB53GKCT2ySDzRqzN/w4aJegT9wUixPkZGZlI/fbtTjhEUAOU7wnwbNeD+Fdrdgvdk3ZVMBAGgLQHNV/FwwXzJUilk+QOvc6fBaEhvUOmGgEjGhvaOhTqfTYSKGXvRxalT9GU0pS4hA/BbFr6Hnp3I9qlzdTwCsIOdCok2AJ/7avZnZclg0H6smaSIiJJgZ96sfPOpjICRUDaSHEgBf+V3PK/7A9AR6kVzQnYvazyxmt6tPNKEBjxklFU0M0uYcq4F/MMbveYHmKvBoQCMoBlGraIMJsjYx4pSSkmFSg2JxVW72K+iEpImtvjr+nNVULHWgavm06dFCW+3uFcqoiwH3EF6WwSv5TNK21GxNLtfBvpUGwztcmjr39m9pQONrFUQc5oRXSMJKz31Lrk+Em6hY+8YWJiIgG8PlVLV4P1BED9Vjdh7pyLKMo+ybB2Fs94B2uTbB7t3bXlgOUm1UzbKuIJq0TkDsYrcPH24bNv4zS4an9traq/pDyBW+VijLWoNLYNrET2KgugY0d6NYmYu3xvHWoFNav4zFpTrk6zzAD5Lddts0Hh59VKk8L7C9EuEKEpHx0wE/1lLkrwvK01W7fh3EEmcuJJmRel7+G1G9gcoOVw95QkkLQC8CDsU55Oq5r0SHVNHy/FcT8/EEBEUALjNp8PqQaZI3Rqde3g5Qf9kWs7NwzU2TTnnkLUP+owSvDDryy1wpjzWZfflIsSIHrH12Tt+Rw8P/u/h9KxKhGUVFEvlIf8txy0yCHwxpev3pbxW8JpOtn/D5uy5m0UXNyWIPUJz7hCt/Poj9y8T+31Tg02jf6ZQWpyevM8aNxe04gvck8O8NpB6nSrsOHUGviu181+fSccyt3L2sg8Z6CGpzbjuLF11DLppUzDuKD+896BAfNKeyMDx9xAwqpwUn7qA8YEvNnCVgMe9IW8JA7z4ZMGvLu2n7JN6RrH0= X-Microsoft-Antispam-Message-Info: t5qC/xynjU499ZWnLTdE9tz7/S6G7rPMVRO3yAMF8uPDDtByS3st3L9nGBf/AA85OJU47nevOzzb9cuCudoFAa1YGNZ4g3imSiRdvnd56iCfhhLtGZr61zdK65QEKbtkNbgKNOTt+1zXLD2qDzAazZXK6lrOZFWcOpx2wyYUNaCftif5YASgBTbJzeWksSFV X-Microsoft-Exchange-Diagnostics: 1; AM0PR08MB3347; 6:gJWS/sEyqohq7caTnrcZnabGPeQksXgWqmsyh14jX+FPVvjBDMGWyAncGWQQDmB2ViC7a+322t0bIJwbV2vKNq5bZ6Ds7D3dh79zeNlO8aT+EUyVChGT55bU6cF5UfoKBlcHYD+lI9ZM00u1PTmx8IEKaPvEGCurWcvzvfQ+R3bNeRH6oLM7rLmeBcyylPkXkYeybTiOCt9R47f/EAjaIHkH5y279xZijRTzN+q8nL7UnPwrmOL885A5vTtFKoho1gAlE2KBHqrihi2WVGKCRqejGou97bx7TW6V0rFqOL5HMN7+mxX3ePjJUt1bk4wB46Dn8jUFishdkyqwqXnbakzuwRcBBLZfNe1HmiNhWtP4+mRFHWiz3tYX3+AsH71s6J5QTTUBZtjekYUWvLSJbyMpqhkHkyO/GAw/ga9/d+I4yyF4xPWHjklaV5tCd820cfO5IDr+HIlSAspMptRxwQ==; 5:YUgF+YRchfd+ts3Bd7mkiKFlMp3SeSWG1mgC/NN4SqAfwwhoM8jOKSlfXjCxltmVvFTaBkxm6lJMJ+Ytk0a4uxAjVHBHadXUku8o9jiexgnuyneAtpVdZH7w0nsGXkoAibAABY5uQgAHrTse168KVG+mEjhkW9oNMhAoXRy0Ufg=; 24:snRC9QdWf/UtmIQ0ydMF4Wj5VELl2SFJsomtp03rZ5OBnz/YdtX4YSYLehfWF99htfUnMfl8ROLt3eGR5LUi9z6OB2LDNQnxkl4XdcJHB0s= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM0PR08MB3347; 7:5S9lR9q3iVO1vniDZPCx+4gLYVkN/ZLpwEiY42OmtkuM42TtQGh1IcF9/xJAqzmJR2BJdYMRf7lgjW4ngto6WLSRxFPJefoufirBE2Ioffr26IDsauqRKTqMrL3tRNdLBDIrklalSSoiMktJS6xEtLqiQ2r0WJFrkwJtDQ2+krNCmNWOXAIkigyx50EwNo+roEgLahlu8z9/dGWebLbABZ8beBdSDj+kbzs0MZdgzL4cXcn0n2eQFGJQC/nlhpEz; 20:vdQXQ0loGxHAT+D3i+8ZKY4fYT05pcKNMGW2KitN/0O4woJx7EnIQd68fwXm5tAMCYVlUWVoExAxUzRIzN5ykFCj4lgBpGeCtm+SWefN4pqRkHIGDdJt9qeOP8xJX7+gfoCrLvhsKULu284ES2jr5B8M0WC2LW+UpwSQNTVj6fk= X-MS-Office365-Filtering-Correlation-Id: 0bfbba4c-5aed-4cf2-8ceb-08d5b4f42d0f X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 May 2018 14:58:35.5994 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0bfbba4c-5aed-4cf2-8ceb-08d5b4f42d0f X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR08MB3347 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.2.97 Subject: [Qemu-devel] [PATCH v9 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Anton Nefedov Reviewed-by: Alberto Garcia Reviewed-by: Eric Blake --- block/mirror.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/block/mirror.c b/block/mirror.c index 820f512..a22ddef 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -1098,6 +1098,15 @@ static BlockDriver bdrv_mirror_top = { .bdrv_child_perm = bdrv_mirror_top_child_perm, }; +static void mirror_top_set_supported_flags(BlockDriverState *bs) +{ + bs->supported_write_flags = BDRV_REQ_FUA & + bs->backing->bs->supported_write_flags; + bs->supported_zero_flags = + (BDRV_REQ_FUA | BDRV_REQ_MAY_UNMAP) & + bs->backing->bs->supported_zero_flags; +} + static void mirror_start_job(const char *job_id, BlockDriverState *bs, int creation_flags, BlockDriverState *target, const char *replaces, int64_t speed, @@ -1163,6 +1172,8 @@ static void mirror_start_job(const char *job_id, BlockDriverState *bs, return; } + mirror_top_set_supported_flags(mirror_top_bs); + /* Make sure that the source is not resized while the job is running */ s = block_job_create(job_id, driver, NULL, mirror_top_bs, BLK_PERM_CONSISTENT_READ, From patchwork Tue May 8 14:58:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Nefedov X-Patchwork-Id: 910238 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=virtuozzo.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="b/XJ7IZR"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40gN1b6dVNz9s0W for ; Wed, 9 May 2018 00:59:31 +1000 (AEST) Received: from localhost ([::1]:51628 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fG45R-0000GO-FR for incoming@patchwork.ozlabs.org; Tue, 08 May 2018 10:59:29 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47808) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fG44g-0000EF-T0 for qemu-devel@nongnu.org; Tue, 08 May 2018 10:58:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fG44c-0001Uv-Pd for qemu-devel@nongnu.org; Tue, 08 May 2018 10:58:42 -0400 Received: from mail-db5eur01on0097.outbound.protection.outlook.com ([104.47.2.97]:13120 helo=EUR01-DB5-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 1fG44c-0001Tv-JB; Tue, 08 May 2018 10:58:38 -0400 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=xD+f59x7tHJ5TsIe3zhWVfJhFzEy+yF6POlHjqjpYIQ=; b=b/XJ7IZRIMWBi75McSSoUFddbNVWdGu1hKmBdy3FRytqqb0FjDswlNXfpPEs9S97saR//1r8/boSb6MYPQlb6gq/8Dwa5itV7vZ4gzdLlzvB6NeO9Viqm+i1y896yXK+BE5TW61y+qSekJmsrhPblyFfPobKjUPpnj3UlMHuv7E= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=anton.nefedov@virtuozzo.com; Received: from xantnef-ws.sw.ru (195.214.232.6) by AM0PR08MB3347.eurprd08.prod.outlook.com (2603:10a6:208:5f::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.755.16; Tue, 8 May 2018 14:58:36 +0000 From: Anton Nefedov To: qemu-devel@nongnu.org Date: Tue, 8 May 2018 17:58:09 +0300 Message-Id: <1525791496-125188-3-git-send-email-anton.nefedov@virtuozzo.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1525791496-125188-1-git-send-email-anton.nefedov@virtuozzo.com> References: <1525791496-125188-1-git-send-email-anton.nefedov@virtuozzo.com> MIME-Version: 1.0 X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: DB6PR07CA0020.eurprd07.prod.outlook.com (2603:10a6:6:2d::30) To AM0PR08MB3347.eurprd08.prod.outlook.com (2603:10a6:208:5f::20) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(5600026)(2017052603328)(7153060)(7193020); SRVR:AM0PR08MB3347; X-Microsoft-Exchange-Diagnostics: 1; AM0PR08MB3347; 3:/tZBh36MPLtSsvcoaVHMD3p/mO/1h41QzG3EeOkBFmZHctPJpj6Fqc7yVSJ6SnmFhXStHKJe2o1jTnCTllaoq1y2jIs+LX8o/WUSpfVQ2Q2CjCA6iaJrGK4ie2yq3JSLqKORp/5XueUTgqwXPZHXtUD1Swn0wc2sGvXohSsQmxWIksqCBy9VKOd0E+mFdRk2cXPznXyABww7ejGlGjoybAu/b3mwNfAVCSYlCaky8CeSpbs6npom7xKrgsTZn3ls; 25:0GgsN4b67BJsVq7bCVd0v64oHorxyZ60oz8bGsBMKTM16p6S56hEZAYXiCnnJPLyz4hI0ry4qEP1MgE+LuP8cniiL0UsYzyl6YBAode2Qx6newNLPBi6LAXPAbvOniDdzWFmRTYut2CHHsDLSN8ZhCVm8175ZrJmlairxJCW9mpA8e1OPfvZQHj2zfsL7UcEnLe5x0kRDBytnF5fLGlEfIa6yt9f29TM6DKJ50frkR16TICwJQLPrCIGFufh+uWYEdHxYTWShhJbw3qzni8VclUKuYOsql2bQstzWGVnOhvAyO/oiw25BLnN/4MZQo9SLcz7IgeeL1qyVz5uehX/rg==; 31:/0leDxQv1sYBRlMpEzVRhytpHWkSU3nvsy7QmZZ6AIHxxoeUpfnrpgEX7C0sP0Y3timCZPCxYbeCjUCBxnx9i6wugcXp6gAp9XyRx9DXFB7aNvr13HU98FpGMwv7qD2gRcXxRDkMeh/nDFtb7BRReTFiqLcNu+f7w1kPIea4FEeBa6jDPvtQpI6QLpZif1Cw1mwMkeiI45kQLQTbFp7ZlBKmQKo1eOLIjVbCJKa4t4Y= X-MS-TrafficTypeDiagnostic: AM0PR08MB3347: X-Microsoft-Exchange-Diagnostics: 1; AM0PR08MB3347; 20:GHJSmVlgwH0JHSVvS3+5dXGIwAH9Lf8JyFBBt77Ry8B53E0jPRDDPz1uvMa0COIuQY5xTXJZudDFe5+cpx52fopY3SfpcimyE1Ed12ok0XZtMtqveZmoq12l8JA3j/OE6Gz+SLG50W50R9PzDrjU7aAsA86MO2Lt43UC0Q+o919ugD/VqwVRVBNj2p8EIinn0kpjQRn/2GCa7OUInZbBGpDnOKkemwWpw1oPXb9jUBOyAPRrWCQsdkWbSohn51tfaeyJnT5WFlYYEZvdTfEFDV7cW1YkTh4TMNOUTZka3/rsi9SBFcmQRLbeTyC9CiixfLSe9clhWlnIU9YNQPpb5ivRSC3cqsBPDcYpMPbHUYhzP9jUM0Uovewl/0J01Et/LHvwIjNDehCjZI5VUb6dK3bTUkQAuOrrQAqOOshly9aXOk9Q5BdSaFBm/2+tp88/OfYBPVWjwWtMFKgQ+/392AVVQJX/DGEtH8N/rsWSQxI2PhtEM890Q85Ctbxh9O7k; 4:7buMjBUug7R01V/DApwc8t8prTbukDxGMsA5gInlw0K0PWYZSHv435Jb4RnbZ7o5A/S0P6jf+SqcyDtZTHo5RsDu8efpcwsryyf3w25E7zeg70Ay4jO43TkvXY1QCtb27wFqvXX32AAhD2+D22mdHGEAx7NvPuzxzMDujG5WSoplvzxb2ByIPUs9NP9bKms956AOz31eqPHLj4a5ObaJXvLREIdTYORKXVk++0OYmx48fEWyB5Qe+Si5wE/ewIblY6i5DmKO5v/dr39p1QrBSg== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(10201501046)(93006095)(93001095)(3231254)(944501410)(52105095)(3002001)(149027)(150027)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(20161123558120)(6072148)(201708071742011); SRVR:AM0PR08MB3347; BCL:0; PCL:0; RULEID:; SRVR:AM0PR08MB3347; X-Forefront-PRVS: 0666E15D35 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(39850400004)(366004)(376002)(396003)(346002)(39380400002)(199004)(189003)(5660300001)(6486002)(81156014)(8676002)(81166006)(97736004)(2361001)(6116002)(3846002)(2351001)(446003)(2616005)(44832011)(16586007)(956004)(486006)(316002)(305945005)(476003)(86362001)(11346002)(25786009)(68736007)(6916009)(6666003)(36756003)(69596002)(51416003)(66066001)(47776003)(386003)(6506007)(52116002)(8936002)(26005)(53416004)(55236004)(76176011)(105586002)(186003)(106356001)(16526019)(107886003)(53936002)(4326008)(7736002)(50226002)(50466002)(48376002)(478600001)(6512007)(2906002); DIR:OUT; SFP:1102; SCL:1; SRVR:AM0PR08MB3347; H:xantnef-ws.sw.ru; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: virtuozzo.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM0PR08MB3347; 23:+wI8SN0nB3hCwjvzbVx3RshfwjnVT1JeyhZdm3lpF?= Ky3KYOC79JRrj6i3sglRqROFqqlkqSMFBkPmyI0grAxupvU3pf68kbZ20Ca6YrFDshrTbVPaugXvyAypFY3m1KsuNcRQlFAzrB/PcwXvaymhcmtmWw9q+55LD2fHHZeyk8dx48xpX/Vo7fEvsUvgTpuwUCKT50YxhU80ID6VwUMTf2VBq6BwRLWYFYAhDut5JUQtd2h8AK1iRk6oNeoxIwtnZRCVAATtbviMzh5Yx6VoxxFNowz3J4gz0iUQINfgstjT8rsHebr90vYuE4Ve2SaeQK88wfMKJEg3yEE7gGrDEc1JnXhak+IlM2BXpslJ0bdVQ/eqsbt+uAor8a70wEXL9reDC2E6XyEsRhgrl6lj01dc691vDrtRLkrpD9ksKhB8eHXB5mH4L8cFaA9oMrngd9NJqFnDF7kFkU1IMbc+mVXB6ga0+wchAHltqsJyriDvsiNnNaWZWyEPSK+MNgfEJkk+lABWivo8uOHpRS8A+xdAYtjIq7d40x3ucz4JIA4g5reBnExE/WMCzCHkPyCzo67aM1MsVuOh5NrIo/JMCky/kldlRzutu3P7KRmY6F94GORsZZ1A6Sa9r+beU5nMXRpYpfHSC1+5XY9EsKhNIF4kKySckaRo35WrPaXvGjz9U50k85crJmnBDo0IQ7sNoSFPU5M5KggsrBeqFh2BUbwtiQNXHC3o1vqQdFxyyk+TDweMHhn2B3jWD6t+2vXTjlbWJeEGquDccbigPH97WHWbXumUwKC+nX09QsQOND0j/3Jq5K+rIK1EOR8WnodWZcs56wKBEy/nAkQ7iL437DmtKnqEM7u35DiqKj5tFORkEa796EqZXLgsfMlWhNCsMkzTuJ5pRHgKNbrcgmYCr3L4DzqmWM/nhiiD3365mdZSXD32tRlrnL5YQmOYH3eZj7h5xYdt5jFmwJ62WJ49oOu08TlqlVOvR3hncRANQlTNzlFRG9jTTTF5DtPVZRGd6Y7DZ9Zis+I7jgtKyhK6lGBAYC+jgnt7WtXJLOHuHQlGol0uYdpytAW/7Xo6kjUG5tgbk/c6OqNAgSrLJlDpbJWC2e4t+wforM9Km0o13VJAFytr53AHhSk5uLUralLova6Gaw+i0QuaZ3s4O8i6Rjxx0/vHJgNJtLa5/+NBui9I9Js1KYnCgNkad81mI5NoL+XRoDQhdDuZtEvQxh/MBTsnhF0AGr5Cvu4vjHBSa/vugrX5E15B3/5z1Wmb/HHCGPxEsD+Jod+ieK6z/hMqN9N7wMSYPf4rE6cwThUUZU= X-Microsoft-Antispam-Message-Info: PDjP4PQDGCbRj6lKMpRa7iHAvyzmbCkQpZlEpB5Fb7Y/FVxs0QeJBoAb6yzDEg2aPkdUiIf/T7yzIzUPkaWaLlPE8fQ2/A7z6ci2XLfnN5Ymeepn5nkPms5+xGyKsxUvU94cw7Uax8fDS3Uhxpd+nK6xIrm93HBhSMJUQSFuW4dFSw29s3ctRyVgIhWCthMx X-Microsoft-Exchange-Diagnostics: 1; AM0PR08MB3347; 6:K0+rnV/i+i1Ng6nDy9mi1xp9gXiMgrI/g8gEK/z3t3Kz0g1+KyQnoDbCKnNE2vyhHwIxlhbySDWkv6jHRGMS/BigGSN3LvACEodLEPdpLXQNZa7AZRLygmfDTqN0ISdSCZQgG4ExSZRretLbmw3VivxQWltkHok6Y4gppT4GW09pr8pWcajz3P7uc18IVcorAu5+PVbfgwq/VroEGg+fQogocPzqDREHTlodORJMYq1ORJk1C/l4ZDXYGctCmEv94R5PllqZaSWd2AGeOirrLjoZZ2yxL8WjShxXVgzg6kkpUIiRiFuGn+VbKx7r9bQZqxCNoTkufVqCRtD1xKyussPdod8sMQoAGy6PU8UM3PbDYead/bVwp0ML2QhU9R7yeHDD9pgr3QcESnIOrhN+0f7G/wv+kqwdxhVWH/vXzLRrs7PkGIxUgUiGJ9UX1488w1Zf8tZPA/nxWUTlPgIL6w==; 5:3SCKt+Ga0ue6NKX5UvOtTr1OjHUbZ/ulou125mRQx/QbQHjKe5kYXu4CXlBlh7vg6WRq6Kgz3mfXcuaeHaF3UeJ1LRXEjgOg1nND6ESvwdhtwZCbB5qbz36cbsdLOig3PvJVFn9PwwAxN8VzFG2qPF2CHsK2d/cCxhwkjKOeqEY=; 24:e8DBSKfOeP66WAq5tyg73JbtnDXd7a+8aWgdOraRcodPGmfAMB797Zx5IJIicM+QHXHC1ONhLjMsvBaTmVGJhi9Dj8lCGAkeCUK4NYatlWo= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM0PR08MB3347; 7:skDHB9WVBEV0j/qOVoRy5LdrJr2UvH3GQfWAWVjra9MBGKYOb0SI6gBJNSW5q6mg+2Z2PwFdfXx5//95o3Rp9rMJd84mtsiaLF/yju6SWiyKKOrY/eESJwnNrTWMEm0h4d9sGQzroW+/32lo1xn9oIeBpDR4VXc/livMRpVsSn6yv9hZf1wMjJpG47a3h1QsSC8LrTm6vqNCvZpwztq8SYR0YxKg3Lc5G11oEmJI9uNNL8sUgfaf5dAxuQn3gKay; 20:KbRd/UBiAzSNlLSr3lG1vZ4UDybqWpq8g9cJm64ZGPMZw/dVJu3ouMV2pH9aSCNzJ8xDM0/GggtUkFou1Q58Afi0Ur152IIztp2pjUVox9HYq81nXBO32pXWz/Ps6eGWqrRrP0qPOfzgX/EkB4e4lINm5NJP5ipSyNHnD+Evrfk= X-MS-Office365-Filtering-Correlation-Id: cc17d50d-6fbb-4f70-d425-08d5b4f42db8 X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 May 2018 14:58:36.7088 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: cc17d50d-6fbb-4f70-d425-08d5b4f42db8 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR08MB3347 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.2.97 Subject: [Qemu-devel] [PATCH v9 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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 754cc9e..496ae09 100644 --- a/block/blkverify.c +++ b/block/blkverify.c @@ -141,6 +141,15 @@ static int blkverify_open(BlockDriverState *bs, QDict *options, int flags, goto fail; } + bs->supported_write_flags = BDRV_REQ_FUA & + bs->file->bs->supported_write_flags & + s->test_file->bs->supported_write_flags; + + bs->supported_zero_flags = + (BDRV_REQ_FUA | BDRV_REQ_MAY_UNMAP) & + bs->file->bs->supported_zero_flags & + s->test_file->bs->supported_zero_flags; + ret = 0; fail: qemu_opts_del(opts); From patchwork Tue May 8 14:58:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Nefedov X-Patchwork-Id: 910246 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=virtuozzo.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="Tini+DBE"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40gN5P2FZfz9s2k for ; Wed, 9 May 2018 01:02:49 +1000 (AEST) Received: from localhost ([::1]:51654 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fG48c-0003PQ-Ts for incoming@patchwork.ozlabs.org; Tue, 08 May 2018 11:02:47 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47855) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fG44j-0000Fj-7j for qemu-devel@nongnu.org; Tue, 08 May 2018 10:58:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fG44f-0001Wt-2m for qemu-devel@nongnu.org; Tue, 08 May 2018 10:58:45 -0400 Received: from mail-db5eur01on0131.outbound.protection.outlook.com ([104.47.2.131]:52409 helo=EUR01-DB5-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 1fG44e-0001Vh-Op; Tue, 08 May 2018 10:58:41 -0400 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=Ehh60Q70L/A0ILdH36kapKAGFRGNvBi+BTLFX8+Tk+8=; b=Tini+DBE0Fin5QbBNPELUDWcaldxOcp3+KXZyH4xgViWX2F2CCGPc7NtcaYXpggOkZ2EKrGjfoG4alDTjjXTsZ2QTaVyABVDkOkwOSP1hlqUkTz2S10tOlQgq8Hd1uCFMf5qEM1lWNt1VjnqZMr0fH9Vb0RD5ab3id0vX53XMCc= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=anton.nefedov@virtuozzo.com; Received: from xantnef-ws.sw.ru (195.214.232.6) by AM0PR08MB3347.eurprd08.prod.outlook.com (2603:10a6:208:5f::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.755.16; Tue, 8 May 2018 14:58:37 +0000 From: Anton Nefedov To: qemu-devel@nongnu.org Date: Tue, 8 May 2018 17:58:10 +0300 Message-Id: <1525791496-125188-4-git-send-email-anton.nefedov@virtuozzo.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1525791496-125188-1-git-send-email-anton.nefedov@virtuozzo.com> References: <1525791496-125188-1-git-send-email-anton.nefedov@virtuozzo.com> MIME-Version: 1.0 X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: DB6PR07CA0020.eurprd07.prod.outlook.com (2603:10a6:6:2d::30) To AM0PR08MB3347.eurprd08.prod.outlook.com (2603:10a6:208:5f::20) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(5600026)(2017052603328)(7153060)(7193020); SRVR:AM0PR08MB3347; X-Microsoft-Exchange-Diagnostics: 1; AM0PR08MB3347; 3:sgNlifN39KuSSdfeU9sm+cLOrH3cE/odI0dUU2vBbaIhTJq+lKoRrxZngm4irTuGNGfXGam7Wxex0jErB0VwiJJfO2p85WxPQ/5PL36WhkcqZYD3XesR+Ji1CPZFji9HwnCK6LWDLy2EiVcWIq2a1f0SNRGbJ/1R2j/em3/NJMpUt92C8aUkkvNwSURc9nvj82KYM4+yqg4ll7UiGHNlyx/3ptRtWMneH6hOSanTW2978l4jI/8P+VObwGocJxYP; 25:7+5pyzIkHW66OKzRUggg8JNJeDXR0ZXIUxqGByW2JzQuLukPnT38pbpnsnHIeESIVFhc4csQZsKagab03SaYm2rTsfd794LpfTr/iQt+R01BRtKg4ftBkEggaPVbF7FpQnrfG90KpZrhj8TVcRcF5XUsOPrYkWhSb6iKz8hIppBdEmd5kuz9gIll3eJLbrfxrz3cCNdx2hvINi+Wbq/WekVaeCTfGhOr3OIoPqm63wElDdEEykJzh5y3To51783rVUE0qbsKAhTJ9xIMClRFkGyPiSJte9nPM3acohJrPN4FFqthQ11ijl3pk7KMd1GBRv6z/3PPqBBtomFHWYKcTw==; 31:mAoQhC7SOOSDQNoqX3CMq/iuOcyGP+SqRgpuStaUyIcZ9mqMYNFXPvMiES3DbVs+Gws6KNFrf6ZC+Xp4S/I8yBqguQVSfgVeYDe2yMvrTybybkRA1ekZqmLuVaCWG+930fjGWZA2smD39/tT+ys89dulGs4tfxFelywBDUAvy3RE6tgMxHnbm8Wp7agxFhxFaBIFVNHZ8mBES9PlFkcrcbsx/RDgkKzywJht5kHS5yw= X-MS-TrafficTypeDiagnostic: AM0PR08MB3347: X-Microsoft-Exchange-Diagnostics: 1; AM0PR08MB3347; 20:GQsnKUqvn6bMKk09aYaiAG5rPxyZfFhtWwMQKUyhgsIX0FR1JYgDVKySCweJOj9VOawLJOBah8NSa+K9WAdThejS+LImqc/sJoLGcS+DrG1yUYSDlbJ9IOie6bFZVrzl5/1NmfGaShxoZoLAaPEKOULKzEtpra/eJYP+KHvRdpknw91AezJGoy4JDRsBShfWPQX+0HV/qrwK0yanN6K4tlyi+rqwfC+0Am1I+/F7ebLDgrKygQJE9rfsM4UEAb6FARGSEIbEK3GGYFMmDlPzOtxjwH+0yByYGvLzT416rj7zSQRdkgoe5GCib85uBBePMW9/eBf8ezzpUY2YXf3PYKpm1vrxQfxlhN5IVwO2/bVdcWSEoP0CyiWN4ztWlxiqe9dTpr5Pw7N28g7DLZ/Z6vuFo01R9/JGNRoXSE97s8HdFpZD0ZG8v7cXIngYq3/Gyh4hwaD9voNBxmHNNjVmh4u3JKx1stU7zJEbNclG7iXbPKQ+v97nf3sh47Yr0Q8f; 4:wnmZi9jqCzgfjf/IOkU/W5rCcFp4AztulvemzC03odAyJO1l1xcPDkkLXjKyuEYtdZTU0VD6Wddwnvgh7+0UVcKdO3x1mL2u3Nfmhn6+iKEea6HfrnEt+W0KknbEwlLGkJNyQk6lucd3MIudixzEcv/QzJme/yN50+KN9FKN3l7ksWP2v9BiKQl4kVP9CoS1qOHdL1pQE5cOQ1Fwvb0Bs7gj00a87WNiPOrvwyUR5PBbqjgPqdhhWgs0abjPVHmLxgXJedxmrplcDLJXqe3v7g== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(10201501046)(93006095)(93001095)(3231254)(944501410)(52105095)(3002001)(149027)(150027)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(20161123558120)(6072148)(201708071742011); SRVR:AM0PR08MB3347; BCL:0; PCL:0; RULEID:; SRVR:AM0PR08MB3347; X-Forefront-PRVS: 0666E15D35 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(39850400004)(366004)(376002)(396003)(346002)(39380400002)(199004)(189003)(5660300001)(6486002)(81156014)(8676002)(81166006)(97736004)(2361001)(6116002)(3846002)(2351001)(446003)(2616005)(44832011)(16586007)(956004)(486006)(316002)(305945005)(476003)(86362001)(11346002)(25786009)(68736007)(6916009)(6666003)(36756003)(69596002)(51416003)(66066001)(47776003)(386003)(6506007)(52116002)(8936002)(26005)(53416004)(55236004)(76176011)(105586002)(186003)(106356001)(16526019)(107886003)(53936002)(4326008)(7736002)(50226002)(50466002)(48376002)(478600001)(6512007)(2906002); DIR:OUT; SFP:1102; SCL:1; SRVR:AM0PR08MB3347; H:xantnef-ws.sw.ru; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: virtuozzo.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM0PR08MB3347; 23:j8QoSZ1JzlBhvcH6Zve5tturuRE03OV/umOlC9mXm?= 1TlZDxZvBq/Xfa+I86DFa7jUywpHHgB83NccVQbUCSS9yUUAUFFKt3y0LDV2NU8EJlgVi9fTt+C0Xg1nQ0ymHXy/6mG2VaWaXLvHflEvPzAivVBAbbezh9CEDTjLXTi+LkuBsir5yt2i0i3MnBkZmOf6jzDJfVTOUUv6/rYTywvdqmXSfAuU96hKW73boGcQ9mawDq57NSER1dITETsJRSAOwnB2kgFxzFjkaGJ0XM1pZeV3scA6Ry9As0qb6gEIrsOi82TLQsw3xjpv/XIQF++7KduYiNdIrpKNJVQ7nLyHrszimoUqsMqPhyKwgKlmjAHmbORvgpLALEFLQ2omoHXsuAT95XdnEMzZIhq3iav5oyceK5qVo4gcJSVzKJqoLu6SgDQVEbTyrw0RA4gl53zFbfIFwEBkdX2/TOhf8folmNm5GGtXGTnnRaaZrQVYx9Q9tn+zdHhaNTl9JIw/vJ9CLvBSA8XLpp2ZCRhRWc6+QWXEx/AGyL1h57O7LPtZE+/C5Ujf3O1lZ9RbZgqG2TQWN+CHpMwIkWq00I71pypHnP+Zz8RCkowLxN3ya5OZ938FeingjTG2Cc/X3/LKuvlIxMJOi3esnVwILaDdUaDREujZJjW7/BycxjeRKX/hZ9JvaMBCayNDbEwGA7ZerFtnsSFWwZQEOQVZ1i6EbBZH1jNOCzV0vZpOE78KjHuEmbuSuIW7R38TP5wjxjvDi+hHD7RvWtuvKj7GlJleRUp9h64CUYJLN+qU2qHCNNjKEMJxe2jQvtljbEhMY3PsbDE749Ahs4KWuVJ3IiclmJAG85A1QK5xDsrWRBOHSCgTApWa+TLrlaxoDzcF1Mk+2cEtt6CfpeiMJMPm4E6UzIXJ6tbsmAxmaChiklxRMahEs1N3WE9xFe/hC9Vtw7L2Sl7WxZe1LjMSC06byxGlx1kSHUD5/ECq6Jh7amewMnKXIHnHcC1IvRtEz3oJnxfnslIbkJaDcVug6edxPCPkNLaCfkMdfejFKC7ull5t5pc68sgv7GUPu92Ur2t0qevD69jqm879Bbaldvo1ldksLFI8+t73ky+Wb4uSx6+1C3tIXXYWWjCVWOoNL+NiDcfhBwgP0qCiGNB4Pw2RjNORWPG5uYH2Oz6tCZB9gSnAjifMvi+OHFAb0XW4puF3r66jLE126J0TMrechff53xKPPDqqc8gIbTRGjK+VikLeTujlDZTwyJgtFc/Lqka2Q0fKTm2UBTWYUXb/5jT/N0idDJoCxh7FKz2Oo/YyDkEWlKC8sA= X-Microsoft-Antispam-Message-Info: 3QbrHgFNwtbRpEhSRL+jbpNEfQrRbuRynaxvc+igYd4t/uHlWCmyneexq+MPTB6N95GFVP2V0nvLmVuufvMLjMTsJLeyvFA9ctw1ELRi/maaUygxZ/vQx1BysThNdDNSXavwLg6oV0KdzMYaykvGlEs+DybjvM+qJPUWwZxP31dAWHlxhR6ob3s3zKhvnQKb X-Microsoft-Exchange-Diagnostics: 1; AM0PR08MB3347; 6:iEXmS1i1fyZINggpBtJpZ8jWhvEcTKT2X97F+WDHhyLDnEx1ubqdJWp5htzmqOpb7qf3VkK6a8WPuC7VbIEug6/3JGJmAYtNpiu7+99HFzLs3UJf7XpFnx5qjacTp280XVMlw2405tMGpzoN3/IYVyPmCZLtycalmMvgjXMqZyPKOujnDpmB7J0RVOGXl5TLdu9iR5ARwIIpEW/AANSvl+1lVfuyjBrawEiR7DJMqFXUEO5RiF59rcQhiqlqWNdhl7e7yfefogQUTbw57Tvx1SMB/wsT5Z9d+u0YTT9OX5NZ1+31SnMjq98LCj9wPYzd9H1XYzGVxBhLWF8KfE0fjckHHhBZTUFNkq9WWgLyVveg4TEJpMCqsm+RJf+EYCZCoEXaoUyk/BeTkXprnj24J1Mo8FOt7Tc6qftvsYFPjECeVg5DIII5toTJCnHgwehlU7by6p4VxwaOJjUr5+wiLw==; 5:bk78V+GTIhzm5JsO4A5WX9lHx62T0y7Lo8wMNIq2Zi34vkGDnjZqjjXbdf1nUfCfFMsVlRic4p4HrkbfmBGZqsmd5VmhprWQmkJzzJQ7rqeJ/1KCXW57MNsR4DAuTTTQArXl0joFeG8JE35W1WHdB2TW1cYCbi6mu5+fYQBfGk0=; 24:uvLTiET6vdw9J98h1H/MS8L+bi+ovz7LVTLvwSX9wO1TkniDSEz1E97fOrmxG/xPMlIRReTgUYrs2MJYagVxrVGEtCcduINRgxS0N16gR1g= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM0PR08MB3347; 7:3ZSPx+xQlyr3bNoHf80vffdVi/SE+hiC3mDe77ngWauIYQjapua0+WtoUtAvryMRcEffTGlgzFsdIVXuRXPN0D1su60NnLclusurOnTCEFM6qqjoYNRODGZ9ACyr8VRVyxc3cBgtFbSwMz51wdQNuBG55TGTI3+/mPJwGdTjsilZN33gLktlo/hDct6NfKSkr2ORs3BLJQSyAS7gvo64UcXSfpkGBjZWxEyEA8kzdcIkF4TARWOVvfsDLMLTUImv; 20:VKERQNACf5Q/Mw+/w/mW80QlUg9XiOZz9Hz2b84/G4NSFQ6ugKsaaZmBlNWyp/zqgjUIDt9Vo0a2PAtGLaZp7izIvkss58NFtvAZZs9MZ2VxBC/rUahDG7GXnWVVzzkMctuA7JnYaeuCRrJtdoRzlnBq6uDip9JPlfGKgyzkfbc= X-MS-Office365-Filtering-Correlation-Id: f3de9b61-75e6-41a7-1b6d-08d5b4f42e62 X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 May 2018 14:58:37.8182 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f3de9b61-75e6-41a7-1b6d-08d5b4f42e62 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR08MB3347 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.2.131 Subject: [Qemu-devel] [PATCH v9 3/9] quorum: 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Anton Nefedov Reviewed-by: Alberto Garcia Reviewed-by: Eric Blake --- block/quorum.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/block/quorum.c b/block/quorum.c index a5051da..26e7d78 100644 --- a/block/quorum.c +++ b/block/quorum.c @@ -867,6 +867,20 @@ static QemuOptsList quorum_runtime_opts = { }, }; +static void quorum_set_supported_flags(BlockDriverState *bs) +{ + BDRVQuorumState *s = bs->opaque; + int i; + + bs->supported_write_flags = BDRV_REQ_FUA; + bs->supported_zero_flags = BDRV_REQ_FUA | BDRV_REQ_MAY_UNMAP; + + for (i = 0; i < s->num_children; i++) { + bs->supported_write_flags &= s->children[i]->bs->supported_write_flags; + bs->supported_zero_flags &= s->children[i]->bs->supported_zero_flags; + } +} + static int quorum_open(BlockDriverState *bs, QDict *options, int flags, Error **errp) { @@ -961,6 +975,8 @@ static int quorum_open(BlockDriverState *bs, QDict *options, int flags, } s->next_child_index = s->num_children; + quorum_set_supported_flags(bs); + g_free(opened); goto exit; @@ -1029,6 +1045,8 @@ static void quorum_add_child(BlockDriverState *bs, BlockDriverState *child_bs, s->children = g_renew(BdrvChild *, s->children, s->num_children + 1); s->children[s->num_children++] = child; + quorum_set_supported_flags(bs); + out: bdrv_drained_end(bs); } @@ -1064,6 +1082,8 @@ static void quorum_del_child(BlockDriverState *bs, BdrvChild *child, bdrv_unref_child(bs, child); bdrv_drained_end(bs); + + quorum_set_supported_flags(bs); } static void quorum_refresh_filename(BlockDriverState *bs, QDict *options) From patchwork Tue May 8 14:58:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Nefedov X-Patchwork-Id: 910250 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=virtuozzo.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="ZrzkkqsY"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40gN8l1MhHz9s27 for ; Wed, 9 May 2018 01:05:42 +1000 (AEST) Received: from localhost ([::1]:51676 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fG4BQ-0005yc-7j for incoming@patchwork.ozlabs.org; Tue, 08 May 2018 11:05:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47870) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fG44j-0000Gf-Um for qemu-devel@nongnu.org; Tue, 08 May 2018 10:58:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fG44f-0001XK-Ib for qemu-devel@nongnu.org; Tue, 08 May 2018 10:58:46 -0400 Received: from mail-db5eur01on0131.outbound.protection.outlook.com ([104.47.2.131]:52409 helo=EUR01-DB5-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 1fG44f-0001Vh-8B; Tue, 08 May 2018 10:58:41 -0400 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=kyxfNrSDCDZ/FF/5EGKsP9C1QCgxTJGsGm9ejzhZIqc=; b=ZrzkkqsYbxSOzN+wDgLmzXGhDJUKcud2OUnSS7LQRcyLZa5b6TY584CYmnE1MNwq44A8Z2tD4m8Lqv6nvWYKzstX7QVJVpvdnu2SWHPft0Z3/LGwQxtfNOVf3+aLxPaCbg3f8awtFYejYt02k5jGVrUr3ta71E3HEu6md0hkQeM= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=anton.nefedov@virtuozzo.com; Received: from xantnef-ws.sw.ru (195.214.232.6) by AM0PR08MB3347.eurprd08.prod.outlook.com (2603:10a6:208:5f::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.755.16; Tue, 8 May 2018 14:58:38 +0000 From: Anton Nefedov To: qemu-devel@nongnu.org Date: Tue, 8 May 2018 17:58:11 +0300 Message-Id: <1525791496-125188-5-git-send-email-anton.nefedov@virtuozzo.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1525791496-125188-1-git-send-email-anton.nefedov@virtuozzo.com> References: <1525791496-125188-1-git-send-email-anton.nefedov@virtuozzo.com> MIME-Version: 1.0 X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: DB6PR07CA0020.eurprd07.prod.outlook.com (2603:10a6:6:2d::30) To AM0PR08MB3347.eurprd08.prod.outlook.com (2603:10a6:208:5f::20) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(5600026)(2017052603328)(7153060)(7193020); SRVR:AM0PR08MB3347; X-Microsoft-Exchange-Diagnostics: 1; AM0PR08MB3347; 3:Uea/q/yikUWUqEbgZFySRuvCnNHrCkHSfqWZErW/J3oMsSiIs0MRI6XdHPM8qOgdbaSPWRR0HlGTMqAapcqY5s76XUH7MK2Z9ieOxcJeK4daDtYl4tVluCzRF9JP4BnFJT6UH8sN3Y/3scyHWxc/SUoYgXY3n/x1KszR7vpMVvbRiqZW9mwPcN7QmEpKWB5WTxE9OjQXTD3c8UuIRaRleAJgtoMKOkyAK6Irzt0bUvR4WaempkQng/h2F3LIOzJx; 25:SH1fNDTanOiX0zNgQxEgM2HBzy5f58vSl96QdH9vwathqQy2L0xhqXDteoPEtDsveNEDWdOEBJ3gTgnRnQJTxiqBqGaGNU1EjghkemGG8QI8KZpS30YgGH5TkM3oVfTHO5ILSH2f4JlyGdPIGHacsfwnbze825rBhmrUoz5ZEJfpI8ZWHZCG9moPOu0PmIYCk3X6XEDKXIYSxf37GIIpyR3uDzHRq+8xkSmhJeM4OG85fj95lv/WiV91t4xDB0O4oKr6v/tLhm9zmcnVylATodyI1dKraDxCV9GCUZMT2G1BSwJp1Pxa/XmwO4q0LFVGeFBhriXRoojKibrDqiFz8w==; 31:X9xYHnsjFf2e7/4iMok2ma8AHsl80cXdex0Ecg5MkS07MhzYHCMYHpBKGuFgN9Z1UuP1z2YruByHEdbF6o4Wz5UScm1lB5vS1yuHDl/sV1gafVujivzG/wahfDe92mqWSUWCJ1lhHRqJTiBRLUYdQmNFsyBUrcOOMXyaPnciXhmloc46Z0ozMNPfu1w19xAuQmAh1CmlAzeX3Z5aE8OoDHR+zZ1uIsS1fHPAHLqnphU= X-MS-TrafficTypeDiagnostic: AM0PR08MB3347: X-Microsoft-Exchange-Diagnostics: 1; AM0PR08MB3347; 20:8kWvZZcBpLbBMSSzqmZExJ1LBPK9tPXdpOKwgwGTMOwQ74nWaDD5qceIOHFOYBoLKcGMeDIlGui4k6Jw+FSpms717J+zkdPwx8eW4ZtfLXtzKKf43H+82D7W1KPD22qDygQ5crYSS7d7rAlzkQVJmSBmmEkr88naE6UXGvilQ0dUw0vZt3td+GLQEa3UjDS7tq3HribPKfPrqbRPvPMJaL3zcyNCEnxU5ApKNerKoSNPxfWbLC7mkZP+GQ5w18TACGu2IC3ggQ1cflzlKsJoPvTvQpOWh5L6tndT3jM4zd7riFuCZLe9OLs0FCJ7iShS5MoqarCd5BZVnm3iSYRbAmpt5gkbfz1oiIblzsh/+o2F8unM7vVHZ440X/WxMhBwZ1l87erMIxOncVAAqm0sUrT28lgy7UQAUyv+PY3+aIFSvt3JQ2sdMTdJh7r4z2r9YKilnle7VwjO8byK+cVvywxErK58NHNEu1Kej810fSPQGOsnOTMYF7XhxjeeFs1d; 4:Nr9zqYHvOZJXQrWh5VqJABj0Z0/N03xkgljYn+lkUGMqluvSTRKzk3YnF9LEEh8rtJzZYAuW3M9VVkz3pjgkRD6lurF5EpPYQSXcZzCENKALt28V/L3yWEU4HImqqxn2+9MQb+JMxTZfcF/3zO1HKx8l1lno6/nO8w8qZbWl68RgBTn7lfgC5za1OW4Lz1GWHzXSvg+52jRESf/Dz4qm/C9LLJdlDyHy0tVz2JfmMjPHg1hmvMDMp5W0nx/exuBZU0Sf8AOxN6TZkKdd6I081A== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(10201501046)(93006095)(93001095)(3231254)(944501410)(52105095)(3002001)(149027)(150027)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(20161123558120)(6072148)(201708071742011); SRVR:AM0PR08MB3347; BCL:0; PCL:0; RULEID:; SRVR:AM0PR08MB3347; X-Forefront-PRVS: 0666E15D35 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(39850400004)(366004)(376002)(396003)(346002)(39380400002)(199004)(189003)(5660300001)(6486002)(81156014)(8676002)(81166006)(97736004)(2361001)(6116002)(3846002)(2351001)(446003)(2616005)(44832011)(16586007)(956004)(486006)(316002)(305945005)(476003)(86362001)(11346002)(25786009)(68736007)(6916009)(6666003)(36756003)(69596002)(51416003)(66066001)(47776003)(386003)(6506007)(52116002)(8936002)(26005)(53416004)(55236004)(76176011)(105586002)(186003)(106356001)(16526019)(107886003)(53936002)(4326008)(7736002)(50226002)(50466002)(59450400001)(48376002)(478600001)(6512007)(2906002); DIR:OUT; SFP:1102; SCL:1; SRVR:AM0PR08MB3347; H:xantnef-ws.sw.ru; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: virtuozzo.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM0PR08MB3347; 23:0EDwJDRMCliVDcgA1uDfTr+E8TFIYAwHgX0830MPK?= 5revypsAOcPSIJWplvlBQZjU7H0eftzOzW2uWNVjJZKK0VL+UGOpfG0wlhhGX0d+lnwI7U/bnh134927Oz8MhoYmzEpHb1wcLhSBSGYzpVN7AC2oiYBPpFXUgtJoi/ow9/n0LjhbHBOVBjSNcfKte7YBMuy8BegYBhE123ml2xpHQTNaGRShy3kBzX1MSJLTtf5iW/2KDrINGRIB72ipErn7AHaRkwWQqFR8PPZcex0r6c8Kcqv/DpYrTnB86XW7lvXnW5XmHg17AQ8SzxAj8FxxAXTj5P1Xwrjz+YnUDgjdXb/ZmWHrLD1kOAbQftB3f/dq/KHxt06fA80vmsSJDmm9LHZulRrGT7Mp1q3tL9nnsAx5Q12D2MA+cuTfbgcK6XrA9zjnwh5xLHtr0qCPE8QBuzndet4xt69i6Miq+D5/FGJtDjnMAjQZCzK+ra4Jh8+3/0G5FKc2E7cqLz7pevpg+0YCJjE2pC8+rNmI5nDdZdkmi0ALpuJPSuAPE2IfHr1XEb77yitc/M4zagaFJeFqLSZu696aHpz8TNrqIKW+XqWz3QjyeDGeroKzUJ36KgyURDQzagpqAwRlkzZDvA0RrS7SYO+pWVTmBiKSghHVIC8uiv3sTF4Icd34sXSGeRqc3399MbLzAUjyBL/HE6AxCSMoqBXyI8/my8Ac5i8hchL55VFeGTRjikjFFcWh6t8oHhM+0va98ywhNOxsm0T2F+Zg12ROojGEf5knmIg1839Sub9FjqUduWuIBc8r0ZhIE74k8tiWgIzFkKaDMyNG2HfyqTs4Mj9inzdPAyucUFTqYUTlyFO+Sirw2eBKGeonqzQ+1D7H7EsRZP3acUFJ/n1WJ8tVRNSiqHd+EuZLhcw1ja2HvL93X8Q82jHgzj6LoDaOuCFs+bBV06ONpotrLvdNaFal/4Vly1oIhLXG2f7OhAOtf93viaazHhgnbqvhLft4OVDaNXR9/GgcPlVTkJVmmRN5WbcHUsOed8Z0+Huw9FE8FTOU6RsIjoKiMUGbstFj8CrsB+9B6+lN/5387V4lf/gJG1d1EjNsghmaIzgtDEDIG8ishRJzz3wGXLwAHWThqfVd9JX33v4Au32KSMnwvS+2620ozQbXgcqg1gI9ks3WsFkpN7z+WTPPkIuS8CKHw7tRojAv1RI4HR5iNN8pKlSn3E61/DhXKxPCHsqvna1mXyfpQVuImdY5/j7h7bdNx6BLkd/OGuY4jYfsd/KPo4ybpnbqrozkFWflLBfP+fWU7ABtPB//xuTP6w3SEUD/JkRUx9ztK8aAJezhmKBmBcCSHGAtwQa/tmpxA== X-Microsoft-Antispam-Message-Info: kVJyK4XCK7A2vQaByeKGffj49075FbwcZ0oDRNI95MHx/TtdlodZcyxn7UKz8ySmJzVZZ/KiRhYrzaQ0I1qBpmXVdUnrdnEBq/updHizAvPcNHlHank/eDTVgqqUDa+mMaBoCZnlDkHfOpj2BVj3GUvSAj89Z92R+JqEXZvpnPMRcWoYgl242pl9z9hgmqTN X-Microsoft-Exchange-Diagnostics: 1; AM0PR08MB3347; 6:UhbWaj+iJSjSHjc4lWB/n9733/qVBnZVdiDGu8So3fxvhWVcDdiNcv26cWlR7gNnYzvmlg/ywZXTG/tvVFSxbs2MOeeu5GS558ys/DfhBFEpqpkeis6vw2IsnoWyeNDJpDAZr1NCHqxmIjDVEJMiBwOAlm/24plxtMMW/uxmUINoLMEHVRC8nzif26FkKy4prkGQG0rmeEZjGp1MQBbnn63jTVdnsgTIfrC2P5sr/srTm/e7K6V6tSbWrUHtO3TtcJOIr9Qfa9p9ryehpTtGFgZLk8302/SmnhP3VQORDBBGCxHOZ2ExaSVPyy7CJUuERtWdc2nY/gXl2TRbmVkhC27LAk6Bq4dz9nV6S55KRJ/N/Ho5ujk4AS/miWm6E2wZmOOjmqegM0VyE0RhSGqwuS/1CPmo8+AaIbSJmHgJzZLcHAHvki86ws1HCQ6SLOzv54m+5ZU+SA+z/8wdb7uBGg==; 5:eFAt7UfhWBUv9A1U25crSDtbcU3nFyMwnV0AbBl3OC9gHhQ0CO37dQJonfkqnlgXS00XCYQhlGkm0+l+stTezPjxtQ1d07vzqzIrU/YB6VmFUZ0Syw0+tRP7+l+uW0Q+y0E3R/AfR3c5yTFQU99WK69CCQDr2WvZtQK9vr/F+m4=; 24:vx0CRfAC1pty5CFUfotHRwnuN+MAOccFu55/rEjqEGqPiX+IRhcSV81SzSE+b1la8iqQNxqWm/bJ/OmXVdK3hEV54sLTjoFCbQS2wAWMssI= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM0PR08MB3347; 7:rXB717897hfpxe2rFR7VHx2FxviKtcSokg+Rqu5rkrQhFs76f6thRWjNylLSAFdP4pm+eejY8s89CFnVZk5TDpux346Paf2NucBvClD6kS8deTY3hDRJamhqvkjNpAm8Fq5Tnjiorwngks0ufUOaJU99cIh6YAL6KtKV7HK7qo67b8zrzV4FLxGoxhMk7VhUp78mh6CgelHGog1TjgXsQlX8pboURoitgr5/9/XooLdyp6xd8O3KUOub8AEomsaX; 20:VZE9kR9Wyvmzy60weCnT8slJxEHOPi32Dr/IKBEcehH77Lvl/t9GNN0h2OYi4bJIEXTnogiROGMrYRRJJm0gCQK7UlBjpjpJH7q+ZnW5vwrYCqxK5rpN5xfaXFbNUsdOD9gUZRYSFTp3gypmgdeqbwErIWu2Gc/SrC59CtrANig= X-MS-Office365-Filtering-Correlation-Id: 959db51e-c331-41d3-3ba2-08d5b4f42f04 X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 May 2018 14:58:38.8963 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 959db51e-c331-41d3-3ba2-08d5b4f42f04 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR08MB3347 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.2.131 Subject: [Qemu-devel] [PATCH v9 4/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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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: Alberto Garcia --- include/block/block.h | 8 +++++++- include/block/block_int.h | 2 +- block/io.c | 18 ++++++++++++++++-- 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/include/block/block.h b/include/block/block.h index cdec363..097feca 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -53,9 +53,15 @@ typedef enum { BDRV_REQ_NO_SERIALISING = 0x8, BDRV_REQ_FUA = 0x10, BDRV_REQ_WRITE_COMPRESSED = 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. + * If this flag is set then BDRV_REQ_ZERO_WRITE must also be set. + * This flag cannot be set together with BDRV_REQ_MAY_UNMAP. + */ + BDRV_REQ_ALLOCATE = 0x40, /* Mask of valid flags */ - BDRV_REQ_MASK = 0x3f, + BDRV_REQ_MASK = 0x7f, } BdrvRequestFlags; typedef struct BlockSizes { diff --git a/include/block/block_int.h b/include/block/block_int.h index c4dd1d4..7145823 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -661,7 +661,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; /* the following member gives a name to every node on the bs graph. */ diff --git a/block/io.c b/block/io.c index bd9a19a..660702a 100644 --- a/block/io.c +++ b/block/io.c @@ -1417,7 +1417,7 @@ static int coroutine_fn bdrv_co_do_pwrite_zeroes(BlockDriverState *bs, assert(!bs->supported_zero_flags); } - if (ret == -ENOTSUP) { + if (ret == -ENOTSUP && !(flags & BDRV_REQ_ALLOCATE)) { /* Fall back to bounce buffer if write zeroes is unsupported */ BdrvRequestFlags write_flags = flags & ~BDRV_REQ_ZERO_WRITE; @@ -1510,7 +1510,9 @@ static int coroutine_fn bdrv_aligned_pwritev(BdrvChild *child, !(flags & BDRV_REQ_ZERO_WRITE) && drv->bdrv_co_pwrite_zeroes && qemu_iovec_is_zero(qiov)) { flags |= BDRV_REQ_ZERO_WRITE; - if (bs->detect_zeroes == BLOCKDEV_DETECT_ZEROES_OPTIONS_UNMAP) { + if (bs->detect_zeroes == BLOCKDEV_DETECT_ZEROES_OPTIONS_UNMAP && + !(flags & BDRV_REQ_ALLOCATE)) + { flags |= BDRV_REQ_MAY_UNMAP; } } @@ -1586,6 +1588,9 @@ static int coroutine_fn bdrv_co_do_zero_pwritev(BdrvChild *child, assert(flags & BDRV_REQ_ZERO_WRITE); if (head_padding_bytes || tail_padding_bytes) { + if (flags & BDRV_REQ_ALLOCATE) { + return -ENOTSUP; + } buf = qemu_blockalign(bs, align); iov = (struct iovec) { .iov_base = buf, @@ -1671,6 +1676,9 @@ int coroutine_fn bdrv_co_pwritev(BdrvChild *child, bool use_local_qiov = false; int ret; + assert(!((flags & BDRV_REQ_ALLOCATE) && (flags & BDRV_REQ_MAY_UNMAP))); + assert(!((flags & BDRV_REQ_ALLOCATE) && !(flags & BDRV_REQ_ZERO_WRITE))); + trace_bdrv_co_pwritev(child->bs, offset, bytes, flags); if (!bs->drv) { @@ -1815,6 +1823,12 @@ int coroutine_fn bdrv_co_pwrite_zeroes(BdrvChild *child, int64_t offset, { trace_bdrv_co_pwrite_zeroes(child->bs, offset, bytes, flags); + if ((flags & BDRV_REQ_ALLOCATE) && + !(child->bs->supported_zero_flags & BDRV_REQ_ALLOCATE)) + { + return -ENOTSUP; + } + if (!(child->bs->open_flags & BDRV_O_UNMAP)) { flags &= ~BDRV_REQ_MAY_UNMAP; } From patchwork Tue May 8 14:58:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Nefedov X-Patchwork-Id: 910252 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=virtuozzo.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="Us4UPkoQ"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40gNC75sZjz9s0W for ; Wed, 9 May 2018 01:07:47 +1000 (AEST) Received: from localhost ([::1]:51692 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fG4DR-00081q-A1 for incoming@patchwork.ozlabs.org; Tue, 08 May 2018 11:07:45 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47889) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fG44l-0000I9-4x for qemu-devel@nongnu.org; Tue, 08 May 2018 10:58:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fG44h-0001Ye-0k for qemu-devel@nongnu.org; Tue, 08 May 2018 10:58:47 -0400 Received: from mail-db5eur01on0136.outbound.protection.outlook.com ([104.47.2.136]:52463 helo=EUR01-DB5-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 1fG44g-0001Xd-NF; Tue, 08 May 2018 10:58:42 -0400 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=zgzXLFFDB8YgjFnPayKJuVoYray8OagaCmTsbmRSVkQ=; b=Us4UPkoQx/sIFtUFbK7oUy0fYH+TY6K2MLhpQHc4E5qspcqdRRy/LIQgrmQAZwHCUafsbUBOUFWDgLlS7mRltx5A4skM5PamFrlBrFsv0pNSA/sWcFMuZUZc3Yk1qUr294dXqZYd3gt0mXkIeVqn8xZ4QjIel60jgaS3PsKQZNM= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=anton.nefedov@virtuozzo.com; Received: from xantnef-ws.sw.ru (195.214.232.6) by AM0PR08MB3347.eurprd08.prod.outlook.com (2603:10a6:208:5f::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.755.16; Tue, 8 May 2018 14:58:40 +0000 From: Anton Nefedov To: qemu-devel@nongnu.org Date: Tue, 8 May 2018 17:58:12 +0300 Message-Id: <1525791496-125188-6-git-send-email-anton.nefedov@virtuozzo.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1525791496-125188-1-git-send-email-anton.nefedov@virtuozzo.com> References: <1525791496-125188-1-git-send-email-anton.nefedov@virtuozzo.com> MIME-Version: 1.0 X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: DB6PR07CA0020.eurprd07.prod.outlook.com (2603:10a6:6:2d::30) To AM0PR08MB3347.eurprd08.prod.outlook.com (2603:10a6:208:5f::20) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(5600026)(2017052603328)(7153060)(7193020); SRVR:AM0PR08MB3347; X-Microsoft-Exchange-Diagnostics: 1; AM0PR08MB3347; 3:Pq9GD4BhgI75X+yR3HNt7uxYTrlkGrEIYLUEqyfEv6q92qP37DzxPQoZyS5DqHR5NU5wJEEOKWXLTqB9f1y5R+pnwgUv3NcwUeiFUzF6bjXjK2imR1fUThlMU4pR8AmzdezLLc4ftZlrpO7dlCEOqdSTJOcuGLg4ZrO/WGBnqsIJWFhh8WYzsQ2sNMMYl9lKG7+yoDatoSYY+YO34x2qjw0X4f22iWPENbNFDixGZmKFa5JhPPP2EbUC5UzfVqKY; 25:iQQ04OVcVTxwg9Vo1LBjtvTdbH2s3ZT65+3NGi6ZBzqXiQD5MBjr5/Y8/9G5F1ZbdH5CfU6tM/47YfAkiQSG8RwPsXjq/S09DsXOxeocSTSVWvFaMS/LcLLdQpU7zCjHXeMTbP2vOpmCnxs+iA9f89IXf42RDExiRTUDzwvVqpt2krPsd1LzgB4MqP1rYDGdt3RDPkxz2Q+QfCf4Eeex3peHpaif+8+GSQLFtoOwXIddY7N2oD/mOyhrBVuB5ot6JDwyinQhPT8WVYMrdgnWnLCf4L0zYnPLy2jQkulSqrRkuHZMAy9lK3CZbSMoSgO4BwG6S9JNZGD2OGXPFiqelg==; 31:T14pr26Uw/rp0jUiRBXG63Y60n1guvf+h+kZlvU9uqBEkqbl6REiL/1Av/mg90k/RvJSLHaybZjNY1+h1v+Ka2KVr1dzLQGkThzveNnwLzvBvW1lpfDY1818ChCLXVwB2U0ticZfEvy15/1/EY4UZ+8HoqGAUDK4m/GmwuY4xPtToxP9WVq6kxqOMQYdgJlWssR3TrGcFQpTENNdvPf9xFmqbwNP3DB4548vU0O92fI= X-MS-TrafficTypeDiagnostic: AM0PR08MB3347: X-Microsoft-Exchange-Diagnostics: 1; AM0PR08MB3347; 20:Kdy4UMwEhgMZeb+6ENbyrt1LKtL7sN9HzUSB/pUHAQg4S8YZH31yyp3X16WIleSaaf3aveUMaw/x1jtoEDgcfVxPAj8HqbIh5mLE/OAbSpBmeUm7uMUjjXiQmeZgx4oTd8neOMcPe+VdgppBHiGgSVbdArP7X1Z0NaVRZvVazyc3wfuV03n4qGsjQao8Q4H7MoM8L13ho56UvABnwMNY7CF+JR42fCJtXW42XvEmzm7BY5UrdgQAqRqJKdgZrhNVD1lYcsdcsYu+k7Kpsv+6qy/BjB4RZy0PXZ5vlAFDuFCPTUWQnmhaMwo1zTPTL1Q9ayZpQi8lwGjkRkhw94uxh13tzR64T4LLbrDTzMykIUOgoZx2CQXWyvxVJztZCn7nIQy6BpbIsZ/GgpWydI8G5SFVjV+tgHkn9twqon3hYw64M/xeMM+/OBZXs5FEimlPhkijoNVtOcgdq8xy1rmzst5YC8tLAC+LKFh9ZzHtzl6Z/FaDFp0tIO18LG8qwGZn; 4:HkT22RgrjFelasAT7FburnTngl+jiPvmLOdCzLXM+3silI6XQs4uNPxgcm9bNvO0HirnQBusd+uXl1PlHBZCy4LJFtIdMPp88eksidB3CphpOCWsSgz7w2lCOVss5MhZByFPd9Ev1eiwkakRjbeihiSPVQTLl/TLLuCGOgSoRIKqFMC+oh2DyjTCYQEFeotVMmZUCLlrshkdZM7k6vjUaYw4IChNROmgeJIUyaWEQee4lWEwBkwcvQsJDdwgCUITrivvJGDjb+RHmEFClyvPJQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(10201501046)(93006095)(93001095)(3231254)(944501410)(52105095)(3002001)(149027)(150027)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(20161123558120)(6072148)(201708071742011); SRVR:AM0PR08MB3347; BCL:0; PCL:0; RULEID:; SRVR:AM0PR08MB3347; X-Forefront-PRVS: 0666E15D35 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(39850400004)(366004)(376002)(396003)(346002)(39380400002)(199004)(189003)(5660300001)(6486002)(81156014)(8676002)(81166006)(97736004)(2361001)(6116002)(3846002)(2351001)(446003)(2616005)(44832011)(16586007)(956004)(486006)(316002)(305945005)(476003)(86362001)(11346002)(25786009)(68736007)(6916009)(6666003)(36756003)(69596002)(51416003)(66066001)(47776003)(386003)(6506007)(52116002)(8936002)(26005)(53416004)(55236004)(76176011)(105586002)(186003)(106356001)(16526019)(107886003)(53936002)(4326008)(7736002)(50226002)(50466002)(59450400001)(48376002)(478600001)(6512007)(2906002); DIR:OUT; SFP:1102; SCL:1; SRVR:AM0PR08MB3347; H:xantnef-ws.sw.ru; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: virtuozzo.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM0PR08MB3347; 23:raxm6i1dkhKmkcjSqeh8ZFIWxah7MfsAB58mfTxgU?= jkXYH9SBZmYcHhwOVJiEejgy/390bLzhcxDYDrbglGwRwYOgtTa0LNb7YKVy6C0/tQsqowZikXVc1mTVQMx45a4IwVc3RaCYB4/c8TxFiJeQuhdT4W6IqIolA4MENtwbnIMxogcyR56EsvfiZzwRL995KlPRMeOcmpzX/8HYFiQBCOQdLoRb4SdxUlVnVcauthKqDM/YtRVxkzhg67dmOjdtkpIaSkAwdKTE1/C1HjmgiWknSvDmSIY1wqQAe9wv5C6FMITpkzt55iXAEVMLTXfnkSVOg2nlXVGEd90r3gg8fTeTCCTana+wJM9As4UJhRH6rkokJcnwWUxbGIqKU6ujwtGebCwFDnfOlLg3siSJJEvu2fHHPeY/ji9KrO8iLTtnYdJZC693JzgDyU62YAdiEqeluqirMC0AKU/D4xaY2ehlZKmHN7MG5DE4swc45c5SLJbITpdEPIp/DamrQXZ14/9TWn5FEUsvCUFYE79xwpKlexWua/LhksThn7zRJsdMDQb0Lt6+QOm1uSXDPIfIX9awmEhRIxsEokucKh4HJlQcsOUR6LhY4k7vjpQwXJRKB7q/d3IlmU3HrVwzYdAsFQjeAKIRnOll0pnEks87zXjao2pW/vRWhbBovlNh0oPjc1fYeL3rudB4I8DtszJdwoXYLk/e9apOGy4y6qxnEby5XnuB/sCQC02fYE+lCYUocvVkqmSHxFQ2JV4dS/rlPMxRnoLYXiWneonEqH/lIb16iSCR38ytbjqbFETV7df2702mynWyJ9G9pGMWnQAG7L2e13U/bXfaGJ/mMGFc5YHZu3p52n3hrkkAeOMU3Ub5a7GzPXSswYF8fvMnZKTmV3iX0MH7fmDt/nfLSwIOrOS48fFYmNmIUgkhcPwDk0ZHMN+cX5m/e9PIefdBH6CfJx71LUqZXcRw3jAjIG1sTTAxtm2IkKKzazJzeYPxKwS4vI139tT8T3/lMGpMzjcLFErgAgAfrvdpVX+TQD8yIw67GnbbSprj1CagkzQmgt6+ICQL7Ckvgn4XL97Qn7oeUYdXx8Jw+QboPxGk8LF+TTdyoW9ca/SDp6i2KafSoV65QXkYdQsDaulbn9/QkNu9GoxoVeVUZqwOb0Etb4jYfgjULiB6wK4KP5ShRkSKhSELZ8hcU+J3rceaW6623rJDWRw6fgEnijX1wGtC8iICW8gb0pRcTDb6thEqU4QZUJG4nU20w7N+Pg0j1BbYRa/d8R3mGxWj5ed9HP/lZA+zmCzz0VNOej6Mivq+V/w1WtJiUAhXGIgXjBKfdLxyy3aOPFFI/LjDx68PXubSXuoeQ== X-Microsoft-Antispam-Message-Info: Nb2Y/x6LxzssX8TYrL4NtuSV0cJA/XZK+14+V3lBwvRVDJoriFm703KcAV+EBUewlFfZNRJbYjwmHZsDr1sdS9DdqIbFfIvj98lnBKxBRe734KAaWhPo5zKl8f+7sEUZqIntkAL+gmb3kgbChlSnvGj93JvohLGlJNtAKnYn0U4WDoEeOmpUmLO87yWjqbsq X-Microsoft-Exchange-Diagnostics: 1; AM0PR08MB3347; 6:MW5prc5ujaLFoYhfAbvqj9B+WS5lfOEKgB8Au40NgjPivSgv/6NR9QCV2GiHKc1hTJbFE9hqfWtaaepQzODQWIdkIJTS/TZYV+8/1bGskFPpmwA6ehT+8WMdc45sUfAg4+pr8Zv8oHT78acvXmmMWfCYbE5WtoblNRodGJRxEfs0QMtemYQIsf3zt46pKNxNMy3WX5G6I25mpaMowtOwHgbJV2VSMICtIwTittpvqqDj47Ix2jZrlqNHBrQYb38yuc+erNZBKL0FEePT/2bMwK6wyOic5o95xiykefvCd2yKbrdQI2fKpWUiYSZrKCkTwnwNmGwif1C2cylQHkrH9OJ/qzVP0s62tJCE5iLggYNcKd6NkkeEKkvpN/UsD1yMbJIoNktPETvyjPAlPFCXmrJxT+/NG27rfwgBf9wEUZRbPJMbA0bSV5mYxsfhsjIDIC4lgSkmp4g3K5/LSW946w==; 5:e2lxhWLltUCtYnqFMQ+yGcAScnRl4nYLRoOSsRq9ag4uuDW0VfYTxMm5QDQ1MEo7LFe89xIQuggMAbHprCnh1PXYdBvFUmy/11CqfJHOv9mq1iiCBiBveSyis7UQesWH/Y3KcNq9DgMWOYvqOWFwiuBSUoCkTUPL61RcaUp+SlE=; 24:hNw70eZkuMLT/gA6kaUqGC8F7r1hN/75bvd2sPG3N6Jmnj5SAibEw88gIPc9XTUfrY5JdSu0pFld4CYH2frdx8DkrJU1jnvzfagt5IrMUas= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM0PR08MB3347; 7:YzMpoi4csRmH4nY9eK0qYuvCC1RjPEmHPlPRQUxZYCBHqZ0nSLsiQbHBO+DSHyCoLTyRYq7fWScK1Y5yGp6oHl5q8c0Tk2JwFTu+lhiWkT5SE89AcVfW+DIi/EOJVMCbZCHg9b+ib56RjERxSB6M2tWEvC/l7gHb1guG779wQsDSf6OW/F4/dg8bIeG2d0xhBRgqv1VmGcc8icIk+sZ367VwA+iSQw2TT9dappMK/F7A2C51MemRJxrhx/NyfRQk; 20:YUM2jRFcDdaavf4atgX01szeN7p53IaGQS7QA0OhYhL2X52CBx97n4xW3J9R6Ly26Qqm5ZBaY+sWlyp7q9GRhgFeZvjVmAcA+q9KizULMaLfsdYWIs/myLsHQhCkgy2uiSYxhB8KTy54ldosSoEU1PlO5QOkZRMcnKLcKvUvVM0= X-MS-Office365-Filtering-Correlation-Id: a2acffaa-12e4-445e-6ea8-08d5b4f42fb9 X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 May 2018 14:58:40.0682 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a2acffaa-12e4-445e-6ea8-08d5b4f42fb9 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR08MB3347 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.2.136 Subject: [Qemu-devel] [PATCH v9 5/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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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: Alberto Garcia --- block/io.c | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/block/io.c b/block/io.c index 660702a..a2fb69a 100644 --- a/block/io.c +++ b/block/io.c @@ -598,12 +598,13 @@ void bdrv_dec_in_flight(BlockDriverState *bs) bdrv_wakeup(bs); } -static bool coroutine_fn wait_serialising_requests(BdrvTrackedRequest *self) +static bool coroutine_fn find_or_wait_serialising_requests( + BdrvTrackedRequest *self, bool wait) { BlockDriverState *bs = self->bs; BdrvTrackedRequest *req; bool retry; - bool waited = false; + bool found = false; if (!atomic_read(&bs->serialising_in_flight)) { return false; @@ -629,11 +630,14 @@ static bool coroutine_fn wait_serialising_requests(BdrvTrackedRequest *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) { + found = true; + if (!wait) { + break; + } self->waiting_for = req; qemu_co_queue_wait(&req->wait_queue, &bs->reqs_lock); self->waiting_for = NULL; retry = true; - waited = true; break; } } @@ -641,7 +645,12 @@ static bool coroutine_fn wait_serialising_requests(BdrvTrackedRequest *self) qemu_co_mutex_unlock(&bs->reqs_lock); } while (retry); - return waited; + return found; +} + +static bool coroutine_fn wait_serialising_requests(BdrvTrackedRequest *self) +{ + return find_or_wait_serialising_requests(self, true); } static int bdrv_check_byte_request(BlockDriverState *bs, int64_t offset, @@ -1473,7 +1482,7 @@ static int coroutine_fn bdrv_aligned_pwritev(BdrvChild *child, { BlockDriverState *bs = child->bs; BlockDriver *drv = bs->drv; - bool waited; + bool found; int ret; int64_t end_sector = DIV_ROUND_UP(offset + bytes, BDRV_SECTOR_SIZE); @@ -1497,8 +1506,13 @@ static int coroutine_fn bdrv_aligned_pwritev(BdrvChild *child, max_transfer = QEMU_ALIGN_DOWN(MIN_NON_ZERO(bs->bl.max_transfer, INT_MAX), align); - waited = wait_serialising_requests(req); - assert(!waited || !req->serialising); + found = find_or_wait_serialising_requests(req, + !(flags & BDRV_REQ_ALLOCATE)); + if (found && (flags & BDRV_REQ_ALLOCATE)) { + return -EAGAIN; + } + + assert(!found || !req->serialising); assert(req->overlap_offset <= offset); assert(offset + bytes <= req->overlap_offset + req->overlap_bytes); assert(child->perm & BLK_PERM_WRITE); @@ -1623,6 +1637,10 @@ static int coroutine_fn bdrv_co_do_zero_pwritev(BdrvChild *child, bytes -= zero_bytes; } + if (flags & BDRV_REQ_ALLOCATE) { + mark_request_serialising(req, align); + } + assert(!bytes || (offset & (align - 1)) == 0); if (bytes >= align) { /* Write the aligned part in the middle. */ From patchwork Tue May 8 14:58:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Nefedov X-Patchwork-Id: 910254 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=virtuozzo.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="XxGo/pZx"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40gNF92hLLz9s0W for ; Wed, 9 May 2018 01:09:33 +1000 (AEST) Received: from localhost ([::1]:51710 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fG4F9-0000tu-2K for incoming@patchwork.ozlabs.org; Tue, 08 May 2018 11:09:31 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47892) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fG44l-0000Id-Rj for qemu-devel@nongnu.org; Tue, 08 May 2018 10:58:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fG44h-0001Z3-DF for qemu-devel@nongnu.org; Tue, 08 May 2018 10:58:47 -0400 Received: from mail-db5eur01on0136.outbound.protection.outlook.com ([104.47.2.136]:52463 helo=EUR01-DB5-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 1fG44h-0001Xd-6b; Tue, 08 May 2018 10:58:43 -0400 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=W6aSNrgqLwqoNEcV2Y9Q9T+6EaunAd8M+5KvHnValAQ=; b=XxGo/pZxRjV4gd0ncg1nrL1BrJ60ZoZfJnMRlC8qykmcmOj/Vi2xD2+MTQZmXKQDVdf2nyoCILj9apK2X/1zrGluf8Do3EMpHWOvta/H4JtORUwAEBJVBNldRjsZMcOe4Y0rPKQr438jqAvf2N4aLd9BRfK90hqWiVXOzDLtKik= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=anton.nefedov@virtuozzo.com; Received: from xantnef-ws.sw.ru (195.214.232.6) by AM0PR08MB3347.eurprd08.prod.outlook.com (2603:10a6:208:5f::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.755.16; Tue, 8 May 2018 14:58:41 +0000 From: Anton Nefedov To: qemu-devel@nongnu.org Date: Tue, 8 May 2018 17:58:13 +0300 Message-Id: <1525791496-125188-7-git-send-email-anton.nefedov@virtuozzo.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1525791496-125188-1-git-send-email-anton.nefedov@virtuozzo.com> References: <1525791496-125188-1-git-send-email-anton.nefedov@virtuozzo.com> MIME-Version: 1.0 X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: DB6PR07CA0020.eurprd07.prod.outlook.com (2603:10a6:6:2d::30) To AM0PR08MB3347.eurprd08.prod.outlook.com (2603:10a6:208:5f::20) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(5600026)(2017052603328)(7153060)(7193020); SRVR:AM0PR08MB3347; X-Microsoft-Exchange-Diagnostics: 1; AM0PR08MB3347; 3:R3Mn6Uo6+KkE7YSTIo4boowjrtfuWbpZLhAoL/VNDug2b0XoRM9QjgGPwleduXJx0XoYBRDEF9F75LPj3JfwhK5fCGq/iGngQ/I1fl+u3wLi5liXgsYdA+rK6N/eorLPow2MKmULg2Xkf7g+QoiO3FFGokfK4GeAbHNvNLERI6qob2EiyRPo8xVYt7E6oUlwFtFaob66unrSWP5pZ9CoOQjyzzQaZSv1NCnC7arIRUSZmTBvB45Wt3f+YkT3mWxJ; 25:gKzQfkzuKcan3Xp96uCQxRo8bnOpASzBSoje5OZybI+rmId5gjLUZStlcuTP/u2m0h6LNZqodUR9lYYgoknJveMxHztLPBQQzeyXLT52CHk+uHuA+76vIuxdLfuHozXA/YsnaSBopSUDkq6PWKgciiRklmUH0XARH6GHXqYo++9BZuB422cATiYQtJlVqm27WZb0ONx4YRQle5KJ9urTiYcGI8+J71w7orYiklISYID+1GGqG5QJXkxF7AfiSt73r2kO2lYpgd9iaIjqoVRP0hFGU7eCJ+zitd3/M10ywxNE3dxYkB9iWVO3I8Smm91SxL6H4F6I7JZsBxgBGdoVNQ==; 31:X5vd8VG7JurjH59v83MtNPVSCFWOjXj+4sitC2Gx9LtaBlYbn4RYO1xWD+nDqANkDDh+p6UK0vUwvX7oJeWxa4InF+LrbKoO7i9JOC/3dQPdIUl9BM+iXVpsjGxYdwgl0EGNmG1324lNlnRZmTSEBxWiGWFiBj7LR7mkWVHLuToBd4G1/QfPAtUx17E+d9k+11ZvmADSV4lxDrFJER/LC75+FTMHEA+2sCwOMPUXGU0= X-MS-TrafficTypeDiagnostic: AM0PR08MB3347: X-Microsoft-Exchange-Diagnostics: 1; AM0PR08MB3347; 20:YDsoKaD2ID4X1rsxHLKsFrNTzv5erxc5fDEphauncziWfB4T5epOEL7gwR/pr0iNmx2Dj3pWZbYzfevbcgmSRmRBSFcP0m3cIIadfW1g0iXh2pp6+sRGK8tBKeHV7d1AO+lPV6yvlEjJtBiWUr/nxenK44esR8dlyrHc00rVHm2GqbC7+tImAhdUi2zJ4S4eOzUKOt+oqcldEb9O/OFVzUyffZIgGEPTfPOlLyihOWz/odl43sbGETkYrfcRH/28sQfRYpZhbNTNgmRtNKxq54W7konI3+MEYq7RUIv4Crr71E1eeyLlEeDaeSgStKiYS1xLJYxuReSes8ekzqfSwW5ta8WKiXrfw11ln93sfQF9lskvhEtLcofgNyIOZMIY7zfUNO29zAHnXcThpll+/7duDDYguTdjiFWgGwSxL+ZHjginyrV2kqoF4aUX5tTs5G6hGpbOVl/0SM9MUWjoME6iwC/9T6FSXtWyZcdhnKXqacgxwaMf4YU9jZH/M4NH; 4:s0IfW4hm2vp1NW726Fb85a8M7bWNDR/HWh0t135Rsx1bZXRtNN2w1GuUbuO5HP2ragHDsZvRCki8gVtsa/qNWrI5zsxVMwoNFBExFR+h1q5zZOSbVINSrhPoa/O54GRUxWLeALr/0BYD994304dQmGGfyKaClsE4OU4nczBLUcPiBOPyZ+8J1CT799L87Td98eXtWEEKBsQI3Y8p5dHx6fSN8VrlTqzVVaM+h0aAvOPfLYZyPHWxtO7zLhAVEgD1ECXr4Y1iMkl9CEtQmPSccg== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(10201501046)(93006095)(93001095)(3231254)(944501410)(52105095)(3002001)(149027)(150027)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(20161123558120)(6072148)(201708071742011); SRVR:AM0PR08MB3347; BCL:0; PCL:0; RULEID:; SRVR:AM0PR08MB3347; X-Forefront-PRVS: 0666E15D35 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(39850400004)(366004)(376002)(396003)(346002)(39380400002)(199004)(189003)(5660300001)(6486002)(81156014)(8676002)(81166006)(97736004)(2361001)(6116002)(3846002)(2351001)(446003)(2616005)(44832011)(16586007)(956004)(486006)(316002)(305945005)(476003)(86362001)(11346002)(25786009)(68736007)(6916009)(6666003)(36756003)(69596002)(51416003)(66066001)(47776003)(386003)(6506007)(52116002)(8936002)(26005)(53416004)(55236004)(76176011)(105586002)(186003)(106356001)(16526019)(107886003)(53936002)(4326008)(7736002)(50226002)(50466002)(59450400001)(48376002)(478600001)(6512007)(2906002); DIR:OUT; SFP:1102; SCL:1; SRVR:AM0PR08MB3347; H:xantnef-ws.sw.ru; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: virtuozzo.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM0PR08MB3347; 23:PFVmxrdQvCZqSG2DCEU632azANTswcOcZLLq7zw19?= /2MtrKCMQz5ZBPRh1s/sV0MrH8r5V8jPIbjzrUcFTxDFUhVTq2POOZANWa209GOrRIq8QmbkuOdhcg3d1uUMzHEh/8grtiEAO1nZWxCYQn/QeFz5v26sRhuVYiSz5Ww8O4BtLK0gnLYrAqyBDYyJdTQcf4omtwKJngXIueIZXiE9XPfuR8NO99dME0A9zZ3fozstQitd4Lp3lAt88QD72K3WGr23HHh5UVo/zV8sKiuZI+FtCekoR7O16hPpgsnNKzBJyXMVmaJtFOc08p/ki6tiYiAUi1oHGnDW7CeHi8zcodkzI8j4zSSpUabZbyj5p2gPDK9a8Ig2o8wAG4fXsm6W9YrT08C6E4MzcR+EJryBFJGUAnkT1BH+MP4XfMinJtFXnVKqSTKqOcf/qm3BIGisp0etKR34pSZd3CJ8oy2GwbJkUcWOEJRYB+StHUF0+A0ysowH/XDEy+05WwwzZnm1zgVX5U4cS2VKPtVLdS9TZragtowb/P8Rdmr7MPlvTCqZEDq9GA6ErZN3YlMeqCD8i7bQNA2yzapePkQITocl4UyIeSm45YBkzCyPqcmqHwlzZDXjs6BRvMusaG3C65ygj0t4JJ4eiFNm6il/IcVCApTBSY8QH0f2dSdMUW0wg8xdFsUn+oDwEq0oaA5HH8abYXp19XbQApPM6N4wLsb5C1kikuKPIoDEV2ArW7D3S7LdF8wBP09oiHSdtlMlaQn2p9AokDCc32ZTQlNhVRVCEruQfy0GFUCjO5tKAGHv69wcSMD6EiDHAMIvi6vQMJMGNY3+5m04ebfBd/3m+btLL3nGSVsVbC+b3un7BXY3MAooijKUy+hN2mgH1UxEeE/oRFyMfqbm3dQLXtCQprg6aAV0da2u/x5/XM9WEXREGIO0SwThjRaUN1oyfHDxZoaCwbdEbNleX2tybSoFXn5jPJEc5Z2EUPGBgH9tJ/jMLk6g0TFsKx3Pyazkk/akRvaLrO0FKpSgW0qQsCXBEol0fhJAOgi7oze6jPLF7QMrB8QjEEu3+0Eo1fykrOcCVYRuUMJO2rHn2vZRLqiff75U3QuxlflHGFUBDBjqgaq6M7jfsGCWSWFtgrsEZRtJXMZk7sEJwV2SnYBNqII2p4TB63mfSQ+xWFgYm0OO6RKvldRVwLkyQXTovPVLWWTVubPizPin7VhoMZMbDdR28O/ar9/p+6SgrSsXFtaPgbCx+SyH/dKCNuUmCf/D7Rf/7NB3O00YLONYiFXUMnjacVkEyXD8XV1I1brf9v+b3DIBVwyD3g3U81Ntt8QbIlvZm2mMlbHovQUgFky/6NFJeQPvQ== X-Microsoft-Antispam-Message-Info: 0vm2FIpUnCk0/qCw4dSURouc6IEOXp6b3fUa9Gng2fiwSN/tSQZZ6H4pf8I2SAL8NLqkg4xpCNEVY1dILqXRVCiCLSEWWdPp8dzBIlfrCRxNholwDIKwX+OGG7VKpAhqevbuY6A1To4TvonjZbBaNe4F1cxy5rRAeVlKZpqJRRVjyqN83eRaul59RGo1p5v3 X-Microsoft-Exchange-Diagnostics: 1; AM0PR08MB3347; 6:Ohqa8GNbNytpRmPUXMiso5CrnrEcWdFHM/cw3ay0PMNC4C5SAOYAh3er3sFB0HPS0OHJ2PgEVbgNQnsaAQ4Yj1AMbqCzLzP4w5PmXD7oznGFp5UGd1bf8CYa7/hlXW+e146sX6sAMFh/BBF8FHxdQrD5DEKimFqLzzsWsMaHUN/sTLQAXvNJW9/mf55yZ/KYtpByCh3EsWDVTXSP4mBgn71JejyalTRi8wpyEx3JgqdYkizEeZxiA+MUSGM4I+6CRQRAUlU2xya2sUajDiQHOzGioWoWxs0SDpmVGXUUTFJ5BSb7tAaLRskoQ3sF/VgwLox0FcUmLBGoYVplywWdGJ/A7vBphVbxX8rg7/BY+ITtQIfPCDpd3d5Hvu+Fa+i53p2soGjtTdiq+WkazXz7Lyun4xevnI5cQ1kS3ySoVMABuM3tQfh0Mn13gVby1X0k2p7WiCjMkProtMDEH9CKrA==; 5:lmd6u8nyKDeRSu6EYJ+74enhqoY1hOtr60EF7V+evJknjMK/h44CBgvBvVjO9REnXilI4SCa3zcDkRIvUN/Okhh8Qa5KYGjshxStxcV8fXOmgFmROkNp8MGfTdXUSqOlOs0XfPgrvGBuylvvj9yjSI6STm2iG2QUzRrnpNylShE=; 24:XjHUizGRsqqeMFWh8xeA6NBt2/UItxLtMUsDYwPlIL0E7+y0+4iOsvs3EInWt36BXhCPI+9i8W6S7vBnvStqSgI8uvdbN4Vf+f7uGqSEnp0= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM0PR08MB3347; 7:fEJt3CTfU92gM9jmp4091ph8AO5bG+TzdP8yWIuFhwZr+feK8SsOyKV3WYnO7G6HCWkoQ6q954riUQ0YWn0mKT8HRmA+eYQTrU4brNF8TUusimsYAnYKGW3aJH1rLSxYFlANK0ffAgBXi0QMlC+EUJumNo2QslmWBHBBDDU/R7TZZihMHCkcU2QK8l6N1MGes6MtoqdDcO6qYY3aVyND5B0UGLnlKkhajX9f8wpIqaefuau8H3GJPNriRAoshKHL; 20:m3MS5/ctMgQFZYNULl4bdNZFS9Rab2s+GP8Xfhf1qapFikxwi+Zbcxh2YmWhNDyh0xxZ1lCB511GeKQJrPn/XACyX/xsLwQghPW5ZzoD2pq9SSimepgRFgfXvdpvEMMTHzLqNujMeKRJU67+bOs1mt58X8Bt3fIwR11UtDvbtd4= X-MS-Office365-Filtering-Correlation-Id: 39527534-42cc-4814-b5dd-08d5b4f43062 X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 May 2018 14:58:41.1776 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 39527534-42cc-4814-b5dd-08d5b4f43062 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR08MB3347 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.2.136 Subject: [Qemu-devel] [PATCH v9 6/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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Current write_zeroes implementation is good enough to satisfy this flag too Signed-off-by: Anton Nefedov Reviewed-by: Alberto Garcia --- block/file-posix.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/block/file-posix.c b/block/file-posix.c index 3794c00..3795e1c 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -560,7 +560,10 @@ static int raw_open_common(BlockDriverState *bs, QDict *options, } if (S_ISREG(st.st_mode)) { s->discard_zeroes = true; +#ifdef CONFIG_FALLOCATE s->has_fallocate = true; + bs->supported_zero_flags |= BDRV_REQ_ALLOCATE; +#endif } if (S_ISBLK(st.st_mode)) { #ifdef BLKDISCARDZEROES @@ -595,10 +598,11 @@ static int raw_open_common(BlockDriverState *bs, QDict *options, #ifdef CONFIG_XFS if (platform_test_xfs_fd(s->fd)) { s->is_xfs = true; + bs->supported_zero_flags |= BDRV_REQ_ALLOCATE; } #endif - bs->supported_zero_flags = s->discard_zeroes ? BDRV_REQ_MAY_UNMAP : 0; + bs->supported_zero_flags |= s->discard_zeroes ? BDRV_REQ_MAY_UNMAP : 0; ret = 0; fail: if (filename && (bdrv_flags & BDRV_O_TEMPORARY)) { @@ -1416,6 +1420,10 @@ static ssize_t handle_aiocb_write_zeroes(RawPosixAIOData *aiocb) } s->has_fallocate = false; } + + if (!s->has_fallocate) { + aiocb->bs->supported_zero_flags &= ~BDRV_REQ_ALLOCATE; + } #endif return -ENOTSUP; From patchwork Tue May 8 14:58:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Nefedov X-Patchwork-Id: 910240 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=virtuozzo.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="MvPlOhsw"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40gN4x2mc1z9s27 for ; Wed, 9 May 2018 01:02:25 +1000 (AEST) Received: from localhost ([::1]:51645 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fG48E-00034c-Vy for incoming@patchwork.ozlabs.org; Tue, 08 May 2018 11:02:23 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47921) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fG44n-0000Ji-Kg for qemu-devel@nongnu.org; Tue, 08 May 2018 10:58:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fG44j-0001b7-Gw for qemu-devel@nongnu.org; Tue, 08 May 2018 10:58:49 -0400 Received: from mail-db5eur01on0090.outbound.protection.outlook.com ([104.47.2.90]:24016 helo=EUR01-DB5-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 1fG44j-0001a7-8C; Tue, 08 May 2018 10:58:45 -0400 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=Uqjga9BaNVylnen/0PMi+1TMal1Cf6GtYZ6h42DDbjk=; b=MvPlOhswW++TiKUqlaSqYiKODf/2UNPiZM3WYvmb2f2KBOUNQushqqBtE2sc97pOMNVoQ6lf/ZZpajQYYH6Vu0PmBh8tTdDB6ez3sOhv75GxrMvrHLpvbBS3Z9Bnq7qEEpas2qt5aSiOSY+FZHiItqCs2LZC49RfqLslc7t3Smg= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=anton.nefedov@virtuozzo.com; Received: from xantnef-ws.sw.ru (195.214.232.6) by AM0PR08MB3347.eurprd08.prod.outlook.com (2603:10a6:208:5f::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.755.16; Tue, 8 May 2018 14:58:42 +0000 From: Anton Nefedov To: qemu-devel@nongnu.org Date: Tue, 8 May 2018 17:58:14 +0300 Message-Id: <1525791496-125188-8-git-send-email-anton.nefedov@virtuozzo.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1525791496-125188-1-git-send-email-anton.nefedov@virtuozzo.com> References: <1525791496-125188-1-git-send-email-anton.nefedov@virtuozzo.com> MIME-Version: 1.0 X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: DB6PR07CA0020.eurprd07.prod.outlook.com (2603:10a6:6:2d::30) To AM0PR08MB3347.eurprd08.prod.outlook.com (2603:10a6:208:5f::20) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(5600026)(2017052603328)(7153060)(7193020); SRVR:AM0PR08MB3347; X-Microsoft-Exchange-Diagnostics: 1; AM0PR08MB3347; 3:2ASzc/8M63+8+X2fDedKdzUpF9vAGX04d6QMtudotkUGIQWU0y/icpCtYub8nGtdmzrodT3GTEEXF0Jdwgz1OXW0y3BIVLbaNTau2WzofYaP8nyUcZwpduvFYGtaBu7o19e5d8um6YT/EyoQ+zcLM7CPdBqm1UC4FDstFSLYwhUH+rLKVgekme0MrQvfygG3LVRhMdHGsIXjACGLtBvleWz52WoFBPRPNYeP9bamDGACPAHEwo4Bxl//EJb8p3JC; 25:eK6wK6ilfkct2BA8nP8k+Rq3Dd+n4HUqZNzCA7uPvIEVLzIcUWH+0Wb+5/fWHB4u5PQ2BOeqWq0J+dFCkbLUocKqKBKHmsCpzF2OSUo9HsmwE/Y+XHzkLsegMu1dnRExLgtoD2psuK7XuUutJusgeg0lIVc4knfMh6K26qR0j8y8h7NDU0BBBC3V/9aohp1aLSm/CSgDblRp5PiuodPWj0db7OL/Ym32neu72issbET3lJQ0OnJKT+vOv2MfmZS14JJazHDcB4Cn+lQeDWtYu2TmVkfIXmO2NSshExKu/64k1Jc9xIk7egUzecwMlKLMBW6iwURnpTqlYnF3NVN5jA==; 31:39G1XHnktlQesUP0SnyZwC1wyGU21DY/1U8HJL9aEyFEqwkBc5nnJwblGD/yxIBAxmlo7MJMjJjENy3VsdakJ7nGEuDWCrUkUbeiBVJgkAKQMvsBF+ZEWUCHlBezVACkgcpVDgvZySZ4SDt5eS6KftHzv/OLN2pTXNn3zAyyO16dxinGKeOew9sB6qoAEGwyc75X7d/xZZNgfZlRQxjkKI14T7yPdPpJnvUrNEylXJg= X-MS-TrafficTypeDiagnostic: AM0PR08MB3347: X-Microsoft-Exchange-Diagnostics: 1; AM0PR08MB3347; 20:Hr0HGLBEs7XVh1uwpM/MxJ2y832AbhjsC3pm+vvEZMyIDYmI5mPw1CztdMNORc10EGfPH5sTGV8Qj+H0keayewnF0WGEbCLrEEU3DfNg0d7O5w5bo6JQ06JaRiw+u0pPghQG7VR4pzCvG8QvFz9EOjEbJ1LZLhe631ICRDbD0yhLjkQukR1gZvt+ifXF7dWuXc6Aok/wYTMrWI0vlGHzApUgCkKnozIQ4tS8oZzxFo/lVo0oEAWOwMLYwDeXD4nOHMQrONKiKsypzLwvNdFSA8fCn/sxdtSJBFPUQr1NJmoY7liCbrT9Ro1tcpVx9v0C7RXoEp3QuE1REwwRM/LsSKnvTVZic60T0SiDaC43u18tj1S+J44d9WN4Gqk2aX9pCTFrMezlLDDVSQevkf9Ak7EhkulcmRhUQCS5jq6bFDi9kcGTfRftqfYVkVPbkNZ/fB18G3yjQV7SrYqnFcucakjlLVO1f5QhZV9dZQKC6L9keehN8Lf9WL8a1sxuqxFa; 4:nLabi3Kz0PfaGAk1jkJCVZFLhzdMjdsVup4JxMTfiPhMARAphlm8rQD5Ai/QwqexS/P6W+PWApV4oz0BVtAvIwYEvtbw7nYG14GgfpfxGwrwXTRA0XXAF5YsvuQWC81gSbXCJeXwEeaA+2hSxM+kzG8d1Em0NYKpinQ0R718ut1LAxRwktudK6TcUmpDgpmkuH+hzvN6+sKkFm0odpeP5SQ/4tybqpWxlaBG95IBdwFmZPZKiBcHsgaX/Y7nyPDiRSRknCEpfd6GdEZcgJHXKg== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(10201501046)(93006095)(93001095)(3231254)(944501410)(52105095)(3002001)(149027)(150027)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(20161123558120)(6072148)(201708071742011); SRVR:AM0PR08MB3347; BCL:0; PCL:0; RULEID:; SRVR:AM0PR08MB3347; X-Forefront-PRVS: 0666E15D35 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(39850400004)(366004)(376002)(396003)(346002)(39380400002)(199004)(189003)(5660300001)(6486002)(81156014)(8676002)(81166006)(97736004)(2361001)(6116002)(3846002)(2351001)(446003)(2616005)(44832011)(16586007)(956004)(486006)(316002)(305945005)(476003)(86362001)(11346002)(25786009)(68736007)(6916009)(6666003)(36756003)(69596002)(51416003)(66066001)(47776003)(386003)(6506007)(52116002)(8936002)(26005)(53416004)(55236004)(76176011)(105586002)(186003)(106356001)(16526019)(107886003)(53936002)(4326008)(7736002)(50226002)(50466002)(48376002)(478600001)(6512007)(2906002); DIR:OUT; SFP:1102; SCL:1; SRVR:AM0PR08MB3347; H:xantnef-ws.sw.ru; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: virtuozzo.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM0PR08MB3347; 23:Z2lxJJUBcBUEG3dj5+g6ASwn4+C4oCCkRrSsY0xBY?= GFGxuuwnzFAv8Cb2HnchKiaDPa03TG6T2yvfkze4FOPfQkMkxEHh3E+Nq08882eZG3wNYF34IZ4eVkCcS4sqaHPOEbnpGiIu7V5fPIySQBqG6MOqkCzh92kNbO2nnRuUfV0a1qZm4JQ7+QyY57rXWje6XtZMmdRlrXAUWeYXHwh6xVpBBYrZCOPOE9EQaAVGXTGGtuC1vWQ24j17PtFzMhu39k7sZ4XZ6fIg8RTtn0kcYhftcxxsrS99Sm9+0S2ydq8NN2rnJ/td0vhRcpomSdt5081/mKkKoiHJ84t6oGy17Z5S+W/TvPRnH2Pk5WG78ABYF+Lh54qk1sLtEA+w1Geey88Fg0dFc3baqfc0+zMl83SIOO7n6KFZSzorX0OAOm3WUda4n2n1Nzpmu0uLXwaTcIkqU+GVEzp4LUCIRXGmKVoU3wDLHY4za4mhJdcvvy4OWOdbvI1DJ6OUOZu7CKgMafmIJPJuTkOo7i6wajSMdb/Zkrj1dArY12Xm7oFdOo8VxJbAQSv1M/pJef6sOxdb6MXdGVZNdViQcWYEvYQEWWBZ1dL7kM1GSZX/FiPXb9drVWNmE/5NdThNICBqI6WKVtHAi2Z876q9/BW1/WFLVYkw2nFq7W4JmHmDsXefgNFJyjmMJoi3ovuNCbzfo5ankkKBTvvROro3+Rq2uRAe2GYbwiRbqd2aB1jygUfkoPUqeatu0Yy+1Zem0zxIrBzjkU4SWbcITJHSeE82mcNw3ghN+w7PylAEkU2retPlACsxpS2JS+WnzG2Fv49kXIoGnwEVSo9cIVHX5WAQ256xJPdr/0sbCOJSOvcETFE8ZKakmi9NpryJdX2KbbrHatYj1kZw4WpYfy9WF9XCq2GNn0Ps9kopn5T+2qa24vQzZ4kWAB4qu1G7xABsSEzBDTQs9lHgX0Wcr7lFLYj83+nfYlQSZ2jnswOFH4gsQT0esgojUhxfiu5IcPMEgdXE0vO3MGzcGEFKmrR7xDyKj+fKNOJpaP0KqGjqH/PQF7++IIiIlTn+yUfNZwVIRwgTnBz+ZfQCl+/hTaTkzbeCLh9f3P1+FYUIWvXOqyozR3ErO/NQUpjr8m6zWLU0EDNC3TL7Zbynb1pQ5LN5FyBr+pPam9qTOvFMFmPXBUmFtugsS8SP3wNhilmtBlBl3zRxbajOhlP4Uw0PUxt3WVjZyNSMB0fWu4UEeNNopchv7c4WP+d7rtvN23UuDWUl8bPrFhCPwNi4sOkZN32hGA+tTO1RMSugvL+NwAQAI2HKX0sklY= X-Microsoft-Antispam-Message-Info: PfdOH5mjULSUUhv8cjCKktrHD2FuJ8QWsqJC3IdxwB5loxVomr862plY6Sg8eXSCXeoYESfSjYu6a6P9ps25C6nWRCzo3Q2EXV53mTIqbTF8AGk+xpWnN7jDkK1VSE3BwnTCQBAvN3qgo7HK2eLvLV/YWsxBkDyIfG7DSw5gZDPt0lclElLJiBdKTU9MpuI9 X-Microsoft-Exchange-Diagnostics: 1; AM0PR08MB3347; 6:woxvpaZuaBt2MKT6xiuysZge0eEWBV2hpGW20A75xSTapp7kiTXOJcy06XCQ4FPKiv0K6tN5V0wAHlyJC8Zbd8+jKaIju5aqWjNPGmzex0FnFIbGKw8NUayXTGPInuIhAEFdnsn5dlgz4nNmOZWFLj9DrA5/AePRqMk2tQ6gYWYTK5Z/g2VR0kb5NahpSy7+D3OXd/ucuu8MFTx7jGRqmpHXZ1a30okoDwhHaDrIIK7oZLPCK/nHqeE5d38IqHAvhZO5Rgm376VBSWAJbSKshIuO/qjN8/SYvD+Co6+9y8VVww82vqGqHTLG0va2Sp+7BvXtQZLpNYKMGp9dmdm259cLLmNa06Q8VbO2mctXM7bNE86SmYu28o3aDUg9Aialq1xP4xnZ8AlaRZvcdXbSTWYwwJEBPayr1TMX7q7kmrEhjN9V3j49beyyr76jF+HCq6A2B1ZhZbUh4LP/zYrR2A==; 5:u1XZPdpvVTTFKOpSPovu67Jc+lv27a9oESaa2WR5ujkehR+dolHvehVp8S+g08niQ25wVYf+d7sJE0EHDa3nFV86kDYvhWdangPuV73SeDyJ94pv4BDjXe5PFi+GRdjwYrytcQ0BNirFs7pnoh6mlSukCcOkrcNd8KwtCxWvtUE=; 24:qHXSPztROQgJYoTN5XMBjZlSqb355QiNYRHfBi/dTGjhCm4FqLPdZ7mSQo0C/dHb7k3Gc66qC97qaQE+vOVQK0v3IvJwYETqkRPwBH2SCYE= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM0PR08MB3347; 7:h/DMS1InWnNGwOUZAjpghmbfD9zAzyN1Ls+CXp1Ryke80cfqFiiku+qj50mwopRSprot2UZrE4G5L4etLpiaSYp/JyVMQ8WdixdGsnxC8IcuJYV/PdszxmIC0PTqzlHyqnp9zYcDnAN9VV9M8CPoZkW/shX+1TdJhnnaGx0Q4wsWt4S2RMezMq+bb+Pw4+Ri3WcnW99QJ2td6c/QrPWaizlhj2eZeKe1WbhBxiHFhYZfgv1tyQnmY/e21bK7Z7mz; 20:iQBTyhwfOAeaf8o/Q7Dw9NZotb8oHvUPD5aKC9pdhrTa/PpWuazhwOMPIHEP9x4rINaGIFD8R853VXNGxIyX50PsEBa7PpOGTo3SKmCWT7w3lD7HvCKJouXIhuMai0y6SAE9K+sYER7Tq3K758BIM8jxJxhaJJscSw4J403Bzn4= X-MS-Office365-Filtering-Correlation-Id: 2adc3ab2-aeae-4891-22d1-08d5b4f43132 X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 May 2018 14:58:42.2557 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2adc3ab2-aeae-4891-22d1-08d5b4f43132 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR08MB3347 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.2.90 Subject: [Qemu-devel] [PATCH v9 7/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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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/quorum.c | 3 ++- block/raw-format.c | 3 ++- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/block/blkdebug.c b/block/blkdebug.c index 053372c..f5f1232 100644 --- a/block/blkdebug.c +++ b/block/blkdebug.c @@ -400,7 +400,8 @@ static int blkdebug_open(BlockDriverState *bs, QDict *options, int flags, bs->supported_write_flags = BDRV_REQ_FUA & bs->file->bs->supported_write_flags; - bs->supported_zero_flags = (BDRV_REQ_FUA | BDRV_REQ_MAY_UNMAP) & + bs->supported_zero_flags = + (BDRV_REQ_FUA | BDRV_REQ_MAY_UNMAP | BDRV_REQ_ALLOCATE) & bs->file->bs->supported_zero_flags; ret = -EINVAL; diff --git a/block/blkverify.c b/block/blkverify.c index 496ae09..fa95f22 100644 --- a/block/blkverify.c +++ b/block/blkverify.c @@ -146,7 +146,7 @@ static int blkverify_open(BlockDriverState *bs, QDict *options, int flags, s->test_file->bs->supported_write_flags; bs->supported_zero_flags = - (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; diff --git a/block/mirror.c b/block/mirror.c index a22ddef..6fb3aa6 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -1103,7 +1103,7 @@ static void mirror_top_set_supported_flags(BlockDriverState *bs) bs->supported_write_flags = BDRV_REQ_FUA & bs->backing->bs->supported_write_flags; bs->supported_zero_flags = - (BDRV_REQ_FUA | BDRV_REQ_MAY_UNMAP) & + (BDRV_REQ_FUA | BDRV_REQ_MAY_UNMAP | BDRV_REQ_ALLOCATE) & bs->backing->bs->supported_zero_flags; } diff --git a/block/quorum.c b/block/quorum.c index 26e7d78..349bdc3 100644 --- a/block/quorum.c +++ b/block/quorum.c @@ -873,7 +873,8 @@ static void quorum_set_supported_flags(BlockDriverState *bs) int i; bs->supported_write_flags = BDRV_REQ_FUA; - bs->supported_zero_flags = BDRV_REQ_FUA | BDRV_REQ_MAY_UNMAP; + bs->supported_zero_flags = + BDRV_REQ_FUA | BDRV_REQ_MAY_UNMAP | BDRV_REQ_ALLOCATE; for (i = 0; i < s->num_children; i++) { bs->supported_write_flags &= s->children[i]->bs->supported_write_flags; diff --git a/block/raw-format.c b/block/raw-format.c index a378547..ca65f86 100644 --- a/block/raw-format.c +++ b/block/raw-format.c @@ -417,7 +417,8 @@ static int raw_open(BlockDriverState *bs, QDict *options, int flags, bs->sg = bs->file->bs->sg; bs->supported_write_flags = BDRV_REQ_FUA & bs->file->bs->supported_write_flags; - bs->supported_zero_flags = (BDRV_REQ_FUA | BDRV_REQ_MAY_UNMAP) & + bs->supported_zero_flags = + (BDRV_REQ_FUA | BDRV_REQ_MAY_UNMAP | BDRV_REQ_ALLOCATE) & bs->file->bs->supported_zero_flags; if (bs->probed && !bdrv_is_read_only(bs)) { From patchwork Tue May 8 14:58:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Nefedov X-Patchwork-Id: 910239 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=virtuozzo.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="D7raqaEV"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40gN3K5ZsBz9s0W for ; Wed, 9 May 2018 01:01:00 +1000 (AEST) Received: from localhost ([::1]:51637 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fG46s-0001ul-0A for incoming@patchwork.ozlabs.org; Tue, 08 May 2018 11:00:58 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47966) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fG44q-0000ME-Bm for qemu-devel@nongnu.org; Tue, 08 May 2018 10:58:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fG44l-0001cs-M9 for qemu-devel@nongnu.org; Tue, 08 May 2018 10:58:52 -0400 Received: from mail-db5eur01on0106.outbound.protection.outlook.com ([104.47.2.106]:58640 helo=EUR01-DB5-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 1fG44l-0001bO-6B; Tue, 08 May 2018 10:58:47 -0400 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=G4UyHSyGadH517vuqTaEqlZxdu9TU8LiMsS3YNcOKIo=; b=D7raqaEVQDCE2vXI8X9IIuE9MGmzWH0AVgy2jINpyr5UMaJedUQzx7LDsnfg1tH2C5nYnd89rqJqW0XbyCXRQo1Bbo/EFWdZ+TCj9fSnXXJaqK+Gw58/zXVcmj86c0o710L/z1XOQ71YpLm4mXoWhglleMpcB/h1ol1JcVXJ6+0= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=anton.nefedov@virtuozzo.com; Received: from xantnef-ws.sw.ru (195.214.232.6) by AM0PR08MB3347.eurprd08.prod.outlook.com (2603:10a6:208:5f::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.755.16; Tue, 8 May 2018 14:58:43 +0000 From: Anton Nefedov To: qemu-devel@nongnu.org Date: Tue, 8 May 2018 17:58:15 +0300 Message-Id: <1525791496-125188-9-git-send-email-anton.nefedov@virtuozzo.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1525791496-125188-1-git-send-email-anton.nefedov@virtuozzo.com> References: <1525791496-125188-1-git-send-email-anton.nefedov@virtuozzo.com> MIME-Version: 1.0 X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: DB6PR07CA0020.eurprd07.prod.outlook.com (2603:10a6:6:2d::30) To AM0PR08MB3347.eurprd08.prod.outlook.com (2603:10a6:208:5f::20) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(5600026)(2017052603328)(7153060)(7193020); SRVR:AM0PR08MB3347; X-Microsoft-Exchange-Diagnostics: 1; AM0PR08MB3347; 3:FqScvbNHBDC5tifDUE/ThKNxZmH0voBg2Q2jF9qg5J6I9iZvHiHIvJRMDP2j+x3CP0QKcaTcUiHTgAINd5+SJABX2vmVXucCC81HvhXIE7SV+rcepWpQj361B/hxHXORWZLCM+tBJErqOfwBhqR/xlJ6jjSIHTAFnJS3gd09XCs+wwbnaMfgxWXFn6ZR2R/uxbURXXvzv7VtXL4B3XozuIQbO6csPFlYfVrbpmrDg5IaSF7yO+tOOy7+4Q2g+eLN; 25:/mHcuEoaoMW1SMY3it8gYNEhK2Nki1zzqpB23WYMbD0lh0Ec2+Iq3cQPLKtPGIslIZfSy3sy3iO0aNoicxqZRkCmVe2CB+W1KItAOc+6B25XiuetOVmHqQWid1EQhpuvBhX77LeuLRr6nAvjARPg0L04cEvSatbKfzcJJneShX06beP8HWcxvPSihFhWuwZtke7dgwj5x1nQjczyZe89dQXtano2VBEUSYHCctJ3xGY1QvIMRye7BP3YcS5eVxOIXeVLV5YJd+GPw6WApQhpPfwS95UM/YQG/0u8uxtZY0oFT9auFhAH8/mgk0+cDpmoK1d9WX+HQD0RIn/DLyEd+g==; 31:auLWFTbpFJgcotMJjpz7pca1drzyp9hRj5yqSBHm8dLscYV8nQs9GM8YJoZHNpN89HBnUCLsG9rz9jvEzyB3BmmN/h2MyLgylQQLNaQs1WiOpidQrnmDc6hzxJcJIoS3mPFXTHNO4wAuhlQh9B/3NR6SxrzwZLW+/tmZbV1nrE28zLg/t3FKO8vJrcWVpDmanDALHPt1XgIzZ0bQH9o93hjWjMyAeQt4tsHgYm/R3ms= X-MS-TrafficTypeDiagnostic: AM0PR08MB3347: X-Microsoft-Exchange-Diagnostics: 1; AM0PR08MB3347; 20:YTRHQK/3OmUByDXZrGGGrB63dSvh2aZ+H1jsWqESpGAMbegKRjky9xEsK3q8IXYT+iPpfKmI2qz0SJlSS5wEQiq1ZvfaXEvhkjBS43O7gRFKMYpMgsI06B1n9xghXyA67ymV/RAUumkphb0+7KWMwo7ALEzthZqQY2m9eTnUMzrSWqo71ocePxSMVLtjRXRNj8yZTveV+Cm+wYnLHGC8Ih55H9U1dJbGIXTdx0Xs/N3IdFuNpN8XuJ72Z7exDIVVh4my/eDrVWqs8HJ989nYyO4477CJtv65se0qgF7eGoI73ZQzFjaXasL2QQHgOO5lULTBQVIgYY2aWnJa9SeUEImMXKZcSRJNJKTUETDNU2jPW5OwquJLQm9dnxunfpvtRhztCEcZBHzqUXLFxXFAkgFEDklD8rhciEfL6vDXKuf63qJVVt2rZbexKCeHYM8zo0/sXruJhGhPk1aHLxdlu7Fd1j1zYygANIAmPH07nOeqFoL8sVwh37OD/Bzqng1h; 4:OSWKbI9jTaenBm9T559RVLfsMY30NivTLqofJSET43ggMLmDeoM90O5UJZpGRlhRvZPN+7a7Pv8Nk9dqgWD4Sz9I567tRq9PY0zB9oKSgIklFdOQqzIu30gcQsComdLaIZrXU6I2P/EAVd9+Wz69RgjcCuukuNSxAwc9XEI16+P6os+OqNA3svuHwd/WdcPDiyFz586j9pEixTKsKDeQ967DtrRLCDiQY8V5EWQdhdq6G+mN0ylA5snXvCtEMXLQjTgTdOJU3oFxE5ocWtyRrQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(10201501046)(93006095)(93001095)(3231254)(944501410)(52105095)(3002001)(149027)(150027)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(20161123558120)(6072148)(201708071742011); SRVR:AM0PR08MB3347; BCL:0; PCL:0; RULEID:; SRVR:AM0PR08MB3347; X-Forefront-PRVS: 0666E15D35 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(39850400004)(366004)(376002)(396003)(346002)(39380400002)(199004)(189003)(5660300001)(6486002)(81156014)(8676002)(81166006)(97736004)(2361001)(6116002)(3846002)(2351001)(446003)(2616005)(44832011)(16586007)(956004)(486006)(316002)(305945005)(476003)(86362001)(11346002)(25786009)(68736007)(6916009)(6666003)(36756003)(69596002)(51416003)(66066001)(47776003)(386003)(6506007)(52116002)(8936002)(26005)(53416004)(55236004)(76176011)(105586002)(186003)(106356001)(16526019)(107886003)(53936002)(4326008)(7736002)(50226002)(50466002)(59450400001)(48376002)(478600001)(6512007)(2906002)(21314002); DIR:OUT; SFP:1102; SCL:1; SRVR:AM0PR08MB3347; H:xantnef-ws.sw.ru; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: virtuozzo.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM0PR08MB3347; 23:CZ/9G7J8AFRmZTQtPRHRNGYGFpiRJKLVcv6ekD7Bm?= doT1c4dEqhhVY7SqpJUUgkSlxGPWmxDpUH46Da94Ew9F5/sdpv/m9b2IrpAJubo0k8sPk8ZRr9AKrc87Wcqvbn5e9R36BLrkhC6eWkexCKJIRhpX70g+mPZmV0rLDwzENfvLWiJS80r+xQgOJ8siAjLSRUj/jGyHcPbzzbfjYD1SsSmrtjh3A6wfw3uWWobIme9x125vc/WZ8pV9tGxUrfBWRbYeBbBQ7qRnR6nzLz4L1Yv1y1RiOmjfXdCAatiIXur6XRslmseED/aQi4+8vl2Lq00C7MeZs7iIgMMdoZGEioMMROU4uF7TQFWchDL1w6L6zll8bK5Xof0qq+nAmTzZAmk36kHfuPCyr6i7hF5CXau32yeh5oC99SwcTC+rqCbaYsOcast8j2h8tzhUhXvgoiAopXq2v7Jm5wlNWMPsrRKmyuN5u1/X4dEiXMQOXMN/T9P0D0oVA704dIKr+OC0h9DUQ1bKxqDLr/B1R2eQEeHSsYSdNZrKBPCkt21fSeWjqqD4TgjfalDjS+ePCYr/rZFNuyHfGnrhOwaGDopPJxDVWfGlyD+USOMbBTQ4vDAZ9q0eH3f3MeU3zbsVcCdlBxRp+0XQhWDtvmldiKdjxgU6wDiW0o555KodgpouBaQfD28FN6hyx/JO0tsC3plfqRCFPSpzNM30sw8Jxzt4G7s0GzFuVweMNUCDK3n3Tf3MfMWen781cCcGos/rD8M4KJaHfPPCF40EKKhXkxW4j2rA4qQi1MICdx89JNtPyRvaiDDmuMsjlZt4dYZFbWlV+BNvq1P1IdeMqKuHwMn87/X6VbxfW22hvSPdELUcYSsr6dQqr3u0ofsHv8wTDIWW8Ci6fpaXx5LFQR56VCG38DS6o5oeH1ahbxUZ/yoTpZxwP3Kd3NRn9TgtrGqfXHHzaVK5noVsfSn2DjAVpi7nqSu0zeNnpO+7guBIda8wFB6i7+BNsXg8R2Toap3JDEAZQFvwO94Rmih5P0ZTJQbmdFyfl0IazNC/GtqNNfqp2L/mvP60S58WOiJ3NheQzVJnL18zlEMNjWZjHPsdncYzf3EV63cI2ADl0g3Jas3GoYWukrpSLFEsXUQPnhj/zVUUx4rK1lE5A6f75B/QN0CVA1h6x1Ac0HdLezvJrBDR9xEV4akmbjD/yCoBpP+RW+kFmzyR012XYs++wzNvcXmuhTteF+SMjoX2afahOms/IrCBTdYqBRzcE0BdQANqxQm8v+5tOC7oEc8VPwiFGPd8YcrKhgXcfRuVPn8TFNOA5nO/ZiTpFKu/AeHs0hsGfvr09IO+4lqmz/6zti+jhOSQUGSM3RzXw7Cak6UWwdzpUU= X-Microsoft-Antispam-Message-Info: 0UyRHuepqaOgVtc6KwdCclMg4u24/w4Pu8FxNR5tXK1Xs/1R7ib1KU3JqTcB0W3LAA7HONiUuNitTb2smhT7xBRgEoMUSNPTPvx1VntfI3y90Hh+AoDBeZONs37uBErMxszEImOqqRUUfwZZTJl5nL4R87EARMsjjUfEEQzRqhlGyKF5YzwgM9LQj6INZhbA X-Microsoft-Exchange-Diagnostics: 1; AM0PR08MB3347; 6:sLv4ilTTEO/MSN7DGdMTVfm3DxVb/2QkkIAmV51TTgQrDJfV0KZTYGfJYkdHigl1pYqkDxkx+Clw6QNPty91XgXKA72h8pst6ZzrPXN80tSmGupcrQsH9DCuIYiGP+nRjCYJ2T/wEnJLVu9s77ZgmZK6DAR2yocVzdYtwCAZ7HvTdk82OLJ5+2nXNhK6pGTD0FZydBx9wFoHevreQQKjsI1JGUCE6NmUXuNNGY1c2pTnmO039GMLqpwM9vTJehCgo93YhZj0syjKGEE0Fd+1qUP5wjnLRvgV86d9ozuKZaSOwxq0d8t5ZJl/+ptZCRuA8kV3VyejQkQRxLw9j5LipAyAjm56FDyXgQSLbew/lYiIWBy2B7A51/pXHFBfGlhAoCNoEoBvL0BJhj61Gs0fJnjH6fdaCECSNRVFKgiLAtPmZ4YxyQWckKmjdiIgO+2h7NySm0n//cO93LFnXyyqtQ==; 5:qm5Jlg7BrfqJx8SnzifQn2Bmb15A6fbzlsoPF97HSCgSqA+i24t3cUAcSFkosidQcFhDHsXkBNUVaqvqSc399Pq5+A3QEv7cO37mqHeOg32uMrbGBbjys5K7Mfmi4TQEx0usGIl/ZHgyUB8CflFTRVDAEx/jh1wsZzFZpm4XBkg=; 24:/cs69lO2vyGah8XWeb4Y6FPLQfOZjEiOETtdqXHNfhCgX9x/z1srruqRVZ/Z5XaRHmSo+we63Fdw1WY5jC/NIsAwG40tfm0MRdBjGyyTyi0= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM0PR08MB3347; 7:6p8E9+5JFLQx2jhVaS25mjCkVhMY6N+PQ3b46R81daeTHvzq2W2YBGDaSICkAoR5Szh8sw8t2pEB/aukPk86ycup5uovt7BQboCDxSAIHbzO49fCZWyWkawK6HmNpep6U+EN/tCTVBTDwE2OylVlO3tljRAQU61rLHXS1WsWRen81mgbIUAe/BnWFXcPWLBNNuiR3eXQpCNfp7OL9+SAFyJUP0yHKUrFiphmZXqwYhNxU23cnbymMzWI3SCSdyTD; 20:3bhSJyod/Cw3ZFRetUKJ6oZDMfXNuHdNIbSNIg7ogjpKhdlvhFSbPlxxbURKb9yyOTTp0vkIG/toUT4XdOP7qEZbhLhEGFh08d+ce35iEoeZ6DlsUSom14Sm930nGodBRNVPPiu52558xmWBSmgQqPh3uu6tdbKSzC0LU03V8c4= X-MS-Office365-Filtering-Correlation-Id: 4af42a2b-2546-417a-430b-08d5b4f431d4 X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 May 2018 14:58:43.6151 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4af42a2b-2546-417a-430b-08d5b4f431d4 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR08MB3347 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.2.106 Subject: [Qemu-devel] [PATCH v9 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" If COW areas of the newly allocated clusters are zeroes on the backing image, efficient bdrv_write_zeroes(flags=BDRV_REQ_ALLOCATE) can be used on the whole 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. Signed-off-by: Anton Nefedov Reviewed-by: Alberto Garcia --- qapi/block-core.json | 4 ++- block/qcow2.h | 6 ++++ block/qcow2-cluster.c | 2 +- block/qcow2.c | 80 ++++++++++++++++++++++++++++++++++++++++++++-- block/trace-events | 1 + tests/qemu-iotests/060 | 26 +++++++++------ tests/qemu-iotests/060.out | 5 ++- 7 files changed, 109 insertions(+), 15 deletions(-) diff --git a/qapi/block-core.json b/qapi/block-core.json index c50517b..816c44b 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -2900,6 +2900,8 @@ # # @cor_write: a write due to copy-on-read (since 2.11) # +# @cluster_alloc_space: an allocation of file space for a cluster (since 2.13) +# # Since: 2.9 ## { 'enum': 'BlkdebugEvent', 'prefix': 'BLKDBG', @@ -2918,7 +2920,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'] } ## # @BlkdebugInjectErrorOptions: diff --git a/block/qcow2.h b/block/qcow2.h index adf5c39..2633853 100644 --- a/block/qcow2.h +++ b/block/qcow2.h @@ -380,6 +380,12 @@ typedef struct QCowL2Meta Qcow2COWRegion cow_end; /** + * 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 1aee726..d364d29 100644 --- a/block/qcow2-cluster.c +++ b/block/qcow2-cluster.c @@ -806,7 +806,7 @@ static int perform_cow(BlockDriverState *bs, QCowL2Meta *m) assert(start->offset + start->nb_bytes <= end->offset); assert(!m->data_qiov || m->data_qiov->size == data_bytes); - if (start->nb_bytes == 0 && end->nb_bytes == 0) { + if ((start->nb_bytes == 0 && end->nb_bytes == 0) || m->skip_cow) { return 0; } diff --git a/block/qcow2.c b/block/qcow2.c index 2f36e63..019b54b 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -1916,6 +1916,11 @@ static bool merge_cow(uint64_t offset, unsigned bytes, continue; } + /* 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 != offset) { @@ -1941,6 +1946,68 @@ static bool merge_cow(uint64_t offset, unsigned bytes, return false; } +static bool is_unallocated(BlockDriverState *bs, int64_t offset, int64_t bytes) +{ + int64_t nr; + return !bytes || + (!bdrv_is_allocated_above(bs, NULL, offset, bytes, &nr) && nr == bytes); +} + +static bool is_zero_cow(BlockDriverState *bs, QCowL2Meta *m) +{ + /* This check is designed for optimization shortcut so it must be + * efficient. + * Instead of is_zero(), use is_unallocated() as it is faster (but not + * as accurate and can result in false negatives). */ + return is_unallocated(bs, m->offset + m->cow_start.offset, + m->cow_start.nb_bytes) && + is_unallocated(bs, m->offset + m->cow_end.offset, + m->cow_end.nb_bytes); +} + +static int handle_alloc_space(BlockDriverState *bs, QCowL2Meta *l2meta) +{ + BDRVQcow2State *s = bs->opaque; + QCowL2Meta *m; + + if (!(bs->file->bs->supported_zero_flags & BDRV_REQ_ALLOCATE)) { + return 0; + } + + if (bs->encrypted) { + return 0; + } + + for (m = l2meta; m != NULL; m = m->next) { + int ret; + + if (!m->cow_start.nb_bytes && !m->cow_end.nb_bytes) { + 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 = bdrv_co_pwrite_zeroes(bs->file, m->alloc_offset, + m->nb_clusters * s->cluster_size, + BDRV_REQ_ALLOCATE); + if (ret < 0) { + if (ret != -ENOTSUP && ret != -EAGAIN) { + return ret; + } + continue; + } + + trace_qcow2_skip_cow(qemu_coroutine_self(), m->offset, m->nb_clusters); + m->skip_cow = true; + } + return 0; +} + static coroutine_fn int qcow2_co_pwritev(BlockDriverState *bs, uint64_t offset, uint64_t bytes, QEMUIOVector *qiov, int flags) @@ -2023,24 +2090,33 @@ static coroutine_fn int qcow2_co_pwritev(BlockDriverState *bs, uint64_t offset, goto fail; } + qemu_co_mutex_unlock(&s->lock); + + ret = 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 = 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; } } + qemu_co_mutex_lock(&s->lock); + while (l2meta != NULL) { QCowL2Meta *next; diff --git a/block/trace-events b/block/trace-events index f8c50b4..f85a980 100644 --- a/block/trace-events +++ b/block/trace-events @@ -70,6 +70,7 @@ qcow2_writev_done_part(void *co, int cur_bytes) "co %p cur_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 0x%" PRIx64 " nb_clusters %d" # block/qcow2-cluster.c qcow2_alloc_clusters_offset(void *co, uint64_t offset, int bytes) "co %p offset 0x%" PRIx64 " bytes %d" diff --git a/tests/qemu-iotests/060 b/tests/qemu-iotests/060 index 6c7407f..e6ed8b2 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 "=== Testing overlap while COW is in flight ===" echo +BACKING_IMG=$TEST_IMG.base +TEST_IMG=$BACKING_IMG _make_test_img 1G + +$QEMU_IO -c 'write 64k 64k' "$BACKING_IMG" | _filter_qemu_io + # compat=0.10 is required in order to make the following discard actually -# unallocate the sector rather than make it a zero sector - we want COW, after -# all. -IMGOPTS='compat=0.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='compat=0.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 before -# doing the read; then, trigger the corruption prevention by writing anything 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 second L2 # table. Finally, resume the COW write and see it fail (but not crash). echo "open -o file.driver=blkdebug $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 echo diff --git a/tests/qemu-iotests/060.out b/tests/qemu-iotests/060.out index 25d5c39..00a6702 100644 --- a/tests/qemu-iotests/060.out +++ b/tests/qemu-iotests/060.out @@ -97,7 +97,10 @@ read 512/512 bytes at offset 0 === Testing overlap while COW is in flight === -Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 +Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=1073741824 +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=IMGFMT size=1073741824 backing_file=TEST_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 From patchwork Tue May 8 14:58:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Nefedov X-Patchwork-Id: 910245 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=virtuozzo.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="Kb0wmeSx"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40gN5C44QHz9s2k for ; Wed, 9 May 2018 01:02:39 +1000 (AEST) Received: from localhost ([::1]:51653 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fG48T-0003Hh-3B for incoming@patchwork.ozlabs.org; Tue, 08 May 2018 11:02:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47969) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fG44q-0000MH-Eq for qemu-devel@nongnu.org; Tue, 08 May 2018 10:58:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fG44m-0001dT-4L for qemu-devel@nongnu.org; Tue, 08 May 2018 10:58:52 -0400 Received: from mail-db5eur01on0106.outbound.protection.outlook.com ([104.47.2.106]:58640 helo=EUR01-DB5-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 1fG44l-0001bO-TF; Tue, 08 May 2018 10:58:48 -0400 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=3SuavverubBYMiuKWKs7v4oLZkCJfON8z+/1zkFuxYE=; b=Kb0wmeSxzNf+rSm14tZoOoLBZ82W8m0u5UqFyhsEgtpXzExlRYWjZ+cL4vaCb0btQyFGBA93F0AG12Tl/1inAGlR2Utkj6uobBopiShuXSMNY9dnBTSZaK18m2tzHwHpUXe6CFZErGGG7QxGfIUS6bLQvrY9dXw03z7wY2s0xx4= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=anton.nefedov@virtuozzo.com; Received: from xantnef-ws.sw.ru (195.214.232.6) by AM0PR08MB3347.eurprd08.prod.outlook.com (2603:10a6:208:5f::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.755.16; Tue, 8 May 2018 14:58:44 +0000 From: Anton Nefedov To: qemu-devel@nongnu.org Date: Tue, 8 May 2018 17:58:16 +0300 Message-Id: <1525791496-125188-10-git-send-email-anton.nefedov@virtuozzo.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1525791496-125188-1-git-send-email-anton.nefedov@virtuozzo.com> References: <1525791496-125188-1-git-send-email-anton.nefedov@virtuozzo.com> MIME-Version: 1.0 X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: DB6PR07CA0020.eurprd07.prod.outlook.com (2603:10a6:6:2d::30) To AM0PR08MB3347.eurprd08.prod.outlook.com (2603:10a6:208:5f::20) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(5600026)(2017052603328)(7153060)(7193020); SRVR:AM0PR08MB3347; X-Microsoft-Exchange-Diagnostics: 1; AM0PR08MB3347; 3:Ybruy5j8xcHb2MiTKgkYOCsSxwaTJEOALNJIC7pOavkKN2gReM0vFYAEekltUKvK52RpJI0t4CEDQsRmVcMMsQDjP4fqmGoLjrcy35VHoY4LTp3gKF3PaLA936k2CuNHaq2nKLfkp5ziJMdIQHTEzJkcdJUvulLpCC5Shte1k5tCVw+RAoPs+pE4SatmMZNuBRrYF6jZ7CIhGdFIPLs/xqT8C2/PLD/oedxiZMco79Ye+vkI+FnzbrSy59npjglO; 25:0upyadUXDBItglWjuU1njAH48vcIjGGj8SJ9ExQLa8Vc/qQmTBadXgfZfjBY47L6w2d46zTAycqTiACm83WS7hlhgo2aMKoY9LvpW+2JezTsZj9na79bknevEC2WTfups7jMHoyX3oXXtgjLdUFa2iaGcyYW/hv2yPdhasqA/LhLj++XZ0jlR6edfLE18wPOI7u9yJO3W+n1Nyv5cbzJng2D84Td1CuWl434UyGDhw3BfOdzEAbBlIloT5/ViiRot3XabZkqg+xbC5D0v1kArQLfXJJPzHn5xdeO5WW8emUegFs9HKIEvM6O8lSp29yFdQy715Tae1OABhMcq+/MTA==; 31:WvUVffB6XGxljCpOxeFwW9bzqVnwSxYY1xIIuEsQNW7V/PYsIJeqWOm+XG5ONLifRXVApuAdrzxorM4MsOlADfzQ9tDe++vsRDid2Wyy553HJTNdCjwFhn6Ap23nkxAzVexIQKffQdW0tms7JyUPS8bvZ9CYnigB7o6BXLOtpi14C1IPsnuFUAugN7ibF734P87pfwvxTcIhf98F4Q9i32K3hogg8CiP1k8vpgg65T8= X-MS-TrafficTypeDiagnostic: AM0PR08MB3347: X-Microsoft-Exchange-Diagnostics: 1; AM0PR08MB3347; 20:QpSli/GFHB20EW72RqNTHYvA0x8QNPrzgRZ3t6/qbX1hZ0ih8xe4PyJSDaM3Av5/U7hLAQ7PjLri38ShVsLNIBc6SQKI3LdsEYbLPsKYgQXJvi/1srZLnEqmSdOcaLL6fHvLbYr7BViKlkRTzMKLcsfPFgg6rusCOQEdN+GzwDBq0caVErCwmw7vi/IxRMH8vN6S5orkqoCV4xwWmelsMCn6rqebj01n9gAnE0tZNK0HTrZrjfAwUP4zg7zfjWk1He8/AYiOyjR9i2YZHJIA0Qz35jiRWI3qFwwu+7qsarBxWauZDUnAvuhDQzmbgeCXl0zI6LmRQERQ88KrJrU3THUaVmqmjzLrXn8cbaxn3rzFqcGtQ6jNmL9Pl5oQranTPcsEttSFPzra2E6E6HZKMOH96qOMHrWtm8dwtNilSAXLOSnzefawP7Dav189GPhRbMXugIBTDqgsVVTFXuj4yvVHFtlkQQcln29WSCBNdmX2lPZn0hI3fE7NYMy9ptR/; 4:gX4ZUFgIb10DMQ80+M5599u2YkhnK0yB0oDRCVnK96hRgBN0Oca0V/eryV6mARMfiUryjQ8MIpqUmfeW4ZbCxNj2vJFUPe4RmAedZjkQmfynpYLkkG+wiS+zDb+2nIspNRJo0F0hkuenzI9YjJ4p+vSYXnMfeP503I24gLw1vdd89JsFLNLjPAWdH6OmdRP03bT+wSG6oSA0vjDbnnLO3Az0Zxy/pUzOuwcu+Qa/lqa0+8X46Fa6m7Xj/+9fmtRXiE822XM4PiewGYdkST9Tew== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(10201501046)(93006095)(93001095)(3231254)(944501410)(52105095)(3002001)(149027)(150027)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(20161123558120)(6072148)(201708071742011); SRVR:AM0PR08MB3347; BCL:0; PCL:0; RULEID:; SRVR:AM0PR08MB3347; X-Forefront-PRVS: 0666E15D35 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(39850400004)(366004)(376002)(396003)(346002)(39380400002)(199004)(189003)(5660300001)(6486002)(81156014)(8676002)(81166006)(97736004)(2361001)(6116002)(3846002)(2351001)(446003)(2616005)(44832011)(16586007)(956004)(486006)(316002)(305945005)(476003)(86362001)(11346002)(25786009)(68736007)(6916009)(6666003)(36756003)(69596002)(51416003)(66066001)(47776003)(386003)(6506007)(52116002)(8936002)(26005)(53416004)(55236004)(76176011)(105586002)(186003)(106356001)(16526019)(107886003)(53936002)(4326008)(7736002)(50226002)(50466002)(59450400001)(48376002)(478600001)(6512007)(2906002)(21314002); DIR:OUT; SFP:1102; SCL:1; SRVR:AM0PR08MB3347; H:xantnef-ws.sw.ru; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: virtuozzo.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM0PR08MB3347; 23:IwJMqNUjlU3qcvdmF0sbqLByK90YDGohT6tQ3gLRe?= 70hLysfqMxOGJumE4xJyw2QtB9Fh+jAsq4IitjgoR/nGe5TZmEbRWKiCYqfeEGtyqXLMauW5lTUB9f9QIOY31l+fHI0YCqIi8N2Utk8sG5n5ih6U7OstLBZXytp/XIE97Qk2g9G3+ptwNN97pklOj5MWXDueGLydOCQyHpa12+Sj8PlQY+QFn8QBT915fe2kHJ4v1qNcvZ5MjhPpbMqJcALgHViy3KnMMgbGeNQaUkE1B7KFxij6iR4Xd8U4cLeU7nPNoeBz2qKwmhSqB1Cs96/Jb2ZoI1EO64PiTTT7LZGOiiQW05RFtHd5AV93MZl6yXHlT2waJWF3fGDTOhsq587RHYPuQAP/Qha836xMqf1OV/ABOZ0Co1i7OSfECtysgmfB994/nRl32LPRdI2YfOtgq12u0h/QU0hAKsfAsiXiOlRbXy1uQUvatlN7CijIkddu57FkVVawc7/Kskosg+/JPpYCbK9YpNsiGYxcN+hoAI2IRW896tdyqFCL7M6UuX5snQCbkcUy+enl/KnMDit/Tw5dYscEC9LcBUko9qVUGcTBuZKS6OM/22Qbii0/mxTPyrmwhan+GdKa32rtbtoVQY7zYss0k4HKgMgYsdXoyX7rruQ0UpD2o/FIqsR47IL2qOCxI/u84WMYzEV2DNvWGnbwhqVMfdAcXapi4g6ZiSSh08uv3iz2SBcKuGL+IjvejwuzAUv80aBFvprNVpW3NUh/X2EiY0mISKcHI38xjomboR/01AlMHznXibQQpqv/6ZdvFL0rELAUSE/flehJd4H4OPETmjqX5zWn8n0HtQH8Rj8QuUVcLNdHjVrppHYPbFeKmfAi7FnB0vqGN9FTmMyp62V7RPBLviJ8saJuZmoNzfMsSaNDGRxswdcXXRTLokwW1i+3cyfkwiAEh4gp96vc2xpfMfl2IrOCwd86vkIfXDySFreLJvbEePduN/V1uS5LmAtRXbZSNqLSVv1CVIInivJDk8TpTbxRcC6j1CzMN4mqQWl99bb2WiwgXDO547l/4jKurCPcAKQPidyuJ0qx0FLSHuPr6OnXnfC+T7EB9NwtfQsyx0IMug9Os7xgOipn7NLuI2pFRtXmAN7NjyAhALOmNy/yEgiqdF10fU0kaChHddDuG82Pjex4k8/5oNtSUYwZV4aNhenxkWFgSgQhv2qWAJ2Aqua4aHEuFJvVyZbyAxemVdm+uMFna8qRxlQBy4pYPkA2OvbhhefAp70UmfN2ujNAFnVbb337khvAyyySNUQugb9CdEgJ0mCFLWgYtggzOn4BgKzXyg6gMmbX/oJDJTrh14SAj0Yx4RYyG+L18fLe6Gt0TZ0+1w= X-Microsoft-Antispam-Message-Info: vTVnEv39nC1XJ8YIkG8gYJSjYxylIoKEvVSQ3300a09BBShCD1A0VAsXAtChDnO+lMlVqtwY+B1T64t1IuXlfST03qjJGe2yzF+bSS3w2qEjutxZlcocok1FdjntHLZKsYRC9aHTUqnRR2/2uyfMWjmgYshQQJjJHdhyaO1gUpvqq7KP7IAXrevOb88t7EfX X-Microsoft-Exchange-Diagnostics: 1; AM0PR08MB3347; 6:gI3cQ5thOJny77rXYzxxqP6bROhbEnY2Ru+yf/I5+aNPSn2bX9oQraH5Um1pZaWdcp1q9rO0l3gmJ7+Ylo6m4heIQAM292BbIKOY//r7qECp8ZniAtFF7x5HfDNrK7+NUPHpNLRECxko4nGMSqHpkHnQcao9BV4c3eA1yVn6s5E5Wa+1HaPG7/TR78I+AtNoZmcytouFduov52KDlaN+ZbXlZKJh25nhKXGYdNucNIPdjDVVb6cBGJVatVJKK8m9xFlEAvU2fWmiRrZHl3ImDWohxB2R9r170HO8UxXAqxuQ8ovbwH6dWLANc6Y9WHXZOeHMYe+EQr52FNYUYw04KTKzxKTjGiNzXKbnXyVWksNmh6qoDMHxLYdTZgAXyomfTEZSZc99lrDqXTakN6ENf1y7NwHUthwW90O/06chF9nB7pzuOjAMZlp2Ai7COS6HG2wcwKqJ6s8GvnpCUm/OEQ==; 5:IVzFQ2uhhqKNnijT6vvz/N+5SIOF76bBhZ7WLdrsuHEHLUA+PUyMwzIu8d5jGQIp8oq2KqNlhlQgIW4O9xl7QlmqgsI+D3AmewOEapY/PXgtjqNPPMD1jAGXVOefg8P+PapiDg5amzASjvLHEZ8hQ9UNWPtCXWnMWJoeKJ5BK7E=; 24:AuBrhqzlwt6s00MesLvc7tkAN4m80RCs3F9d4GR1hJy+04f3i2u2c4EA6LSVN0GpRhjX9lS8C5iVxfEDmdY4ooCpiz4VlpN6f+c5B/l7Hh0= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM0PR08MB3347; 7:sZE73gr1zsbrB+TlZj07Kopc/C/aEFKU4B/GB2xGq0ja/pmnZ/8p0oLduiGXP41dhvtSbIbG9SEKzf+aQ0JMPRrtGfa0Sh3Be5alZBrU5kX6tx4T1X3R9xZqC/qDLI/KIhBDGdBSsNRxJE6otpZ5NYxWcGoE+yXRMWQdVkK74cm/zolH0NE1wuQu+P8HfQGWQ9+uZulrKMe5kVuFOhs809J2tCWocIWIYdUMbFWjqj8VEnCT2LTXKp6NO8Y8b8LB; 20:CtYcnfgOdyTJRp6Vl1663/g8rDgOb00BTLbfrxgPM/rjcr98dRycsMdxqGWrYX6jjV7Sf3uH6KmwobjZ9lH25K4qmjWabiI+J1f897UAaGRfM9n/EDKh12jtKECAbC7+tvsubZgJ8Fq1NZAfBwDiY7wYSHBWr/8OWzjT/8gDGeE= X-MS-Office365-Filtering-Correlation-Id: 1f1fc2dd-6edd-4a5b-74a7-08d5b4f432a8 X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 May 2018 14:58:44.9901 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1f1fc2dd-6edd-4a5b-74a7-08d5b4f432a8 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR08MB3347 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.2.106 Subject: [Qemu-devel] [PATCH v9 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" COW (even empty/zero) areas require encryption too Signed-off-by: Anton Nefedov Reviewed-by: Eric Blake Reviewed-by: Max Reitz Reviewed-by: Alberto Garcia --- 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 "== reading whole image ==" $QEMU_IO --object $SECRET -c "read 0 $size" --image-opts $IMGSPEC | _filter_qemu_io | _filter_testdir echo +echo "== rewriting cluster part ==" +$QEMU_IO --object $SECRET -c "write -P 0xb 512 512" --image-opts $IMGSPEC | _filter_qemu_io | _filter_testdir + +echo +echo "== verify pattern ==" +$QEMU_IO --object $SECRET -c "read -P 0 0 512" --image-opts $IMGSPEC | _filter_qemu_io | _filter_testdir +$QEMU_IO --object $SECRET -c "read -P 0xb 512 512" --image-opts $IMGSPEC | _filter_qemu_io | _filter_testdir + +echo echo "== rewriting whole image ==" $QEMU_IO --object $SECRET -c "write -P 0xa 0 $size" --image-opts $IMGSPEC | _filter_qemu_io | _filter_testdir 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=IMGFMT size=134217728 encryption=on encrypt. read 134217728/134217728 bytes at offset 0 128 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +== rewriting cluster part == +wrote 512/512 bytes at offset 512 +512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) + +== verify pattern == +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) + == rewriting whole image == wrote 134217728/134217728 bytes at offset 0 128 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)