From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E5EF5C43333 for ; Tue, 2 Mar 2021 07:47:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A033564DE7 for ; Tue, 2 Mar 2021 07:47:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1576439AbhCBE3B (ORCPT ); Mon, 1 Mar 2021 23:29:01 -0500 Received: from szxga05-in.huawei.com ([45.249.212.191]:13018 "EHLO szxga05-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235221AbhCBBhq (ORCPT ); Mon, 1 Mar 2021 20:37:46 -0500 Received: from DGGEMS411-HUB.china.huawei.com (unknown [172.30.72.58]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4DqKSS1k6szjVBC; Tue, 2 Mar 2021 09:35:04 +0800 (CST) Received: from huawei.com (10.175.112.208) by DGGEMS411-HUB.china.huawei.com (10.3.19.211) with Microsoft SMTP Server id 14.3.498.0; Tue, 2 Mar 2021 09:36:37 +0800 From: Zhou Guanghui To: , CC: , , , , , , Subject: [PATCH] mm/memcg: set memcg when split pages Date: Tue, 2 Mar 2021 01:34:51 +0000 Message-ID: <20210302013451.118701-1-zhouguanghui1@huawei.com> X-Mailer: git-send-email 2.25.0 MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.175.112.208] X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When split page, the memory cgroup info recorded in first page is not copied to tail pages. In this case, when the tail pages are freed, the uncharge operation is not performed. As a result, the usage of this memcg keeps increasing, and the OOM may occur. So, the copying of first page's memory cgroup info to tail pages is needed when split page. Signed-off-by: Zhou Guanghui --- include/linux/memcontrol.h | 10 ++++++++++ mm/page_alloc.c | 4 +++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index e6dc793d587d..c7e2b4421dc1 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -867,6 +867,12 @@ void mem_cgroup_print_oom_group(struct mem_cgroup *memcg); extern bool cgroup_memory_noswap; #endif +static inline void copy_page_memcg(struct page *dst, struct page *src) +{ + if (src->memcg_data) + dst->memcg_data = src->memcg_data; +} + struct mem_cgroup *lock_page_memcg(struct page *page); void __unlock_page_memcg(struct mem_cgroup *memcg); void unlock_page_memcg(struct page *page); @@ -1291,6 +1297,10 @@ mem_cgroup_print_oom_meminfo(struct mem_cgroup *memcg) { } +static inline void copy_page_memcg(struct page *dst, struct page *src) +{ +} + static inline struct mem_cgroup *lock_page_memcg(struct page *page) { return NULL; diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 3e4b29ee2b1e..ee0a63dc1c9b 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -3307,8 +3307,10 @@ void split_page(struct page *page, unsigned int order) VM_BUG_ON_PAGE(PageCompound(page), page); VM_BUG_ON_PAGE(!page_count(page), page); - for (i = 1; i < (1 << order); i++) + for (i = 1; i < (1 << order); i++) { set_page_refcounted(page + i); + copy_page_memcg(page + i, page); + } split_page_owner(page, 1 << order); } EXPORT_SYMBOL_GPL(split_page); -- 2.25.0