* [PATCH] x86/mm/cpa: Add missing comment in populate_pdg()
@ 2016-07-23 16:59 Andy Lutomirski
2016-07-23 19:18 ` [tip:x86/mm] " tip-bot for Andy Lutomirski
0 siblings, 1 reply; 2+ messages in thread
From: Andy Lutomirski @ 2016-07-23 16:59 UTC (permalink / raw)
To: x86; +Cc: Borislav Petkov, linux-kernel, Andy Lutomirski
In commit 21cbc2822aa1 ("x86/mm/cpa: Unbreak populate_pgd(): stop
trying to deallocate failed PUDs"), I intended to add this comment,
but I failed at using git.
Signed-off-by: Andy Lutomirski <luto@kernel.org>
---
arch/x86/mm/pageattr.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
index 2bc6ea153f76..47870a534877 100644
--- a/arch/x86/mm/pageattr.c
+++ b/arch/x86/mm/pageattr.c
@@ -1091,6 +1091,11 @@ static int populate_pgd(struct cpa_data *cpa, unsigned long addr)
ret = populate_pud(cpa, addr, pgd_entry, pgprot);
if (ret < 0) {
+ /*
+ * Leave the PUD page in place in case some other CPU or thread
+ * already found it, but remove any useless entries we just
+ * added to it.
+ */
unmap_pud_range(pgd_entry, addr,
addr + (cpa->numpages << PAGE_SHIFT));
return ret;
--
2.7.4
^ permalink raw reply [flat|nested] 2+ messages in thread* [tip:x86/mm] x86/mm/cpa: Add missing comment in populate_pdg()
2016-07-23 16:59 [PATCH] x86/mm/cpa: Add missing comment in populate_pdg() Andy Lutomirski
@ 2016-07-23 19:18 ` tip-bot for Andy Lutomirski
0 siblings, 0 replies; 2+ messages in thread
From: tip-bot for Andy Lutomirski @ 2016-07-23 19:18 UTC (permalink / raw)
To: linux-tip-commits
Cc: linux-kernel, tglx, torvalds, peterz, hpa, bp, mingo, luto
Commit-ID: 55920d31f1e3fea06702c74271dd56c4fc9b70ca
Gitweb: http://git.kernel.org/tip/55920d31f1e3fea06702c74271dd56c4fc9b70ca
Author: Andy Lutomirski <luto@kernel.org>
AuthorDate: Sat, 23 Jul 2016 09:59:28 -0700
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Sat, 23 Jul 2016 21:17:10 +0200
x86/mm/cpa: Add missing comment in populate_pdg()
In commit:
21cbc2822aa1 ("x86/mm/cpa: Unbreak populate_pgd(): stop trying to deallocate failed PUDs")
I intended to add this comment, but I failed at using git.
Signed-off-by: Andy Lutomirski <luto@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/242baf8612394f4e31216f96d13c4d2e9b90d1b7.1469293159.git.luto@kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
arch/x86/mm/pageattr.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
index 2bc6ea1..47870a5 100644
--- a/arch/x86/mm/pageattr.c
+++ b/arch/x86/mm/pageattr.c
@@ -1091,6 +1091,11 @@ static int populate_pgd(struct cpa_data *cpa, unsigned long addr)
ret = populate_pud(cpa, addr, pgd_entry, pgprot);
if (ret < 0) {
+ /*
+ * Leave the PUD page in place in case some other CPU or thread
+ * already found it, but remove any useless entries we just
+ * added to it.
+ */
unmap_pud_range(pgd_entry, addr,
addr + (cpa->numpages << PAGE_SHIFT));
return ret;
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-07-23 19:19 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-07-23 16:59 [PATCH] x86/mm/cpa: Add missing comment in populate_pdg() Andy Lutomirski
2016-07-23 19:18 ` [tip:x86/mm] " tip-bot for Andy Lutomirski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome