Message ID | 20201002160843.28666-2-aryabinin@virtuozzo.com |
---|---|
State | New |
Series | "Series without cover letter" |
Headers | show
Delivered-To: criupatchwork@gmail.com Received: from imap.gmail.com [142.250.102.108] by patchwork.criu.org with IMAP (fetchmail-6.4.8) for <root@localhost> (single-drop); Fri, 02 Oct 2020 18:11:18 +0200 (CEST) Received: by 2002:a6b:b654:0:0:0:0:0 with SMTP id g81csp976547iof; Fri, 2 Oct 2020 09:11:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyYOLxgvZAGPZeiyVdVqfVTdyVDyO5Oot8mBPuuC144Vg9sBWYNNnNpYBrxG9xCOzuod9QS X-Received: by 2002:a19:c7d7:: with SMTP id x206mr1058015lff.540.1601655072264; Fri, 02 Oct 2020 09:11:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1601655072; cv=none; d=google.com; s=arc-20160816; b=jf9rtiJLJXsrGw6vks1qK2S6a3DS3U4jrW5iL8FIIvDnGz5hLM4GKzj85Oa0UsTlFc Wp2iVhMi76MIl9+ybczrVjtZlsKH3vpqfEjR74FlN1Q5Khu+NF3wd9t4dhj5xJyXz5rI 5+G7pnDTMQmghjfYhF6FpLimxKN0rYQczUfdyGy+h2f/UbDVQWIOoVBe5rgdUb7O6Owh ExVpZ9+X0Xch3HYP4bQDe6sMGrlYyCb4TgDuGZ7wuYGDmhhyteke6+cNnizQQb3Ep7PY DMm6YILE0ZT4pBhSgmQfvnrxufeaf4c2mhC/xX95qf9ifuSm673WEfGhlZzrYeu97C/3 bAwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from; bh=mW6+XEYOUozU3xRwhlKl13yezyCWnIT+xhKJQo9z3YU=; b=eyCrJAw5JhGaXrJtFZbIRcnFN29WZYn98pVmiEa25ztZcmAu5r1Bt3Dk01ACHzDsXS tRfgmFoyywokaaJRDRYaaoLKYB5KL0ZjbhgkxZInSR9xA/SlAlKQDBnT6FeBca6Zed87 8H5iuJgajyWXZjLT9+/eSqizeSngK3QiA+hOabzFRpqlgiZuugV2Uxmt6R/2fIMPZ3sk yowEpNwNc4d+0Mi9Lto7r0wSQeE+6BkGz7c4Q3xRnGAVgeWErUeYFXQPU2Fr5Ct5H4QN guphncUjjL+eNQDFEyzbWH957z/XXWwiakS4haBnBslmJJIChh5wOeaoOm78DOB9ccYP MJtA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of devel-bounces@openvz.org designates 185.231.241.50 as permitted sender) smtp.mailfrom=devel-bounces@openvz.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=virtuozzo.com Return-Path: <devel-bounces@openvz.org> Received: from mail.openvz.org (mail.openvz.org. [185.231.241.50]) by mx.google.com with ESMTPS id f7si692859ljg.422.2020.10.02.09.11.11 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 02 Oct 2020 09:11:12 -0700 (PDT) Received-SPF: pass (google.com: domain of devel-bounces@openvz.org designates 185.231.241.50 as permitted sender) client-ip=185.231.241.50; Authentication-Results: mx.google.com; spf=pass (google.com: domain of devel-bounces@openvz.org designates 185.231.241.50 as permitted sender) smtp.mailfrom=devel-bounces@openvz.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=virtuozzo.com Received: from localhost.localdomain (localhost [127.0.0.1]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 092G9qfK007342; Fri, 2 Oct 2020 19:09:52 +0300 Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-am5eur03lp2057.outbound.protection.outlook.com [104.47.8.57]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 092G9nab007338 for <devel@openvz.org>; Fri, 2 Oct 2020 19:09:50 +0300 Received: from DB6PR1001CA0017.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:4:b7::27) by AM6PR08MB2968.eurprd08.prod.outlook.com (2603:10a6:209:43::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3433.37; Fri, 2 Oct 2020 16:09:54 +0000 Received: from DB5EUR01FT044.eop-EUR01.prod.protection.outlook.com (2603:10a6:4:b7:cafe::2d) by DB6PR1001CA0017.outlook.office365.com (2603:10a6:4:b7::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3433.32 via Frontend Transport; Fri, 2 Oct 2020 16:09:54 +0000 Authentication-Results: spf=pass (sender IP is 185.231.240.75) smtp.mailfrom=virtuozzo.com; openvz.org; dkim=none (message not signed) header.d=none; openvz.org; dmarc=pass action=none header.from=virtuozzo.com; Received-SPF: Pass (protection.outlook.com: domain of virtuozzo.com designates 185.231.240.75 as permitted sender) receiver=protection.outlook.com; client-ip=185.231.240.75; helo=relay3.sw.ru; Received: from relay3.sw.ru (185.231.240.75) by DB5EUR01FT044.mail.protection.outlook.com (10.152.4.182) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3433.34 via Frontend Transport; Fri, 2 Oct 2020 16:09:54 +0000 Received: from [192.168.15.21] (helo=localhost.sw.ru) by relay3.sw.ru with esmtp (Exim 4.94) (envelope-from <aryabinin@virtuozzo.com>) id 1kONcQ-002qoB-BL; Fri, 02 Oct 2020 19:09:14 +0300 From: Andrey Ryabinin <aryabinin@virtuozzo.com> To: devel@openvz.org Date: Fri, 2 Oct 2020 19:08:43 +0300 Message-Id: <20201002160843.28666-2-aryabinin@virtuozzo.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201002160843.28666-1-aryabinin@virtuozzo.com> References: <20201002160843.28666-1-aryabinin@virtuozzo.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d64d8141-5432-4824-2bcd-08d866ed99d2 X-MS-TrafficTypeDiagnostic: AM6PR08MB2968: X-Forefront-Antispam-Report: CIP:185.231.240.75; CTRY:RU; LANG:en; SCL:-1; SRV:; IPV:CAL; SFV:SKN; H:relay3.sw.ru; PTR:relay.sw.ru; CAT:NONE; SFS:; DIR:INB; X-MS-Oob-TLC-OOBClassifiers: OLM:4303; X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?9zAbazxly+FReq50rz9lrdeCmCburG7E0EFE3ce4a01u3bIq76YiHRI2g3Vi?= =?us-ascii?Q?bGyKMtq/juncJ/IvAt1rrhZmIjIkhTQ/g8LJHn6QZUN+MU2LA44C/jDVZZ3B?= =?us-ascii?Q?FRfPn8E/ptlStWhcOjFNF3DVb0T8DO8LbxdHFlJfi1EVH1FmFqMKe51FpiJN?= =?us-ascii?Q?yW29YdIKPjId9kQy0BqyyNzjFrOEhv9kIDaEyV75dml6D5xsNVqaQSH/zYec?= =?us-ascii?Q?lc/vYuBIu1a26b7Vrb1+D6qZJVsYAWVU94XteudF1iQNiDBCg8FV4rMhIBIh?= =?us-ascii?Q?BOKpdAcs0zoGUd8AVEQ7TSfe1RBAJq+Nz+pgBLVlneMpvOyb27cs1S5S2hbi?= =?us-ascii?Q?9ZcxIWtxK1+OXRSDmwO5nV5NdWkhr8Ji5OEeZRvSOwyJu7BbYf4169hN5zGd?= =?us-ascii?Q?GCwllT2UOth1jCGqRz9vvNyOoYZBrjYFr6f90U4NFGaBro97auNyUJsoXArx?= =?us-ascii?Q?BTerMt//H39D1j7UdImWu8QTNxBH4Q2lYN9RMd9vSiCot0YU7P7uJJOlBSJQ?= =?us-ascii?Q?o9t4NAAEz6oaEfswv12l+/iKdTTXIgWyI5rPMoKfakmAjwsX7cqgvcJu/NWl?= =?us-ascii?Q?eNpTYBZkkC5spDqAyAZccklsgxKuCYnDVIkgdTzYP4rpyhqlGHhhYXhTCjn8?= =?us-ascii?Q?/2W2AAvqWGyD75X091baJ3rDOnXVS3LYVq7+N/lfXInEjfoLUOy8Ww6OeN7w?= =?us-ascii?Q?RaU52shAin8Sugrq/OO7G9Dg/9Wq7KTxfz8uGUidK/V7cSwNfvSE+PhkTHLp?= =?us-ascii?Q?GZxRv1lOv06Qo4lPFaHqryCbVO/wEKfO/zHnjQTQ8KZ6xPEdNc7bygvK6l9a?= =?us-ascii?Q?htJWi+WvT8vjC0oLWj16rossvRx2uWp7pIyRNgtldi3XzJZ5IUrBM7qG8IYU?= =?us-ascii?Q?YRy2jl7W27zraeYGKH1wvjEEtugJZEosiAxlO4J1ftgJjwuuxB5TSUKWlRg+?= =?us-ascii?Q?BDElbRwUNnH3fzCwL0kIIK2dIIAzjl66sO92vzqoiT5MwWF59xTtxHn6Qnc6?= =?us-ascii?Q?3/My/ovL59GJRTSSH9VVAjA76NVoDrdw9XoOs+waoOvhQnI7VDcyf9ZIpWKG?= =?us-ascii?Q?OoigDZmoBfXZV78kPlZlgZRgkXYKmhjfw2qgnMyEmhjAfXnn7DWmzqU6Jrtd?= =?us-ascii?Q?WKmfiDCQoFKzHCDzKtfwT7EwO6CLOA4nAuU5n5s54Mm4y2dBl0SJGuszzMnk?= =?us-ascii?Q?cXMPZ/aGiFC6Zn6Bmgd/KEbDMc7khFR1CVY8klmDsT1YRbT452kiwIQn3vdE?= =?us-ascii?Q?8j0mbyzdsPNiPz2VvgfD1KKFdo1QCk0sB/0Ws0V0FiMDtw2ykejSfz0BhqJH?= =?us-ascii?Q?03E=3D?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Oct 2020 16:09:54.6815 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d64d8141-5432-4824-2bcd-08d866ed99d2 X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=0bc7f26d-0264-416e-a6fc-8352af79c58f; Ip=[185.231.240.75]; Helo=[relay3.sw.ru] X-MS-Exchange-CrossTenant-AuthSource: DB5EUR01FT044.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB2968 X-MS-Exchange-CrossPremises-OriginalClientIPAddress: 185.231.240.75 X-MS-Exchange-CrossPremises-TransportTrafficType: Email X-MS-Exchange-CrossPremises-AuthSource: DB5EUR01FT044.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossPremises-AuthAs: Anonymous X-MS-Exchange-CrossPremises-SCL: -1 X-MS-Exchange-CrossPremises-Processed-By-Journaling: Journal Agent X-OrganizationHeadersPreserved: AM6PR08MB2968.eurprd08.prod.outlook.com Subject: [Devel] [PATCH vz8 2/2] mm/memcg: fix cache growth above cache.limit_in_bytes X-BeenThere: devel@openvz.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: OpenVZ development <devel.openvz.org> List-Unsubscribe: <https://lists.openvz.org/mailman/options/devel>, <mailto:devel-request@openvz.org?subject=unsubscribe> List-Archive: <http://lists.openvz.org/pipermail/devel/> List-Post: <mailto:devel@openvz.org> List-Help: <mailto:devel-request@openvz.org?subject=help> List-Subscribe: <https://lists.openvz.org/mailman/listinfo/devel>, <mailto:devel-request@openvz.org?subject=subscribe> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: devel-bounces@openvz.org Errors-To: devel-bounces@openvz.org |
diff --git a/mm/memcontrol.c b/mm/memcontrol.c index c30150b8732d..37d4df653f39 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -2213,14 +2213,18 @@ static void reclaim_high(struct mem_cgroup *memcg, { do { + long cache_overused; if (page_counter_read(&memcg->memory) > memcg->high) { memcg_memory_event(memcg, MEMCG_HIGH); try_to_free_mem_cgroup_pages(memcg, nr_pages, gfp_mask, true); } - if (page_counter_read(&memcg->cache) > memcg->cache.max) - try_to_free_mem_cgroup_pages(memcg, nr_pages, gfp_mask, false); + cache_overused = page_counter_read(&memcg->cache) - + memcg->cache.max; + + if (cache_overused > 0) + try_to_free_mem_cgroup_pages(memcg, cache_overused, gfp_mask, false); } while ((memcg = parent_mem_cgroup(memcg))); }
Exceeding cache above cache.limit_in_bytes schedules high_work_func() which tries to reclaim 32 pages. If cache generated fast enough or it allows cgroup to steadily grow above cache.limit_in_bytes because we don't reclaim enough. Try to reclaim exceeded amount of cache instead. https://jira.sw.ru/browse/PSBM-106384 Signed-off-by: Andrey Ryabinin <aryabinin@virtuozzo.com> --- mm/memcontrol.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)