From: Yang Shi <shy828301@gmail.com> To: Hugh Dickins <hughd@google.com> Cc: Andrew Morton <akpm@linux-foundation.org>, Shakeel Butt <shakeelb@google.com>, "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>, Miaohe Lin <linmiaohe@huawei.com>, Mike Kravetz <mike.kravetz@oracle.com>, Michal Hocko <mhocko@suse.com>, Rik van Riel <riel@surriel.com>, Christoph Hellwig <hch@infradead.org>, Matthew Wilcox <willy@infradead.org>, "Eric W. Biederman" <ebiederm@xmission.com>, Alexey Gladkov <legion@kernel.org>, Chris Wilson <chris@chris-wilson.co.uk>, Matthew Auld <matthew.auld@intel.com>, Linux FS-devel Mailing List <linux-fsdevel@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, linux-api@vger.kernel.org, Linux MM <linux-mm@kvack.org> Subject: Re: [PATCH 05/16] huge tmpfs: move shmem_huge_enabled() upwards Date: Fri, 30 Jul 2021 14:57:03 -0700 [thread overview] Message-ID: <CAHbLzkqN0L9S3shxU-2PJBeqbKwt4knFN2_Nh-tAcfq=QfLJDw@mail.gmail.com> (raw) In-Reply-To: <a859bb7f-7978-7e3a-eb32-88224cfa50dc@google.com> On Fri, Jul 30, 2021 at 12:39 AM Hugh Dickins <hughd@google.com> wrote: > > shmem_huge_enabled() is about to be enhanced into shmem_is_huge(), > so that it can be used more widely throughout: before making functional > changes, shift it to its final position (to avoid forward declaration). > > Signed-off-by: Hugh Dickins <hughd@google.com> Reviewed-by: Yang Shi <shy828301@gmail.com> > --- > mm/shmem.c | 72 ++++++++++++++++++++++++++---------------------------- > 1 file changed, 35 insertions(+), 37 deletions(-) > > diff --git a/mm/shmem.c b/mm/shmem.c > index c6fa6f4f2db8..740d48ef1eb5 100644 > --- a/mm/shmem.c > +++ b/mm/shmem.c > @@ -476,6 +476,41 @@ static bool shmem_confirm_swap(struct address_space *mapping, > > static int shmem_huge __read_mostly; > > +bool shmem_huge_enabled(struct vm_area_struct *vma) > +{ > + struct inode *inode = file_inode(vma->vm_file); > + struct shmem_sb_info *sbinfo = SHMEM_SB(inode->i_sb); > + loff_t i_size; > + pgoff_t off; > + > + if ((vma->vm_flags & VM_NOHUGEPAGE) || > + test_bit(MMF_DISABLE_THP, &vma->vm_mm->flags)) > + return false; > + if (shmem_huge == SHMEM_HUGE_FORCE) > + return true; > + if (shmem_huge == SHMEM_HUGE_DENY) > + return false; > + switch (sbinfo->huge) { > + case SHMEM_HUGE_NEVER: > + return false; > + case SHMEM_HUGE_ALWAYS: > + return true; > + case SHMEM_HUGE_WITHIN_SIZE: > + off = round_up(vma->vm_pgoff, HPAGE_PMD_NR); > + i_size = round_up(i_size_read(inode), PAGE_SIZE); > + if (i_size >= HPAGE_PMD_SIZE && > + i_size >> PAGE_SHIFT >= off) > + return true; > + fallthrough; > + case SHMEM_HUGE_ADVISE: > + /* TODO: implement fadvise() hints */ > + return (vma->vm_flags & VM_HUGEPAGE); > + default: > + VM_BUG_ON(1); > + return false; > + } > +} > + > #if defined(CONFIG_SYSFS) > static int shmem_parse_huge(const char *str) > { > @@ -3995,43 +4030,6 @@ struct kobj_attribute shmem_enabled_attr = > __ATTR(shmem_enabled, 0644, shmem_enabled_show, shmem_enabled_store); > #endif /* CONFIG_TRANSPARENT_HUGEPAGE && CONFIG_SYSFS */ > > -#ifdef CONFIG_TRANSPARENT_HUGEPAGE > -bool shmem_huge_enabled(struct vm_area_struct *vma) > -{ > - struct inode *inode = file_inode(vma->vm_file); > - struct shmem_sb_info *sbinfo = SHMEM_SB(inode->i_sb); > - loff_t i_size; > - pgoff_t off; > - > - if ((vma->vm_flags & VM_NOHUGEPAGE) || > - test_bit(MMF_DISABLE_THP, &vma->vm_mm->flags)) > - return false; > - if (shmem_huge == SHMEM_HUGE_FORCE) > - return true; > - if (shmem_huge == SHMEM_HUGE_DENY) > - return false; > - switch (sbinfo->huge) { > - case SHMEM_HUGE_NEVER: > - return false; > - case SHMEM_HUGE_ALWAYS: > - return true; > - case SHMEM_HUGE_WITHIN_SIZE: > - off = round_up(vma->vm_pgoff, HPAGE_PMD_NR); > - i_size = round_up(i_size_read(inode), PAGE_SIZE); > - if (i_size >= HPAGE_PMD_SIZE && > - i_size >> PAGE_SHIFT >= off) > - return true; > - fallthrough; > - case SHMEM_HUGE_ADVISE: > - /* TODO: implement fadvise() hints */ > - return (vma->vm_flags & VM_HUGEPAGE); > - default: > - VM_BUG_ON(1); > - return false; > - } > -} > -#endif /* CONFIG_TRANSPARENT_HUGEPAGE */ > - > #else /* !CONFIG_SHMEM */ > > /* > -- > 2.26.2 >
next prev parent reply other threads:[~2021-07-30 21:58 UTC|newest] Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-07-30 7:22 [PATCH 00/16] tmpfs: HUGEPAGE and MEM_LOCK fcntls and memfds Hugh Dickins 2021-07-30 7:25 ` [PATCH 01/16] huge tmpfs: fix fallocate(vanilla) advance over huge pages Hugh Dickins 2021-07-30 21:36 ` Yang Shi 2021-08-01 3:38 ` Hugh Dickins 2021-08-02 20:36 ` Yang Shi 2021-07-30 7:28 ` [PATCH 02/16] huge tmpfs: fix split_huge_page() after FALLOC_FL_KEEP_SIZE Hugh Dickins 2021-07-30 23:48 ` Yang Shi 2021-07-30 7:30 ` [PATCH 03/16] huge tmpfs: remove shrinklist addition from shmem_setattr() Hugh Dickins 2021-07-30 21:50 ` Yang Shi 2021-07-30 7:36 ` [PATCH 04/16] huge tmpfs: revert shmem's use of transhuge_vma_enabled() Hugh Dickins 2021-07-30 21:56 ` Yang Shi 2021-08-01 4:01 ` Hugh Dickins 2021-08-02 20:39 ` Yang Shi 2021-07-30 7:39 ` [PATCH 05/16] huge tmpfs: move shmem_huge_enabled() upwards Hugh Dickins 2021-07-30 21:57 ` Yang Shi [this message] 2021-07-30 7:42 ` [PATCH 06/16] huge tmpfs: shmem_is_huge(vma, inode, index) Hugh Dickins 2021-07-30 23:34 ` Yang Shi 2021-08-01 5:22 ` Hugh Dickins 2021-08-01 5:37 ` Hugh Dickins 2021-08-02 21:14 ` Yang Shi 2021-08-04 8:28 ` Hugh Dickins 2021-08-04 19:01 ` Yang Shi 2021-08-06 5:21 ` Hugh Dickins 2021-08-06 17:41 ` Yang Shi 2021-08-05 23:04 ` Yang Shi 2021-08-06 5:43 ` Hugh Dickins 2021-08-06 17:57 ` Yang Shi 2021-08-12 18:19 ` Yang Shi 2021-07-30 7:45 ` [PATCH 07/16] memfd: memfd_create(name, MFD_HUGEPAGE) for shmem huge pages Hugh Dickins 2021-08-04 14:03 ` Kirill A. Shutemov 2021-08-06 3:33 ` Hugh Dickins 2021-07-30 7:48 ` [PATCH 08/16] huge tmpfs: fcntl(fd, F_HUGEPAGE) and fcntl(fd, F_NOHUGEPAGE) Hugh Dickins 2021-08-04 14:08 ` Kirill A. Shutemov 2021-08-06 4:34 ` Hugh Dickins 2021-07-30 7:51 ` [PATCH 09/16] huge tmpfs: decide stat.st_blksize by shmem_is_huge() Hugh Dickins 2021-07-30 23:40 ` Yang Shi 2021-07-30 7:55 ` [PATCH 10/16] tmpfs: fcntl(fd, F_MEM_LOCK) to memlock a tmpfs file Hugh Dickins 2021-08-03 1:38 ` Matthew Wilcox 2021-08-04 9:15 ` Hugh Dickins 2021-07-30 7:57 ` [PATCH 11/16] tmpfs: fcntl(fd, F_MEM_LOCKED) to test if memlocked Hugh Dickins 2021-07-30 8:00 ` [PATCH 12/16] tmpfs: refuse memlock when fallocated beyond i_size Hugh Dickins 2021-07-30 8:03 ` [PATCH 13/16] mm: bool user_shm_lock(loff_t size, struct ucounts *) Hugh Dickins 2021-07-30 8:06 ` [PATCH 14/16] mm: user_shm_lock(,,getuc) and user_shm_unlock(,,putuc) Hugh Dickins 2021-07-30 8:09 ` [PATCH 15/16] tmpfs: permit changing size of memlocked file Hugh Dickins 2021-07-30 8:13 ` [PATCH 16/16] memfd: memfd_create(name, MFD_MEM_LOCK) for memlocked shmem Hugh Dickins
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to='CAHbLzkqN0L9S3shxU-2PJBeqbKwt4knFN2_Nh-tAcfq=QfLJDw@mail.gmail.com' \ --to=shy828301@gmail.com \ --cc=akpm@linux-foundation.org \ --cc=chris@chris-wilson.co.uk \ --cc=ebiederm@xmission.com \ --cc=hch@infradead.org \ --cc=hughd@google.com \ --cc=kirill.shutemov@linux.intel.com \ --cc=legion@kernel.org \ --cc=linmiaohe@huawei.com \ --cc=linux-api@vger.kernel.org \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=matthew.auld@intel.com \ --cc=mhocko@suse.com \ --cc=mike.kravetz@oracle.com \ --cc=riel@surriel.com \ --cc=shakeelb@google.com \ --cc=willy@infradead.org \ --subject='Re: [PATCH 05/16] huge tmpfs: move shmem_huge_enabled() upwards' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).