From patchwork Thu Aug 9 21:53:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leonid Bloch X-Patchwork-Id: 955878 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="nqCcDkNE"; 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 41mjcF41qRz9s47 for ; Fri, 10 Aug 2018 08:29:49 +1000 (AEST) Received: from localhost ([::1]:53306 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fntRD-00054J-8d for incoming@patchwork.ozlabs.org; Thu, 09 Aug 2018 18:29:47 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48370) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fnsta-00052f-IM for qemu-devel@nongnu.org; Thu, 09 Aug 2018 17:55:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fnstW-0006ox-J4 for qemu-devel@nongnu.org; Thu, 09 Aug 2018 17:55:02 -0400 Received: from mail-co1nam05on071c.outbound.protection.outlook.com ([2a01:111:f400:fe50::71c]:30903 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 1fnstW-0006oN-9s; Thu, 09 Aug 2018 17:54:58 -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=Ha1eiX9E45t2eLttLAnFseAE2krJtm7sORU/EEKM8D8=; b=nqCcDkNEdGWmWQQE93eiVk1V8JKhoW4Anccz+iQVUuQdDy31PWgyCLVzTMfc53j0u2YXh14JwKhKUwizr7y0dBQY69DMApzHzwV5aprZrQlthOqlganI/x8XBnSlrsk0H2W1NQN0k7tTh1a77TF+XkRQQ/s3kmTbJFVXKFkIisI= 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:35 +0000 From: Leonid Bloch To: qemu-devel@nongnu.org Date: Fri, 10 Aug 2018 00:53:06 +0300 Message-Id: <20180809215307.18241-8-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: 224473e3-0218-4b83-631d-08d5fe42b39a 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:jN/iqUfrV+pEzCmJ9x6BT0QXRcneYWytiUDuUinrToc5A7y6as25MUlyIvswY7eEe5N0MlvfBoDkQb88cKRYcgO5h/xcc/hIMXIJMAs8QUt/UrAI+jVRFEKkYiTKzz4DHwlmj9nREpIrB0LfTeUt2Nocx371GUyPpzcQ8yiJ/nWs53oPXOSVUXJsJUuul8Abf8/ZBunKqxzjyTC941xrQfJ1tD4sVESno105pgKY0DKCu1RNLHXayFAcPJ5u3cpV; 25:uk8DRj+8WCEcsyHtDsLmO4/YrPZcmIHVPd9a49+7gQz2G1vudiPMW9ktUSCgtZeh9LCQw2K4KMOsMR4GqZI9rwPXYe9cBKmowNWvNoPPi3l11zIcxm/Mn2/df9ijUfFfTvYKf+E00TnhDnoRsWluZYNy7w52wgB8wyowZ7+mB5yJZ15O0JYNbEvv7HcnUYdvnXtwIoKj2kZ0QvhGNRjApaN1QFLU8QRc0/I9lh1P77InjpCECKrdMnC0tJD0fD10HCJ32wTQuEO8PoORGJah8o7+Ha8ADeVKpL2KZ9z6zzW8r35emCMcm/ba66C9hRdhuk/7JBsGNad1nNrl37/gOA==; 31:2DKNDY4vpsZhimjfN9PHuquq9AD6HqCrkR1MKTQvq8wmygjk9hOFfu5qLjtLudmokfs1afKFuWWd9U7ilYdZXJEAklz1z9OL32y7TWb4i8bUhj2NSciJPfafo9tMCzLo+7Fo3/vASRq/LIjeKfNHS1XIC9rvXYCbUiifKI4OyCDZ3bWO0G5g3lqiUcT60XczyNyWvx/11B8jePedtn7MSu2155N44y8Ov0IhYuyNSyo= 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:86iSEzhOd0BusYqmQDrf2DxRKqyxAXHbr9w+XuNk1Ezj78g0cYUN+DsqftVYy6TXiDwCVTpcYLKZBknV2C2cM5qVQKNnrleTxs+8IUxdFkumpCDWZLq/WKp0K1OJO5uiByU8o+nRzEq0wYvPvFt7xdQ5GQkmDOLAj7IiTp0Be35VqqP0aLVhzE3tFrmoRi5gEFzDU4TlsoUzfy5ucyZ6CwEKS151aJxDen9rn8hlRJIxnsNcUcmrtkKPcqVoL5TP/f8XBE29iNxauVg6but8Ng== 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:kf8sAC+u39We1uhWIsiqMTNImQyYB7KqIrES7rj7D?= 8d5KkCUPSHSLcwZZvP3e7M5TYJ48Vt4KrjBfEvXms+W4EP0huZ+pLZj3BmqPQDIUzSnHfjIR9fflhcavFyELX/kURn3kxtNnxrccbMIpedRCi0hg0hXaIUbCyc1eW6cphlNzO8BFXYVELRtNiMQMARR94tyBvqjeDBJ057JnC29DAQZOr6hie6QUyZLjeNq1ZS3UfiSLGE9VS0cORGskTFeK1BrvyqTbUCLMASLZLuhkyZo8pYF/AI3WMKC59sVk+8iIs/q3jQ3jQK1WDnQamV/FIeOpr+U0lWDpWp2UmJwaxcEq6aY9W3TsBtpTd8o9H9OqoIm+UEnb2HsltL9rqSkdnJ5Ty03n7t4NFP1tbz5FdxorIA8oi536Qog8bx570RnQ6vGjO9ZepjRNzGWzPRIBzWPqwWvJM1VQEbohBgMgU9qRPI68pc/hawxTiC90LW9ja/NUs1Sxot5c4lpmcty/QKpT/O0Eg/BC/smA6pXjc3YdDgT0MWcgr3tFBZyaA64we3wC+g8ePoYyDArldjsih3vr6VMk6xPHWX29d9cakgKFcQEWtetkBBcZjW5zYAcwsdSxJF3OKyocspuW9RlM7iUtU+DId2HznnZTUqV5zZWwCZXdYSYame7wDlooapiAbaKRUQuYW6HtqPS9Yqe7WaysV0UY4TBDw4Oni+qHYCyYcvtmIxX3M/vnONoxovHsm2hFraAJw0CJ2q2yW/RtL6CL7UlI1KaLxSq/1K796EVtleKPJyJ72Gu/f35vxJ6mfUEdTUdFc4vm5KrZZ70Gf7e6GDEpgULTWIgR277xvKeXc4plf0cV2bb3x9Uuij1Otpx7rbaede1AP2MstjnvVBJC9LDE92v6kFFUjAIfiyNFITOht8X/bNJ2ZrcA6IkIsrIVkInahhhcK6neP8lBgqCFdzlOyHWlJJvXUZgt8ZTrZwabNJZY0zweu/utRLbOy9WeaPxjd+9mX311lmrmMsGdBalCDrIwqghwl9cOV3SsrexmsMgV5t824iQEJSnGUzm1/ydkUdrwjwWS2YYpyLZn95XHxdznuxQjRMsnITM7t4G2RnGDA90s4Q9YrXfK/Giu4p+8QtLDOSALdCPFnUDleqsPw42+j51vp1xdRWLJZ0u4Bh1ae0NXJSqAmq0IjmT4B2mw2TWFFCfkGM+XolMKNNaFIfWOjYanduexpVKcjBmqbLJsO+y0TpFN+viAhQs59kqg/DNeanP802kIwEsiElD4OowvSzPlnFrIw== X-Microsoft-Antispam-Message-Info: M3QxgGHCqK4RnYRcg31cEVwf6m4cFkTiPbmJ/fFjQTqtvVvlBWbYT4TSwRZqow62VhoFa29OPNj4zVaI/wLm0OXe7qqpLrx1AVPnnE2yRResyglVXyetFL15SDczkcrc0xjUVNkozBPCi9PTcczreSqOMtnGrjQtM9wrCiHMbFlhHihruOt+NcxsSDYMC8/AWMxpGI1W3wTEjptgAMijV/qVsMDThhLansY1vc3BZIAu0hhAdAI1FvHavqr3n/fXrtn/0ze1i5DrwgDlx4X8VagQ2sEYOTGtN4ikaQiYvxE1hRRV9ejHP69X8OjQ/Ks+ycQvdyay2EW8iFgPZce43lELxj3TGAr/c2gowibRZqw= X-Microsoft-Exchange-Diagnostics: 1; CO2PR07MB2615; 6:wOftp234JaW8ZUnjyJtWLCtfhT+cU65NOVA4RMhNeDJ3L0Pltyzy6ltwzltXohihQuDZRWCYU7By0XZ6qg9p67gqR+P6IY0/r5RtH0g3Qovpi/xPzYUaxwIt3pFSCdZj3MahB1MPO0Qe37qpQaanWCL2bac8zYSkCzeR/mIy3fs/EaAIABHAadnMqMm6UlVAAkAAfqcUNeE561isrQXrF2S4zHDxOZglmi6ORlHRZ1paU0+iLx7+uGLbBY1Ossb7jqp18b8pQDLpMGjf7etuWU5WFmAdbGRHZErKlbK7U06d0FIBM2PT5rBaHgTKAR2l7AdcqRQuGDM0BE3/VfwuSaWw96N2teqgmEUV1pAPEqs7RIG3V8jQSEWqjAa+/pneqvdgS0VkqCEHIggEZRFUnIg+u5A4KkjQnKx1ZVRje7RYasA2PmQQM53ZC07uXGlTljb1pkNWbGzPK09ZCm6E0Q==; 5:YR+d9jDNMnfCNaNwjBNmC8AHdhgv7vnE2jzdPUrQD33zBxOCMRdhkQZLyACHHLtqlOuWRVCQnKyR4QQRPbgkI//d+WVMzzK4e2pI/DbgyCQk0vstJhcHpGYLt+aYQ0zQV96vT+mTNHboSBjY0hSE8w9HfX4kj6dKAShBhLHZuqA=; 7:q3bnfH8idJQ6votaJSrPTTDLNwVaRmyQFPHmKY3rAFrbhNiWZXFl5Ut14iyY9jqdOHLUN6et6QOak0Q1yUk8EkJjFujUc7O7jc7nXeoCNXkvlLFCpV+eVLzYNVFoZoYwn8MvHFf3K7SaEoNyFOMJ4FKC1PVcflRtobCVO0Kiay/oCGrW7ExBUsGjp8+jXOyQuo07UX5yW0hOOBfFsljdISFYK00x47fuUyTvYkftIpLHFwjgldQvApZwrRKFK3iX SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: janustech.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Aug 2018 21:54:35.7101 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 224473e3-0218-4b83-631d-08d5fe42b39a 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::71c Subject: [Qemu-devel] [PATCH v6 7/8] qcow2: Set the default cache-clean-interval to 10 minutes 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 default cache-clean-interval is set to 10 minutes, in order to lower the overhead of the qcow2 caches (before the default was 0, i.e. disabled). Signed-off-by: Leonid Bloch Reviewed-by: Alberto Garcia --- block/qcow2.c | 2 +- block/qcow2.h | 1 + docs/qcow2-cache.txt | 4 ++-- qapi/block-core.json | 3 ++- qemu-options.hx | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index ba4dfae735..b4f291765b 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -944,7 +944,7 @@ static int qcow2_update_options_prepare(BlockDriverState *bs, /* New interval for cache cleanup timer */ r->cache_clean_interval = qemu_opt_get_number(opts, QCOW2_OPT_CACHE_CLEAN_INTERVAL, - s->cache_clean_interval); + DEFAULT_CACHE_CLEAN_INTERVAL); #ifndef CONFIG_LINUX if (r->cache_clean_interval != 0) { error_setg(errp, QCOW2_OPT_CACHE_CLEAN_INTERVAL diff --git a/block/qcow2.h b/block/qcow2.h index d77a31d932..587b053453 100644 --- a/block/qcow2.h +++ b/block/qcow2.h @@ -77,6 +77,7 @@ #define DEFAULT_CLUSTER_SIZE 65536 +#define DEFAULT_CACHE_CLEAN_INTERVAL 600 /* seconds */ #define QCOW2_OPT_LAZY_REFCOUNTS "lazy-refcounts" #define QCOW2_OPT_DISCARD_REQUEST "pass-discard-request" diff --git a/docs/qcow2-cache.txt b/docs/qcow2-cache.txt index 6ad1081d1a..684147ad45 100644 --- a/docs/qcow2-cache.txt +++ b/docs/qcow2-cache.txt @@ -204,8 +204,8 @@ This example removes all unused cache entries every 15 minutes: -drive file=hd.qcow2,cache-clean-interval=900 -If unset, the default value for this parameter is 0 and it disables -this feature. +If unset, the default value for this parameter is 600. Setting it to 0 +disables this feature. Note that this functionality currently relies on the MADV_DONTNEED argument for madvise() to actually free the memory. This is a diff --git a/qapi/block-core.json b/qapi/block-core.json index 5b9084a394..9a6a708a37 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -2830,7 +2830,8 @@ # # @cache-clean-interval: clean unused entries in the L2 and refcount # caches. The interval is in seconds. The default value -# is 0 and it disables this feature (since 2.5) +# is 600, and 0 disables this feature. (since 2.5) +# # @encrypt: Image decryption options. Mandatory for # encrypted images, except when doing a metadata-only # probe of the image. (since 2.10) diff --git a/qemu-options.hx b/qemu-options.hx index 4c44cdbc23..6abf3631ec 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -767,7 +767,7 @@ it which is not used for the L2 cache) @item cache-clean-interval Clean unused entries in the L2 and refcount caches. The interval is in seconds. -The default value is 0 and it disables this feature. +The default value is 600. Setting it to 0 disables this feature. @item pass-discard-request Whether discard requests to the qcow2 device should be forwarded to the data