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; }