From patchwork Fri Dec 30 14:31:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Butsykin X-Patchwork-Id: 9492237 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 D237C60417 for ; Fri, 30 Dec 2016 15:04:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C0D011FF8F for ; Fri, 30 Dec 2016 15:04:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B4B01223B2; Fri, 30 Dec 2016 15:04:53 +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 F398A1FF8F for ; Fri, 30 Dec 2016 15:04:52 +0000 (UTC) Received: from localhost ([::1]:40195 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cMyjk-00005x-4l for patchwork-qemu-devel@patchwork.kernel.org; Fri, 30 Dec 2016 10:04:52 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40232) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cMyjK-000052-Cz for qemu-devel@nongnu.org; Fri, 30 Dec 2016 10:04:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cMyjG-0000XN-Ec for qemu-devel@nongnu.org; Fri, 30 Dec 2016 10:04:26 -0500 Received: from mail-db5eur01on0103.outbound.protection.outlook.com ([104.47.2.103]:46080 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 1cMyjG-0000VZ-3v; Fri, 30 Dec 2016 10:04:22 -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=3PqGu7hxUyMrTxLQ+osXxT62SVMmvR0dKIIpAa8E400=; b=dHTnfbMMRE5229r48QQpX46QW81TL21xosgb1ZB+GyEDNJaq29JiGCsnYiLHUqvkLUMp7f9V23BnHlvr6qk198xZVJGYvF3dA4r7uSMnR6f/bKX963RRlBHConp1GJT2Gj8DjCI0Dh9XdXoC721VhmFHq8pI7ZMe45pF9eI5dQM= 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:14 +0000 From: Pavel Butsykin To: , Date: Fri, 30 Dec 2016 17:31:40 +0300 Message-ID: <20161230143142.18214-17-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: 4fc09c39-1871-48bd-cf62-08d430c0a61b X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:HE1PR0802MB2555; X-Microsoft-Exchange-Diagnostics: 1; HE1PR0802MB2555; 3:biHZHuyg1rTDeqw/f6t7Yiqh46NGsgkVyz3OcRO+UaN24NcXC0jFnsTaEUV2WufpOIFbIad3nqqsirDzQi408r1PtCnCznQqS6X9J0XMTxznoZiKoQ4pklcujjSAWV/HfsTUymokzhubretcoWTMN6prTLmhbA6JSwEjwlOEFxpJAHwNnBfhC6Kuy2z7ljhx1B1uCpTSDVVYzpF/VqvsGz70b0+9KXloWBCPen74xOK0Da/kxrQ79j7pSNUQsgLEoEqKKhxdFlEyrPUhZ0gzmw== X-Microsoft-Exchange-Diagnostics: 1; HE1PR0802MB2555; 25:xf7tkZsKZbwEqCctK1eQrv5f09YeJaDX/m2Njr4/thCHGHXnORDrRdw1B9LrZiBozRt4lVUFacJBS+Vd9MheptAqt1F5W2VjvIpF1fmH2UCxarPBJmitXTua09yckCemajIGUVMMzS4cGDmDW8e8Dds+LJKwGHpvkQZyV9awBj3uCRHNmYF4GbByyKMGWAU8qQiHu9BcVFHWnLpw/+d7fSCIVmkf4lSm+4RnPH66eo+sbURpTYC/uO3xdg/Ruazqlg0tGSyXwaPEL7wSD4LqIbla4BPRYvqEA/6wllqHqsenW+/ejAWbIwHsl6i3efPTvMgzqPGcPlQuBsCnlxAUErGm+mPF8D0lke+Yc0DAR8azQZr39TTR+c9ZT594LyxZ6ZpEVAJTn7Nl/6nkOggG8ygbKRQstNcLyvzi9ivw7sa2VZhde3Hwwnt3tp8paJUU67ONLS78EIVRhyv9SBZ68fv3ZxZGnPS2idiISawFekf6EH/hT+OWXQ5nHdGjEFZKP9n6HQJLiDbe/qC/8IDNgupqZwKXeZlkf6xfgUDYYOJuc31MnPaHUZ0lfuKm15ZwvWC+XLL+Ix/3Mjj3X8XO9zEKHdDWoWHJK98X2EDf9eSkFfHkd//5Y6IoinpnTXzdVJ2aLDmb3F9mURuxlscAWExfMoaSZHpOanWGUFS5suVpwYuahgtpbW+W9ECFfs+l8QX9riVczdkyM2CV0t9agPRZ/rY3x2Xl0Nql73WLwSc1+QvYXnO+5Xl7Ay+fxCBz X-Microsoft-Exchange-Diagnostics: 1; HE1PR0802MB2555; 31:ar2KhGtWKpNF3u6VqhJ2R+NzuiQmKAjAiqSnh67G3nYG+/gMDOJL2EvQjWaQyUVMQFWOmLYYw18GrZlD9TvMJciIUt9eMv5v81oVVma1CSHNy93r9zo1Xe99a/wmfdFyj6kkBwCe20ioI4ZXqFOdR+TW6I7aAWNrlWgHf4sBwEnTD1Dd88lXkVCJfyndfx1uk85wwYUTmSglcCEi1fX4bLxO457tGVuHzEi+N4iMYCrw0asuvvjvh6tTN1s0OzjHHbrfs4OqGo2lZNcQ4x42/w==; 20:ARoCOUOfd/+aVnne0dnNRP82DtARtvMkENrkGCU+YUuUsbdbJn+MlCTAVrZQSVtr5hsgPuh7L5XAQ0+KW9iszTl/bUaqhtAXGEbf5SskMQxF86xVkmAZ5C1FP4uGLOs7jEpJe3IE4/Nu4UVtm9G6RqMmxTQipidos53XgLcQG/2/anKNt1vy898jrqmlKo60WY/U3AUqNKLl0la+5sRXfvitDbYUIQBfdURpoidLkjAw7k6EkcgO6HPn8edZPctt 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:l7OAkj+5w3JYca04kQQjAOyw0G9/VpxIxOs+z+pOpYIpBQAKnod1T7exYenosK3/saqOivbFG81xAebrF3a33CRLLln/a9pxVK+flbxxWaBlZ6Sbo7FFr/K3B6WO4W+fhD8USSlsWHkxqrlgPWza3+XoKPkbToJ3tseBJyYssFbE960OoC2qEv7TTVwkP1IZw3S5C4Jx4wcyEj1quBhCEvLpYObzvlOLmg0vB51zzxgiqQ/YYNgP4fNKBFp+CXCSF2zQGNmDsoEmswjbvlJTJDcY/oSuZXpi2aDcwJV2oAVjsXG/SEABcf6wr5V2TaaMOBetP74cqM/Wubj/ivI2dtFk2fIrHOuTLcBjv7Jfo9MRCgeWGC9PYoUMheeHIuENQKO8F4HujeQmB+B+/ZO6MNFkNpqkA8mFmKCDc/6hcEMmx3pHwd7SXY0eUZTdtnUaCowVZnjbjwzY10KT/P11r6/06x3wf0eXcL/k847As+FGGUjkr3P3Y2H2GWQN2z/1Fj+8vJkk7uspcMmaq9NiGpMqFRGkpbWk7Cnqq7lbdFpz/oWnBOgdXQkSLYuUPmbc5Bo5NFo0UIXzFeYCkxJWgX9u2SJ7XNHUlAKytLz81co= 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)(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:FOhT2oBwUPKZA3P6TADC8+0pcrvYntd7YncBWYP?= =?us-ascii?Q?k/lHreo7s8qWTDHb+Il2HIR/kgA2zGexFi6yES37FOdMYR8GTy7d8TU3F01X?= =?us-ascii?Q?PTYf2WJmlxNBRccYwWb+gNECEyKBWEJ0GTxRnLh+ODpdPEJY+nJvNchgTHUY?= =?us-ascii?Q?pWfc0lZSO1+l0U3sqYO+jPZUXS7x/3smzky/ws/o2uwj7X6OPrleHyepvUkI?= =?us-ascii?Q?G+XnfIlKYfdh6xUnNHGvcl0M58lvTCVV6tjl8xC9vBybPHokhh0aZBzsk//8?= =?us-ascii?Q?q0URztsgVHE6ZoCEKsBvVhp6uS4NiVYK2FfTcpq4JVD3VCC4mG9YJDbZy9e7?= =?us-ascii?Q?2hrAJBdexDKub2AKba8HP/AIFFGPtQBp+iFFF6BWNbSvvYksi4iLQjik9gJh?= =?us-ascii?Q?N5cuvaL46pQmVqDDQyxanhzciO3E6aJS+QDlzwbC630csAhZr/TTyylGYg/S?= =?us-ascii?Q?C8cpj1m+jC6WfTqr0rDvmIwGrIdkTzIBqMNjXXh20WI3Rbt6Qp258CVRUOpG?= =?us-ascii?Q?HbVrPq/1jMJQ/kIbrRFcT0j9r3OmWwGjW0dCie+rGnWtPPcD/mHKjnJs2vwc?= =?us-ascii?Q?fvMKRs/qWvfgB/lzdem3Mdbc1YBvrdXNrEaVhi9+n/WmEulCzXPE59424/vD?= =?us-ascii?Q?rLvqT3I4QhmOp3eD5qfyZnX80kiNWA0la0Goxqtkftyw4/TXvmgYqiSGKsjo?= =?us-ascii?Q?Kt9yEwOKqDVq4AYxP9EJSkiUc5g83z+jeHHbZd73LqoeHsnPTZ5gyAIQIodp?= =?us-ascii?Q?JVMHHnKk//osr3nhl74LJe8Ru++CcSFmLE1IkV64wBMRmV8EEW5BvQob01Bx?= =?us-ascii?Q?R6KzZ7B9jvqc/PbLPs3Auuf3GPraSm3E2f2KOx6sdiTZnau4A5f0/asXiIzv?= =?us-ascii?Q?QJwY5SuzvBeS29wTeJOsCtoe9JM6WCaG9A+TJ0aDMc8/PTRd7d1VqnFGP8gb?= =?us-ascii?Q?eK55VAOMBdtFq+QUVttGC5mi0eMIX5zxjaUGwhgsMZIfwuoBzFLFmjp+XxpN?= =?us-ascii?Q?qR9H5eY4Wgdm/C/p5UHuNWe/YxE2SbvMpvJvYgZLMU9NXH53ibKgVIm/ym2A?= =?us-ascii?Q?qmieSNWvFLmg6UwL6rONYWJZdUeP4u3YDV03wVprxqBuP3skpGMgXmPVCyzz?= =?us-ascii?Q?U4XzZBlu2/ds=3D?= X-Microsoft-Exchange-Diagnostics: 1; HE1PR0802MB2555; 6:802ssi/AbQMoV1edOr6SE4AWyjYmRYJViJ4zjPEFkF4kfweIycpbBKPVV2iRn3mDviqPC7Q9UvY2YuWrH50cowilXGOLTkae0JogbA0pAYo7kf7e7ltfYBzKOohQUAK9wqzNnB+6dHAb8mt6pSK8eZ5S8Ld3xuQW3VqstGLPcH16C7uvXyu9MCGru4O5VldDaHP7B5J0rrruA/Y2Q3+DXb4ep9DBCRpLExZgbwcqTmQh+2lxoMeAKqX5NlTy4ieWvbi6sCOhfuc6Gr+f71yUOc2+drCaNvZKgFT5DV5xET6S8jJ5o4MSS7vNzwdKw7panqtJ4TJbCi2owRer43o6sX6+GnDYJ5fANuc9PiN4UsUqzu2YWhyllESycp3HPvdzbA0kAHw+rVbyMyMEFu55JrkaxSlcpzvfcIBU8PeiPRE=; 5:H0gdBiftSvmddoE7F1BPLmRTIZxg2f9Z3lcagWQMVQYEA0Tjoma0ksX7QQmRpkOyl5Mlfpu88mBoGGv+hsOhBfVLN46OwZwMU36UcrPe/J4dBjYz9zSbH2wL3bO33d8KvGh/sHzDwCH4WU+zSPerUw==; 24:M3XYOht7tcPKWBbVtjrpx4yrnm91UjsMhUXbxQ3DQbIRbjqXc/X12PI3kyEM738Z1f9TZPFxllbM0yn0EFWDjU1G+8mnPIeEPEu9hynZhCI= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR0802MB2555; 7:eDWuJeUl9cKzRFG78B322c+dcgslRrvv/x+HrxM3YFHPFcKkTEdLrbGpEefeJIkjNmLgodiXlX/S5bQiYrNe8TpsiaohCCJXEUuqZPALJ+GuUnX6Yqeqc1tD9ckEqaguPklFJQprYbE7g2KWW8o5XAPYKeI9090HV6fbt2nmTFd95kyn/+ZS0qsZUhYMYwKNl+artx08DENQnc1urNTmQpYWhozACoDY3YA3lJTkTAHvXzqAQbi1TD0mzI2uXRisvLbJxUHU9mNUJeweXDDUnxvI8F9jKnSoRNHeok9g7HPDa2bY34/hl/Dab/DnPqu8+0VlMTibc6QMm/lrGL/CrbFLqrYshOfa4poqJXZhReaMTUnQfFvI1MhHiMCFpR/F//tzohYlfk1z0X9e7gE3jqB50V9OunC0RXK6H04lAYTrBpvLw/IulMGyNiN2REyGAXHcQPGIH2U7U9de58RruA==; 20:4DRPLr+tqNws63vAJGxFO5J9HPxuqLKjdJUfuKVprnKvE/Bh6O1mkakk4kcYAwX1PY5pAD+f+hUQN233egXiJPaLMAEZuXFEbD0sVrzHe5v9d5mCPe2lYtGcXCG1+TFfyED80fonyPty9HWB9oxDKPXxARZ+Y1bsrruej1aw8js= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Dec 2016 14:32:14.2224 (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.103 Subject: [Qemu-devel] [PATCH v2 16/18] block/pcache: drop used pcache 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 The pcache is directed to certain situations to sequential reads. This concept allows to drop parts of the cache that were already used, which will reduce the size of cache and the number of displaced nodes. Signed-off-by: Pavel Butsykin --- block/pcache.c | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/block/pcache.c b/block/pcache.c index 3f89e40b05..6d2b54cf78 100644 --- a/block/pcache.c +++ b/block/pcache.c @@ -81,6 +81,7 @@ typedef struct PCacheNode { NODE_STATUS_REMOVE = 0x08, NODE_STATUS_DELETED = 0x10, /* only for debugging */ } status; + uint64_t rdcnt; QLIST_ENTRY(PCacheNode) entry; int ref; } PCacheNode; @@ -109,13 +110,17 @@ static uint64_t ranges_overlap_size(uint64_t offset1, uint64_t size1, return MIN(offset1 + size1, offset2 + size2) - MAX(offset1, offset2); } -static void read_cache_data_direct(PCacheNode *node, uint64_t offset, - uint64_t bytes, QEMUIOVector *qiov) +static void read_cache_data_direct(BlockDriverState *bs, PCacheNode *node, + uint64_t offset, uint64_t bytes, + QEMUIOVector *qiov) { + BDRVPCacheState *s = bs->opaque; uint64_t qiov_offs = 0, node_offs = 0; uint64_t size; uint64_t copy; + assert(node->status & NODE_STATUS_COMPLETED); + if (offset < node->common.offset) { qiov_offs = node->common.offset - offset; } else { @@ -124,11 +129,17 @@ static void read_cache_data_direct(PCacheNode *node, uint64_t offset, size = ranges_overlap_size(offset, bytes, node->common.offset, node->common.bytes); copy = qemu_iovec_from_buf(qiov, qiov_offs, node->data + node_offs, size); + node->rdcnt += size; + if (node->rdcnt >= node->common.bytes && + !(node->status & NODE_STATUS_REMOVE)) + { + rbcache_remove(s->cache, &node->common); + } assert(copy == size); } -static int read_cache_data(PCacheNode *node, uint64_t offset, uint64_t bytes, - QEMUIOVector *qiov) +static int read_cache_data(BlockDriverState *bs, PCacheNode *node, + uint64_t offset, uint64_t bytes, QEMUIOVector *qiov) { if (node->status & NODE_STATUS_INFLIGHT) { ReqLinkEntry rlink = { @@ -143,7 +154,7 @@ static int read_cache_data(PCacheNode *node, uint64_t offset, uint64_t bytes, return rlink.ret; } } - read_cache_data_direct(node, offset, bytes, qiov); + read_cache_data_direct(bs, node, offset, bytes, qiov); return 0; } @@ -228,6 +239,7 @@ static RBCacheNode *pcache_node_alloc(uint64_t offset, uint64_t bytes, node->data = g_malloc(bytes); node->status = NODE_STATUS_NEW; + node->rdcnt = 0; node->ref = 1; QTAILQ_INIT(&node->wait_list); @@ -492,7 +504,7 @@ static int pickup_parts_of_cache(BlockDriverState *bs, PCacheNode *node, PartReqEntry *part = &req.parts[req.cnt]; if (ret == 0) { if (part->rlink.ret == 0) { - read_cache_data_direct(part->node, offset, bytes, qiov); + read_cache_data_direct(bs, part->node, offset, bytes, qiov); } else { ret = part->rlink.ret; } @@ -523,7 +535,7 @@ static int pcache_lookup_data(BlockDriverState *bs, uint64_t offset, if (node->common.offset <= offset && node->common.offset + node->common.bytes >= offset + bytes) { - ret = read_cache_data(node, offset, bytes, qiov); + ret = read_cache_data(bs, node, offset, bytes, qiov); } else { ret = pickup_parts_of_cache(bs, node, offset, bytes, qiov);