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-3-songliubraving@fb.com>
In-Reply-To: <20191017164223.2762148-3-songliubraving@fb.com>
From:   Yang Shi <shy828301@gmail.com>
Date:   Thu, 17 Oct 2019 10:38:37 -0700
Message-ID: <CAHbLzkq7XVfUqS7ajVcNhWPWYxg9HKcnveOzACAorZwY3uPQBA@mail.gmail.com>
Subject: Re: [PATCH v2 2/5] mm/thp: fix node page state in split_huge_page_to_list()
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>
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: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
>
> Make sure split_huge_page_to_list() handle the state of shmem THP and
> file THP properly.
>
> Fixes: 60fbf0ab5da1 ("mm,thp: stats for file backed THP")
> Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
> Tested-by: Song Liu <songliubraving@fb.com>
> Signed-off-by: Song Liu <songliubraving@fb.com>

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

> ---
>  mm/huge_memory.c | 9 +++++++--
>  1 file changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/mm/huge_memory.c b/mm/huge_memory.c
> index c5cb6dcd6c69..13cc93785006 100644
> --- a/mm/huge_memory.c
> +++ b/mm/huge_memory.c
> @@ -2789,8 +2789,13 @@ int split_huge_page_to_list(struct page *page, struct list_head *list)
>                         ds_queue->split_queue_len--;
>                         list_del(page_deferred_list(head));
>                 }
> -               if (mapping)
> -                       __dec_node_page_state(page, NR_SHMEM_THPS);
> +               if (mapping) {
> +                       if (PageSwapBacked(page))
> +                               __dec_node_page_state(page, NR_SHMEM_THPS);
> +                       else
> +                               __dec_node_page_state(page, NR_FILE_THPS);
> +               }
> +
>                 spin_unlock(&ds_queue->split_queue_lock);
>                 __split_huge_page(page, list, end, flags);
>                 if (PageSwapCache(head)) {
> --
> 2.17.1
>
>