From patchwork Thu Aug 9 21:53:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leonid Bloch X-Patchwork-Id: 955876 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="n1EhhSYV"; 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 41mjW76xfHz9s47 for ; Fri, 10 Aug 2018 08:25:23 +1000 (AEST) Received: from localhost ([::1]:53254 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fntMv-000140-Kc for incoming@patchwork.ozlabs.org; Thu, 09 Aug 2018 18:25:21 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48258) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fnstC-0004RI-IX for qemu-devel@nongnu.org; Thu, 09 Aug 2018 17:54:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fnstB-0006fY-CZ for qemu-devel@nongnu.org; Thu, 09 Aug 2018 17:54:38 -0400 Received: from mail-co1nam05on0724.outbound.protection.outlook.com ([2a01:111:f400:fe50::724]:21479 helo=NAM05-CO1-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 1fnstB-0006f0-3T; Thu, 09 Aug 2018 17:54:37 -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=5KZMmlmN7dOAE01Wi8hStPLGyKFALSicNbHHp0xlCmw=; b=n1EhhSYVul20vhKMQ/po2a+/jw4lLrhZe5AVrRSor1EZpDbA2XXwdvkyVZMdZ5xzWRetR1FGL/2rRyErkP5CNtTmNNsnxrccuNyFYUFiXW6lgVMYxMUAov1wVd4aVaGyZ7f0cSg+/8tNTCY8MUm3Qko7F2q6vND5F6WqLmrxLz4= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=lbloch@janustech.com; Received: from Jupiter.local (141.226.29.227) by CO2PR07MB2615.namprd07.prod.outlook.com (2603:10b6:102:14::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1038.23; Thu, 9 Aug 2018 21:54:33 +0000 From: Leonid Bloch To: qemu-devel@nongnu.org Date: Fri, 10 Aug 2018 00:53:05 +0300 Message-Id: <20180809215307.18241-7-lbloch@janustech.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180809215307.18241-1-lbloch@janustech.com> References: <20180809215307.18241-1-lbloch@janustech.com> MIME-Version: 1.0 X-Originating-IP: [141.226.29.227] X-ClientProxiedBy: AM4PR0101CA0050.eurprd01.prod.exchangelabs.com (2603:10a6:200:41::18) To CO2PR07MB2615.namprd07.prod.outlook.com (2603:10b6:102:14::10) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 35f1f67e-ebc2-4e7a-2f77-08d5fe42b209 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(7021125)(8989117)(4534165)(7022125)(4603075)(4627221)(201702281549075)(8990107)(7048125)(7024125)(7027125)(7028125)(7023125)(5600074)(711020)(2017052603328)(7153060)(7193020); SRVR:CO2PR07MB2615; X-Microsoft-Exchange-Diagnostics: 1; CO2PR07MB2615; 3:fBIN3Nxt16EEfLcz14w52EHhSA06fSrCOoPXSsE06KK/r/jb+kniMDlq4T4Nqp8yfEcMB8liMm2VslQzcQHV6dG/2QScUvkA7tQQ60en46IvXJx3VZ4CiRNWR5KkVS9IfxrWKyR7uKPbpbfy9lrWw6BflSlEPEyuRPHdBrK0OzqK2rTo8PJePsBXevPQd/Ei5TXOJDHZu92RnFdDianrwbIBStlJI116hzRo+31sARnQwad3PoZ7Xf3CPtHQO8fG; 25:WtmBjk1UeVvR2K3PtPA7XVHc7Ckh346Vlw6jd3zKncihXg8uq6tayHCFulDPTr+XjfO3SZjDVIQ/jb8CpylrcF39p1VYKO0K25zdv90ewRRvPNK2Oq6OOh+4IUhybFckQTIT9FpY0k7cUITTENwhpQcifo64q8GGY5VKjLMs0OxgusU3AuUBmphJfW7EdGiBUpbnECh8w/XqJXTb5UdaWOxIUrxYywJ/N9/Efc96NpOS1XglHiK133PjCm498ktzKeQnr2EsNsuqc6ifrU73oB3MHILb/0Mzoq+mRG6Reo3oDANC6gcNE2qhN4DWF8WrhbiPVERDtm9E0/AXmUf7Yg==; 31:YwgNmFUI+YYJeoneZz2NMe5dv5GCMNw0bLrZGtE9BMnP7QDLhn54b/angk5xo4Dsa/2zobnd6Sumx8ZDgZjCUio0+URYorZ1J66b8prbX6L79n5xczYCs5LtvxNoc0UIvIIWEr0cnefzUoFfMCr1tsDwus2rAHT5ST3G0pN7I7xN91iqMDqXTk+4pH6ogiCGX7efXppqKH/xfMnU0mClM82Riq/8qLXU0dPPyvJGsDE= X-MS-TrafficTypeDiagnostic: CO2PR07MB2615: 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)(3002001)(3231311)(944501410)(52105095)(93006095)(93001095)(149027)(150027)(6041310)(20161123558120)(20161123564045)(2016111802025)(20161123560045)(20161123562045)(6043046)(6072148)(201708071742011)(7699016); SRVR:CO2PR07MB2615; BCL:0; PCL:0; RULEID:; SRVR:CO2PR07MB2615; X-Microsoft-Exchange-Diagnostics: 1; CO2PR07MB2615; 4:6o1XwLwkWL8iV/DHt6tNUc6SSPiHRqDNxwvh01jYPVNr8P6/Za56f6Lzqf/b5nmel01KjXCwGe0TDXl3yGjmKlruNl4K+9eXjxaxXMtEJUVENChUmfKz2W8T3gsSfqbKI/CyS8R4gnSBJh218X86M9Cx8V4MTtic2Bv3YupWd5sdwmsE1m2T+MobTExnYCq+WyYRO5wtwUNrqxPeeVQrMbeZpgUtlmqL+yef9Drn+2SS6tj7EpE4lRW3bbKKEoVMnB4qcp8keqmzp5VlTI2yNA== X-Forefront-PRVS: 0759F7A50A X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(376002)(346002)(396003)(136003)(39830400003)(366004)(199004)(189003)(486006)(2616005)(16526019)(86362001)(6486002)(7736002)(8936002)(16586007)(48376002)(478600001)(446003)(81156014)(68736007)(81166006)(186003)(476003)(26005)(305945005)(386003)(2906002)(8676002)(50466002)(50226002)(14444005)(956004)(11346002)(25786009)(316002)(52116002)(51416003)(6116002)(6506007)(1076002)(3846002)(5660300001)(105586002)(6512007)(106356001)(6916009)(47776003)(36756003)(2351001)(4326008)(97736004)(53936002)(107886003)(66066001)(54906003)(2361001)(6666003)(76176011); DIR:OUT; SFP:1102; SCL:1; SRVR:CO2PR07MB2615; 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; CO2PR07MB2615; 23:wWEsMoaGm5F+FhejQhuFmy8Gpjm7IzQl0FZZ6vNwz?= A4ABGDBGv+DM0AXK8pm1O/qgKNkNVPhdIp+o8zAqDcRQ+lPt9LhGQk6Fq7VNq8Vi00178qLGtTSTEHgJAZfz31e/RrEiYKLAs25/dVt2Xk5Qtq0A8xSFmk4HA9gpoHC9Nt3FpdwWaGHJvd6q92TE/N5kmf7L1FVNmDaECzCIZROxxxxGMiJhUuPZMR/0mTI3K4qw7qonO773T9AAnqBSjZqMbU8NHKeQOi6BldkuWlGsgti68eAMwFTRjzhJTht4l72xj8+8o1OBhkoP2E+aS/2Am2ntvsqgyPU0X8e8mu8qHsN0tjiNJDsszkkl2QB6Ms7fxlDm3RXvj8S+IXj3gPf8c7qqd/OO0kMUqCCs+5q0bOgHkPsdR8V34C5+tBZWCZuhgJrqYgjE2EtVq8hWvvG8gVdDwyteIuRPF6byxbUVqTe9utqQXzLOMYxtNLhKsVRqvg23IKEw+sHUvyV5kRksxSqqRH/hC+CN1Qi8ENF15m3k4GTAUtJbtqWcvn2iu/5O/Ic8CxIew9nP4yjjiO6REJ7+Rsmh1SoEeYAUL5LznDj0ymmvY7EKSXMN+im8x0sGlubLMTItLrzdVLGZ8zlTByK/4h8HSHKxiC4kyTKvZtHEv7fPXJW3hWdVhHyfmkxfyuvzqJkuxn/k8Bhl8oFUh1mBo1dKjX+EltlVJNLsxyFqE059yvSlSEmDf1ASTYVVDNaZ11qRb8quRP75ECAYkVrGP40OBX4FCKShPg5+W1NOfI9WwhGl/KZy5Mh6Wn9rXGJmax+L+pHjlRv+WWZ3f2L025KQldPXWE9Lf5c4PU/Wq0YGB27mELdrlrlr30WSJrzCxBUFzDcrh4YM9r5XVarVPvZRATBSX5tKGhyE7U7zLunUoQIfcYrfXhV1D8xrPTTaMgmdx23NvMYbxHWo+5pQVwiN+muoxLDW20iNyVaOlO32YbZS6Zg+pECgFuJWm32+CUH0F5OZ7tC/El2C+9qYoctKXTJuJjGfd6PfV4r8toudcGTzflVTvyOXf92lgy+9V5OI77ZxojkGB4NaVXhRqVYChe7ZH0uo+vFyLi2pj5F3Y0/hQO3Xqtcj9g5Ku9lvMWaTTgL2pkTRhAKCN4eXPIrUYssnB43wvpsv/W35Yad1yT8NjIo66FVxGgHRC6FiAPLWB16A+DCdFXcts7x74xr6tbJNdKIPbGNIxBhDhoVq7vi98h7N8haVCia/fwyY/lzshOCi4lwYMJ+M/5hzqGBpRPY8pWe/4wdzQ== X-Microsoft-Antispam-Message-Info: +7cXBBD5ZnMKMihBTxL5a3qYqLLjY8+LMHyKvLOT3guzSjcj6RP0lz0YvZaU9mMI2Apc3BgdF6kc0q3XoRBGG5ts0nURcSFXt7fIb3eWjRNcNmItVJLMt9JjzcT+CcO9HIyBwfuB+4H6RwRXo/8BfIIANY6p/Bgoce425C5hRqTuuKg2VNQAWKjOkFgsw4DpAAu+uwSmjjh1pmQUpr4W/hclPLE8EmW3u1uzhnjL9e3ERV695hLrT93wNO/OhGwENjGhG5dR5RKpI/UiEHh75cA1dDbm6dziR4Z841BjFurL+IVfqF6jDeo9/KXXNp47Cvlp9AR53Ms8gCdDhK6QcTGS9+psqcFmXYBylLTMxm8= X-Microsoft-Exchange-Diagnostics: 1; CO2PR07MB2615; 6:TynnBdzIryjSGhQO7CJyQhG6M7D4WNAFOeyblUZP2XTSypOkPwIaFaczN12QQ6xZ0Khq8ttqPxao8r2OL0mLzDQmxRMjOUdcYFITbnvyv+FCtb7KjLukTU01wVNNfpTZmipLOqwj08Jxi912loTVrfsEivBkgvPIOPfKdV6SVZ+NX79d6k3+n8DhZvP8HiOUI9cDbnLlXqJwwLJJIPEEUjDNg0PPRXsVxnxc3O5Kdl8f2A2EW2tNh5AvplWtz9ePR4Rob0ekEsc1vszgsyyNY/XJlWaPUOLBNGczK8VCT+6HHm339JVyYw6m1jvPZ/z2a7rPagzreIsCK3QW4UK7TCfREC9SUIc7mhx8jtE7Qy+9+j3ZWGIdc/B3ayelw0O4QbmspxIxVcOWd5yFb+GqtWvZGNfTuQHTVkUp9Sotd9/RMirCFv1ppaVMIwlKECHUtc0s/416h4Qi6gBg9LOjPA==; 5:hN30AIbbf+x7i6wnWZeSaH+QrqJaGwoEGwRvzSe7NIWrSbH56SXKJ2nVeluKyI0pULrhv1QLsILkCzzkeKF4Zb70GG2ruBLgjeiHWRcsJf4JJaEvAaE4uj6HDmNkywC43lkKYlbltws8UBVjHlB40d/jT5XJTpF1Hcyf0yFC3sA=; 7:p/wEwJPXmohZMnuj3YtEF3qBKAZmMPm9qGrZc9HfKlOI+vhmc87VUn6BY/VTmJaB9+QixQRYzigj3s7AwYK1Qr0sQG8YSxZWWH1k4UjUNkMh/vdsv4Cv6q38gu23eVET6+Q7tmLvDavMLA6F45ECGVgke70GbTyGEab1m+r2+EddgpOKhBlLzLLBJwwUZ6JdOsJ0y39YPuR+oaso8WrtV4F0nWscgTQ6Gi4YKmPIPXhw5ByW3J+lzGKoamlh0QHW SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: janustech.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Aug 2018 21:54:33.0798 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 35f1f67e-ebc2-4e7a-2f77-08d5fe42b209 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 34eb020e-3cf3-43a1-afeb-f5cf1310628e X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO2PR07MB2615 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 2a01:111:f400:fe50::724 Subject: [Qemu-devel] [PATCH v6 6/8] qcow2: Resize the cache upon image resizing 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" The caches are now recalculated upon image resizing. This is done because the new default behavior of assigning L2 cache relatively to the image size, implies that the cache will be adapted accordingly after an image resize. Signed-off-by: Leonid Bloch Reviewed-by: Alberto Garcia --- block/qcow2.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/block/qcow2.c b/block/qcow2.c index 434fb89076..ba4dfae735 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -3418,6 +3418,7 @@ static int coroutine_fn qcow2_co_truncate(BlockDriverState *bs, int64_t offset, uint64_t old_length; int64_t new_l1_size; int ret; + QDict *options; if (prealloc != PREALLOC_MODE_OFF && prealloc != PREALLOC_MODE_METADATA && prealloc != PREALLOC_MODE_FALLOC && prealloc != PREALLOC_MODE_FULL) @@ -3642,6 +3643,8 @@ static int coroutine_fn qcow2_co_truncate(BlockDriverState *bs, int64_t offset, } } + bs->total_sectors = offset / BDRV_SECTOR_SIZE; + /* write updated header.size */ offset = cpu_to_be64(offset); ret = bdrv_pwrite_sync(bs->file, offsetof(QCowHeader, size), @@ -3652,6 +3655,13 @@ static int coroutine_fn qcow2_co_truncate(BlockDriverState *bs, int64_t offset, } s->l1_vm_state_index = new_l1_size; + + /* Update cache sizes */ + options = qdict_clone_shallow(bs->options); + ret = qcow2_update_options(bs, options, s->flags, errp); + if (ret < 0) { + goto fail; + } ret = 0; fail: qemu_co_mutex_unlock(&s->lock);