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 3/4] mm/thp: allow drop THP from page cache
Date: Wed, 16 Oct 2019 00:37:30 -0700 [thread overview]
Message-ID: <20191016073731.4076725-4-songliubraving@fb.com> (raw)
In-Reply-To: <20191016073731.4076725-1-songliubraving@fb.com>
From: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
Once a THP is added to the page cache, it cannot be dropped via
/proc/sys/vm/drop_caches. Fix this issue with proper handling in
invalidate_mapping_pages() and __remove_mapping().
Fixes: 99cb0dbd47a1 ("mm,thp: add read-only THP support for (non-shmem) FS")
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/truncate.c | 12 ++++++++++++
mm/vmscan.c | 3 ++-
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/mm/truncate.c b/mm/truncate.c
index 8563339041f6..dd9ebc1da356 100644
--- a/mm/truncate.c
+++ b/mm/truncate.c
@@ -592,6 +592,16 @@ unsigned long invalidate_mapping_pages(struct address_space *mapping,
unlock_page(page);
continue;
}
+
+ /* Take a pin outside pagevec */
+ get_page(page);
+
+ /*
+ * Drop extra pins before trying to invalidate
+ * the huge page.
+ */
+ pagevec_remove_exceptionals(&pvec);
+ pagevec_release(&pvec);
}
ret = invalidate_inode_page(page);
@@ -602,6 +612,8 @@ unsigned long invalidate_mapping_pages(struct address_space *mapping,
*/
if (!ret)
deactivate_file_page(page);
+ if (PageTransHuge(page))
+ put_page(page);
count += ret;
}
pagevec_remove_exceptionals(&pvec);
diff --git a/mm/vmscan.c b/mm/vmscan.c
index c6659bb758a4..1d80a188ad4a 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -932,7 +932,8 @@ 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))
+ if (unlikely(PageTransHuge(page)) &&
+ (PageSwapCache(page) || !PageSwapBacked(page)))
refcount = 1 + HPAGE_PMD_NR;
else
refcount = 2;
--
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 ` [PATCH 2/4] mm/thp: fix node page state in split_huge_page_to_list() Song Liu
2019-10-16 7:37 ` Song Liu [this message]
2019-10-17 16:12 ` [PATCH 3/4] mm/thp: allow drop THP from page cache 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-4-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).