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: <20211027195221.3825-1-shy828301@gmail.com> <C8C6E50C-D300-40D4-AA5C-490F673BADFE@fb.com>
 <CAHbLzkqTW9U3VvTu1Ki5v_cLRC9gHW+znBukg_ycergE0JWj-A@mail.gmail.com> <20211027135328.001e4582a9535e8e4be785bb@linux-foundation.org>
In-Reply-To: <20211027135328.001e4582a9535e8e4be785bb@linux-foundation.org>
From:   Yang Shi <shy828301@gmail.com>
Date:   Wed, 27 Oct 2021 14:57:04 -0700
Message-ID: <CAHbLzkpPuM=R3=4wCY_pVzJMaHqm=JYff-+7nVWg-pzjsr+2zw@mail.gmail.com>
Subject: Re: [PATCH] mm: khugepaged: skip huge page collapse for special files
To:     Andrew Morton <akpm@linux-foundation.org>
Cc:     Song Liu <songliubraving@fb.com>, Hugh Dickins <hughd@google.com>,
        "sunhao.th@gmail.com" <sunhao.th@gmail.com>,
        Matthew Wilcox <willy@infradead.org>,
        "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>,
        "andrea.righi@canonical.com" <andrea.righi@canonical.com>,
        Linux Memory Management List <linux-mm@kvack.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "stable@vger.kernel.org" <stable@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

On Wed, Oct 27, 2021 at 1:53 PM Andrew Morton <akpm@linux-foundation.org> wrote:
>
> On Wed, 27 Oct 2021 13:44:37 -0700 Yang Shi <shy828301@gmail.com> wrote:
>
> > > > --- a/mm/khugepaged.c
> > > > +++ b/mm/khugepaged.c
> > > > @@ -445,22 +445,25 @@ static bool hugepage_vma_check(struct vm_area_struct *vma,
> > > >       if (!transhuge_vma_enabled(vma, vm_flags))
> > > >               return false;
> > > >
> > > > -     /* Enabled via shmem mount options or sysfs settings. */
> > > > -     if (shmem_file(vma->vm_file) && shmem_huge_enabled(vma)) {
> > > > +     if (vma->vm_file)
> > > >               return IS_ALIGNED((vma->vm_start >> PAGE_SHIFT) - vma->vm_pgoff,
> > > >                               HPAGE_PMD_NR);
> > >
> > > Am I misreading this? If we return here for vma->vm_file, the following
> > > logic (shmem_file(), etc.) would be skipped, no?
> >
> > Oh, yes, you are right. My mistake.
> >
> > Andrew,
> >
> > Could you please apply the below fix?
>
> um, how well tested are these changes?

I has this fix on my test machine, but somehow forgot to fold it into
the original patch. The whole fix was tested by opening /dev/nullb0
readonly and mapping with PROT_EXEC, the THP was not collapsed
anymore.