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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id A0A4DC3601B for ; Fri, 4 Apr 2025 02:20:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C5317280014; Thu, 3 Apr 2025 22:20:10 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C026F28000B; Thu, 3 Apr 2025 22:20:10 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A550B280014; Thu, 3 Apr 2025 22:20:10 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 8570028000B for ; Thu, 3 Apr 2025 22:20:10 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 1A5B2161C3D for ; Fri, 4 Apr 2025 02:20:12 +0000 (UTC) X-FDA: 83294756664.16.660BF7B Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by imf23.hostedemail.com (Postfix) with ESMTP id 25E08140004 for ; Fri, 4 Apr 2025 02:20:10 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2023-11-20 header.b=HIFU++hR; dmarc=pass (policy=reject) header.from=oracle.com; spf=pass (imf23.hostedemail.com: domain of anthony.yznaga@oracle.com designates 205.220.177.32 as permitted sender) smtp.mailfrom=anthony.yznaga@oracle.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1743733210; a=rsa-sha256; cv=none; b=L/FyWp2BfSS1doreGY7RVcDrGspt3vvN6ViETc0kuolIPGdPD1P/oXRiTDt/A+SrDow45/ l6XPPbW/dRIcfqQXCnLKW89sFvvFqYXm94YX4F6slHEbsVnBShUH5FrQgUwOZRGw9TwISj Y6oGrkAtYJiB4M8HrkOYQyxGtxiH44c= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2023-11-20 header.b=HIFU++hR; dmarc=pass (policy=reject) header.from=oracle.com; spf=pass (imf23.hostedemail.com: domain of anthony.yznaga@oracle.com designates 205.220.177.32 as permitted sender) smtp.mailfrom=anthony.yznaga@oracle.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1743733210; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=Ktr19sh/3ozrpHi17WBwpuZmpP/ujNYWxACqCHdmQzw=; b=3vrhBNtEjSl6Vfb6jInNhRqY2MuCv3axwJHsErDzswhqpYEyRkYbmlNWi/mvonMeqHts30 6CGtTHwlhwWsV7m47O3LvN3C5dDB2YsMzzrddit9SG7g3z+Lueml+HxZe8CkwgNPNX9azU VIpCy0YCZQS37q4iXIlGDItQaaRJXj4= Received: from pps.filterd (m0246630.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 5341NVOE008087; Fri, 4 Apr 2025 02:19:57 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=corp-2023-11-20; bh=Ktr19 sh/3ozrpHi17WBwpuZmpP/ujNYWxACqCHdmQzw=; b=HIFU++hRb/Xbnty+H/4sa /c7uqUGMCT8WHv7K8qEEhwEnTnqO3rmkv4oGC1MrjPh+JzyumQoeE1uh62Lf9YKD PxUZqo0Cy1o48l9EiQ9j+4Ko/kwlfwJkLcoZsGPsTKbr6rsZ+gO+40IZrgAMQKWr ssftNQbJs5pk6WlNzEfwBG1qvIj3lPK08D6cgNxPyzLE107WaZLEKbTd8bdqZVNh psRtut/9atoCgF/c9lfZd137EHgKwiHwPRs9ceU7cVqj7cz56RtiYVGCDqqkRzzs ORW2VBPNDtVxk7FboZ2l6yjKgHVrXWb95jySIF8jJI1ODWSD2WDFfEBM1BB4cl3j A== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 45p79ceaj1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 04 Apr 2025 02:19:56 +0000 (GMT) Received: from pps.filterd (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 5340ZtwD017309; Fri, 4 Apr 2025 02:19:56 GMT Received: from pps.reinject (localhost [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 45t2pspjk3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 04 Apr 2025 02:19:56 +0000 Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 5342H8hG030074; Fri, 4 Apr 2025 02:19:55 GMT Received: from localhost.localdomain (ca-dev60.us.oracle.com [10.129.136.27]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTP id 45t2pspj73-21; Fri, 04 Apr 2025 02:19:55 +0000 From: Anthony Yznaga To: akpm@linux-foundation.org, willy@infradead.org, markhemm@googlemail.com, viro@zeniv.linux.org.uk, david@redhat.com, khalid@kernel.org Cc: anthony.yznaga@oracle.com, andreyknvl@gmail.com, dave.hansen@intel.com, luto@kernel.org, brauner@kernel.org, arnd@arndb.de, ebiederm@xmission.com, catalin.marinas@arm.com, linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, mhiramat@kernel.org, rostedt@goodmis.org, vasily.averin@linux.dev, xhao@linux.alibaba.com, pcc@google.com, neilb@suse.de, maz@kernel.org Subject: [PATCH v2 20/20] mm/mshare: associate a mem cgroup with an mshare file Date: Thu, 3 Apr 2025 19:19:02 -0700 Message-ID: <20250404021902.48863-21-anthony.yznaga@oracle.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20250404021902.48863-1-anthony.yznaga@oracle.com> References: <20250404021902.48863-1-anthony.yznaga@oracle.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1095,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-04-04_01,2025-04-03_03,2024-11-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 bulkscore=0 mlxscore=0 spamscore=0 adultscore=0 suspectscore=0 mlxlogscore=999 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2502280000 definitions=main-2504040014 X-Proofpoint-GUID: 7vkFVKheDEa9Sb1cTcQnlOeo0S0Hrku- X-Proofpoint-ORIG-GUID: 7vkFVKheDEa9Sb1cTcQnlOeo0S0Hrku- X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 25E08140004 X-Stat-Signature: cm77nned9w3ma3thpo8foiu1x5rce5j5 X-Rspam-User: X-HE-Tag: 1743733210-89335 X-HE-Meta: U2FsdGVkX18b5YYPJU8orzXUBN8g3mDUuhLHnyx3QSpOwUkgQip+eTUR8Mr6W2t/kg8DR0dJMvWRgRWvqygkLKPWj9uhpsx5xoY5R6VP1Ib7PCLy37xI51CZg65seietUo2ndKKjo7wlrXDmfnn2jhPKvOc0dO3R9WeG9YSxy8wOHVkOD8eNC6aBQc3TvcudGHCHc9cKTtPK4DCGxKF/fPzorbYEWYZ4M/loyqLNa2daK6Kckxw/4KDXU8AIUVatJi/mJFsXhCWmGNikgcIednqXhfjrI+B77+wzhNVHziu8BjRCuVklOR8j5O2INkJd+kWl5PmD+d5NSObjUnreCc1bX2Jpw6y5vQBk27v73jkYouYBWKNkVF1vMO26kJv2ORppPtpZv1yuQ8d99VGtDiF1nn1Tu10xyW42/EShj+1+KPeJTUCT+IAODDVTElm7r9AZhj7sqCEB8iLopTjzt5IBos8VIiL1xZ6R6mDnJk6QK5NDRSf2MR9/VGHVmNUYvY34riQummMNa6+BwRTT8nrCvBUAqkhcYnXcHZPngA7v+t9b9x8+oAP0bt354xYMHmYTyXYANOf3YSX/T6SIv3Vv+R6ngoNRuRfG12jYQmSEuRQjG3BBx5mx3QPguaRvkzMdkpmP5bxbM/Kqk7z7hJDISZa4aLx333vYIkbEuT/UbfsxUUM0yv/DsPZM+YSWUDsdwtIoZQf+ZC/jZZNnkECnrVbsxp7MYr9oH8DB+2C6MHH2BLNF1zcQw182ctANf8tB54k+DnnBOUUQwjqlvRYwH8lyEKf8WbwQM9fDNXl8qsrsPq69rXV9tAwArB897lkOpmcTLyMlWO1bieYtUZmAorapSoyzXfN/4N/uo6CXDHJonhInyWmZVtuXZpqv+RApGBRuMVtMr8tMXsSYzBFfDzHYXlbgw+NDdwMKX8mpbw3ZH5bSGZdyP8n0r3a17iawPWKAJMO4qQ8ExbG ffN6Y3c8 hHqblteMMu/NNXTWZXfeLIZGa52Rwopu5gGHrhuPiWmD4QKULhKp8VkSM91y/rilcPVMGbXJNZ52B/1H8wFWZQy/+Su9dI/JrE0RQBhouKonlLpic7vJ63ZPIwvpzTCpc9AMO41pnv1jFmzi7bl1NdzhHfItyNS13P9a1GEKCKNE6ofD3W99K1BTwuHz5TwwDvBEVkgsV34pmWOzdnTVJ+wlq3TsWOQOJFfgfgIgCK24ohR26uYQ3htBlTw== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: This patch shows one approach to associating a specific mem cgroup to an mshare file and was inspired by code in mem_cgroup_sk_alloc(). Essentially when a process creates an mshare region, a reference is taken on the mem cgroup that the process belongs to and a pointer to the memcg is saved. At fault time set_active_memcg() is used to temporarily enable charging of __GFP_ACCOUNT allocations to the saved memcg. This does consolidate pagetable charges to a single memcg, but there are issues to address such as how to handle the case where the memcg is deleted but becomes a hidden, zombie memcg because the mshare file has a reference to it. Signed-off-by: Anthony Yznaga --- arch/x86/mm/fault.c | 11 +++++++++++ include/linux/mm.h | 5 +++++ mm/mshare.c | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 49 insertions(+) diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c index 49659d2f9316..f79186b76ffe 100644 --- a/arch/x86/mm/fault.c +++ b/arch/x86/mm/fault.c @@ -20,6 +20,7 @@ #include #include /* find_and_lock_vma() */ #include +#include #include /* boot_cpu_has, ... */ #include /* dotraplinkage, ... */ @@ -1218,6 +1219,8 @@ void do_user_addr_fault(struct pt_regs *regs, unsigned int flags = FAULT_FLAG_DEFAULT; bool is_shared_vma; unsigned long addr; + struct mem_cgroup *mshare_memcg; + struct mem_cgroup *memcg; tsk = current; mm = tsk->mm; @@ -1374,6 +1377,8 @@ void do_user_addr_fault(struct pt_regs *regs, } if (unlikely(vma_is_mshare(vma))) { + mshare_memcg = get_mshare_memcg(vma); + fault = find_shared_vma(&vma, &addr); if (fault) { @@ -1401,6 +1406,9 @@ void do_user_addr_fault(struct pt_regs *regs, return; } + if (is_shared_vma && mshare_memcg) + memcg = set_active_memcg(mshare_memcg); + /* * If for any reason at all we couldn't handle the fault, * make sure we exit gracefully rather than endlessly redo @@ -1416,6 +1424,9 @@ void do_user_addr_fault(struct pt_regs *regs, */ fault = handle_mm_fault(vma, addr, flags, regs); + if (is_shared_vma && mshare_memcg) + set_active_memcg(memcg); + if (unlikely(is_shared_vma) && ((fault & VM_FAULT_COMPLETED) || (fault & VM_FAULT_RETRY) || fault_signal_pending(fault, regs))) mmap_read_unlock(mm); diff --git a/include/linux/mm.h b/include/linux/mm.h index 9e64deae3d64..e848c29eafe4 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -1179,12 +1179,17 @@ static inline bool vma_is_anon_shmem(struct vm_area_struct *vma) { return false; int vma_is_stack_for_current(struct vm_area_struct *vma); #ifdef CONFIG_MSHARE +struct mem_cgroup *get_mshare_memcg(struct vm_area_struct *vma); vm_fault_t find_shared_vma(struct vm_area_struct **vma, unsigned long *addrp); static inline bool vma_is_mshare(const struct vm_area_struct *vma) { return vma->vm_flags & VM_MSHARE; } #else +static inline struct mem_cgroup *get_mshare_memcg(struct vm_area_struct *vma) +{ + return NULL; +} static inline vm_fault_t find_shared_vma(struct vm_area_struct **vma, unsigned long *addrp) { WARN_ON_ONCE(1); diff --git a/mm/mshare.c b/mm/mshare.c index 276fb825cc9a..509b1ae8ce72 100644 --- a/mm/mshare.c +++ b/mm/mshare.c @@ -16,6 +16,7 @@ #include #include +#include #include #include #include @@ -34,8 +35,22 @@ struct mshare_data { unsigned long size; unsigned long flags; struct mmu_notifier mn; +#ifdef CONFIG_MEMCG + struct mem_cgroup *memcg; +#endif }; +struct mem_cgroup *get_mshare_memcg(struct vm_area_struct *vma) +{ + struct mshare_data *m_data = vma->vm_private_data; + +#ifdef CONFIG_MEMCG + return m_data->memcg; +#else + return NULL; +#endif +} + static void mshare_invalidate_tlbs(struct mmu_notifier *mn, struct mm_struct *mm, unsigned long start, unsigned long end) { @@ -408,6 +423,9 @@ msharefs_fill_mm(struct inode *inode) struct mm_struct *mm; struct mshare_data *m_data = NULL; int ret = 0; +#ifdef CONFIG_MEMCG + struct mem_cgroup *memcg; +#endif mm = mm_alloc(); if (!mm) { @@ -434,6 +452,17 @@ msharefs_fill_mm(struct inode *inode) #ifdef CONFIG_MEMCG mm->owner = NULL; + + rcu_read_lock(); + memcg = mem_cgroup_from_task(current); + if (mem_cgroup_is_root(memcg)) + goto out; + if (!cgroup_subsys_on_dfl(memory_cgrp_subsys)) + goto out; + if (css_tryget(&memcg->css)) + m_data->memcg = memcg; +out: + rcu_read_unlock(); #endif return 0; @@ -447,6 +476,10 @@ msharefs_fill_mm(struct inode *inode) static void msharefs_delmm(struct mshare_data *m_data) { +#ifdef CONFIG_MEMCG + if (m_data->memcg) + css_put(&m_data->memcg->css); +#endif mmput(m_data->mm); kfree(m_data); } -- 2.43.5