From: Song Liu <songliubraving@fb.com>
To: <linux-kernel@vger.kernel.org>, <linux-mm@kvack.org>,
<akpm@linux-foundation.org>
Cc: <matthew.wilcox@oracle.com>, <kernel-team@fb.com>,
<william.kucharski@oracle.com>,
"Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>,
Song Liu <songliubraving@fb.com>
Subject: [PATCH 2/4] mm/thp: fix node page state in split_huge_page_to_list()
Date: Wed, 16 Oct 2019 00:37:29 -0700 [thread overview]
Message-ID: <20191016073731.4076725-3-songliubraving@fb.com> (raw)
In-Reply-To: <20191016073731.4076725-1-songliubraving@fb.com>
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>
---
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
next prev parent reply other threads:[~2019-10-16 7:38 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-16 7:37 [PATCH 0/4] Fixes for THP in page cache Song Liu
2019-10-16 7:37 ` [PATCH 1/4] proc/meminfo: fix output alignment Song Liu
2019-10-16 7:37 ` Song Liu [this message]
2019-10-16 7:37 ` [PATCH 3/4] mm/thp: allow drop THP from page cache Song Liu
2019-10-17 16:12 ` Matthew Wilcox
2019-10-17 16:36 ` Song Liu
2019-10-16 7:37 ` [PATCH 4/4] uprobe: only do FOLL_SPLIT_PMD for uprobe register Song Liu
2019-10-16 12:10 ` Oleg Nesterov
2019-10-16 16:10 ` Song Liu
2019-10-17 8:47 ` Oleg Nesterov
2019-10-17 14:05 ` Song Liu
2019-10-17 14:28 ` Oleg Nesterov
2019-10-17 15:34 ` Song Liu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191016073731.4076725-3-songliubraving@fb.com \
--to=songliubraving@fb.com \
--cc=akpm@linux-foundation.org \
--cc=kernel-team@fb.com \
--cc=kirill.shutemov@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=matthew.wilcox@oracle.com \
--cc=william.kucharski@oracle.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).