x86, 64bit: do not assume CPU is NX capable when setting early page tables
PATCH 1/1 x86, 64bit: do not assume CPU is NX capable when setting early page tables
The kernel sets the NX bit in the early page tables without checking whether the CPU actually supports this feature. If it doesn't the first attempt to use them will cause a kernel hang. Since these are temporary page tables marked as initdata this fix takes the approach of not bothering with the NX bit at all.
Noticed when my AMD machine that happened to have the NX feature disabled by the BIOS failed to boot after the update to 3.9.
---
arch/x86/kernel/head64.c +1 -1
@@ -99,7 +99,7 @@ again: pmd_p[i] =0 ; *pud_p = (pudval_t )pmd_p - __START_KERNEL_map + phys_base + _KERNPG_TABLE; } - pmd = (physaddr &PMD_MASK ) + (__PAGE_KERNEL_LARGE & ~_PAGE_GLOBAL); + pmd = (physaddr &PMD_MASK ) + (__PAGE_KERNEL_LARGE_EXEC & ~_PAGE_GLOBAL); pmd_p[pmd_index (address)] = pmd;return 0 ;
tip-bot for H. Peter Anvin
merge bot[tip:x86/urgent] x86-64, init: Do not set NX bits on non-NX capable hardware
x86-64, init: Do not set NX bits on non-NX capable hardware
Commit-ID: 78d77df71510a96e042de7ba6dbd7998103642cb Gitweb: http://git.kernel.org/tip/78d77df71510a96e042de7ba6dbd7998103642cb Author: H. Peter Anvin <[email protected]> AuthorDate: Thu, 2 May 2013 10:33:46 -0700 Committer: H. Peter Anvin <[email protected]> CommitDate: Thu, 2 May 2013 11:27:35 -0700
x86-64, init: Do not set NX bits on non-NX capable hardware
During early init, we would incorrectly set the NX bit even if the NX feature was not supported. Instead, only set this bit if NX is actually available and enabled. We already do very early detection of the NX bit to enable it in EFER, this simply extends this detection to the early page table mask.
--- arch/x86/kernel/head64.c | 3 ++- arch/x86/kernel/head_64.S | 1 + 2 files changed, 3 insertions(+), 1 deletion(-)
arch/x86/kernel/head64.c +2 -1
@@ -34,6 +34,7 @@extern pgd_t early_level4_pgt[PTRS_PER_PGD ];extern pmd_t early_dynamic_pgts[EARLY_DYNAMIC_PAGE_TABLES ][PTRS_PER_PMD ];static unsigned int __initdata next_early_pgt =2 ; +pmdval_t __initdata early_pmd_flags = __PAGE_KERNEL_LARGE & ~(_PAGE_GLOBAL | _PAGE_NX);/* Wipe all early page tables except for the kernel symbol map */ static void __init reset_early_page_tables (void )
@@ -99,7 +100,7 @@ again: pmd_p[i] =0 ; *pud_p = (pudval_t )pmd_p - __START_KERNEL_map + phys_base + _KERNPG_TABLE; } - pmd = (physaddr &PMD_MASK ) + (__PAGE_KERNEL_LARGE & ~_PAGE_GLOBAL); + pmd = (physaddr &PMD_MASK ) + early_pmd_flags; pmd_p[pmd_index (address)] = pmd;return 0 ;
arch/x86/kernel/head_64.S +1 -0
@@ -200,6 +200,7 @@ ENTRY(secondary_startup_64) btl $20,%edi /* No Execute supported? */ jnc 1f btsl $_EFER_NX, %eax + btsq $_PAGE_BIT_NX,early_pmd_flags(%rip) 1: wrmsr /* Make changes effective */ /* Setup cr0 */
RE: [tip:x86/urgent] x86-64, init: Do not set NX bits on non-NX capable hardware
(resending as plaintext)
Quoted 5 lines
During early init, we would incorrectly set the NX bit even if the NX feature was not supported. Instead, only set this bit if NX is actually available and enabled. We already do very early detection of the NX bit to enable it in EFER, this simply extends this detection to the early page table mask.
AFAIK the only production x86-64 processor that don't support NX that I know of is the original Nocona D0 stepping. Must more common are the problem of BIOSes disabling the NX feature.
Yuhong Bao
H. Peter Anvin
reviewerRE: [tip:x86/urgent] x86-64, init: Do not set NX bits on non-NX capable hardware
Yes... But both apply.
Quoted 14 lines · Yuhong Bao
(resending as plaintext)
Quoted 3 lines
During early init, we would incorrectly set the NX bit even if the NX feature was not supported. Instead, only set this bit if NX is actually available and enabled. We already do very early detection
of
Quoted 1 line
the NX bit to enable it in EFER, this simply extends this detection
to
Quoted 1 line
the early page table mask.
AFAIK the only production x86-64 processor that don't support NX that I know of is the original Nocona D0 stepping.
Must more common are the problem of BIOSes disabling the NX feature.Yuhong Bao
Signature · 1 line
Sent from my mobile phone. Please excuse brevity and lack of formatting.