From: Nicholas Piggin <npiggin@gmail.com>
To: linux-mm@kvack.org
Cc: Nicholas Piggin <npiggin@gmail.com>,
Peter Zijlstra <peterz@infradead.org>
Subject: [PATCH 2/3] mm: add page_cpupid_reset_last atomic variant
Date: Sun, 20 Dec 2020 15:03:39 +1000 [thread overview]
Message-ID: <20201220050340.849754-2-npiggin@gmail.com> (raw)
In-Reply-To: <20201220050340.849754-1-npiggin@gmail.com>
This can be used when there is concurrency on the struct page. If cpupid
is not in page flags, it can use a store.
Use this to replace the open-coded reset in wp_page_reuse.
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
---
include/linux/mm.h | 15 +++++++++++++++
mm/memory.c | 2 +-
2 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 5b3fc2c8fd8b..6ece500464e0 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -1362,6 +1362,11 @@ static inline void __page_cpupid_reset_last(struct page *page)
{
page->_last_cpupid = -1 & LAST_CPUPID_MASK;
}
+
+static inline void page_cpupid_reset_last(struct page *page)
+{
+ WRITE_ONCE(page->_last_cpupid, -1 & LAST_CPUPID_MASK);
+}
#else
static inline int page_cpupid_last(struct page *page)
{
@@ -1374,6 +1379,12 @@ static inline void __page_cpupid_reset_last(struct page *page)
{
page->flags |= LAST_CPUPID_MASK << LAST_CPUPID_PGSHIFT;
}
+
+static inline void page_cpupid_reset_last(struct page *page)
+{
+ page_cpupid_xchg_last(page, (1 << LAST_CPUPID_SHIFT) - 1);
+}
+
#endif /* LAST_CPUPID_NOT_IN_PAGE_FLAGS */
#else /* !CONFIG_NUMA_BALANCING */
static inline int page_cpupid_xchg_last(struct page *page, int cpupid)
@@ -1415,6 +1426,10 @@ static inline void __page_cpupid_reset_last(struct page *page)
{
}
+static inline void page_cpupid_reset_last(struct page *page)
+{
+}
+
static inline bool cpupid_match_pid(struct task_struct *task, int cpupid)
{
return false;
diff --git a/mm/memory.c b/mm/memory.c
index 7d608765932b..990e5d704c08 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -2798,7 +2798,7 @@ static inline void wp_page_reuse(struct vm_fault *vmf)
* unrelated process.
*/
if (page)
- page_cpupid_xchg_last(page, (1 << LAST_CPUPID_SHIFT) - 1);
+ page_cpupid_reset_last(page);
flush_cache_page(vma, vmf->address, pte_pfn(vmf->orig_pte));
entry = pte_mkyoung(vmf->orig_pte);
--
2.23.0
next prev parent reply other threads:[~2020-12-20 5:03 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-20 5:03 [PATCH 1/3] mm: prefix page_cpupid_reset_last as non-atomic Nicholas Piggin
2020-12-20 5:03 ` Nicholas Piggin [this message]
2020-12-20 5:03 ` [PATCH 3/3] mm: skip page_cpupid_reset_last atomic update if the value is already reset Nicholas Piggin
2020-12-21 1:53 ` [PATCH 1/3] mm: prefix page_cpupid_reset_last as non-atomic huang ying
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=20201220050340.849754-2-npiggin@gmail.com \
--to=npiggin@gmail.com \
--cc=linux-mm@kvack.org \
--cc=peterz@infradead.org \
/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).