Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
MIME-Version: 1.0
References: <20191017164223.2762148-1-songliubraving@fb.com> <20191017164223.2762148-4-songliubraving@fb.com>
In-Reply-To: <20191017164223.2762148-4-songliubraving@fb.com>
From:   Yang Shi <shy828301@gmail.com>
Date:   Thu, 17 Oct 2019 10:43:39 -0700
Message-ID: <CAHbLzkrYPF8V9hCsQfT3DfdEAWZw2gCXjHgB-vmsWXhm3VVXtA@mail.gmail.com>
Subject: Re: [PATCH v2 3/5] mm: Support removing arbitrary sized pages from mapping
To:     Song Liu <songliubraving@fb.com>
Cc:     Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux MM <linux-mm@kvack.org>,
        Andrew Morton <akpm@linux-foundation.org>,
        matthew.wilcox@oracle.com, kernel-team@fb.com,
        william.kucharski@oracle.com,
        "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>,
        Matthew Wilcox <willy@infradead.org>
Content-Type: text/plain; charset="UTF-8"
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On Thu, Oct 17, 2019 at 9:42 AM Song Liu <songliubraving@fb.com> wrote:
>
> From: William Kucharski <william.kucharski@oracle.com>
>
> __remove_mapping() assumes that pages can only be either base pages
> or HPAGE_PMD_SIZE.  Ask the page what size it is.
>
> Fixes: 99cb0dbd47a1 ("mm,thp: add read-only THP support for (non-shmem) FS")
> Signed-off-by: William Kucharski <william.kucharski@oracle.com>
> Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
> Signed-off-by: Song Liu <songliubraving@fb.com>

Acked-by: Yang Shi <yang.shi@linux.alibaba.com>

> ---
>  mm/vmscan.c | 5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/mm/vmscan.c b/mm/vmscan.c
> index c6659bb758a4..f870da1f4bb7 100644
> --- a/mm/vmscan.c
> +++ b/mm/vmscan.c
> @@ -932,10 +932,7 @@ static int __remove_mapping(struct address_space *mapping, struct page *page,
>          * Note that if SetPageDirty is always performed via set_page_dirty,
>          * and thus under the i_pages lock, then this ordering is not required.
>          */
> -       if (unlikely(PageTransHuge(page)) && PageSwapCache(page))
> -               refcount = 1 + HPAGE_PMD_NR;
> -       else
> -               refcount = 2;
> +       refcount = 1 + compound_nr(page);
>         if (!page_ref_freeze(page, refcount))
>                 goto cannot_free;
>         /* note: atomic_cmpxchg in page_ref_freeze provides the smp_rmb */
> --
> 2.17.1
>
>