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 4D8EAC3DA59 for ; Mon, 15 Jul 2024 13:36:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C42C76B009B; Mon, 15 Jul 2024 09:36:47 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BF26F6B009D; Mon, 15 Jul 2024 09:36:47 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AE1D86B009F; Mon, 15 Jul 2024 09:36:47 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 913726B009B for ; Mon, 15 Jul 2024 09:36:47 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 533A8C169D for ; Mon, 15 Jul 2024 13:36:47 +0000 (UTC) X-FDA: 82342087254.22.BB81DD3 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf23.hostedemail.com (Postfix) with ESMTP id 8569F140011 for ; Mon, 15 Jul 2024 13:36:45 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=none; spf=pass (imf23.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com; dmarc=pass (policy=none) header.from=arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1721050568; 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=mGU4pYmTixXjstVsxFdIn9qTYjp3IIrNWsaORtOjkts=; b=Xl6xDrUTWrKfNJYYNAuZLKru1BIZPthUhkdQuZ3+JJHI97ofCScCpL/3rWFQumotwD0shP HZi0cfpTgG4coR0NXosy3aNmLYvRULUBTKRfk74SZ6BnzHCzl26QPHrGO10NvrLfbOPE8z zWR9jkgXTIscYfwbHFyNVgbCeB4vxIA= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1721050568; a=rsa-sha256; cv=none; b=j70PxnZ2RlBFn/IxVjCfqnkDmrnaM7ndM3ZL3Uo/xU0CNER4gFy08wfBXDPfb1lSoAN3aO KbDHz4D85y+d7JO53bbAEdtt65IoFxpLWhLA/zQFJ0V8Tsw6rHPWWnJHy3fOHObpkrLISO hfjUXgXH3wQGeX8vic3KghUsvQTLQAQ= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=none; spf=pass (imf23.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com; dmarc=pass (policy=none) header.from=arm.com 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 243F5DA7; Mon, 15 Jul 2024 06:37:10 -0700 (PDT) Received: from [10.57.77.136] (unknown [10.57.77.136]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 4777E3F73F; Mon, 15 Jul 2024 06:36:43 -0700 (PDT) Message-ID: Date: Mon, 15 Jul 2024 14:36:41 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2 3/3] mm: shmem: move shmem_huge_global_enabled() into shmem_allowable_huge_orders() Content-Language: en-GB To: Baolin Wang , akpm@linux-foundation.org, hughd@google.com Cc: willy@infradead.org, david@redhat.com, 21cnbao@gmail.com, ziy@nvidia.com, ioworker0@gmail.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org References: <16dad33282617ecb90a3f466b35273b10be68d21.1720755678.git.baolin.wang@linux.alibaba.com> From: Ryan Roberts In-Reply-To: <16dad33282617ecb90a3f466b35273b10be68d21.1720755678.git.baolin.wang@linux.alibaba.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 8569F140011 X-Stat-Signature: bxjyjiz9kkfq33bejy1cfbh4wtxr13pd X-HE-Tag: 1721050605-247910 X-HE-Meta: U2FsdGVkX1/uH+pH/43NqBGPgrrkrPZ3nKAYwZBA/X2wHKH6n7AHEfq68MW91ODezkdC8+eFW0BiT3wkOSBr0H4eF+/+kfRFYBQCnjYz7MOpun0E+HQgrTcoAEIX5ciI1gtXCa5HW/rVDtv4CTLLj2Lpv3lMRw3BN67Q0vU/RyeVTFoDuvj1gNZCROrNeXSO1k/V2LzpEAFFtPC2BhTYzn9IBi5YfK2vxPQZcl/FKs3x4QU8/9pI9RvinGovh8BJKUvM9mfA21i1rEIVjmnMiW9dhlAez1bQLS03c7LrUEd+/qwzCMRre5+edx6lCZ/CD+7Vg1Q67olTrBNVhc6aHtOpTDSg2pSE44+M0g8i/T+arpVmmM0S2NrNPxyjon1k48uOakQSmTigagZf3iJ2bIcY6Fm5RHJHoYkml5FQkwk/RfM4UJLstj6I8l5dEYR2o/qq5SZxBITZe3yc2JSd8I6+C8hNGHsLrEa5SP/5iL3aBvamh2NFKWGfcpmee6mIdg0BpGr1BAEQZHynpforYPn+mZ7guNFmtPZNvwFurn7p15KylSsTnfki3gCaFaF3dE/3OMgtaiQVSy95WPFqsDiUSiTVOCw+t/sAgFYQUsOtVzbN1orjVYZVdufqfvcw96uJxyrOkrNNSUIeQC4H4lZgnKMMC3+HMqFyS7itC5BTw37ARwHVFT/i+nNVpdihVBHMedJnVYAgxcNPQy1TCw/8u/kjsPwGBW/9tVE6oAp//b+Hve3jjIUH475KT8rXIWycImrIpO33FGm1dYecrqF5CzkhsjWILvApK92UrE0Rv3AHETNho9OI4uNTq5mzPPmIzNFX79gh3+sODDZJMERKGHbgDTQlyNYLZq3iYmFAv4VfoZ5T2Foh78ohFH3n0h2rYdO7Veo75AbJmgpbNhHpHiiA6LhiWHNTGVJDFLCkeVSmN1KcctBFr2i/MoFSfKdPRlJ1sY8RF+46xS+ AZk7Ae6/ fmiFXErmYPOCtIFBrnfdYD6I5XIUd1YpdPIXXkM/mpW3o/eX3wOVv2qvzSW1nq98Su4u61o1HjooR8R4x1Z/oxMW/IBSrC8YpLn3m+7j3VGdnv5GdRSstWDZTsTB6TPukyl4rIJkn6POvsz/RKPgJq5+mRzvecgJeCLEbcz49oSSWt1vOWjRkAYe5oT7QmYnm02MEaBiCVMcckUJVG5Bx8PqvZwjbhfiSRt5CfKp6j7vO9HIf/e4C2kRekNE2rxS7gFBzeRMLT+I12JkuWTn4+3swQw== 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 13/07/2024 14:24, Baolin Wang wrote: > Move shmem_huge_global_enabled() into the shmem_allowable_huge_orders() function, > so that shmem_allowable_huge_orders() can also help to find the allowable huge > orders for tmpfs. Moreover the shmem_huge_global_enabled() can become static. > > No functional changes. > > Signed-off-by: Baolin Wang one nit below, but either way: Reviewed-by: Ryan Roberts > --- > include/linux/shmem_fs.h | 12 ++---------- > mm/huge_memory.c | 12 +++--------- > mm/shmem.c | 41 ++++++++++++++++++++++++++-------------- > 3 files changed, 32 insertions(+), 33 deletions(-) > > diff --git a/include/linux/shmem_fs.h b/include/linux/shmem_fs.h > index 405ee8d3589a..1564d7d3ca61 100644 > --- a/include/linux/shmem_fs.h > +++ b/include/linux/shmem_fs.h > @@ -111,21 +111,13 @@ extern void shmem_truncate_range(struct inode *inode, loff_t start, loff_t end); > int shmem_unuse(unsigned int type); > > #ifdef CONFIG_TRANSPARENT_HUGEPAGE > -extern bool shmem_huge_global_enabled(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); > + bool shmem_huge_force); > #else > -static __always_inline bool shmem_huge_global_enabled(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) > + bool shmem_huge_force) > { > return 0; > } > diff --git a/mm/huge_memory.c b/mm/huge_memory.c > index cc9bad12be75..f69980b5b5fc 100644 > --- a/mm/huge_memory.c > +++ b/mm/huge_memory.c > @@ -151,16 +151,10 @@ 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)) { > - bool global_huge = shmem_huge_global_enabled(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; > + if (!in_pf && shmem_file(vma->vm_file)) > return shmem_allowable_huge_orders(file_inode(vma->vm_file), > - vma, vma->vm_pgoff, global_huge); > - } > + vma, vma->vm_pgoff, > + !enforce_sysfs); > > if (!vma_is_anonymous(vma)) { > /* > diff --git a/mm/shmem.c b/mm/shmem.c > index 1445dcd39b6f..4d274f5a17d9 100644 > --- a/mm/shmem.c > +++ b/mm/shmem.c > @@ -581,7 +581,7 @@ static bool __shmem_huge_global_enabled(struct inode *inode, pgoff_t index, > } > } > > -bool shmem_huge_global_enabled(struct inode *inode, pgoff_t index, > +static bool shmem_huge_global_enabled(struct inode *inode, pgoff_t index, > bool shmem_huge_force, struct mm_struct *mm, > unsigned long vm_flags) > { > @@ -772,6 +772,13 @@ static unsigned long shmem_unused_huge_shrink(struct shmem_sb_info *sbinfo, > { > return 0; > } > + > +static bool shmem_huge_global_enabled(struct inode *inode, pgoff_t index, > + bool shmem_huge_force, struct mm_struct *mm, > + unsigned long vm_flags) > +{ > + return false; > +} > #endif /* CONFIG_TRANSPARENT_HUGEPAGE */ > > /* > @@ -1625,27 +1632,39 @@ static gfp_t limit_gfp_mask(gfp_t huge_gfp, gfp_t limit_gfp) > #ifdef CONFIG_TRANSPARENT_HUGEPAGE > unsigned long shmem_allowable_huge_orders(struct inode *inode, > struct vm_area_struct *vma, pgoff_t index, > - bool global_huge) > + bool shmem_huge_force) > { > unsigned long mask = READ_ONCE(huge_shmem_orders_always); > unsigned long within_size_orders = READ_ONCE(huge_shmem_orders_within_size); > - unsigned long vm_flags = vma->vm_flags; > + unsigned long vm_flags = vma ? vma->vm_flags : 0; > + struct mm_struct *fault_mm = vma ? vma->vm_mm : NULL; nit: rather than deriving the fault_mm here, I wonder if its cleaner to just pass vma to shmem_huge_global_enabled()? shmem_huge_global_enabled() is just using it as a guard to access vm_flags, which you can just as easily do by testing the vma for non-NULL. And you can access mm flags with vma->vm_mm->flags after testing the vma too. > /* > * Check all the (large) orders below HPAGE_PMD_ORDER + 1 that > * are enabled for this vma. > */ > unsigned long orders = BIT(PMD_ORDER + 1) - 1; > + bool global_huge; > loff_t i_size; > int order; > > - if ((vm_flags & VM_NOHUGEPAGE) || > - test_bit(MMF_DISABLE_THP, &vma->vm_mm->flags)) > + if (vma && ((vm_flags & VM_NOHUGEPAGE) || > + test_bit(MMF_DISABLE_THP, &vma->vm_mm->flags))) > return 0; > > /* If the hardware/firmware marked hugepage support disabled. */ > if (transparent_hugepage_flags & (1 << TRANSPARENT_HUGEPAGE_UNSUPPORTED)) > return 0; > > + global_huge = shmem_huge_global_enabled(inode, index, shmem_huge_force, > + fault_mm, vm_flags); > + if (!vma || !vma_is_anon_shmem(vma)) { > + /* > + * For tmpfs, we now only support PMD sized THP if huge page > + * is enabled, otherwise fallback to order 0. > + */ > + return global_huge ? BIT(HPAGE_PMD_ORDER) : 0; > + } > + > /* > * Following the 'deny' semantics of the top level, force the huge > * option off from all mounts. > @@ -2081,7 +2100,7 @@ static int shmem_get_folio_gfp(struct inode *inode, pgoff_t index, > struct mm_struct *fault_mm; > struct folio *folio; > int error; > - bool alloced, huge; > + bool alloced; > unsigned long orders = 0; > > if (WARN_ON_ONCE(!shmem_mapping(inode->i_mapping))) > @@ -2154,14 +2173,8 @@ static int shmem_get_folio_gfp(struct inode *inode, pgoff_t index, > return 0; > } > > - huge = shmem_huge_global_enabled(inode, index, false, fault_mm, > - vma ? vma->vm_flags : 0); > - /* Find hugepage orders that are allowed for anonymous shmem. */ > - if (vma && vma_is_anon_shmem(vma)) > - orders = shmem_allowable_huge_orders(inode, vma, index, huge); > - else if (huge) > - orders = BIT(HPAGE_PMD_ORDER); > - > + /* Find hugepage orders that are allowed for anonymous shmem and tmpfs. */ > + orders = shmem_allowable_huge_orders(inode, vma, index, false); > if (orders > 0) { > gfp_t huge_gfp; >