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 1951FC47DAF for ; Thu, 18 Jan 2024 14:49:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9C2C46B0093; Thu, 18 Jan 2024 09:49:14 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 973236B0095; Thu, 18 Jan 2024 09:49:14 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 83ACA6B0096; Thu, 18 Jan 2024 09:49:14 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 6FBE56B0093 for ; Thu, 18 Jan 2024 09:49:14 -0500 (EST) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 3A553160D05 for ; Thu, 18 Jan 2024 14:49:14 +0000 (UTC) X-FDA: 81692714628.25.608F5F0 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf10.hostedemail.com (Postfix) with ESMTP id 157B7C0007 for ; Thu, 18 Jan 2024 14:49:11 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf10.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1705589352; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hhGsXXnOWbtXpzFJtFn62xHMiCySxcZZyXgaQspickY=; b=q30eiYXqODKVdI1C2ZUeKimpd7AePx08m+6vA6bRdqsNGJkPINzDWCAZJGh2HODI/ijOwM cSpKoRV/o0vil7OIxUD9E9QNKS9HGUBqnS364k9Yr857ceIYYu6uEucWdlFGDY32z7TUlA HROtJjBW+Jg4wTUznXDdwb8jOrL1X2Y= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf10.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1705589352; a=rsa-sha256; cv=none; b=FDKYcdrv1z50xL5RmPj0j+7kackUpFZvKeKkGqgLH9AdTBOe/uiUfHH/lgQhjwxOdwygvX ALPNy2MUuW6pDcn6O3ScBpWl0YxNn3oiM3tn+5yxTdlYyQVS5XFDQLatRCKgWXHglV8PVi F18xem8GcoUFNq/TcRXY+T9n85RXlKY= Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id C15731042; Thu, 18 Jan 2024 06:49:56 -0800 (PST) Received: from [10.57.77.97] (unknown [10.57.77.97]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 247BF3F73F; Thu, 18 Jan 2024 06:49:10 -0800 (PST) Message-ID: <31ca14fe-0dea-47e7-839b-ecd6170c111d@arm.com> Date: Thu, 18 Jan 2024 14:49:08 +0000 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2] mm: memory: move mem_cgroup_charge() into alloc_anon_folio() Content-Language: en-GB To: Kefeng Wang , Andrew Morton , linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Matthew Wilcox , David Hildenbrand References: <20240117103954.2756050-1-wangkefeng.wang@huawei.com> From: Ryan Roberts In-Reply-To: <20240117103954.2756050-1-wangkefeng.wang@huawei.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 157B7C0007 X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: m1jfm5pm19gwr6964pnxabfqiq84ssxf X-HE-Tag: 1705589351-996871 X-HE-Meta: U2FsdGVkX18O1ns84PJzwlzs97BRIW/yqud2MLmSusts9st7BwC+np5iw+h1J+GnK/NARau464ruWv3qwYN4zLSngFwfkrR3Z1lYXJJZG3M0VheuURHZNnpfrL06ZQaiKNtycJ5vWqBelti2IQoRm7xuAqzpG4rrtbAWEmYMlUeFczOVKYYOMhG601rElLIE0tubPckyDpqMh3OAD5RtUPGnSzNGOt3CMVMrWOMuDZ1eAe1yZXkLQ9PwLeJclsZhAx6YHbri9PP4QfxAz0ERuJ/npw7lJTiVasIDPU8Ik5OhPoE+28i8fyuGW2Fv/pLm9QuSmhaE8wGwtF2DOoBpfknmbZY+9PfESWcCubc0SOG6NDLq0/iFGoUjbLzyN3ezj/jOcLknFwWiR9TbWSaEIBayArHDjQXY5ZrV/NTmrY8BPhmDCTaJHaNb2NQ/Gno/Be+6Sqej0KkJ49bPkf5imQjlmDFA0pWCgu8gR/axjtin/gZV8y8Bnbz1g+CapM3s5odTTn2qsGXLJ2KtKrNwTnXPsifReuRBRZngFXKd0C9F8huI4p7+ajorpKB6cC6DE76SDxKjjfdEMch8XA3kRqIlOaFfnK73vr/9uV3F6zK2EuYjTaz7RNM9JDFBUm6QYhtTLTp6nXXxgV3f4yBSdu0cMRieY21nUwGV7WUwHHhgo4k6iFZmtf8DcLPtkAAXEoSY6fMrSAnz5L2ItZmgCwlG2w4OaCr5IMzaZawe2tOLkQyd85/dwTc8C+WKsUB2/6Z0R5AguHl3fCJxQmnIERLUembw1H/DCR/hLFBZkx700AtgOc1vzfI7A+rl7ZfGlZgs9yuWeHPpAKhkDdGAANUVFiPho9/UJtsm+jciDQQo/4r+J9fdhdxUrJoTMVzT2Ek/etbLYaAXBpYYkSYwCVwkCUsJQcUKtrhF9ZzbHHla9RRgwSMDLFJ2hIFp8a1O0gweHD3OXsKyfdZYtqI RAgBFnUc NKuyUcuiaylWAokUmWzKiSUdXPljimjUOfSoapUyVFpbUmqtjhtgACPOgjB3GbrlVI3ZQhv1Ux+FlaMbCW11bxOSMsbIHpiDemtWBzbGiCGqzMkXkOgOiJswdHBWmm17EpyALewbeSnjYIntIBROsvsjdKqAqbfmrUkNh89HwW22Emj4C7R/gxXsBYxQpjIupZiENIL/4yCoSyodrVSZHfxkaieATHXXBA4U/ntdnaU1Gw3SZh86p8tDsWLC8j/8bo/MyT0CMEhxxFBE= 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: On 17/01/2024 10:39, Kefeng Wang wrote: > mem_cgroup_charge() uses the GFP flags in a fairly sophisticated way. > In addition to checking gfpflags_allow_blocking(), it pays attention > to __GFP_NORETRY and __GFP_RETRY_MAYFAIL to ensure that processes within > this memcg do not exceed their quotas. Using the same GFP flags ensures > that we handle large anonymous folios correctly, including falling back > to smaller orders when there is plenty of memory available in the system > but this memcg is close to its limits. > > Signed-off-by: Kefeng Wang Reviewed-by: Ryan Roberts > --- > v2: > - fix built when !CONFIG_TRANSPARENT_HUGEPAGE > - update changelog suggested by Matthew Wilcox > > mm/memory.c | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > > diff --git a/mm/memory.c b/mm/memory.c > index 5e88d5379127..551f0b21bc42 100644 > --- a/mm/memory.c > +++ b/mm/memory.c > @@ -4153,8 +4153,8 @@ static bool pte_range_none(pte_t *pte, int nr_pages) > > static struct folio *alloc_anon_folio(struct vm_fault *vmf) > { > -#ifdef CONFIG_TRANSPARENT_HUGEPAGE > struct vm_area_struct *vma = vmf->vma; > +#ifdef CONFIG_TRANSPARENT_HUGEPAGE > unsigned long orders; > struct folio *folio; > unsigned long addr; > @@ -4206,15 +4206,21 @@ static struct folio *alloc_anon_folio(struct vm_fault *vmf) > addr = ALIGN_DOWN(vmf->address, PAGE_SIZE << order); > folio = vma_alloc_folio(gfp, order, vma, addr, true); > if (folio) { > + if (mem_cgroup_charge(folio, vma->vm_mm, gfp)) { > + folio_put(folio); > + goto next; > + } > + folio_throttle_swaprate(folio, gfp); > clear_huge_page(&folio->page, vmf->address, 1 << order); > return folio; > } > +next: > order = next_order(&orders, order); > } > > fallback: > #endif > - return vma_alloc_zeroed_movable_folio(vmf->vma, vmf->address); > + return folio_prealloc(vma->vm_mm, vma, vmf->address, true); > } > > /* > @@ -4281,10 +4287,6 @@ static vm_fault_t do_anonymous_page(struct vm_fault *vmf) > nr_pages = folio_nr_pages(folio); > addr = ALIGN_DOWN(vmf->address, nr_pages * PAGE_SIZE); > > - if (mem_cgroup_charge(folio, vma->vm_mm, GFP_KERNEL)) > - goto oom_free_page; > - folio_throttle_swaprate(folio, GFP_KERNEL); > - > /* > * The memory barrier inside __folio_mark_uptodate makes sure that > * preceding stores to the page contents become visible before > @@ -4338,8 +4340,6 @@ static vm_fault_t do_anonymous_page(struct vm_fault *vmf) > release: > folio_put(folio); > goto unlock; > -oom_free_page: > - folio_put(folio); > oom: > return VM_FAULT_OOM; > }