From patchwork Mon Aug 24 15:36:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Schatzberg X-Patchwork-Id: 11733551 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 240CC14F6 for ; Mon, 24 Aug 2020 15:39:13 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id E514D20838 for ; Mon, 24 Aug 2020 15:39:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="RItE8EEV" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E514D20838 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 320526B0031; Mon, 24 Aug 2020 11:39:12 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 2F78A6B0032; Mon, 24 Aug 2020 11:39:12 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1E7416B005C; Mon, 24 Aug 2020 11:39:12 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0143.hostedemail.com [216.40.44.143]) by kanga.kvack.org (Postfix) with ESMTP id 0B0AE6B0031 for ; Mon, 24 Aug 2020 11:39:12 -0400 (EDT) Received: from smtpin25.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id B94011F06 for ; Mon, 24 Aug 2020 15:39:11 +0000 (UTC) X-FDA: 77185870902.25.verse34_341187227054 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin25.hostedemail.com (Postfix) with ESMTP id D2AE51804D8B3 for ; Mon, 24 Aug 2020 15:37:59 +0000 (UTC) X-Spam-Summary: 1,0,0,ea273a343aeddfd4,d41d8cd98f00b204,schatzberg.dan@gmail.com,,RULES_HIT:41:355:379:387:541:800:960:973:988:989:1260:1311:1314:1345:1359:1437:1515:1535:1542:1711:1730:1747:1777:1792:2198:2199:2393:2559:2562:2731:3138:3139:3140:3141:3142:3354:3865:3867:3870:3871:3872:3874:4117:4250:4321:4605:5007:6119:6261:6653:6742:6743:7514:7901:7903:9413:10004:11026:11658:11914:12043:12296:12297:12438:12517:12519:12555:12895:13053:13894:14096:14181:14394:14687:14721:21324:21433:21444:21451:21627:21666:21740:21795:21990:30012:30051:30054:30075:30090,0,RBL:209.85.222.196:@gmail.com:.lbl8.mailshell.net-66.100.201.100 62.18.0.100;04yf15sdwbf7uwmo6nt6p5nqucmudycgtm3ok39isk38fc9h1gk9x6ztgozyhwm.ph87x3z3dbb9jew33ouekyczo6azs3uuniu1bgo9furqc4btncm7iua4hxhkac5.g-lbl8.mailshell.net-223.238.255.100,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fp,MSBL:0,DNSBL:none,Custom_rules:0:0:0,LFtime:24,LUA_SUMMARY:none X-HE-Tag: verse34_341187227054 X-Filterd-Recvd-Size: 6936 Received: from mail-qk1-f196.google.com (mail-qk1-f196.google.com [209.85.222.196]) by imf37.hostedemail.com (Postfix) with ESMTP for ; Mon, 24 Aug 2020 15:37:59 +0000 (UTC) Received: by mail-qk1-f196.google.com with SMTP id z3so3452280qkz.7 for ; Mon, 24 Aug 2020 08:37:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Yrl/C8FqKmoOKWHTpqylWzEmmhY9cYd3FuadfFi1qcU=; b=RItE8EEVLrQqxhHs3ZQx7Foq2ps0SM+5TqKNvM/s7lfy4kor2yBW+T08mxhNfvBWdd 2RGDEzkzR8jhYgMV3q7iDQIFJ5N3+DPafuAHlDCJjomPLEEaQCEiUHaXB/fY9433YTsC z4u23zXtSA57ff5mbtLKaqvEvZLJ+9p0xfEpVwFss6stu2xMCbmkqgJvkbrdqwsittxM vxEsBpyiDThrdVRko7aOAFnRIcOS3OruLiTt18HlFoE4bY7VQ4/Se9LhQo94miRVqNqE zltvwW6JVmIcXiauJaAOAdvAv7LmqDFpUiL4nh1upk4yoUY62xPrZP3zlYv/LPKosakr rJZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Yrl/C8FqKmoOKWHTpqylWzEmmhY9cYd3FuadfFi1qcU=; b=NKJZkoGdX1XH2vStIYglY4Pta4kHBufbWbzZWyuV87bN0KYDysIi+TSO5fZ85nrcgs MEcptsQxcnM7h/nO+jsVvKkFZiL6oIiJNP4kH8cEgbb+ifMDSLp86bDZZ7Hf1SFl2LdC +hbXBqJ6Iq4cONRONeLnhKoGBf7txupvjTSeSAnP1CxmkFD83ol+FppfwkNzPpyyridC neF+zKDeHGedfSXdty84ucom/06iQYQLmYbWOEay+r2UYnGTzDs6tHXGhAIcFnAxOLx8 mwkgfP0DXYTsvlftOsa1JbCPgRJ9DWNUGouJcnQBBBP9GSJXl8+Oj3XIzebA+HHQVlLH dW5Q== X-Gm-Message-State: AOAM531As3v9BGJMmNIjNSvcDFAiyFR4Ni+YddwAaCeSNOiu0mXkAImb FjAsvUh67H9AFQl+6Lju0cI= X-Google-Smtp-Source: ABdhPJxM2LRyHFxWMV0ffiXTNeWLlg2RxoQyqcPYMgKOZkQDeMNmnS+2daox8wpkc2aWlsKTKcbtIg== X-Received: by 2002:a37:a981:: with SMTP id s123mr4697387qke.324.1598283478654; Mon, 24 Aug 2020 08:37:58 -0700 (PDT) Received: from dschatzberg-fedora-PC0Y6AEN.thefacebook.com ([2620:10d:c091:480::1:dd21]) by smtp.gmail.com with ESMTPSA id m17sm10942758qkn.45.2020.08.24.08.37.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Aug 2020 08:37:57 -0700 (PDT) From: Dan Schatzberg To: Cc: Dan Schatzberg , Johannes Weiner , Tejun Heo , Chris Down , Shakeel Butt , Jens Axboe , Alexander Viro , Jan Kara , Amir Goldstein , Li Zefan , Michal Hocko , Vladimir Davydov , Andrew Morton , Hugh Dickins , Roman Gushchin , Yang Shi , Jakub Kicinski , Peter Zijlstra , Ingo Molnar , Mathieu Desnoyers , Michel Lespinasse , Vlastimil Babka , Thomas Gleixner , linux-block@vger.kernel.org (open list:BLOCK LAYER), linux-kernel@vger.kernel.org (open list), linux-fsdevel@vger.kernel.org (open list:FILESYSTEMS (VFS and infrastructure)), cgroups@vger.kernel.org (open list:CONTROL GROUP (CGROUP)), linux-mm@kvack.org (open list:CONTROL GROUP - MEMORY RESOURCE CONTROLLER (MEMCG)) Subject: [PATCH 3/4] mm: Charge active memcg when no mm is set Date: Mon, 24 Aug 2020 11:36:01 -0400 Message-Id: <20200824153607.6595-4-schatzberg.dan@gmail.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200824153607.6595-1-schatzberg.dan@gmail.com> References: <20200824153607.6595-1-schatzberg.dan@gmail.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: D2AE51804D8B3 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam03 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: memalloc_use_memcg() worked for kernel allocations but was silently ignored for user pages. This patch establishes a precedence order for who gets charged: 1. If there is a memcg associated with the page already, that memcg is charged. This happens during swapin. 2. If an explicit mm is passed, mm->memcg is charged. This happens during page faults, which can be triggered in remote VMs (eg gup). 3. Otherwise consult the current process context. If it has configured a current->active_memcg, use that. Otherwise, current->mm->memcg. Previously, if a NULL mm was passed to mem_cgroup_try_charge (case 3) it would always charge the root cgroup. Now it looks up the current active_memcg first (falling back to charging the root cgroup if not set). Signed-off-by: Dan Schatzberg Acked-by: Johannes Weiner Acked-by: Tejun Heo Acked-by: Chris Down Reviewed-by: Shakeel Butt --- mm/memcontrol.c | 11 ++++++++--- mm/shmem.c | 5 +++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index b2468c80085d..79c70eef3ec3 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -6676,7 +6676,8 @@ void mem_cgroup_calculate_protection(struct mem_cgroup *root, * @gfp_mask: reclaim mode * * Try to charge @page to the memcg that @mm belongs to, reclaiming - * pages according to @gfp_mask if necessary. + * pages according to @gfp_mask if necessary. if @mm is NULL, try to + * charge to the active memcg. * * Returns 0 on success. Otherwise, an error code is returned. */ @@ -6712,8 +6713,12 @@ int mem_cgroup_charge(struct page *page, struct mm_struct *mm, gfp_t gfp_mask) rcu_read_unlock(); } - if (!memcg) - memcg = get_mem_cgroup_from_mm(mm); + if (!memcg) { + if (!mm) + memcg = get_mem_cgroup_from_current(); + else + memcg = get_mem_cgroup_from_mm(mm); + } ret = try_charge(memcg, gfp_mask, nr_pages); if (ret) diff --git a/mm/shmem.c b/mm/shmem.c index 271548ca20f3..77c908730be4 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -1695,7 +1695,8 @@ static int shmem_swapin_page(struct inode *inode, pgoff_t index, { struct address_space *mapping = inode->i_mapping; struct shmem_inode_info *info = SHMEM_I(inode); - struct mm_struct *charge_mm = vma ? vma->vm_mm : current->mm; + struct mm_struct *charge_mm = vma ? vma->vm_mm : NULL; + struct mem_cgroup *memcg; struct page *page; swp_entry_t swap; int error; @@ -1809,7 +1810,7 @@ static int shmem_getpage_gfp(struct inode *inode, pgoff_t index, } sbinfo = SHMEM_SB(inode->i_sb); - charge_mm = vma ? vma->vm_mm : current->mm; + charge_mm = vma ? vma->vm_mm : NULL; page = find_lock_entry(mapping, index); if (xa_is_value(page)) {