From patchwork Fri Dec 30 14:31:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Butsykin X-Patchwork-Id: 9492251 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 39DB260838 for ; Fri, 30 Dec 2016 15:15:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 21BA71FF29 for ; Fri, 30 Dec 2016 15:15:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1441E223B2; Fri, 30 Dec 2016 15:15:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2C9F71FF29 for ; Fri, 30 Dec 2016 15:15:07 +0000 (UTC) Received: from localhost ([::1]:40262 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cMytd-0007nl-R7 for patchwork-qemu-devel@patchwork.kernel.org; Fri, 30 Dec 2016 10:15:05 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40685) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cMylA-0001N3-7f for qemu-devel@nongnu.org; Fri, 30 Dec 2016 10:06:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cMyl6-0001tC-Ez for qemu-devel@nongnu.org; Fri, 30 Dec 2016 10:06:19 -0500 Received: from mail-db5eur01on0133.outbound.protection.outlook.com ([104.47.2.133]:6896 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 1cMyl6-0001sI-4e; Fri, 30 Dec 2016 10:06:16 -0500 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=oT7XV1Yq8FYRGORKIAQ3TYmZt7/njHZ9WgQ5dxmxWqo=; b=TSKHXxm+Em2K1nP/GSdqrrIAN8GO5me4xezhAXWFF7GAKKf6YuD6Q5/8/Ng3h0ThMSQDSo+d1zh/mIsB40jZkxJcHVvhAD5gxO6KKZ7cfZhrjhYEVxmvGXPRaATuCOzivN8srkdKXqG/XGa6xGmOvEdFlXPcLM3MtdWrm1kOuv0= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=pbutsykin@virtuozzo.com; Received: from pavelb-Z68P-DS3.sw.ru (195.214.232.6) by HE1PR0802MB2555.eurprd08.prod.outlook.com (10.175.35.148) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.803.11; Fri, 30 Dec 2016 14:32:11 +0000 From: Pavel Butsykin To: , Date: Fri, 30 Dec 2016 17:31:38 +0300 Message-ID: <20161230143142.18214-15-pbutsykin@virtuozzo.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20161230143142.18214-1-pbutsykin@virtuozzo.com> References: <20161230143142.18214-1-pbutsykin@virtuozzo.com> MIME-Version: 1.0 X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: HE1PR0802CA0010.eurprd08.prod.outlook.com (10.172.123.148) To HE1PR0802MB2555.eurprd08.prod.outlook.com (10.175.35.148) X-MS-Office365-Filtering-Correlation-Id: 7c8460b3-15d1-41bf-8663-08d430c0a4b7 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:HE1PR0802MB2555; X-Microsoft-Exchange-Diagnostics: 1; HE1PR0802MB2555; 3:UrxS0zq2OomnvtqxMHfyLeqSJ88ux6FAf7QrB2ruTItA7/aY7w6QGHRzkfeAqfRxV1eoGhJbXVUuiRUtJ9lUXrVrrRaCTGeitYH7Qh3oeVUGhsIgVYxyefnldcCrJo/Kdq7DQiCPNvRS823P0YE16MhCGRF+IaKDzBqEHLINLFq874WlHI/1F8F2aroGJvMkEsHULqonx4HLoF+FdZtp9Eu+9xSmqs/6WlwZ8t0DVmOlb2pEpLntmrNFh4MsxNivRGFRQeMZggqaTO+354In4A== X-Microsoft-Exchange-Diagnostics: 1; HE1PR0802MB2555; 25:r4hSBSILiShWmXjeVvX5/AKbDjC8YrQGFvIBXRyT9HWddT3VkaNYot+8Zs73+4KZ9FgFUVFpWIGXIC0oaa7tK0piwWOLkpEhNnWsAW8kRje2gQK08OsUD50SCAI9zHop8HQKdJZJmhMnsyE+Mnsw/SieH1bkoeZn4/X3oNGRx0MCRBweecIh/uPlw/jmMvYNm14ExAP4Prn+kyZLrt/iu1W6bWpI3sTk+Av/GEo+dXhCukfeujtULV9LB5l0yztdp9QzO/ZCgG36ILDM5ZeJL3Ze+mmkZwoMWy18NfSNG9Xhp1UajjLbaB5YTMzgnHR1QSo8iHfWNzD5Y0/0GumPEPi3k+F5h8Y7IY6qsua3dCm51juTyoRzpqULl3lwI4DWT0+JFB46ZISamYwmPJgopyL3H7PVFB/Ctdy5Weq1GPVzjApVgEQ3E4Zt5hNUfGPAM7KV9YXQgCr+qZCvi+PaN1Md27BIIRvtdYjJttCSzGf8c/XbW+Kif4Wo/M15pDJatuDtR42y3giNlPpVrNUQy0AXg/lVQl4jPyqRJhNgrRVPKcTymfP6H2D6ybt/FvdlhY2ILlDukJ7TDnvFrvVvUc5zQF2aABrJTQC+7XKcoZ+caRGPL+niviv6G1VauB0ztOv79Tab15wNL1RGm/QH36m/Ib5dBEzPBFdW8Cfv8NFM8esVRRdWsPo9olZEY77Y7DBALYt+d9VC2UTQfNjLbmIJwPHzzNi5bzcB06vzhRs1zlweXPihHQjw/j+i6jk8ewJS+d7Cur5Kny/BmEq72g== X-Microsoft-Exchange-Diagnostics: 1; HE1PR0802MB2555; 31:EP2cWmPoMeA1Y9X/F/tp5Ve8jI+c6lkAutE82ofSJJ0UtlYIQLZ5uHHyCjD3b42J+q4I1p/eR1WYt5MGEKVSDW7Se1vY9rPGtnMeyo9mUv3xMOJ9LVKwqHtMZNzkI1mlk1zt1n7aUxBlZgkjJJ9X6gBAHkJNd7Si7B4NRDLqJjokAckcddt7R7v0tk/U4favlZ0POYRZ8nU71C7ESHCqeGwHKngGBNwDDcuOgM7jDmlcduEpkL2QNoWEUxM0j3CNMEJdb0o0ssLUA4t5f3VEJw==; 20:10IUbVjJtkmrNa0IhP0yAa5r3OJ44udxyqqdqwdPidr9PSNXI4gu/qSq9eZmmEEZPcySOJIuqyx1vXn3JxBRF+1u+chJjLP5ue3YId1eBPB1KV/cSeSf9kpgH7nIFgVKSOfu3fsldhJemeTnKlpuBUjxW6rXCaFDsgcEqIyqYFChuGw8q14Y/3qn7kzmovbJ2Kf+jSVYDzCTNyGZnUCzDxiTy3XD7zqZIRIC5iNEIDlqmDuNP23oY8uMKFdLkLro X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046)(6041248)(20161123564025)(20161123562025)(20161123555025)(20161123558021)(20161123560025)(6072148); SRVR:HE1PR0802MB2555; BCL:0; PCL:0; RULEID:; SRVR:HE1PR0802MB2555; X-Microsoft-Exchange-Diagnostics: 1; HE1PR0802MB2555; 4:rYWI1Mg5bzfx30vlFElIv+SRY2MhLkonmfza+I9vRDLi8dgXLz68s9L2YNAhaGD7dLfRixoizhG0OiEwFmstcRWmVSljAyOx2rq05B97rdeh2gqgsWB4GDZha2PhJxxxRi6cTPCTtZIWpIvfgP/kuSBEORxtKUK8Vn0QRFbDzOyS3ruSEldgvsCu++igFxO/5MqlG07Bcdq1zGdFPEo75Im+X0e5qilIEfT+UjqL33UBNzVpajDi3llrSDvW+bq8SVqxJojv97UrVKWwLSQDNLrykc9WvwJdWzDkpPCKMM15XohvHvedXMFDdVC9+DwemXq0f5WSEeivYyzkl9tW677THXToZVW+5Q3C456w8A+c6R8XTi5PcOcYatSHTLz0ZNI8iIMwSSRsx3NObH/xXWHpaG4VQD7ncfPj7Glrt5muLGfuASV8lWB4rC4FacDByzoUOXDWoChjUEk3BWmKy978UbSL0mCZWUyqFWqIwLez3hK/tcUCuSorSmFnxQaGt7o/d3kdvLbkF4DEYeFQBEt8GBZ48yiBYIkS/CAMksYvuhAWxmMGm1UeJOHmBGBSkBChi479aV/iZ3iqLO78JE6XBcpcHxsCgLWyomG1bts= X-Forefront-PRVS: 0172F0EF77 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(39450400003)(199003)(189002)(6666003)(5660300001)(189998001)(5001770100001)(50226002)(81156014)(81166006)(5003940100001)(8676002)(97736004)(47776003)(66066001)(6486002)(36756003)(6116002)(3846002)(76176999)(105586002)(33646002)(92566002)(305945005)(38730400001)(50466002)(106356001)(50986999)(1076002)(6506006)(6512006)(69596002)(4326007)(2950100002)(25786008)(2906002)(7736002)(230783001)(68736007)(53416004)(42186005)(48376002)(101416001)(86362001); DIR:OUT; SFP:1102; SCL:1; SRVR:HE1PR0802MB2555; H:pavelb-Z68P-DS3.sw.ru; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: virtuozzo.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HE1PR0802MB2555; 23:ulSSabLCxsBh0bUciktoZEc/qIbjqC0ksYDlzV6?= =?us-ascii?Q?RRBfJWdPlDkCN6z3lxufZYpNcY8f8lOxWjlySoRb2j//heBZ1HHk8mT7Fmbu?= =?us-ascii?Q?s9y6WoiFeT7YKMhqkp/9dzvE7L68bOTCpz8v/zC53tbIu38G2kKvBPJs93le?= =?us-ascii?Q?MpAMHq8ncyTaVCfG4FvPqnm1+IWeajgu3br7UmXjkiJCDo8wQR/Mkl6RQj6w?= =?us-ascii?Q?G7qJ8/frjY5AQSZR2nYj3vJrxWr20ctU7EIKv+XfHgi1b5/GCwyW26u19+g6?= =?us-ascii?Q?OraXF4IrhHTYWqeUXJTq7k1DKytbM9PpXPe18gEfbdFBTeckrSup4kUVlkhW?= =?us-ascii?Q?QGaQwNgJbhik8kz20+cWpKNilZEWvUnplkwq91NhXqx4eeCLln144lfBa+Gc?= =?us-ascii?Q?Rg41rNklJapo/mH1PEDYoHo+O+xp+inoqUfGXrAClZKBlRe4oTER+XXL9sEa?= =?us-ascii?Q?C462sCksx9ZjADWyvpB3KQK0WdDsSodF6h+KKb5aWkjP2SCMBQKRwpso8OBf?= =?us-ascii?Q?oMCiiimRw1d6M6J0507Dn9PMj9tgG/CfWzK1tAAow8L6k+oyZXVVCV7L+J2P?= =?us-ascii?Q?iaDE2JcW9hEvswwkPxE44fk2R7FNuYhxWhBHy24SDIaCeu+kTyl2O3h6NX1R?= =?us-ascii?Q?uWD7TtZqKeIhJ2DHwoZ8C2MUJG3TGHIp7WKYfEreeSj5mxd203DTuqnSSL2T?= =?us-ascii?Q?9dX6tqvNucWF8fyq1jg73rDQCVqsddROSW6xAeqZmxcIuFLxgNzqNXTiZp5F?= =?us-ascii?Q?/EijmiZr6Jr/OA0ID13R4v1aqkchUuur693C4KkuhHEsr9NdvHEPid5PJuVw?= =?us-ascii?Q?mnTmCkO2iKcFTZG96YJhXUPnPp4saHmdutWwhAPws+5lD2db9m/guQ1ZD3ty?= =?us-ascii?Q?M7I5SUO1w7K4rKQi1VKCCY8OkajXusbMCZDhK1H7Oa193NPO5qwcPB7Kntj8?= =?us-ascii?Q?Alk4jbIotVdLOX0Pb9mcmLkOGGcrmnES4CKDLio3H6MOkz1A1vddG91SzR5p?= =?us-ascii?Q?i1AkXgT18yvKcSw/xMvDj90QeeDBXf9W/PdtvJlfiZRh87kwaUsHwc+U7U5u?= =?us-ascii?Q?pQUip1TfKU8mVp4YOUXgqvrb4g/YK9IiwovAh9mznwFj1npsPcZGFie7Mqnu?= =?us-ascii?Q?lux3Q32hLtjALvnUd8MqN0o6aRgPEI2Fu?= X-Microsoft-Exchange-Diagnostics: 1; HE1PR0802MB2555; 6:r6ckpkJzNbXHYtprZpS213jzjcnCPLIgqvWIGuXW36TqVq8xNMIaKT+BETOnDxh5u0SuODTbs4C4h2dmkAKfVXlVa7HDum/BQCBw06K0NPBpMLGuL5gnWtwvwX9FiADfO3ReobxxtWg7kFrJcPe6G7aOlrKJCA+5yZcrIDbdqyAyp44p9B3nQslEHi5yqyf9OOYYQTvpwZYeGJfTxdnDu9dGSFalb4xSWW5ecXQUFJMrdj2OexHpj9WZGX8vBc+z7EEAK3E3LaWIWGwrl9bmao8mgn7OTVY4cs+57fSggxiuIoct6QfY6x7FEk9KflA9HV0rt6lOZCn2v+kVln5DRLWUCxCrj4ZYg+kzNR8dBf2qPEUvIoZbRFujSStpgs+jsHiWyznZdJyEqEV/BNKyHwiUyt9xiwL4r0uIKjTkdpY=; 5:mNAqopD18uOwHJ8glVXArBThngBr52mPLi7Dfwk7vEmLL7QBjEflPnPDuIIvt2yC3KGKwXflZ3ltJHwpJxE3h/qeCYMQAy2NEqjHCeRRha8vNNv9GaUltilclVQC+OWrNQncF6LWamEr49dkMMiC1Q==; 24:84fpog6I7fIG3XiEbsU9mcL2BIgc8EN/758OYxNz+bcuCpTu5LRSicpWJCXom97Je0CiWo3BrgL9KLx8Ahbkx9V/pZ1F0Un9TGL1+D1P/w8= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR0802MB2555; 7:izBzeG0GXIuQ6wyL63xhgs6DRSEaBFblmlZmqcpbYs6kjezIr+ZakdLRfxtsQdVpxvcSK25Ul8i9XNqqHHjGsiEDxgWT1LWw7gs/y6x+6Rqx6UmPegr403poapjc3YZLZaYy3JAgvQlmdkU0gOUvrVW8m4gvyY5SHQscoJRf5dADUk8QsSGu4xOGcsIBkxM5jGcYuLFQK2lrE9udq7rMZ6hGPC7ITCBhQAmrNHTOSR/zcPupNA3tXKsLG4n/eCTpcMTPQJhC+yLNDGLzSbbRg1/naxsJdnr/3NTpPurxMMp1/0w4PAVWHZtp4bGcHsQFLfchsBIBZ1lOMSDldme7nZh/heylxbrMTrnzR7nPGiOpTM2X/9Bx/SPMdtnDWaUOXwURN64LcAs5IZPfReUexEiL8Eq3X78NHmyL1CNQQlh21qOvjD9AjxBe2az1sLHxG+S4mlqPpuhWC1ydl8CGng==; 20:+wLxn3VlRmnkHKjk6B+AMZX8vPeFrwhpldcVojYXSz55AlyUX96T5y9n7bwW8n74Jg10Zn/qXaPAdaGFTp3VMBaOK7mgBOk+WFv/RdajaB14ARslF9jbioksZGD5xQ8mdTEf8WxEoYEBG6uNDDCuhTkDJr2H9vytfGMUW2P/1MY= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Dec 2016 14:32:11.8875 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0802MB2555 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.2.133 Subject: [Qemu-devel] [PATCH v2 14/18] block/pcache: up-to-date cache for removed nodes 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, den@openvz.org, armbru@redhat.com, mreitz@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP We must be able to keep the actual data even for the removed nodes. This is necessary when we need to defer the reading of node. Because there may come an overlapping write to removed node in the interval between node completion and reading of the node. For this we move the removed nodes to remove_node_list and update node->data on each overlapping write. This is preparatory patch for the resolution of partial cache-hit. Signed-off-by: Pavel Butsykin --- block/pcache.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/block/pcache.c b/block/pcache.c index 140f90d6d7..86b28de44b 100644 --- a/block/pcache.c +++ b/block/pcache.c @@ -60,6 +60,7 @@ typedef struct BDRVPCacheState { RBCache *cache; uint64_t max_aio_size; uint64_t readahead_size; + QLIST_HEAD(, PCacheNode) remove_node_list; } BDRVPCacheState; typedef struct ReqLinkEntry { @@ -79,6 +80,7 @@ typedef struct PCacheNode { NODE_STATUS_REMOVE = 0x08, NODE_STATUS_DELETED = 0x10, /* only for debugging */ } status; + QLIST_ENTRY(PCacheNode) entry; int ref; } PCacheNode; @@ -94,6 +96,7 @@ static void pcache_node_unref(PCacheNode *node) assert(node->status & NODE_STATUS_REMOVE); node->status |= NODE_STATUS_DELETED; + QLIST_REMOVE(node, entry); g_free(node->data); g_free(node); } @@ -205,11 +208,14 @@ static bool check_request_sequence(BDRVPCacheState *s, uint64_t offset) static void pcache_node_free(RBCacheNode *rbnode, void *opaque) { + BDRVPCacheState *s = opaque; PCacheNode *node = container_of(rbnode, PCacheNode, common); assert(node->status == NODE_STATUS_INFLIGHT || node->status == NODE_STATUS_COMPLETED); + QLIST_INSERT_HEAD(&s->remove_node_list, node, entry); + node->status |= NODE_STATUS_REMOVE; pcache_node_unref(node); } @@ -432,11 +438,12 @@ static void pcache_write_through(BlockDriverState *bs, uint64_t offset, uint64_t bytes, QEMUIOVector *qiov) { BDRVPCacheState *s = bs->opaque; + PCacheNode *node, *next; uint64_t chunk_offset = offset, chunk_bytes = bytes; uint64_t end_offs = offset + bytes; do { - PCacheNode *node = rbcache_search(s->cache, chunk_offset, chunk_bytes); + node = rbcache_search(s->cache, chunk_offset, chunk_bytes); if (node == NULL) { break; } @@ -450,6 +457,18 @@ static void pcache_write_through(BlockDriverState *bs, uint64_t offset, write_cache_data(node, offset, bytes, qiov); } } while (end_offs > chunk_offset); + + QLIST_FOREACH_SAFE(node, &s->remove_node_list, entry, next) { + if (node->status & NODE_STATUS_INFLIGHT) { + continue; + } + if (offset >= node->common.offset + node->common.bytes || + offset + bytes <= node->common.offset) + { + continue; + } + write_cache_data(node, offset, bytes, qiov); + } } static coroutine_fn int pcache_co_pwritev(BlockDriverState *bs, uint64_t offset, @@ -479,6 +498,7 @@ static void pcache_state_init(QemuOpts *opts, BDRVPCacheState *s) RBCACHE_LRU, s); s->readahead_size = qemu_opt_get_size(opts, PCACHE_OPT_READAHEAD_SIZE, PCACHE_DEFAULT_READAHEAD_SIZE); + QLIST_INIT(&s->remove_node_list); } static int pcache_file_open(BlockDriverState *bs, QDict *options, int flags, @@ -516,6 +536,8 @@ static void pcache_close(BlockDriverState *bs) rbcache_destroy(s->req_stats); rbcache_destroy(s->cache); + + assert(QLIST_EMPTY(&s->remove_node_list)); } static int64_t pcache_getlength(BlockDriverState *bs)