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 9100FC3271F for ; Fri, 5 Jul 2024 08:30:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 296586B0098; Fri, 5 Jul 2024 04:30:15 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 244E26B0099; Fri, 5 Jul 2024 04:30:15 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1343C6B009A; Fri, 5 Jul 2024 04:30:15 -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 EA4896B0098 for ; Fri, 5 Jul 2024 04:30:14 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 771F81A1451 for ; Fri, 5 Jul 2024 08:30:14 +0000 (UTC) X-FDA: 82305026748.20.6B08E1A Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf30.hostedemail.com (Postfix) with ESMTP id 3B9DD80010 for ; Fri, 5 Jul 2024 08:30:12 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf30.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=1720168193; a=rsa-sha256; cv=none; b=vhzATvmKS4u+3j1alMob6ykx6d9xqlaYKgY5LC6lICOO8qRcjtQu2LYH4rrwz1sCkgf7J4 TFm1tFybaLG55v01tG+Js6y9IZLbWgZdOfkpNsbP5l29D6nl5Z67UyySmbqGz5vQz6BNUH SsZN1QMOYT5lHM0MhlQLBAUZ1AVvL9s= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf30.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=1720168193; 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=bYMSY/GBBCAM25urv3BK85+3n5uPbfy9hcquTETNuP0=; b=dpvjUH/vMwbsvugWQvoRj5o+KHCcyir82qHIXTGEK2IPq2BWntoStopC2eRz7fiaKvdbmt 8U3Oqm8x94BzzF2UWTWy/ORTg8gJv+w6JA+k+RMUMAwBb0NOvSe1/wG75NjsxZsCnLkd4m WWaTa3g7cgIKDar1dv6q6uzfq784IF0= 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 4816F367; Fri, 5 Jul 2024 01:30:36 -0700 (PDT) Received: from [10.57.74.223] (unknown [10.57.74.223]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 936E33F762; Fri, 5 Jul 2024 01:30:09 -0700 (PDT) Message-ID: <8774be3b-10bd-43b2-8dfa-e18cea21f0f6@arm.com> Date: Fri, 5 Jul 2024 09:30:07 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v3] mm: thp: support "THPeligible" semantics for mTHP with anonymous shmem Content-Language: en-GB To: Bang Li , hughd@google.com, akpm@linux-foundation.org Cc: david@redhat.com, wangkefeng.wang@huawei.com, baolin.wang@linux.alibaba.com, ioworker0@gmail.com, ziy@nvidia.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org References: <20240705032309.24933-1-libang.li@antgroup.com> From: Ryan Roberts In-Reply-To: <20240705032309.24933-1-libang.li@antgroup.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 3B9DD80010 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: 91fd38wn5bm9r7of1bnq4ugyw5cky8ey X-HE-Tag: 1720168212-806114 X-HE-Meta: U2FsdGVkX1+iifeZNmZEXdj0/Mglyccct19Qrmo/gblFYhIGgUhTR86vRWanSUeSNnCB1pW2k8EzgceyOYk/BzxTzhe050zRFxhQe3iztOdsDLppXLPp/jtElHRFO2rWzOq+C9uu72aZbQY1mlbVNMokKu3ReN3rg1yEOnKsqxAD0D2Mvja/a1ciLAbKloUBqxUObHOUBY5BysmYexhT2bKuEAAjmdJ2EHyzitGUaR/RL+au66lv2RNIYvZbfOO8l5/8KTA0hPrDNN9UjCaZSBelLA5aIcoUyyZ9Wq1yBKrX9M7c/UVn50TyS+fexDDcVyKV057WuKEtqUktZJN8i/SwHM6xS9P/k7IglS1j++ZYI41pjJv7tMs8t5kSCc47bOgGgVEMhHkXV1jCl6EdmmOMrzAFU7eZImSy92p7OwTSObAlev4wAOMwVMUAX6ofTBTZ7y7cuLWEWA/fJ0rvKr8/++dslqC3W3cPnERO9r6aP/ylecWkoCt1DhoLr69qDGpx7OAvVLWr3qjsBMITweDKlKGPyNcpJAivq2aMQ/7RT/loPMr/zPBf1/PbljxhGawYJtHHm1UmlDULcildCtgV3OG76bxiGnmqaEMae+eG+a6cdxdKEuAhk8WTnch6YkAU1uAGtW/4Ooep/BIDciOJUFB7vwMlPIyD5Df2Lva/Sn01J2puckw0XALgghqdspIIThdzFY4pvDtg7AIh4iT7f7V973gPtEueHfXxUKANVodrHJPf15menTQ1i91ISQOzxtdjs/SuFDvVwPhbBpI9hzUVGAN5LxoikiX8sgv/QJPCotQpJoHqUmX82FY4eJy3xoEGIBRcNFoxAFZ0TLCkDHKOsuSWbTA4MBlAa3ssywHoj2b40U1/pGd6x+etyuHUHf/qDMLMXUfa8C+ev3E2TOoK1z8KE3pYLk+iz2rWc3YGT3sHM6+2ipAiympUnL2Cu+gfniYFzQhNiNB 517T1Mvc s6I5YZOcKge+Qrr5H4LtRTUG+WcQFRljpM3TbZuzJak3vRCc5vCSolZK4hzazdXmk4zHygSlI7puMmU+hhdwJ4fwMrw70szW9H6rxdCy8j1FiuCIGR/C6/DKSneoI/+jmQ436y9nuoAVq72RWF8LZqeAQ7Bk4NZvcPijfe5c3XNfxmIcisaeJqoQgYHi5NkAWv7puiBxExLeqXgVhrF3Xha/eV42nsZD/vzIWAmPFZprtOAieKPMzy8CNj0h9xHor1p6wAgaG4sC2BKQPiEM/er0wlb5S1WUoO381IHhFi62fk33nQfsBQ5uDEK1fs3W85zOI 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 05/07/2024 04:23, Bang Li wrote: > After the commit 7fb1b252afb5 ("mm: shmem: add mTHP support for > anonymous shmem"), we can configure different policies through > the multi-size THP sysfs interface for anonymous shmem. But > currently "THPeligible" indicates only whether the mapping is > eligible for allocating THP-pages as well as the THP is PMD > mappable or not for anonymous shmem, we need to support semantics > for mTHP with anonymous shmem similar to those for mTHP with > anonymous memory. > > Signed-off-by: Bang Li LGTM! Reviewed-by: Ryan Roberts > --- > Changes since v2 [2]: > - Move shmem_allowable_huge_orders() to shmem_fs.h (per Baolin) > - clean up these coding style issues (per Ryan) > > Changes since v1 [1]: > - Put anonymous shmem mthp related logic into > thp_vma_allowable_orders() (per David) > > [1] https://lore.kernel.org/linux-mm/20240628104926.34209-1-libang.li@antgroup.com/ > [2] https://lore.kernel.org/linux-mm/20240702023401.41553-1-libang.li@antgroup.com/ > > include/linux/shmem_fs.h | 9 +++++++++ > mm/huge_memory.c | 13 +++++++++---- > mm/shmem.c | 9 +-------- > 3 files changed, 19 insertions(+), 12 deletions(-) > > diff --git a/include/linux/shmem_fs.h b/include/linux/shmem_fs.h > index 3fb18f7eb73e..1d06b1e5408a 100644 > --- a/include/linux/shmem_fs.h > +++ b/include/linux/shmem_fs.h > @@ -113,12 +113,21 @@ int shmem_unuse(unsigned int type); > #ifdef CONFIG_TRANSPARENT_HUGEPAGE > extern bool shmem_is_huge(struct inode *inode, pgoff_t index, bool shmem_huge_force, > struct mm_struct *mm, unsigned long vm_flags); > +unsigned long shmem_allowable_huge_orders(struct inode *inode, > + struct vm_area_struct *vma, pgoff_t index, > + bool global_huge); > #else > static __always_inline bool shmem_is_huge(struct inode *inode, pgoff_t index, bool shmem_huge_force, > struct mm_struct *mm, unsigned long vm_flags) > { > return false; > } > +static inline unsigned long shmem_allowable_huge_orders(struct inode *inode, > + struct vm_area_struct *vma, pgoff_t index, > + bool global_huge) > +{ > + return 0; > +} > #endif > > #ifdef CONFIG_SHMEM > diff --git a/mm/huge_memory.c b/mm/huge_memory.c > index 5cbd838e96e6..0985bd75a624 100644 > --- a/mm/huge_memory.c > +++ b/mm/huge_memory.c > @@ -151,10 +151,15 @@ unsigned long __thp_vma_allowable_orders(struct vm_area_struct *vma, > * Must be done before hugepage flags check since shmem has its > * own flags. > */ > - if (!in_pf && shmem_file(vma->vm_file)) > - return shmem_is_huge(file_inode(vma->vm_file), vma->vm_pgoff, > - !enforce_sysfs, vma->vm_mm, vm_flags) > - ? orders : 0; > + if (!in_pf && shmem_file(vma->vm_file)) { > + bool global_huge = shmem_is_huge(file_inode(vma->vm_file), vma->vm_pgoff, > + !enforce_sysfs, vma->vm_mm, vm_flags); > + > + if (!vma_is_anon_shmem(vma)) > + return global_huge ? orders : 0; > + return shmem_allowable_huge_orders(file_inode(vma->vm_file), > + vma, vma->vm_pgoff, global_huge); > + } > > if (!vma_is_anonymous(vma)) { > /* > diff --git a/mm/shmem.c b/mm/shmem.c > index f24177e9d5cc..921d59c3d669 100644 > --- a/mm/shmem.c > +++ b/mm/shmem.c > @@ -1622,7 +1622,7 @@ static gfp_t limit_gfp_mask(gfp_t huge_gfp, gfp_t limit_gfp) > } > > #ifdef CONFIG_TRANSPARENT_HUGEPAGE > -static unsigned long shmem_allowable_huge_orders(struct inode *inode, > +unsigned long shmem_allowable_huge_orders(struct inode *inode, > struct vm_area_struct *vma, pgoff_t index, > bool global_huge) > { > @@ -1707,13 +1707,6 @@ static unsigned long shmem_suitable_orders(struct inode *inode, struct vm_fault > return orders; > } > #else > -static unsigned long shmem_allowable_huge_orders(struct inode *inode, > - struct vm_area_struct *vma, pgoff_t index, > - bool global_huge) > -{ > - return 0; > -} > - > static unsigned long shmem_suitable_orders(struct inode *inode, struct vm_fault *vmf, > struct address_space *mapping, pgoff_t index, > unsigned long orders)