Message ID | 20201012115805.24557-1-aryabinin@virtuozzo.com |
---|---|
State | New |
Series | "mm/memcg: optimize mem_cgroup_enough_memory()" |
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); Mon, 12 Oct 2020 13:59:31 +0200 (CEST) Received: by 2002:a6b:b654:0:0:0:0:0 with SMTP id g81csp4309609iof; Mon, 12 Oct 2020 04:59:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwRMUS4PpeRRdUoXVt1/upkZ9U/Gf2HfInXihVX6nQBhtiDfAzCDgEAR5FZ/PppZTEhLiSD X-Received: by 2002:a2e:8059:: with SMTP id p25mr3196905ljg.306.1602503965586; Mon, 12 Oct 2020 04:59:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1602503965; cv=none; d=google.com; s=arc-20160816; b=RomHaF5eArGENmhuhehJPSPvBQxGiOy8YgbFMQae88yialEXXsmQ1eAZ0vJAGKTOay aVWjQYUfeRsTb/rK0sd7LqPUT6AcBzaVfLfQvrqf0sspcFIWi+Zy4F+TOAL+zjiwLxsc d2zQco/vD8C4kWT/Owpg9xyMXWNrNz+Xq6Sn89vIO6z94+LWuXy9sa1oCKQFEO5GsNVD 7VqGbT8VO7WVn7F1VWnY45sYVE6tp9y2C+mDfsl15mx3+npVX0STk0azhOkur0ZQn9TZ 8H3VFM/lEXMvefGoBaET27mVsyopQACnQWH7Ri8SwssJiNbUyhV1lcooW7bPrY+lG3/n LeWQ== 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:message-id:date:to:from; bh=xUfO+SLAvsWNAwC854B6lrhgpsPARl1MEQK2ElLQYU0=; b=bEQoluh9TWEe0cDBTrngBPYN9NlrRqF7QrvLzXKuM0duQ8gVHpT7ojut5aQXDj57L3 FTsLzpg6Sp80sQYEuBR8lBSwL9OzEGGLaeKkvoouYn3+8bMeF242tO1RfR2HnpYgTAoe A7RxGsx/S51H3Zgml7vOgbjYDIRKzE5ZN5vQw7iKLUU16t2rcnp49Ix427bde8NjVbWO 05kOQSP5I/UUWM23aZXEv8Lva9dtQ8ms3YnzNVtCaH9CCS0vatUzdWD3WEYcf6bYZecs vgVYhRsmQnMiGOYL7baeWpmwC16lm/Oh1N/oE0PUNtmN+p2xnxHzDR6XhL7u2e14SdeT MDOQ== 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 c25si6452613lfj.51.2020.10.12.04.59.24 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Oct 2020 04:59:25 -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 09CBwiDO029717; Mon, 12 Oct 2020 14:58:48 +0300 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05lp2104.outbound.protection.outlook.com [104.47.18.104]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 09CBwghF029714 for <devel@openvz.org>; Mon, 12 Oct 2020 14:58:42 +0300 Received: from DB8PR06CA0010.eurprd06.prod.outlook.com (2603:10a6:10:100::23) by AM7PR08MB5317.eurprd08.prod.outlook.com (2603:10a6:20b:101::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3455.27; Mon, 12 Oct 2020 11:58:42 +0000 Received: from DB5EUR01FT018.eop-EUR01.prod.protection.outlook.com (2603:10a6:10:100:cafe::b) by DB8PR06CA0010.outlook.office365.com (2603:10a6:10:100::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3455.21 via Frontend Transport; Mon, 12 Oct 2020 11:58:42 +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 DB5EUR01FT018.mail.protection.outlook.com (10.152.4.251) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3455.23 via Frontend Transport; Mon, 12 Oct 2020 11:58:41 +0000 Received: from [192.168.15.128] (helo=localhost.sw.ru) by relay3.sw.ru with esmtp (Exim 4.94) (envelope-from <aryabinin@virtuozzo.com>) id 1kRwSX-0045An-JX; Mon, 12 Oct 2020 14:57:45 +0300 From: Andrey Ryabinin <aryabinin@virtuozzo.com> To: devel@openvz.org Date: Mon, 12 Oct 2020 14:58:05 +0300 Message-Id: <20201012115805.24557-1-aryabinin@virtuozzo.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7791804e-2afa-47a5-dec2-08d86ea629e9 X-MS-TrafficTypeDiagnostic: AM7PR08MB5317: 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:2887; X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?vz00wnIyhEZpEULU+ySqwb6pP96Zoib3YPxbRZ9SPiowaUaPavoEsk+MHw93?= =?us-ascii?Q?3wbecgQ+zpJaj8MxwKjsF7/QdzqG/oEY8rhHkXgNPUnMSNXwOhFwvP8tb9ku?= =?us-ascii?Q?DzXjPNtXDEkYkBLmmnBnTJsq43l30CR6oQoQiFwfQ4lka9rl38pt04vUoszA?= =?us-ascii?Q?eJG7WiQpRUlolDBWOfzO5eD/b47jxPDTJmtiQJveEdSvr2HGDxmrPItmVxNx?= =?us-ascii?Q?h3jDSRre1/F666yrQ2fDPS0YFfctiM2DbNcxOT9NB3bsDS5WxUtQpXymLlu0?= =?us-ascii?Q?QkAgSogdvgFOhbSW7AWXrGOETs8REkheN9s0uDqGW2FAnubHSIm6O4GbeULD?= =?us-ascii?Q?ArCFbRc913q8g+rxGBXORakDKvefI/mbR1S5FlB3kQ1RoH07rkHm4wQW5Sgi?= =?us-ascii?Q?zNZBgQqqi/BG0otCTj2VHMn58c9xCW4L0h6IWYXOLPMMvdUvQFw/y+zEV0s+?= =?us-ascii?Q?uUv7wxWX1qIMb37Tm1Ibdit/ZWOiUsTC718icofzb+7fc84VeuvzXEJNbF7B?= =?us-ascii?Q?hp/X29iLd30i1nNNNwqWTBIO/gjU9nvtxqkFbCOl0WXePSOAjmCKKQpsZdJj?= =?us-ascii?Q?qI8ciMJ8tdUk+3FyD7xGEWepWQLCDxFbSd83Lvy9HUJsT83K9uQt7ISlum8v?= =?us-ascii?Q?rwU2CKvOxWbvBK8yfQCw9sPOGIfFV17Fy1dD6MdllwLGoNmr7xjOBuPx7xIZ?= =?us-ascii?Q?B16TfX4uiyrAENwtf5b7oKYqobfXkqy/TfW60dzwzy1RKrPbDDJYMDa+yr9g?= =?us-ascii?Q?IJr8201ybdPdoh3WqtUjCXZnAY8/s8pq2PCDHpzH+/ktGsYS4SQ4qSvjCf6i?= =?us-ascii?Q?HDkZsvd4dWg8ADIG/G3A0hPhniXQ4SXXiq98o++MfOTd3EjLKWxITMeRKo4x?= =?us-ascii?Q?H0Ay8k0IDx/yAoukx63Jy6eJZ1cO53OKL0X0ufT0U6R4MTpts57JWF250XXp?= =?us-ascii?Q?F88HiT08/Cj6QkxLltOrlJUozW2zH9kkycK0rSAcfKXj27WzHYt3AA+ad2xg?= =?us-ascii?Q?9bWcLTKkJydsAZ3flm/EyWlIsQKu2NeiQv9BxAjvtQC3NoGWZ5Dk21M32PKK?= =?us-ascii?Q?Am3v1UUBCAw3oMpFiUBn5s1LG1/FoaccvTkQtc5sRBdy34RMRSlbmmfCzwIM?= =?us-ascii?Q?YhRsJ3wUo3APvlKIZvIdvr8MR06pXJX27BSC6dmnkiOp74BuATPUnCTncSki?= =?us-ascii?Q?hdLM0SGt7wl3NI7Ld5+THx5Mqw+ygMc9S54jPrVbqbB0SCigv4w+dgZHOZCB?= =?us-ascii?Q?78SylYo+B0PN5JRpj8feUP8qH7vT9hxQCtdE6LYsU62yJobBX9JA91bvydj6?= =?us-ascii?Q?ncE=3D?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Oct 2020 11:58:41.9724 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7791804e-2afa-47a5-dec2-08d86ea629e9 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: DB5EUR01FT018.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR08MB5317 X-MS-Exchange-CrossPremises-OriginalClientIPAddress: 185.231.240.75 X-MS-Exchange-CrossPremises-TransportTrafficType: Email X-MS-Exchange-CrossPremises-AuthSource: DB5EUR01FT018.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: AM7PR08MB5317.eurprd08.prod.outlook.com Subject: [Devel] [PATCH rh7] mm/memcg: optimize mem_cgroup_enough_memory() 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 6587cc2ef019..e36ad592b3c7 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -4721,11 +4721,7 @@ int mem_cgroup_enough_memory(struct mem_cgroup *memcg, long pages) free += page_counter_read(&memcg->dcache); /* assume file cache is reclaimable */ - free += mem_cgroup_recursive_stat2(memcg, MEM_CGROUP_STAT_CACHE); - - /* but do not count shmem pages as they can't be purged, - * only swapped out */ - free -= mem_cgroup_recursive_stat(memcg, MEM_CGROUP_STAT_SHMEM); + free += page_counter_read(&memcg->cache); return free < pages ? -ENOMEM : 0; }
mem_cgroup_enough_memory() iterates memcg's subtree to account 'MEM_CGROUP_STAT_CACHE - MEM_CGROUP_STAT_SHMEM'. Fortunately we can just read memcg->cache counter instead as it's hierarchical (includes subgroups) and doesn't account shmem. https://jira.sw.ru/browse/PSBM-120968 Signed-off-by: Andrey Ryabinin <aryabinin@virtuozzo.com> --- mm/memcontrol.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)