Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
MIME-Version: 1.0
References: <2862852d-badd-7486-3a8e-c5ea9666d6fb@google.com> <e6e572-f314-8a43-41a7-7582759d24@google.com>
In-Reply-To: <e6e572-f314-8a43-41a7-7582759d24@google.com>
From:   Yang Shi <shy828301@gmail.com>
Date:   Fri, 30 Jul 2021 16:40:54 -0700
Message-ID: <CAHbLzkp2s+Tkd1kdD4XPU-BF_rDy3Ck7+peTg+WdOWORMjwK-g@mail.gmail.com>
Subject: Re: [PATCH 09/16] huge tmpfs: decide stat.st_blksize by shmem_is_huge()
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>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

On Fri, Jul 30, 2021 at 12:51 AM Hugh Dickins <hughd@google.com> wrote:
>
> 4.18 commit 89fdcd262fd4 ("mm: shmem: make stat.st_blksize return huge
> page size if THP is on") added is_huge_enabled() to decide st_blksize:
> now that hugeness can be defined per file, that too needs to be replaced
> by shmem_is_huge().
>
> Unless they have been fcntl'ed F_HUGEPAGE, this does give a different
> answer (No) for small files on a "huge=within_size" mount: but that can
> be considered a minor bugfix.  And a different answer (No) for unfcntl'ed
> files on a "huge=advise" mount: I'm reluctant to complicate it, just to
> reproduce the same debatable answer as before.
>
> Signed-off-by: Hugh Dickins <hughd@google.com>

Reviewed-by: Yang Shi <shy828301@gmail.com>

> ---
>  mm/shmem.c | 12 +-----------
>  1 file changed, 1 insertion(+), 11 deletions(-)
>
> diff --git a/mm/shmem.c b/mm/shmem.c
> index 67a4b7a4849b..f50f2ede71da 100644
> --- a/mm/shmem.c
> +++ b/mm/shmem.c
> @@ -712,15 +712,6 @@ static unsigned long shmem_unused_huge_shrink(struct shmem_sb_info *sbinfo,
>  }
>  #endif /* CONFIG_TRANSPARENT_HUGEPAGE */
>
> -static inline bool is_huge_enabled(struct shmem_sb_info *sbinfo)
> -{
> -       if (IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE) &&
> -           (shmem_huge == SHMEM_HUGE_FORCE || sbinfo->huge) &&
> -           shmem_huge != SHMEM_HUGE_DENY)
> -               return true;
> -       return false;
> -}
> -
>  /*
>   * Like add_to_page_cache_locked, but error if expected item has gone.
>   */
> @@ -1101,7 +1092,6 @@ static int shmem_getattr(struct user_namespace *mnt_userns,
>  {
>         struct inode *inode = path->dentry->d_inode;
>         struct shmem_inode_info *info = SHMEM_I(inode);
> -       struct shmem_sb_info *sb_info = SHMEM_SB(inode->i_sb);
>
>         if (info->alloced - info->swapped != inode->i_mapping->nrpages) {
>                 spin_lock_irq(&info->lock);
> @@ -1110,7 +1100,7 @@ static int shmem_getattr(struct user_namespace *mnt_userns,
>         }
>         generic_fillattr(&init_user_ns, inode, stat);
>
> -       if (is_huge_enabled(sb_info))
> +       if (shmem_is_huge(NULL, inode, 0))
>                 stat->blksize = HPAGE_PMD_SIZE;
>
>         return 0;
> --
> 2.26.2
>