x86: cleanup of NX enabling
Subsystems (5)
H. Peter Anvin
reviewerHello all,
Posting this patch series for review; I intend to commit it to tip:x86/mm unless someone objects over the next few days.
This came about based on Kees' original patch to give better dmesg information about the status of NX availability.
Jeremy: I'm not 100% this is safe for Xen, as Xen takes its own path for initialization, so if you could take a quick look, it would be most appreciated.
arch/x86/include/asm/proto.h | 3 +- arch/x86/kernel/acpi/sleep.c | 9 ++---- arch/x86/kernel/cpu/common.c | 2 +- arch/x86/kernel/head_32.S | 18 +++++++---- arch/x86/kernel/machine_kexec_32.c | 6 +-- arch/x86/kernel/setup.c | 17 ++++------ arch/x86/mm/init.c | 4 -- arch/x86/mm/pageattr.c | 6 ++++ arch/x86/mm/setup_nx.c | 59 +++++++++++++++-------------------- arch/x86/xen/enlighten.c | 4 +-- 10 files changed, 58 insertions(+), 70 deletions(-)
H. Peter Anvin
reviewerPATCH 1/5 x86-32: use symbolic constants, safer CPUID when enabling EFER.NX
Use symbolic constants rather than hard-coded values when setting EFER.NX in head_32.S, and do a more rigorous test for the validity of the response when probing for the extended CPUID range.
--- arch/x86/kernel/head_32.S | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 deletions(-)
arch/x86/kernel/head_32.S +11 -7
@@ -18,6 +18,8 @@ #include <asm/asm-offsets.h> #include <asm/setup.h> #include <asm/processor-flags.h> +#include <asm/msr-index.h> +#include <asm/cpufeature.h> #include <asm/percpu.h> /* Physical address */
@@ -297,25 +299,27 @@ ENTRY(startup_32_smp) orl %edx,%eax movl %eax,%cr4 - btl $5, %eax # check if PAE is enabled - jnc 6f + testb $X86_CR4_PAE, %al # check if PAE is enabled + jz 6f /* Check if extended functions are implemented */ movl $0x80000000, %eax cpuid - cmpl $0x80000000, %eax - jbe 6f + /* Value must be in the range 0x80000001 to 0x8000ffff */ + subl $0x80000001, %eax + cmpl $(0x8000ffff-0x80000001), %eax + ja 6f mov $0x80000001, %eax cpuid /* Execute Disable bit supported? */ - btl $20, %edx + btl $(X86_FEATURE_NX & 31), %edx jnc 6f /* Setup EFER (Extended Feature Enable Register) */ - movl $0xc0000080, %ecx + movl $MSR_EFER, %ecx rdmsr - btsl $11, %eax + btsl $_EFER_NX, %eax /* Make changes effective */ wrmsr
Signature · 1 line
1.6.2.5
tip-bot for H. Peter Anvin
reviewer[tip:x86/mm] x86-32: Use symbolic constants, safer CPUID when enabling EFER.NX
Commit-ID: 8a50e5135af0c243e117e94e27feb8d149c879b4 Gitweb: http://git.kernel.org/tip/8a50e5135af0c243e117e94e27feb8d149c879b4 Author: H. Peter Anvin <[email protected]> AuthorDate: Fri, 13 Nov 2009 15:28:13 -0800 Committer: H. Peter Anvin <[email protected]> CommitDate: Mon, 16 Nov 2009 13:44:56 -0800
x86-32: Use symbolic constants, safer CPUID when enabling EFER.NX
Use symbolic constants rather than hard-coded values when setting EFER.NX in head_32.S, and do a more rigorous test for the validity of the response when probing for the extended CPUID range.
LKML-Reference: <[email protected]>
--- arch/x86/kernel/head_32.S | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 deletions(-)
arch/x86/kernel/head_32.S +11 -7
@@ -18,6 +18,8 @@ #include <asm/asm-offsets.h> #include <asm/setup.h> #include <asm/processor-flags.h> +#include <asm/msr-index.h> +#include <asm/cpufeature.h> #include <asm/percpu.h> /* Physical address */
@@ -297,25 +299,27 @@ ENTRY(startup_32_smp) orl %edx,%eax movl %eax,%cr4 - btl $5, %eax # check if PAE is enabled - jnc 6f + testb $X86_CR4_PAE, %al # check if PAE is enabled + jz 6f /* Check if extended functions are implemented */ movl $0x80000000, %eax cpuid - cmpl $0x80000000, %eax - jbe 6f + /* Value must be in the range 0x80000001 to 0x8000ffff */ + subl $0x80000001, %eax + cmpl $(0x8000ffff-0x80000001), %eax + ja 6f mov $0x80000001, %eax cpuid /* Execute Disable bit supported? */ - btl $20, %edx + btl $(X86_FEATURE_NX & 31), %edx jnc 6f /* Setup EFER (Extended Feature Enable Register) */ - movl $0xc0000080, %ecx + movl $MSR_EFER, %ecx rdmsr - btsl $11, %eax + btsl $_EFER_NX, %eax /* Make changes effective */ wrmsr
H. Peter Anvin
reviewerPATCH 2/5 x86, sleep: always save the value of EFER
In reply to H. Peter AnvinAlways save the value of EFER, regardless of the state of NX. Since EFER may not actually exist, use rdmsr_safe() to do so.
--- arch/x86/kernel/acpi/sleep.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-)
arch/x86/kernel/acpi/sleep.c +3 -6
@@ -78,12 +78,9 @@ int acpi_save_state_mem(void)#ifndef CONFIG_64BIT store_gdt ((struct desc_ptr *)&header->pmode_gdt); - header->pmode_efer_low = nx_enabled; -if (header->pmode_efer_low &1 ) { -/* This is strange, why not save efer, always? */ -rdmsr (MSR_EFER , header->pmode_efer_low, - header->pmode_efer_high); - } + header->pmode_efer_low = header->pmode_efer_high =0 ; +rdmsr_safe (MSR_EFER , + &header->pmode_efer_low, &header->pmode_efer_high);#endif /* !CONFIG_64BIT */ header->pmode_cr0 =read_cr0 ();
Signature · 1 line
1.6.2.5
Re: [PATCH 2/5] x86, sleep: always save the value of EFER
Quoted 6 lines · H. Peter Anvin
Always save the value of EFER, regardless of the state of NX. Since EFER may not actually exist, use
rdmsr_safe()to do so.Signed-off-by H. Peter Anvin <[email protected]>Cc Pavel Machek <[email protected]>Cc Rafael J. Wysocki <[email protected]>
Quoted 26 lines
Cc Nigel Cunningham <[email protected]>--- arch/x86/kernel/acpi/sleep.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-)arch/x86/kernel/acpi/sleep.c +3
-6@@ -78,12 +78,9 @@ int acpi_save_state_mem(void)#ifndef CONFIG_64BIT store_gdt ((struct desc_ptr *)&header->pmode_gdt); - header->pmode_efer_low = nx_enabled; -if (header->pmode_efer_low &1 ) { -/* This is strange, why not save efer, always? */ -rdmsr (MSR_EFER , header->pmode_efer_low, - header->pmode_efer_high); - } + header->pmode_efer_low = header->pmode_efer_high =0 ; +rdmsr_safe (MSR_EFER , + &header->pmode_efer_low, &header->pmode_efer_high);#endif /* !CONFIG_64BIT */ header->pmode_cr0 =read_cr0 ();
tip-bot for H. Peter Anvin
reviewer[tip:x86/mm] x86, sleep: Always save the value of EFER
In reply to H. Peter AnvinCommit-ID: a7c4c0d934c6cbc58de262d090d4a715445453f0 Gitweb: http://git.kernel.org/tip/a7c4c0d934c6cbc58de262d090d4a715445453f0 Author: H. Peter Anvin <[email protected]> AuthorDate: Fri, 13 Nov 2009 15:28:14 -0800 Committer: H. Peter Anvin <[email protected]> CommitDate: Mon, 16 Nov 2009 13:44:57 -0800
x86, sleep: Always save the value of EFER
Always save the value of EFER, regardless of the state of NX. Since EFER may not actually exist, use rdmsr_safe() to do so.
v2: check the return value from rdmsr_safe() instead of relying on
the output values being unchanged on error.
LKML-Reference: <[email protected]>
--- arch/x86/kernel/acpi/sleep.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-)
arch/x86/kernel/acpi/sleep.c +3 -6
@@ -78,12 +78,9 @@ int acpi_save_state_mem(void)#ifndef CONFIG_64BIT store_gdt ((struct desc_ptr *)&header->pmode_gdt); - header->pmode_efer_low = nx_enabled; -if (header->pmode_efer_low &1 ) { -/* This is strange, why not save efer, always? */ -rdmsr (MSR_EFER , header->pmode_efer_low, - header->pmode_efer_high); - } +if (rdmsr_safe (MSR_EFER , &header->pmode_efer_low, + &header->pmode_efer_high)) + header->pmode_efer_low = header->pmode_efer_high =0 ;#endif /* !CONFIG_64BIT */ header->pmode_cr0 =read_cr0 ();
H. Peter Anvin
reviewerPATCH 3/5 x86, pageattr: make set_memory_(x|nx) aware of NX support
In reply to H. Peter AnvinMake set_memory_x/set_memory_nx directly aware of if NX is supported in the system or not, rather than requiring that every caller assesses that support independently.
--- arch/x86/kernel/machine_kexec_32.c | 6 ++---- arch/x86/mm/pageattr.c | 6 ++++++ 2 files changed, 8 insertions(+), 4 deletions(-)
arch/x86/kernel/machine_kexec_32.c +2 -4
@@ -157,8 +157,7 @@ int machine_kexec_prepare(struct kimage *image) {int error; -if (nx_enabled) -set_pages_x (image->control_code_page,1 ); +set_pages_x (image->control_code_page,1 ); error =machine_kexec_alloc_page_tables (image);if (error)return error;
@@ -172,8 +171,7 @@ int machine_kexec_prepare(struct kimage *image)*/ void machine_kexec_cleanup (struct kimage *image) { -if (nx_enabled) -set_pages_nx (image->control_code_page,1 ); +set_pages_nx (image->control_code_page,1 );machine_kexec_free_page_tables (image); }
arch/x86/mm/pageattr.c +6 -0
@@ -1069,12 +1069,18 @@ EXPORT_SYMBOL(set_memory_array_wb);int set_memory_x (unsigned long addr,int numpages) { +if (!(__supported_pte_mask & _PAGE_NX)) +return 0 ; +return change_page_attr_clear (&addr, numpages,__pgprot (_PAGE_NX),0 ); }EXPORT_SYMBOL (set_memory_x);int set_memory_nx (unsigned long addr,int numpages) { +if (!(__supported_pte_mask & _PAGE_NX)) +return 0 ; +return change_page_attr_set (&addr, numpages,__pgprot (_PAGE_NX),0 ); }EXPORT_SYMBOL (set_memory_nx);
Signature · 1 line
1.6.2.5
tip-bot for H. Peter Anvin
reviewer[tip:x86/mm] x86, pageattr: Make set_memory_(x|nx) aware of NX support
Commit-ID: 583140afb989f24d115e80be5c91e503b58ccfc0 Gitweb: http://git.kernel.org/tip/583140afb989f24d115e80be5c91e503b58ccfc0 Author: H. Peter Anvin <[email protected]> AuthorDate: Fri, 13 Nov 2009 15:28:15 -0800 Committer: H. Peter Anvin <[email protected]> CommitDate: Mon, 16 Nov 2009 13:44:58 -0800
x86, pageattr: Make set_memory_(x|nx) aware of NX support
Make set_memory_x/set_memory_nx directly aware of if NX is supported in the system or not, rather than requiring that every caller assesses that support independently.
LKML-Reference: <[email protected]>
--- arch/x86/kernel/machine_kexec_32.c | 6 ++---- arch/x86/mm/pageattr.c | 6 ++++++ 2 files changed, 8 insertions(+), 4 deletions(-)
arch/x86/kernel/machine_kexec_32.c +2 -4
@@ -157,8 +157,7 @@ int machine_kexec_prepare(struct kimage *image) {int error; -if (nx_enabled) -set_pages_x (image->control_code_page,1 ); +set_pages_x (image->control_code_page,1 ); error =machine_kexec_alloc_page_tables (image);if (error)return error;
@@ -172,8 +171,7 @@ int machine_kexec_prepare(struct kimage *image)*/ void machine_kexec_cleanup (struct kimage *image) { -if (nx_enabled) -set_pages_nx (image->control_code_page,1 ); +set_pages_nx (image->control_code_page,1 );machine_kexec_free_page_tables (image); }
arch/x86/mm/pageattr.c +6 -0
@@ -1085,12 +1085,18 @@ EXPORT_SYMBOL(set_memory_array_wb);int set_memory_x (unsigned long addr,int numpages) { +if (!(__supported_pte_mask & _PAGE_NX)) +return 0 ; +return change_page_attr_clear (&addr, numpages,__pgprot (_PAGE_NX),0 ); }EXPORT_SYMBOL (set_memory_x);int set_memory_nx (unsigned long addr,int numpages) { +if (!(__supported_pte_mask & _PAGE_NX)) +return 0 ; +return change_page_attr_set (&addr, numpages,__pgprot (_PAGE_NX),0 ); }EXPORT_SYMBOL (set_memory_nx);
H. Peter Anvin
reviewerPATCH 4/5 x86, mm: clean up and simplify NX enablement
In reply to H. Peter AnvinThe 32- and 64-bit code used very different mechanisms for enabling NX, but even the 32-bit code was enabling NX in head_32.S if it is available. Furthermore, we had a bewildering collection of tests for the available of NX.
This patch:
a) merges the 32-bit set_nx() and the 64-bit check_efer() function into a single x86_configure_nx() function. EFER control is left to the head code.
b) eliminates the nx_enabled variable entirely. Things that need to test for NX enablement can verify __supported_pte_mask directly, and cpu_has_nx gives the supported status of NX.
--- arch/x86/include/asm/proto.h | 2 +- arch/x86/kernel/cpu/common.c | 2 +- arch/x86/kernel/setup.c | 8 +----- arch/x86/mm/init.c | 4 +- arch/x86/mm/setup_nx.c | 43 +++++------------------------------------ arch/x86/xen/enlighten.c | 4 +-- 6 files changed, 13 insertions(+), 50 deletions(-)
arch/x86/include/asm/proto.h +1 -1
@@ -16,7 +16,7 @@ extern void ia32_sysenter_target(void);extern void syscall32_cpu_init (void ); -extern void check_efer (void ); +extern void x86_configure_nx (void );extern int reboot_force;
arch/x86/kernel/cpu/common.c +1 -1
@@ -1136,7 +1136,7 @@ void __cpuinit cpu_init(void)wrmsrl (MSR_KERNEL_GS_BASE ,0 );barrier (); -check_efer (); +x86_configure_nx ();if (cpu !=0 )enable_x2apic ();
arch/x86/kernel/setup.c +2 -6
@@ -783,21 +783,17 @@ void __init setup_arch(char **cmdline_p)strlcpy (command_line, boot_command_line,COMMAND_LINE_SIZE ); *cmdline_p = command_line; -#ifdef CONFIG_X86_64 /* * Must call this twice: Once just to detect whether hardware doesn't * support NX (so that the early EHCI debug console setup can safely * call set_fixmap(), and then again after parsing early parameters to * honor the respective command line option. */ -check_efer (); -#endif +x86_configure_nx ();parse_early_param (); -#ifdef CONFIG_X86_64 -check_efer (); -#endif +x86_configure_nx ();/* Must be before kernel pagetables are setup */ vmi_activate ();
arch/x86/mm/init.c +2 -2
@@ -146,8 +146,8 @@ unsigned long __init_refok init_memory_mapping(unsigned long start, use_gbpages = direct_gbpages;#endif -set_nx (); -if (nx_enabled) +/* XXX: replace this with Kees' improved messages */ +if (__supported_pte_mask & _PAGE_NX)printk (KERN_INFO "NX (Execute Disable) protection: active\n" );/* Enable PSE if available */
arch/x86/mm/setup_nx.c +6 -37
64 lines not on this page · raw message
arch/x86/xen/enlighten.c +1 -3
@@ -1093,10 +1093,8 @@ asmlinkage void __init xen_start_kernel(void) __supported_pte_mask |= _PAGE_IOMAP; -#ifdef CONFIG_X86_64 /* Work out if we support NX */ -check_efer (); -#endif +x86_configure_nx ();xen_setup_features ();
Signature · 1 line
1.6.2.5
tip-bot for H. Peter Anvin
reviewer[tip:x86/mm] x86, mm: Clean up and simplify NX enablement
Commit-ID: 4763ed4d45522b876c97e1f7f4b659d211f75571 Gitweb: http://git.kernel.org/tip/4763ed4d45522b876c97e1f7f4b659d211f75571 Author: H. Peter Anvin <[email protected]> AuthorDate: Fri, 13 Nov 2009 15:28:16 -0800 Committer: H. Peter Anvin <[email protected]> CommitDate: Mon, 16 Nov 2009 13:44:59 -0800
x86, mm: Clean up and simplify NX enablement
The 32- and 64-bit code used very different mechanisms for enabling NX, but even the 32-bit code was enabling NX in head_32.S if it is available. Furthermore, we had a bewildering collection of tests for the available of NX.
This patch:
a) merges the 32-bit set_nx() and the 64-bit check_efer() function into a single x86_configure_nx() function. EFER control is left to the head code.
b) eliminates the nx_enabled variable entirely. Things that need to test for NX enablement can verify __supported_pte_mask directly, and cpu_has_nx gives the supported status of NX.
LKML-Reference: <[email protected]>
--- arch/x86/include/asm/proto.h | 2 +- arch/x86/kernel/cpu/common.c | 2 +- arch/x86/kernel/setup.c | 8 +----- arch/x86/mm/init.c | 4 +- arch/x86/mm/setup_nx.c | 43 +++++------------------------------------ arch/x86/xen/enlighten.c | 4 +-- 6 files changed, 13 insertions(+), 50 deletions(-)
arch/x86/include/asm/proto.h +1 -1
@@ -16,7 +16,7 @@ extern void ia32_sysenter_target(void);extern void syscall32_cpu_init (void ); -extern void check_efer (void ); +extern void x86_configure_nx (void );extern int reboot_force;
arch/x86/kernel/cpu/common.c +1 -1
@@ -1136,7 +1136,7 @@ void __cpuinit cpu_init(void)wrmsrl (MSR_KERNEL_GS_BASE ,0 );barrier (); -check_efer (); +x86_configure_nx ();if (cpu !=0 )enable_x2apic ();
arch/x86/kernel/setup.c +2 -6
@@ -787,21 +787,17 @@ void __init setup_arch(char **cmdline_p)strlcpy (command_line, boot_command_line,COMMAND_LINE_SIZE ); *cmdline_p = command_line; -#ifdef CONFIG_X86_64 /* * Must call this twice: Once just to detect whether hardware doesn't * support NX (so that the early EHCI debug console setup can safely * call set_fixmap(), and then again after parsing early parameters to * honor the respective command line option. */ -check_efer (); -#endif +x86_configure_nx ();parse_early_param (); -#ifdef CONFIG_X86_64 -check_efer (); -#endif +x86_configure_nx ();/* Must be before kernel pagetables are setup */ vmi_activate ();
arch/x86/mm/init.c +2 -2
@@ -146,8 +146,8 @@ unsigned long __init_refok init_memory_mapping(unsigned long start, use_gbpages = direct_gbpages;#endif -set_nx (); -if (nx_enabled) +/* XXX: replace this with Kees' improved messages */ +if (__supported_pte_mask & _PAGE_NX)printk (KERN_INFO "NX (Execute Disable) protection: active\n" );/* Enable PSE if available */
arch/x86/mm/setup_nx.c +6 -37
64 lines not on this page · raw message
arch/x86/xen/enlighten.c +1 -3
@@ -1082,10 +1082,8 @@ asmlinkage void __init xen_start_kernel(void) __supported_pte_mask |= _PAGE_IOMAP; -#ifdef CONFIG_X86_64 /* Work out if we support NX */ -check_efer (); -#endif +x86_configure_nx ();xen_setup_features ();
H. Peter Anvin
reviewerPATCH 5/5 x86, mm: report state of NX protections during boot
In reply to H. Peter AnvinFrom: Kees Cook <[email protected]>
It is possible for x86_64 systems to lack the NX bit either due to the hardware lacking support or the BIOS having turned off the CPU capability, so NX status should be reported. Additionally, anyone booting NX-capable CPUs in 32bit mode without PAE will lack NX functionality, so this change provides feedback for that case as well.
--- arch/x86/include/asm/proto.h | 1 + arch/x86/kernel/setup.c | 11 ++++++----- arch/x86/mm/init.c | 4 ---- arch/x86/mm/setup_nx.c | 22 ++++++++++++++++++++++ 4 files changed, 29 insertions(+), 9 deletions(-)
arch/x86/include/asm/proto.h +1 -0
@@ -17,6 +17,7 @@ extern void ia32_sysenter_target(void);extern void syscall32_cpu_init (void );extern void x86_configure_nx (void ); +extern void x86_report_nx (void );extern int reboot_force;
arch/x86/kernel/setup.c +6 -5
@@ -784,16 +784,17 @@ void __init setup_arch(char **cmdline_p) *cmdline_p = command_line;/* -* Must call this twice: Once just to detect whether hardware doesn't -* support NX (so that the early EHCI debug console setup can safely -* call set_fixmap(), and then again after parsing early parameters to -* honor the respective command line option. +* x86_configure_nx() is called before parse_early_param() to detect +* whether hardware doesn't support NX (so that the early EHCI debug +* console setup can safely call set_fixmap()). It may then be called +* again from within noexec_setup() during parsing early parameters +* to honor the respective command line option. */ x86_configure_nx ();parse_early_param (); -x86_configure_nx (); +x86_report_nx ();/* Must be before kernel pagetables are setup */ vmi_activate ();
arch/x86/mm/init.c +0 -4
@@ -146,10 +146,6 @@ unsigned long __init_refok init_memory_mapping(unsigned long start, use_gbpages = direct_gbpages;#endif -/* XXX: replace this with Kees' improved messages */ -if (__supported_pte_mask & _PAGE_NX) -printk (KERN_INFO "NX (Execute Disable) protection: active\n" ); -/* Enable PSE if available */ if (cpu_has_pse)set_in_cr4 (X86_CR4_PSE );
arch/x86/mm/setup_nx.c +22 -0
@@ -36,3 +36,25 @@ void __cpuinit x86_configure_nx(void)else __supported_pte_mask &= ~_PAGE_NX; } + +void __init x86_report_nx (void ) +{ +if (!cpu_has_nx) { +printk (KERN_NOTICE "Notice: NX (Execute Disable) protection " +"missing in CPU or disabled in BIOS!\n" ); + }else { +#if defined(CONFIG_X86_64 ) || defined(CONFIG_X86_PAE ) +if (disable_nx) { +printk (KERN_INFO "NX (Execute Disable) protection: " +"disabled by kernel command line option\n" ); + }else { +printk (KERN_INFO "NX (Execute Disable) protection: " +"active\n" ); + } +#else +/* 32bit non-PAE kernel, NX cannot be used */ +printk (KERN_NOTICE "Notice: NX (Execute Disable) protection " +"cannot be enabled: non-PAE kernel!\n" ); +#endif + } +}
Signature · 1 line
1.6.2.5
[tip:x86/mm] x86, mm: Report state of NX protections during boot
Commit-ID: 4b0f3b81eb33ef18283aa71440cccfede1753ae0 Gitweb: http://git.kernel.org/tip/4b0f3b81eb33ef18283aa71440cccfede1753ae0 Author: Kees Cook <[email protected]> AuthorDate: Fri, 13 Nov 2009 15:28:17 -0800 Committer: H. Peter Anvin <[email protected]> CommitDate: Mon, 16 Nov 2009 13:44:59 -0800
x86, mm: Report state of NX protections during boot
It is possible for x86_64 systems to lack the NX bit either due to the hardware lacking support or the BIOS having turned off the CPU capability, so NX status should be reported. Additionally, anyone booting NX-capable CPUs in 32bit mode without PAE will lack NX functionality, so this change provides feedback for that case as well.
LKML-Reference: <[email protected]>
--- arch/x86/include/asm/proto.h | 1 + arch/x86/kernel/setup.c | 11 ++++++----- arch/x86/mm/init.c | 4 ---- arch/x86/mm/setup_nx.c | 22 ++++++++++++++++++++++ 4 files changed, 29 insertions(+), 9 deletions(-)
arch/x86/include/asm/proto.h +1 -0
@@ -17,6 +17,7 @@ extern void ia32_sysenter_target(void);extern void syscall32_cpu_init (void );extern void x86_configure_nx (void ); +extern void x86_report_nx (void );extern int reboot_force;
arch/x86/kernel/setup.c +6 -5
@@ -788,16 +788,17 @@ void __init setup_arch(char **cmdline_p) *cmdline_p = command_line;/* -* Must call this twice: Once just to detect whether hardware doesn't -* support NX (so that the early EHCI debug console setup can safely -* call set_fixmap(), and then again after parsing early parameters to -* honor the respective command line option. +* x86_configure_nx() is called before parse_early_param() to detect +* whether hardware doesn't support NX (so that the early EHCI debug +* console setup can safely call set_fixmap()). It may then be called +* again from within noexec_setup() during parsing early parameters +* to honor the respective command line option. */ x86_configure_nx ();parse_early_param (); -x86_configure_nx (); +x86_report_nx ();/* Must be before kernel pagetables are setup */ vmi_activate ();
arch/x86/mm/init.c +0 -4
@@ -146,10 +146,6 @@ unsigned long __init_refok init_memory_mapping(unsigned long start, use_gbpages = direct_gbpages;#endif -/* XXX: replace this with Kees' improved messages */ -if (__supported_pte_mask & _PAGE_NX) -printk (KERN_INFO "NX (Execute Disable) protection: active\n" ); -/* Enable PSE if available */ if (cpu_has_pse)set_in_cr4 (X86_CR4_PSE );
arch/x86/mm/setup_nx.c +22 -0
@@ -36,3 +36,25 @@ void __cpuinit x86_configure_nx(void)else __supported_pte_mask &= ~_PAGE_NX; } + +void __init x86_report_nx (void ) +{ +if (!cpu_has_nx) { +printk (KERN_NOTICE "Notice: NX (Execute Disable) protection " +"missing in CPU or disabled in BIOS!\n" ); + }else { +#if defined(CONFIG_X86_64 ) || defined(CONFIG_X86_PAE ) +if (disable_nx) { +printk (KERN_INFO "NX (Execute Disable) protection: " +"disabled by kernel command line option\n" ); + }else { +printk (KERN_INFO "NX (Execute Disable) protection: " +"active\n" ); + } +#else +/* 32bit non-PAE kernel, NX cannot be used */ +printk (KERN_NOTICE "Notice: NX (Execute Disable) protection " +"cannot be enabled: non-PAE kernel!\n" ); +#endif + } +}
Kees Cook
Acked-byQuoted 5 lines · H. Peter Anvin
Posting this patch series for review; I intend to commit it to tip:x86/mm unless someone objects over the next few days.
This came about based on Kees' original patch to give better dmesg information about the status of NX availability.
FWIW, I tested this stack of patches (in an earlier form) with the following configurations and confirmed expected behavior:
- 64-bit, 64-bit noexec=off - 32-bit pae with nx bit, x86_32 pae with nx bit noexec=off - 32-bit pae without nx bit - 32-bit non-pae
Signature · 2 lines
Kees Cook Ubuntu Security Team