2009-09-22 04:40:42 +08:00
|
|
|
#include <linux/spinlock.h>
|
|
|
|
|
#include <linux/errno.h>
|
|
|
|
|
#include <linux/init.h>
|
|
|
|
|
|
|
|
|
|
#include <asm/pgtable.h>
|
2009-11-14 07:28:16 +08:00
|
|
|
#include <asm/proto.h>
|
2009-09-22 04:40:42 +08:00
|
|
|
|
x86: delete __cpuinit usage from all x86 files
The __cpuinit type of throwaway sections might have made sense
some time ago when RAM was more constrained, but now the savings
do not offset the cost and complications. For example, the fix in
commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
is a good example of the nasty type of bugs that can be created
with improper use of the various __init prefixes.
After a discussion on LKML[1] it was decided that cpuinit should go
the way of devinit and be phased out. Once all the users are gone,
we can then finally remove the macros themselves from linux/init.h.
Note that some harmless section mismatch warnings may result, since
notify_cpu_starting() and cpu_up() are arch independent (kernel/cpu.c)
are flagged as __cpuinit -- so if we remove the __cpuinit from
arch specific callers, we will also get section mismatch warnings.
As an intermediate step, we intend to turn the linux/init.h cpuinit
content into no-ops as early as possible, since that will get rid
of these warnings. In any case, they are temporary and harmless.
This removes all the arch/x86 uses of the __cpuinit macros from
all C files. x86 only had the one __CPUINIT used in assembly files,
and it wasn't paired off with a .previous or a __FINIT, so we can
delete it directly w/o any corresponding additional change there.
[1] https://lkml.org/lkml/2013/5/20/589
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: x86@kernel.org
Acked-by: Ingo Molnar <mingo@kernel.org>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: H. Peter Anvin <hpa@linux.intel.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
2013-06-19 06:23:59 +08:00
|
|
|
static int disable_nx;
|
2009-09-22 04:40:42 +08:00
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* noexec = on|off
|
|
|
|
|
*
|
|
|
|
|
* Control non-executable mappings for processes.
|
|
|
|
|
*
|
|
|
|
|
* on Enable
|
|
|
|
|
* off Disable
|
|
|
|
|
*/
|
|
|
|
|
static int __init noexec_setup(char *str)
|
|
|
|
|
{
|
|
|
|
|
if (!str)
|
|
|
|
|
return -EINVAL;
|
|
|
|
|
if (!strncmp(str, "on", 2)) {
|
|
|
|
|
disable_nx = 0;
|
|
|
|
|
} else if (!strncmp(str, "off", 3)) {
|
|
|
|
|
disable_nx = 1;
|
|
|
|
|
}
|
2009-11-14 07:28:16 +08:00
|
|
|
x86_configure_nx();
|
2009-09-22 04:40:42 +08:00
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
early_param("noexec", noexec_setup);
|
|
|
|
|
|
x86: delete __cpuinit usage from all x86 files
The __cpuinit type of throwaway sections might have made sense
some time ago when RAM was more constrained, but now the savings
do not offset the cost and complications. For example, the fix in
commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
is a good example of the nasty type of bugs that can be created
with improper use of the various __init prefixes.
After a discussion on LKML[1] it was decided that cpuinit should go
the way of devinit and be phased out. Once all the users are gone,
we can then finally remove the macros themselves from linux/init.h.
Note that some harmless section mismatch warnings may result, since
notify_cpu_starting() and cpu_up() are arch independent (kernel/cpu.c)
are flagged as __cpuinit -- so if we remove the __cpuinit from
arch specific callers, we will also get section mismatch warnings.
As an intermediate step, we intend to turn the linux/init.h cpuinit
content into no-ops as early as possible, since that will get rid
of these warnings. In any case, they are temporary and harmless.
This removes all the arch/x86 uses of the __cpuinit macros from
all C files. x86 only had the one __CPUINIT used in assembly files,
and it wasn't paired off with a .previous or a __FINIT, so we can
delete it directly w/o any corresponding additional change there.
[1] https://lkml.org/lkml/2013/5/20/589
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: x86@kernel.org
Acked-by: Ingo Molnar <mingo@kernel.org>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: H. Peter Anvin <hpa@linux.intel.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
2013-06-19 06:23:59 +08:00
|
|
|
void x86_configure_nx(void)
|
2009-09-22 04:40:42 +08:00
|
|
|
{
|
2009-11-14 07:28:16 +08:00
|
|
|
if (cpu_has_nx && !disable_nx)
|
|
|
|
|
__supported_pte_mask |= _PAGE_NX;
|
|
|
|
|
else
|
2009-09-22 04:40:42 +08:00
|
|
|
__supported_pte_mask &= ~_PAGE_NX;
|
|
|
|
|
}
|
2009-11-14 07:28:17 +08:00
|
|
|
|
|
|
|
|
void __init x86_report_nx(void)
|
|
|
|
|
{
|
|
|
|
|
if (!cpu_has_nx) {
|
|
|
|
|
printk(KERN_NOTICE "Notice: NX (Execute Disable) protection "
|
2010-11-11 02:35:54 +08:00
|
|
|
"missing in CPU!\n");
|
2009-11-14 07:28:17 +08:00
|
|
|
} 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
|
|
|
|
|
}
|
|
|
|
|
}
|