Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7;
MIME-Version: 1.0
References: <20231020183331.10770-1-vishal.moola@gmail.com> <20231020183331.10770-4-vishal.moola@gmail.com>
In-Reply-To: <20231020183331.10770-4-vishal.moola@gmail.com>
From:   Yang Shi <shy828301@gmail.com>
Date:   Tue, 24 Oct 2023 10:39:10 -0700
Message-ID: <CAHbLzkq1Q5ysu2yxxVNh92T-fFLo+pP93jfRqLOMdp4M9tBXuw@mail.gmail.com>
Subject: Re: [PATCH v3 3/5] mm/khugepaged: Convert is_refcount_suitable() to
 use folios
To:     "Vishal Moola (Oracle)" <vishal.moola@gmail.com>
Cc:     linux-mm@kvack.org, linux-kernel@vger.kernel.org,
        akpm@linux-foundation.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Fri, Oct 20, 2023 at 11:34=E2=80=AFAM Vishal Moola (Oracle)
<vishal.moola@gmail.com> wrote:
>
> Both callers of is_refcount_suitable() have been converted to use
> folios, so convert it to take in a folio. Both callers only operate on
> head pages of folios so mapcount/refcount conversions here are trivial.
>
> Removes 3 calls to compound head, and removes 315 bytes of kernel text.
>
> Signed-off-by: Vishal Moola (Oracle) <vishal.moola@gmail.com>

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

> ---
>  mm/khugepaged.c | 14 +++++++-------
>  1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/mm/khugepaged.c b/mm/khugepaged.c
> index 6c4b5af43371..9efd8ff68f06 100644
> --- a/mm/khugepaged.c
> +++ b/mm/khugepaged.c
> @@ -524,15 +524,15 @@ static void release_pte_pages(pte_t *pte, pte_t *_p=
te,
>         }
>  }
>
> -static bool is_refcount_suitable(struct page *page)
> +static bool is_refcount_suitable(struct folio *folio)
>  {
>         int expected_refcount;
>
> -       expected_refcount =3D total_mapcount(page);
> -       if (PageSwapCache(page))
> -               expected_refcount +=3D compound_nr(page);
> +       expected_refcount =3D folio_mapcount(folio);
> +       if (folio_test_swapcache(folio))
> +               expected_refcount +=3D folio_nr_pages(folio);
>
> -       return page_count(page) =3D=3D expected_refcount;
> +       return folio_ref_count(folio) =3D=3D expected_refcount;
>  }
>
>  static int __collapse_huge_page_isolate(struct vm_area_struct *vma,
> @@ -625,7 +625,7 @@ static int __collapse_huge_page_isolate(struct vm_are=
a_struct *vma,
>                  * but not from this process. The other process cannot wr=
ite to
>                  * the page, only trigger CoW.
>                  */
> -               if (!is_refcount_suitable(&folio->page)) {
> +               if (!is_refcount_suitable(folio)) {
>                         folio_unlock(folio);
>                         result =3D SCAN_PAGE_COUNT;
>                         goto out;
> @@ -1371,7 +1371,7 @@ static int hpage_collapse_scan_pmd(struct mm_struct=
 *mm,
>                  * has excessive GUP pins (i.e. 512).  Anyway the same ch=
eck
>                  * will be done again later the risk seems low.
>                  */
> -               if (!is_refcount_suitable(&folio->page)) {
> +               if (!is_refcount_suitable(folio)) {
>                         result =3D SCAN_PAGE_COUNT;
>                         goto out_unmap;
>                 }
> --
> 2.40.1
>
>