Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33;
MIME-Version: 1.0
References: <20231016200510.7387-1-vishal.moola@gmail.com> <20231016200510.7387-5-vishal.moola@gmail.com>
 <84cdc2c3-e5e3-469b-b265-8df3e72a8c2f@huawei.com>
In-Reply-To: <84cdc2c3-e5e3-469b-b265-8df3e72a8c2f@huawei.com>
From:   Vishal Moola <vishal.moola@gmail.com>
Date:   Wed, 18 Oct 2023 10:21:25 -0700
Message-ID: <CAOzc2pwRoYhhrCkHXyBD90OzZR4AwV3t9fgEuOo84ftKXKMcbQ@mail.gmail.com>
Subject: Re: [PATCH 4/5] mm/khugepaged: Convert alloc_charge_hpage() to use folios
To:     Kefeng Wang <wangkefeng.wang@huawei.com>
Cc:     linux-mm@kvack.org, linux-kernel@vger.kernel.org,
        akpm@linux-foundation.org, shy828301@gmail.com
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Mon, Oct 16, 2023 at 8:48=E2=80=AFPM Kefeng Wang <wangkefeng.wang@huawei=
.com> wrote:
>
>
>
> On 2023/10/17 4:05, Vishal Moola (Oracle) wrote:
> > Also convert hpage_collapse_alloc_page() to
> > hpage_collapse_alloc_folio().
> >
> > This removes 1 call to compound_head() and helps convert khugepaged to
> > use folios throughout.
> >
> > Signed-off-by: Vishal Moola (Oracle) <vishal.moola@gmail.com>
> > ---
> >   mm/khugepaged.c | 13 +++++++------
> >   1 file changed, 7 insertions(+), 6 deletions(-)
> >
> > diff --git a/mm/khugepaged.c b/mm/khugepaged.c
> > index fa21a53ce0c0..70bba8ddea13 100644
> > --- a/mm/khugepaged.c
> > +++ b/mm/khugepaged.c
> > @@ -886,16 +886,16 @@ static int hpage_collapse_find_target_node(struct=
 collapse_control *cc)
> >   }
> >   #endif
> >
> > -static bool hpage_collapse_alloc_page(struct page **hpage, gfp_t gfp, =
int node,
> > +static bool hpage_collapse_alloc_folio(struct folio **folio, gfp_t gfp=
, int node,
> >                                     nodemask_t *nmask)
> >   {
> > -     *hpage =3D __alloc_pages(gfp, HPAGE_PMD_ORDER, node, nmask);
> > -     if (unlikely(!*hpage)) {
> > +     *folio =3D __folio_alloc(gfp, HPAGE_PMD_ORDER, node, nmask);
> > +
> > +     if (unlikely(!*folio)) {
> >               count_vm_event(THP_COLLAPSE_ALLOC_FAILED);
> >               return false;
> >       }
> >
> > -     folio_prep_large_rmappable((struct folio *)*hpage);
> >       count_vm_event(THP_COLLAPSE_ALLOC);
> >       return true;
> >   }
> > @@ -1062,15 +1062,16 @@ static int alloc_charge_hpage(struct page **hpa=
ge, struct mm_struct *mm,
> >       int node =3D hpage_collapse_find_target_node(cc);
> >       struct folio *folio;
> >
> > -     if (!hpage_collapse_alloc_page(hpage, gfp, node, &cc->alloc_nmask=
))
> > +     if (!hpage_collapse_alloc_folio(&folio, gfp, node, &cc->alloc_nma=
sk))
> >               return SCAN_ALLOC_HUGE_PAGE_FAIL;
> >
> > -     folio =3D page_folio(*hpage);
> >       if (unlikely(mem_cgroup_charge(folio, mm, gfp))) {
> >               folio_put(folio);
> >               *hpage =3D NULL;
> >               return SCAN_CGROUP_CHARGE_FAIL;
> >       }
> > +
> > +     *hpage =3D folio_page(folio, 0);
> >       count_memcg_page_event(*hpage, THP_COLLAPSE_ALLOC);
>
> count_memcg_folio_events=EF=BC=88=EF=BC=89and kill count_memcg_page_event=
?
> >
> >       return SCAN_SUCCEED;

Thanks, I didn't notice that was the last caller.