Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
References: <20230703135330.1865927-1-ryan.roberts@arm.com> <20230703135330.1865927-2-ryan.roberts@arm.com>
In-Reply-To: <20230703135330.1865927-2-ryan.roberts@arm.com>
From:   Yu Zhao <yuzhao@google.com>
Date:   Mon, 3 Jul 2023 13:05:57 -0600
Message-ID: <CAOUHufYtW+6Svaq7pcyBiModTSKn1VU-LKxB_Xwnja=f83X2YA@mail.gmail.com>
Subject: Re: [PATCH v2 1/5] mm: Non-pmd-mappable, large folios for folio_add_new_anon_rmap()
To:     Ryan Roberts <ryan.roberts@arm.com>
Cc:     Andrew Morton <akpm@linux-foundation.org>,
        Matthew Wilcox <willy@infradead.org>,
        "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>,
        Yin Fengwei <fengwei.yin@intel.com>,
        David Hildenbrand <david@redhat.com>,
        Catalin Marinas <catalin.marinas@arm.com>,
        Will Deacon <will@kernel.org>,
        Anshuman Khandual <anshuman.khandual@arm.com>,
        Yang Shi <shy828301@gmail.com>,
        linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org,
        linux-mm@kvack.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Mon, Jul 3, 2023 at 7:53=E2=80=AFAM Ryan Roberts <ryan.roberts@arm.com> =
wrote:
>
> In preparation for FLEXIBLE_THP support, improve
> folio_add_new_anon_rmap() to allow a non-pmd-mappable, large folio to be
> passed to it. In this case, all contained pages are accounted using the
> "small" pages scheme.

Nit: In this case, all *subpages*  are accounted using the *order-0
folio* (or base page) scheme.

> Signed-off-by: Ryan Roberts <ryan.roberts@arm.com>

Reviewed-by: Yu Zhao <yuzhao@google.com>

>  mm/rmap.c | 26 +++++++++++++++++++-------
>  1 file changed, 19 insertions(+), 7 deletions(-)
>
> diff --git a/mm/rmap.c b/mm/rmap.c
> index 1d8369549424..82ef5ba363d1 100644
> --- a/mm/rmap.c
> +++ b/mm/rmap.c
> @@ -1278,31 +1278,43 @@ void page_add_anon_rmap(struct page *page, struct=
 vm_area_struct *vma,
>   * This means the inc-and-test can be bypassed.
>   * The folio does not have to be locked.
>   *
> - * If the folio is large, it is accounted as a THP.  As the folio
> + * If the folio is pmd-mappable, it is accounted as a THP.  As the folio
>   * is new, it's assumed to be mapped exclusively by a single process.
>   */
>  void folio_add_new_anon_rmap(struct folio *folio, struct vm_area_struct =
*vma,
>                 unsigned long address)
>  {
> -       int nr;
> +       int nr =3D folio_nr_pages(folio);
> +       int i;
> +       struct page *page;
>
> -       VM_BUG_ON_VMA(address < vma->vm_start || address >=3D vma->vm_end=
, vma);
> +       VM_BUG_ON_VMA(address < vma->vm_start ||
> +                       address + (nr << PAGE_SHIFT) > vma->vm_end, vma);
>         __folio_set_swapbacked(folio);
>
> -       if (likely(!folio_test_pmd_mappable(folio))) {
> +       if (!folio_test_large(folio)) {
>                 /* increment count (starts at -1) */
>                 atomic_set(&folio->_mapcount, 0);
> -               nr =3D 1;
> +               __page_set_anon_rmap(folio, &folio->page, vma, address, 1=
);
> +       } else if (!folio_test_pmd_mappable(folio)) {
> +               /* increment count (starts at 0) */
> +               atomic_set(&folio->_nr_pages_mapped, nr);
> +
> +               page =3D &folio->page;
> +               for (i =3D 0; i < nr; i++, page++, address +=3D PAGE_SIZE=
) {
> +                       /* increment count (starts at -1) */
> +                       atomic_set(&page->_mapcount, 0);
> +                       __page_set_anon_rmap(folio, page, vma, address, 1=
);
> +               }

Nit: use folio_page(), e.g.,

  } else if (!folio_test_pmd_mappable(folio)) {
    int i;

    for (i =3D 0; i < nr; i++) {
      struct page *page =3D folio_page(folio, i);

      /* increment count (starts at -1) */
      atomic_set(&page->_mapcount, 0);
      __page_set_anon_rmap(folio, page, vma, address + PAGE_SIZE * i, 1);
    }
    /* increment count (starts at 0) */
    atomic_set(&folio->_nr_pages_mapped, nr);
  } else {

>         } else {
>                 /* increment count (starts at -1) */
>                 atomic_set(&folio->_entire_mapcount, 0);
>                 atomic_set(&folio->_nr_pages_mapped, COMPOUND_MAPPED);
> -               nr =3D folio_nr_pages(folio);
>                 __lruvec_stat_mod_folio(folio, NR_ANON_THPS, nr);
> +               __page_set_anon_rmap(folio, &folio->page, vma, address, 1=
);
>         }
>
>         __lruvec_stat_mod_folio(folio, NR_ANON_MAPPED, nr);
> -       __page_set_anon_rmap(folio, &folio->page, vma, address, 1);
>  }