From patchwork Tue Apr 28 16:13:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Schatzberg X-Patchwork-Id: 11515045 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 A53951392 for ; Tue, 28 Apr 2020 16:15:51 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 69914206D6 for ; Tue, 28 Apr 2020 16:15:51 +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="E4MNL14Q" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 69914206D6 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 975538E0008; Tue, 28 Apr 2020 12:15:50 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 925808E0001; Tue, 28 Apr 2020 12:15:50 -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 83B3A8E0008; Tue, 28 Apr 2020 12:15:50 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0153.hostedemail.com [216.40.44.153]) by kanga.kvack.org (Postfix) with ESMTP id 6C87C8E0001 for ; Tue, 28 Apr 2020 12:15:50 -0400 (EDT) Received: from smtpin15.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 308EF441E for ; Tue, 28 Apr 2020 16:15:50 +0000 (UTC) X-FDA: 76757764860.15.doll10_4ff75959b0f38 X-Spam-Summary: 2,0,0,f03b10b9dfdf19f0,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:12986:13053:13894:14096:14181:14394:14687:14721:21324:21433:21444:21451:21627:21666:21740:21795:21990:30012:30051:30054:30055:30075:30090,0,RBL:209.85.160.196:@gmail.com:.lbl8.mailshell.net-66.100.201.100 62.50.0.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:4,LUA_SUMMARY:none X-HE-Tag: doll10_4ff75959b0f38 X-Filterd-Recvd-Size: 6967 Received: from mail-qt1-f196.google.com (mail-qt1-f196.google.com [209.85.160.196]) by imf46.hostedemail.com (Postfix) with ESMTP for ; Tue, 28 Apr 2020 16:15:49 +0000 (UTC) Received: by mail-qt1-f196.google.com with SMTP id c23so17212820qtp.11 for ; Tue, 28 Apr 2020 09:15:49 -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=1xs7a52HdDCbAExnqSe5+2K/TyJ01Rp0raQ7acG2FHw=; b=E4MNL14QuXFKvfZICzfj5fNhzPIifsriRq/F4PIrWZFWcsdAhA7+/0YMPNgMymNaup Xg5cg+/uTHi/B1cn3qqVTK3lQc8Fex5a7ttpahrChGEv0NsDnZ4too1jWJHNnXLNQw+R +iIYvu469MXtSxA1M9cd1XTQJES2bzg+0+aYhm3AuODTvkB0BftZvOTYOUJ5I+moLZlK RX9FbMcKmqfsgmvdKYefTFWyw9fWZK5ZyZgo/276pUXQvXnStHGF+au3idehdV+SDLTb NR9+2WD3an1OkNxpAH9PFODMjWySx36OGCQynoDU89LYMeGLBeeZDUI1vcybRjj3gp7a 6vYw== 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=1xs7a52HdDCbAExnqSe5+2K/TyJ01Rp0raQ7acG2FHw=; b=hK0lYa5/RzC/DHuwm92D2qt+MiyvJoycsZG2kZ6XlySHni6w/mgHFLnqNlr7BYNfoo PGFth7Uh4xOq6CpZQ9257rp8uHgG50TA+ki0dmcxA6vU9evCNt5r53PWyG4pfqCIJzkd rAYSYvJEG2qWDu3qQM8eKbq5cCcxuwSyeRigK9nwlzGB3LX5rVpxjCl4WTpnavMHLoMb 3LfJmRUq6esB1/bGwbQ+/SbEfiRmeNvsJ7g8UNogjC8318ubG3cpqFPlSwRbFrI0sz43 NKDWTfekwmq50f8uBpM20S3kGz3SrRLPwbDy/3dAukXxSeSrc33oPsxmDWG5Z9UzTY72 IWvg== X-Gm-Message-State: AGi0PuaCpA2rFC3n2+fF94BOkybVaw3wp2mDKBf5Tn+sh3V/p0iiS+8t 41GBkc5qwMZswaNMwwkCd3E= X-Google-Smtp-Source: APiQypJFFiv9OaV70OkM1q6yEZ+bOU61wDnKK2elgNnOimCvruyN6mVSWyM2pRgW9YZjXC8EhevipA== X-Received: by 2002:aed:233d:: with SMTP id h58mr26062944qtc.4.1588090547337; Tue, 28 Apr 2020 09:15:47 -0700 (PDT) Received: from dschatzberg-fedora-PC0Y6AEN.thefacebook.com ([2620:10d:c091:480::1:3e4a]) by smtp.gmail.com with ESMTPSA id z2sm14087421qkc.28.2020.04.28.09.15.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Apr 2020 09:15:46 -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 , "Peter Zijlstra (Intel)" , Ingo Molnar , Mathieu Desnoyers , "Kirill A. Shutemov" , Andrea Arcangeli , 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 v5 3/4] mm: Charge active memcg when no mm is set Date: Tue, 28 Apr 2020 12:13:49 -0400 Message-Id: <20200428161355.6377-4-schatzberg.dan@gmail.com> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200428161355.6377-1-schatzberg.dan@gmail.com> References: <20200428161355.6377-1-schatzberg.dan@gmail.com> MIME-Version: 1.0 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 | 4 ++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 5beea03dd58a..af68d1d7b456 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -6435,7 +6435,8 @@ enum mem_cgroup_protection mem_cgroup_protected(struct mem_cgroup *root, * @compound: charge the page as compound or small page * * 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, with *@memcgp pointing to the charged memcg. * Otherwise, an error code is returned. @@ -6479,8 +6480,12 @@ int mem_cgroup_try_charge(struct page *page, struct mm_struct *mm, } } - 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); diff --git a/mm/shmem.c b/mm/shmem.c index d722eb830317..8c8ffc35a957 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -1618,7 +1618,7 @@ 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; @@ -1753,7 +1753,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)) {