From: Lai Jiangshan <jiangshanlai@gmail.com>
To: linux-kernel@vger.kernel.org
Cc: Lai Jiangshan <laijs@linux.alibaba.com>,
Dave Hansen <dave.hansen@linux.intel.com>,
Andy Lutomirski <luto@kernel.org>,
Peter Zijlstra <peterz@infradead.org>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
x86@kernel.org, "H. Peter Anvin" <hpa@zytor.com>
Subject: [PATCH V2 3/3] x86/mm/pti: warn and stop when pti_clone_pagetable() is on 1G page
Date: Thu, 10 Dec 2020 22:35:26 +0800 [thread overview]
Message-ID: <20201210143527.2398-3-jiangshanlai@gmail.com> (raw)
In-Reply-To: <20201210143527.2398-1-jiangshanlai@gmail.com>
From: Lai Jiangshan <laijs@linux.alibaba.com>
Right now, we only clone parts of the kernel image and the cpu entry area.
The cpu entry area would be insane to map with 1G pages since it maps so
many different kinds of pages and has *small* mappings.
For the kernel image to have a 1GB area with uniform permissions seems
pretty far away to practice. It would be en even more remote possibility
that a large swath of it would need to be cloned for PTI. Kernel text
with a non-PCID system is probably as close as we would get. I'm also
not even sure we have the code to create 1GB mappings for parts of the
image.
In other words, no caller calls pti_clone_pagetable() on range that
includes pud large page(1G) by now. If it were called in such case,
there would be bugs in the caller side or other places, so it worths
a warning for robustness.
We also add check for pgd_large() & p4d_large() with the same reason,
and pgd_large() & p4d_large() are constant 0 which just acts as the
self-comment in code without any overhead.
[ Many thanks to Dave Hansen for more elaborated changelog ]
Signed-off-by: Lai Jiangshan <laijs@linux.alibaba.com>
---
arch/x86/mm/pti.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/arch/x86/mm/pti.c b/arch/x86/mm/pti.c
index cd6da1d42ba9..e8d2df072c5c 100644
--- a/arch/x86/mm/pti.c
+++ b/arch/x86/mm/pti.c
@@ -321,10 +321,10 @@ pti_clone_pgtable(unsigned long start, unsigned long end,
break;
pgd = pgd_offset_k(addr);
- if (WARN_ON(pgd_none(*pgd)))
+ if (WARN_ON(pgd_none(*pgd) || pgd_large(*pgd)))
return;
p4d = p4d_offset(pgd, addr);
- if (WARN_ON(p4d_none(*p4d)))
+ if (WARN_ON(p4d_none(*p4d) || p4d_large(*p4d)))
return;
pud = pud_offset(p4d, addr);
@@ -333,6 +333,8 @@ pti_clone_pgtable(unsigned long start, unsigned long end,
addr = round_up(addr + 1, PUD_SIZE);
continue;
}
+ if (WARN_ON(pud_large(*pud)))
+ return;
pmd = pmd_offset(pud, addr);
if (pmd_none(*pmd)) {
--
2.19.1.6.gb485710b
next prev parent reply other threads:[~2020-12-10 13:36 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-30 15:25 [PATCH 1/2] x86/mm/pti: Check unaligned address for pmd clone in pti_clone_pagetable() Lai Jiangshan
2020-11-30 15:25 ` [PATCH 2/2] x86/mm/pti: warn and stop when pti_clone_pagetable() is on 1G page Lai Jiangshan
2020-11-30 16:37 ` Dave Hansen
2020-12-01 17:43 ` [PATCH 1/2] x86/mm/pti: Check unaligned address for pmd clone in pti_clone_pagetable() Dave Hansen
2020-12-02 8:55 ` Lai Jiangshan
2020-12-10 14:35 ` [PATCH V2 1/3] x86/mm/pti: handle " Lai Jiangshan
2020-12-10 14:35 ` [PATCH V2 2/3] x86/mm/pti: issue warning when mapping large pmd beyond specifid range Lai Jiangshan
2020-12-10 14:35 ` Lai Jiangshan [this message]
2020-12-18 13:00 ` [PATCH V2 1/3] x86/mm/pti: handle unaligned address for pmd clone in pti_clone_pagetable() Lai Jiangshan
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=20201210143527.2398-3-jiangshanlai@gmail.com \
--to=jiangshanlai@gmail.com \
--cc=bp@alien8.de \
--cc=dave.hansen@linux.intel.com \
--cc=hpa@zytor.com \
--cc=laijs@linux.alibaba.com \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@kernel.org \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=x86@kernel.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
all inboxes | Powered by JetHome®