From patchwork Fri Sep 21 17:23:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leonid Bloch X-Patchwork-Id: 973351 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=none (p=none dis=none) header.from=janustech.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=janustech.onmicrosoft.com header.i=@janustech.onmicrosoft.com header.b="Fy84bbvC"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42H0sl19WTz9sCP for ; Sat, 22 Sep 2018 03:27:39 +1000 (AEST) Received: from localhost ([::1]:56716 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g3PDM-0001vf-N4 for incoming@patchwork.ozlabs.org; Fri, 21 Sep 2018 13:27:36 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57515) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g3P9k-0007pd-KR for qemu-devel@nongnu.org; Fri, 21 Sep 2018 13:23:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g3P9j-00045R-MO for qemu-devel@nongnu.org; Fri, 21 Sep 2018 13:23:52 -0400 Received: from mail-dm3nam05on0717.outbound.protection.outlook.com ([2a01:111:f400:fe51::717]:20608 helo=NAM05-DM3-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 1g3P9j-00044G-C1; Fri, 21 Sep 2018 13:23:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=janustech.onmicrosoft.com; s=selector1-janustech-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=17jCltmobbbrulmLbfYr2kRyJVbuhFZj/mJJi9sixuc=; b=Fy84bbvCHKgqYdp1H/xbhINpUaBO+ahieJlVd8Ixu4G4/1xkMm7oklRWM5O7WmKAT/qVJF2K6e92OyTdBwOBxT4diACsQXMQqbTnseK2WvlnQ8F2WX5uK/wKj1d3UbmAggXrcdtDtmjjXeTzS9c1J/BuBfLCl1y/Q0+vzP0ucEE= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=lbloch@janustech.com; Received: from Jupiter.local (141.226.29.227) by CY1PR07MB2618.namprd07.prod.outlook.com (2a01:111:e400:c637::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1143.18; Fri, 21 Sep 2018 17:23:47 +0000 From: Leonid Bloch To: qemu-devel@nongnu.org Date: Fri, 21 Sep 2018 20:23:04 +0300 Message-Id: <20180921172310.10068-4-lbloch@janustech.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180921172310.10068-1-lbloch@janustech.com> References: <20180921172310.10068-1-lbloch@janustech.com> MIME-Version: 1.0 X-Originating-IP: [141.226.29.227] X-ClientProxiedBy: HE1PR08CA0065.eurprd08.prod.outlook.com (2603:10a6:7:2a::36) To CY1PR07MB2618.namprd07.prod.outlook.com (2a01:111:e400:c637::16) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4a6f46f9-63d3-4253-09c3-08d61fe6fec4 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(7021125)(8989299)(4534165)(7022125)(4603075)(4627221)(201702281549075)(8990200)(7048125)(7024125)(7027125)(7023125)(5600074)(711020)(2017052603328)(7153060)(7193020); SRVR:CY1PR07MB2618; X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2618; 3:EJZkRaJ6/CiArHa5bHjRqwszN7GVbgpoFtQqGf7bEXS9AFFPcGuwJnrn0l94AWnKxkmltXIfW2Gan/5mr/5ToR2SBfza8wrpwrRdVDa6NZSCbW0a03Cyyq/rNYrqOrOQXYzmi43IjH+h3EWZIjeWroHlTdTXEtjBiQJC0OrrkElWBpForAHM3ZjhemRP0TpshsfhkBYl/DR294Aa9i1pbwEUyyN+SfhfExiBbU6TA4SM9hlWERhSLzcFHrqSS/kd; 25:Vx2NOQAch4voJftrmy9ziY7v8CNIc1mNR/RGMchdrxH3ffGmkU3SzmoXD+tpQOG74onTbqqOfNrLOX6OyaF+Qur0BkdlLCdQEYPuT4UhBRH0XFFasvNAGx9NwBFdlHxW3VA1+ndeTUXZd3KTBoOPLiNYrxxwBHdvNBBuxqa8UHVzsQv7indxjtpQVwHay1K5KJeh/DhBSunln3gI55Gbd7cOSuOVkuQVA2w3FjFuegz6T20vHp3KTvuMzoMw/H0WmvRFAw0a0fvX1Wr3PO5TUYEuLOD+CbwT9dv/CISlzTCcKjA6YnEsxUZd46Z42QSL4AYKPjQvGXlhnFSKxeYwlA==; 31:KdQ03S1OLW2WILaXhn6kkJJ9n7oPraxM3VeDmLophLO5o8lbRVQmmCpEyycXegOzL5hGyNKFtRQ7n/fzDBD5DzxFBghzv1hyZ5Flk3gKsDja4DKRqLt4z8Eh9xZJ+p+hx5Xc/THYZyPwHs0YDaNjALumuqT5bUVPBzjbQpmxlj8Q+Hq/I/B3HxicfFmI1ruMkkP8c5Ce3IAOr50dprYH4zbTqFwogQigBpS+rinV6LE= X-MS-TrafficTypeDiagnostic: CY1PR07MB2618: 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)(3231355)(944501410)(52105095)(3002001)(149027)(150027)(6041310)(20161123560045)(20161123564045)(20161123562045)(20161123558120)(2016111802025)(6043046)(201708071742011)(7699051); SRVR:CY1PR07MB2618; BCL:0; PCL:0; RULEID:; SRVR:CY1PR07MB2618; X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2618; 4:Jgc8iCHcyTLzV6H4gI0YMYzikL8KXWpyr7FutWsnoJAnXj5HSZzsnJOM/IW4QKXC5VLBLGSlO8oTjzw9o7YrrhAPey2MwXNR0GaBHsD1E3K/fYWOJHDTdauG0NBEW9M7zgffHJiab+EfDKus0pcKxWisSw5hwWYvmUXybXx4PZzxzReA3y/WmA8Ij2YoA6JB8tjNULTOxBz4VI2dsuiDpBsh0ZjBXajfNwvv0Mtn+eE4lVl6Du07qrB2ZjhWmDuWvP/IXMlCQNT19Ku9G+8kzQ== X-Forefront-PRVS: 0802ADD973 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(396003)(136003)(366004)(39830400003)(346002)(376002)(199004)(189003)(86362001)(68736007)(50226002)(106356001)(8936002)(1076002)(2906002)(6116002)(4326008)(53936002)(305945005)(8676002)(7736002)(5660300001)(81156014)(25786009)(3846002)(6486002)(36756003)(6666003)(107886003)(6512007)(11346002)(81166006)(97736004)(508600001)(47776003)(105586002)(2361001)(186003)(51416003)(48376002)(6916009)(50466002)(486006)(54906003)(476003)(956004)(66066001)(6506007)(2351001)(16526019)(2616005)(386003)(575784001)(316002)(16586007)(76176011)(52116002)(446003)(26005); DIR:OUT; SFP:1102; SCL:1; SRVR:CY1PR07MB2618; H:Jupiter.local; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: janustech.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR07MB2618; 23:Qe2q8GLjPwlGDYsokIjrdGrVvhkP/eyLNN8YlLQZm?= OzTH56tf2qhST7/QOrEBR6AGzqpmrtyX0UAomGsQ8+7rdlfbAKsDzdlwxybjOZoZNkhuVbXM7zVuxWEy8r9UHGrdckUTb07G53Oqwdr2sb7BaC0qNtJ1doSwGR+wTaJ4HiTuU90oqsYqo3ZJyJa1r9lhMtZwR+csfx1hqcZn4NnmaIcI/0DF7imbeoR1pNA5uostx4lKiM/cMfVByduiNgQ7Lk/8dm2dG+sVYoPKZ+yh4VyinnsIaYkBP11YM8kmjMv3iDEwEZloIguRXsy93eCc1Ck8YDyupHZD3JN6LlaydnldQ5998tpBn8Zq2qcA79rsxTLIa5bOOCLcGWnZwetGqv3F9HpetmbjZM8/EOIaeck0QsZDqg0/dGbkf2JNWDmCEavZlfBMa+80S7wbwWsIaWO7F/I+bVtc/FP+ck+lX1mBdvrewOygTlddG8j70EfGai8lc6Cwbb1M6IwM3VHdsGr/98tvOX6LTN+wqnEBWjo8OxpRC3IvVcD4Euar9KS+7ap9EjeOhy45HtDrg6J5lgwzRmu/qVuzaap3duyzgsOujlYOwyTLh0+tOT5kTz0InAGzBDaWGS8c4hHcmXi7czhJzA7Q+bm5RAePnOd4sMDnJyuwDx3HOIMdSrSbO99y7G69NwT+kakQ3QNmSyJkDOCJVBtDyXD+Sx1iAy63Sdc8+fffLd6XhMFpt3hBMZnfakCl1MCRhifUT20YYpkRuq0533S/ntykmkmLXe9KbexJi8Npa53BkG+yViW8tgiVTaDHIzLHjcMS4N2F9GHMvgGn/orZIihZCnrUR99ssrp3ewnioD3qpCaTonZR1KwywB4MdX4LZivQ4TiRrQkcwIiu2l6FRse/kWFDTlmYSOW4Xtqfy3tHu6r6w2ScNDDdR9N5MoBEWID9jAXtvUn+Y5VUFq9xssSFsURLGBfVtRJKZh3yPKg/5LhkJM+kbmQkBru5SIRCdfgzCgZDvtIjMOXaq380EPT1w7B2kJTNvz/Q1Ee9mYDln3YisNRFM3i/zf/ZFuFv0lmAgfX2d4DZqJLdwGeYFpUI6HNAo+9cYxnL8fiXG2q/1itCLqes/ZEjo6rQFt0XMw7yxOIstS/RZQSkAe9QVzd4bBl2MwfFK6XN2RfUmBSz3CRw9zFCUeeFfJ1QmosuwWFGpV0opDwAJi9d41LPYNg1dBTnSGwzFR5REe+XG8KtleiYb6B9O2TrEiGuoZ6TXT3gzuAfNPU14Gzbzno9hpPMiGlYbBoNg== X-Microsoft-Antispam-Message-Info: riS0pxlS8teRNE3P3CWSwaU3qBGOdNyxkkB0yD8yCVQrE0xdLuDTRNlTmaddg8kLQV8eBwy/QiJuqnL7BjLoHC6uM9+seFIavb/JoyzhTQ8lZGHJEhTbJXztK6N2CbFdw6LNGdNvPZAs1u5f79W1WxregJa2Tc1375zVh6orWxr6Y2e/BjnnQcW8RVMtFHLJoDcB2ezYs7RenMWht6PydfNXGH/Gnhb1Z7FEK1MOkgsYFK14IYniy7784C3O67JR7IaSvE6QlR0K1ukul4oR2hnxqFW4HGAU1Si5jdnHlZSga/RoXoSJ3F4iBqkFoYQCoO22zEsC5h81bLkmfxOPYtMK+QB2USfYqR/jLtsMjgg= X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2618; 6:mOJJSJT8/ycfYn6hwzXKXzSbtI5zBmGGHzpp/7cu4hT8Gv2eCiIPu7ffiMBIa6jlvvhK6WFoOeR/X4OfxPsoViOEVPfKGkh3gyxRqJDeahwe9ReKuNervT2EFuNVvZN0vsLageuYuqcVM1s+66Rpyd1ZOJCu/l2tuET6Fm7JQR/19hkw4PRQj15iX7q0gqHH61TnotuqUP6ikQR1kbjkDUvYw/GcBvL4as1+iUw/qwRp/qkB4J7KtDFNB+YPKo/honEeFrmGh3pkfRF8+PvQKU4goq8KyrLC5JAiwfgD5Lu2yhzfXbenTUDLdBkQKorIv3WnBvqRO5GsEAZMUWybWSATvYR3aQHreij52gHbxoQdsv3Wn+E0bBpbUgA/DonsHRgaNUFYJnqQtgXzFJ8oUSk5vWGQVNaTx1vPKueYlwOhUBFZfB/jzOPf5mjYswulCh8MN6WKd8tG0NXVuXDP0w==; 5:c/ADM9KvdqbIeq+sZqiamxQQ+MSawOgVeOU1MEIm5torqUjg7Vtf5g9S3X8onKWhxuqUIU50X0ZyretwS/bSLJsANGx32oMOG2hDY1fDuH8K3VBMhHfqvCFQj54Ju7MeoEL2e59sRk3PEM88ZYa19hVjuX+VZLTiVbCSwuNi1SM=; 7:UseF2TcN8u3nK9nDLx6W9tdsjh0DipQzDtuzmmjKsKLde9xNJdrnyHXhl7zrwUt3EhZK0pIzEIIRAKdkP9j9B0oKBxENJV0QiYRCHa96Dc8Zkbi8v/U3LGAMN2QNG+WU0E+m6R5G16MRTxm7R4neNs/TkiY2fqoYhsyp60T282FNVwHmtEIpaO84EXad3Z8liyswcyAtJp2WZ3P5IyyqYGGSqqJS0UJA/tdG4vI8m6lEUPMrh8W8MtjonatNSx3g SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: janustech.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Sep 2018 17:23:47.4359 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4a6f46f9-63d3-4253-09c3-08d61fe6fec4 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 34eb020e-3cf3-43a1-afeb-f5cf1310628e X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR07MB2618 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 2a01:111:f400:fe51::717 Subject: [Qemu-devel] [PATCH v10 3/9] qcow2: Make sizes more humanly readable 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: Kevin Wolf , Alberto Garcia , qemu-block@nongnu.org, Max Reitz , Leonid Bloch Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Leonid Bloch Reviewed-by: Alberto Garcia --- block/qcow2.c | 2 +- block/qcow2.h | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index ec9e6238a0..67cc82f0b9 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -830,7 +830,7 @@ static void read_cache_sizes(BlockDriverState *bs, QemuOpts *opts, } } else { if (!l2_cache_size_set) { - *l2_cache_size = MAX(DEFAULT_L2_CACHE_BYTE_SIZE, + *l2_cache_size = MAX(DEFAULT_L2_CACHE_SIZE, (uint64_t)DEFAULT_L2_CACHE_CLUSTERS * s->cluster_size); } diff --git a/block/qcow2.h b/block/qcow2.h index 81b844e936..a8d6f757b1 100644 --- a/block/qcow2.h +++ b/block/qcow2.h @@ -27,6 +27,7 @@ #include "crypto/block.h" #include "qemu/coroutine.h" +#include "qemu/units.h" //#define DEBUG_ALLOC //#define DEBUG_ALLOC2 @@ -43,11 +44,11 @@ /* 8 MB refcount table is enough for 2 PB images at 64k cluster size * (128 GB for 512 byte clusters, 2 EB for 2 MB clusters) */ -#define QCOW_MAX_REFTABLE_SIZE 0x800000 +#define QCOW_MAX_REFTABLE_SIZE S_8MiB /* 32 MB L1 table is enough for 2 PB images at 64k cluster size * (128 GB for 512 byte clusters, 2 EB for 2 MB clusters) */ -#define QCOW_MAX_L1_SIZE 0x2000000 +#define QCOW_MAX_L1_SIZE S_32MiB /* Allow for an average of 1k per snapshot table entry, should be plenty of * space for snapshot names and IDs */ @@ -75,9 +76,9 @@ /* Whichever is more */ #define DEFAULT_L2_CACHE_CLUSTERS 8 /* clusters */ -#define DEFAULT_L2_CACHE_BYTE_SIZE 1048576 /* bytes */ +#define DEFAULT_L2_CACHE_SIZE S_1MiB -#define DEFAULT_CLUSTER_SIZE 65536 +#define DEFAULT_CLUSTER_SIZE S_64KiB #define QCOW2_OPT_LAZY_REFCOUNTS "lazy-refcounts"