From patchwork Mon Aug 31 15:36:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Schatzberg X-Patchwork-Id: 11746531 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 0FB58109B for ; Mon, 31 Aug 2020 15:37:33 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id D127E214D8 for ; Mon, 31 Aug 2020 15:37:32 +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="SjePWpDm" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D127E214D8 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 D13E76B005D; Mon, 31 Aug 2020 11:37:31 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id CC4A38E0001; Mon, 31 Aug 2020 11:37:31 -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 BDA0B6B0068; Mon, 31 Aug 2020 11:37:31 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0182.hostedemail.com [216.40.44.182]) by kanga.kvack.org (Postfix) with ESMTP id 799CB6B005D for ; Mon, 31 Aug 2020 11:37:31 -0400 (EDT) Received: from smtpin20.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 36E09247F for ; Mon, 31 Aug 2020 15:37:31 +0000 (UTC) X-FDA: 77211268302.20.cloth12_1213d6b27090 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin20.hostedemail.com (Postfix) with ESMTP id 019FE180C07AB for ; Mon, 31 Aug 2020 15:37:30 +0000 (UTC) X-Spam-Summary: 1,0,0,ef21435ee130c61d,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:4605:5007:6119:6261:6653:6742: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,0,RBL:209.85.219.65:@gmail.com:.lbl8.mailshell.net-62.18.0.100 66.100.201.100;04yfncgjkwkye6tou51nawwzozhhsoc6jtpbt9dx6k38fc9h1gk9x6ztgozyhwm.ph87x36kynabgk953ouekyczo6azs3uuniu1bgo9furqc4btncm7iua4hxhkac5.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: cloth12_1213d6b27090 X-Filterd-Recvd-Size: 6466 Received: from mail-qv1-f65.google.com (mail-qv1-f65.google.com [209.85.219.65]) by imf36.hostedemail.com (Postfix) with ESMTP for ; Mon, 31 Aug 2020 15:37:30 +0000 (UTC) Received: by mail-qv1-f65.google.com with SMTP id di5so2554825qvb.13 for ; Mon, 31 Aug 2020 08:37:30 -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=hFNO1srh3AW4C+hy+7CfuD56Hs7de0B4v+mt5P6Q+8c=; b=SjePWpDm/dcOfaWyG090sIQ82qRogNC8U9o/SXOsilJibfKn37U7NrP6cYs9z13ajn 3ahnbXMI1dfgdzV1jsX4P8YPuyM1wY2QGXQiesxpHGGEg3Z23HYwzkk62guOns9HMJyO mv5bVZQTbHPtdEJ+eNlOenVGaVNmy48r50T0qx1KJrkByftLK+OzvzENGehdjQZ0EdVJ SbKPXAl9lN5Bz1sTMxYIYgFWi6dPAG2dwLhw1nXA9usckN3AXJXudsT9uUJdRuIs/Ntq 5nv1yGY0UIXNQDK7x6fl3OY/BjqkvDLJzoM8kbzBSnvSW8Q8tEl7Yp4cPcUq9xxnCReP 1UgQ== 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=hFNO1srh3AW4C+hy+7CfuD56Hs7de0B4v+mt5P6Q+8c=; b=j4PkIhTXng+KmWQLF65yuQHI7qYPZsbooL0vZR6/nDUCpvzIeDy8sYNeZ1tM9FjKS4 lE4NDXJv10sZOTMYi0Wd6QaXE79ZUQ6r7nz/nXcbcvG7dvH22jWCpXyf0SYwb/4LQtg7 pzFyvowZ7Wn9Bpf0JiybHl8Ya2p1lW+BEQhuuIQBIj5kSWTYtuYpSSjiQ4M9ipNQty+J 9Sro6ZZG+Bql1l3tpRzyRBwhwb2P/Sg59WqR45RqmDpRnDkM+HlM8iwon0RjLQil04ZJ ch2esF8bJqdCsiIestElWLVDQpBqFevH+wAJ8+1gqthW3O37DYP6K+SPO6JKdc2BLf4a eSkQ== X-Gm-Message-State: AOAM533rzHYlrbji7/V0I0Wuiltfh25bXwig+EiBTmW6DNiRSghSYjCr nf3hEfvssurPTefWFY5VcAA= X-Google-Smtp-Source: ABdhPJxZrAVMLKA6PaN3RQHI9DyNFWZHOVofg01sLYGajv8EisNnh3wB37+tmq28zRDNQhabk9LCkg== X-Received: by 2002:ad4:430d:: with SMTP id c13mr1642259qvs.49.1598888249829; Mon, 31 Aug 2020 08:37:29 -0700 (PDT) Received: from dschatzberg-fedora-PC0Y6AEN.thefacebook.com ([2620:10d:c091:480::1:2edc]) by smtp.gmail.com with ESMTPSA id s5sm9908872qke.120.2020.08.31.08.37.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Aug 2020 08:37:29 -0700 (PDT) From: Dan Schatzberg To: Cc: Dan Schatzberg , Johannes Weiner , Tejun Heo , Chris Down , Shakeel Butt , Jens Axboe , Li Zefan , Michal Hocko , Vladimir Davydov , Andrew Morton , Hugh Dickins , Roman Gushchin , Yang Shi , Jakub Kicinski , linux-block@vger.kernel.org (open list:BLOCK LAYER), linux-kernel@vger.kernel.org (open list), cgroups@vger.kernel.org (open list:CONTROL GROUP (CGROUP)), linux-mm@kvack.org (open list:CONTROL GROUP - MEMORY RESOURCE CONTROLLER (MEMCG)) Subject: [PATCH 2/3] mm: Charge active memcg when no mm is set Date: Mon, 31 Aug 2020 11:36:59 -0400 Message-Id: <20200831153704.16848-3-schatzberg.dan@gmail.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200831153704.16848-1-schatzberg.dan@gmail.com> References: <20200831153704.16848-1-schatzberg.dan@gmail.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 019FE180C07AB X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam05 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 e27ac6d79a32..877778b792da 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..1139f52ac4ee 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -1695,7 +1695,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 page *page; swp_entry_t swap; int error; @@ -1809,7 +1809,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)) {