You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
275 lines
7.3 KiB
275 lines
7.3 KiB
From: jbeulich@novell.com
|
|
Subject: Disallow all accesses to the local APIC page
|
|
Patch-mainline: n/a
|
|
References: bnc#191115
|
|
|
|
--- head-2011-03-11.orig/arch/x86/include/asm/apic.h 2011-02-17 10:23:17.000000000 +0100
|
|
+++ head-2011-03-11/arch/x86/include/asm/apic.h 2011-02-17 10:36:33.000000000 +0100
|
|
@@ -10,7 +10,9 @@
|
|
#include <asm/processor.h>
|
|
#include <asm/apicdef.h>
|
|
#include <asm/atomic.h>
|
|
+#ifndef CONFIG_XEN
|
|
#include <asm/fixmap.h>
|
|
+#endif
|
|
#include <asm/mpspec.h>
|
|
#include <asm/system.h>
|
|
#include <asm/msr.h>
|
|
@@ -49,6 +51,7 @@ static inline void generic_apic_probe(vo
|
|
#ifdef CONFIG_X86_LOCAL_APIC
|
|
|
|
extern unsigned int apic_verbosity;
|
|
+#ifndef CONFIG_XEN
|
|
extern int local_apic_timer_c2_ok;
|
|
|
|
extern int disable_apic;
|
|
@@ -121,6 +124,8 @@ extern u64 native_apic_icr_read(void);
|
|
|
|
extern int x2apic_mode;
|
|
|
|
+#endif /* CONFIG_XEN */
|
|
+
|
|
#ifdef CONFIG_X86_X2APIC
|
|
/*
|
|
* Make previous memory operations globally visible before
|
|
@@ -371,6 +376,8 @@ struct apic {
|
|
*/
|
|
extern struct apic *apic;
|
|
|
|
+#ifndef CONFIG_XEN
|
|
+
|
|
/*
|
|
* APIC functionality to boot other CPUs - only used on SMP:
|
|
*/
|
|
@@ -473,6 +480,8 @@ static inline void default_wait_for_init
|
|
|
|
extern void generic_bigsmp_probe(void);
|
|
|
|
+#endif /* CONFIG_XEN */
|
|
+
|
|
|
|
#ifdef CONFIG_X86_LOCAL_APIC
|
|
|
|
@@ -492,6 +501,8 @@ static inline const struct cpumask *defa
|
|
DECLARE_EARLY_PER_CPU(u16, x86_bios_cpu_apicid);
|
|
|
|
|
|
+#ifndef CONFIG_XEN
|
|
+
|
|
static inline unsigned int read_apic_id(void)
|
|
{
|
|
unsigned int reg;
|
|
@@ -600,6 +611,8 @@ extern int default_cpu_present_to_apicid
|
|
extern int default_check_phys_apicid_present(int phys_apicid);
|
|
#endif
|
|
|
|
+#endif /* CONFIG_XEN */
|
|
+
|
|
#endif /* CONFIG_X86_LOCAL_APIC */
|
|
|
|
#ifdef CONFIG_X86_32
|
|
--- head-2011-03-11.orig/arch/x86/include/asm/apicdef.h 2011-03-11 10:41:53.000000000 +0100
|
|
+++ head-2011-03-11/arch/x86/include/asm/apicdef.h 2011-02-03 14:34:58.000000000 +0100
|
|
@@ -17,6 +17,8 @@
|
|
*/
|
|
#define IO_APIC_SLOT_SIZE 1024
|
|
|
|
+#ifndef CONFIG_XEN
|
|
+
|
|
#define APIC_ID 0x20
|
|
|
|
#define APIC_LVR 0x30
|
|
@@ -143,6 +145,16 @@
|
|
#define APIC_BASE_MSR 0x800
|
|
#define X2APIC_ENABLE (1UL << 10)
|
|
|
|
+#else /* CONFIG_XEN */
|
|
+
|
|
+enum {
|
|
+ APIC_DEST_ALLBUT = 0x1,
|
|
+ APIC_DEST_SELF,
|
|
+ APIC_DEST_ALLINC
|
|
+};
|
|
+
|
|
+#endif /* CONFIG_XEN */
|
|
+
|
|
#ifdef CONFIG_X86_32
|
|
# define MAX_IO_APICS 64
|
|
# define MAX_LOCAL_APIC 256
|
|
@@ -151,6 +163,8 @@
|
|
# define MAX_LOCAL_APIC 32768
|
|
#endif
|
|
|
|
+#ifndef CONFIG_XEN
|
|
+
|
|
/*
|
|
* All x86-64 systems are xAPIC compatible.
|
|
* In the following, "apicid" is a physical APIC ID.
|
|
@@ -421,6 +435,8 @@ struct local_apic {
|
|
|
|
#undef u32
|
|
|
|
+#endif /* CONFIG_XEN */
|
|
+
|
|
#ifdef CONFIG_X86_32
|
|
#define BAD_APICID 0xFFu
|
|
#else
|
|
--- head-2011-03-11.orig/arch/x86/include/mach-xen/asm/fixmap.h 2011-02-01 15:41:35.000000000 +0100
|
|
+++ head-2011-03-11/arch/x86/include/mach-xen/asm/fixmap.h 2011-02-03 14:34:58.000000000 +0100
|
|
@@ -17,7 +17,6 @@
|
|
#ifndef __ASSEMBLY__
|
|
#include <linux/kernel.h>
|
|
#include <asm/acpi.h>
|
|
-#include <asm/apicdef.h>
|
|
#include <asm/page.h>
|
|
#ifdef CONFIG_X86_32
|
|
#include <linux/threads.h>
|
|
@@ -85,10 +84,10 @@ enum fixed_addresses {
|
|
#ifdef CONFIG_PROVIDE_OHCI1394_DMA_INIT
|
|
FIX_OHCI1394_BASE,
|
|
#endif
|
|
+#ifndef CONFIG_XEN
|
|
#ifdef CONFIG_X86_LOCAL_APIC
|
|
FIX_APIC_BASE, /* local (CPU) APIC) -- required for SMP or not */
|
|
#endif
|
|
-#ifndef CONFIG_XEN
|
|
#ifdef CONFIG_X86_IO_APIC
|
|
FIX_IO_APIC_BASE_0,
|
|
FIX_IO_APIC_BASE_END = FIX_IO_APIC_BASE_0 + MAX_IO_APICS - 1,
|
|
--- head-2011-03-11.orig/arch/x86/include/mach-xen/asm/smp.h 2011-03-03 16:12:54.000000000 +0100
|
|
+++ head-2011-03-11/arch/x86/include/mach-xen/asm/smp.h 2011-03-03 16:50:42.000000000 +0100
|
|
@@ -15,7 +15,7 @@
|
|
# include <asm/io_apic.h>
|
|
# endif
|
|
#endif
|
|
-#include <asm/thread_info.h>
|
|
+#include <linux/thread_info.h>
|
|
#include <asm/cpumask.h>
|
|
|
|
extern unsigned int num_processors;
|
|
@@ -190,7 +190,7 @@ extern unsigned disabled_cpus __cpuinitd
|
|
|
|
#include <asm/smp-processor-id.h>
|
|
|
|
-#ifdef CONFIG_X86_LOCAL_APIC
|
|
+#if defined(CONFIG_X86_LOCAL_APIC) && !defined(CONFIG_XEN)
|
|
|
|
#ifndef CONFIG_X86_64
|
|
static inline int logical_smp_processor_id(void)
|
|
--- head-2011-03-11.orig/arch/x86/kernel/acpi/boot.c 2011-03-11 11:06:22.000000000 +0100
|
|
+++ head-2011-03-11/arch/x86/kernel/acpi/boot.c 2011-03-11 11:17:06.000000000 +0100
|
|
@@ -74,14 +74,14 @@ int acpi_sci_override_gsi __initdata;
|
|
int acpi_skip_timer_override __initdata;
|
|
int acpi_use_timer_override __initdata;
|
|
int acpi_fix_pin2_polarity __initdata;
|
|
-#else
|
|
-#define acpi_skip_timer_override 0
|
|
-#define acpi_fix_pin2_polarity 0
|
|
-#endif
|
|
|
|
#ifdef CONFIG_X86_LOCAL_APIC
|
|
static u64 acpi_lapic_addr __initdata = APIC_DEFAULT_PHYS_BASE;
|
|
#endif
|
|
+#else
|
|
+#define acpi_skip_timer_override 0
|
|
+#define acpi_fix_pin2_polarity 0
|
|
+#endif
|
|
|
|
#ifndef __HAVE_ARCH_CMPXCHG
|
|
#warning ACPI uses CMPXCHG, i486 and later hardware
|
|
@@ -187,6 +187,7 @@ static int __init acpi_parse_madt(struct
|
|
return -ENODEV;
|
|
}
|
|
|
|
+#ifndef CONFIG_XEN
|
|
if (madt->address) {
|
|
acpi_lapic_addr = (u64) madt->address;
|
|
|
|
@@ -194,7 +195,6 @@ static int __init acpi_parse_madt(struct
|
|
madt->address);
|
|
}
|
|
|
|
-#ifndef CONFIG_XEN
|
|
default_acpi_madt_oem_check(madt->header.oem_id,
|
|
madt->header.oem_table_id);
|
|
#endif
|
|
@@ -300,6 +300,7 @@ static int __init
|
|
acpi_parse_lapic_addr_ovr(struct acpi_subtable_header * header,
|
|
const unsigned long end)
|
|
{
|
|
+#ifndef CONFIG_XEN
|
|
struct acpi_madt_local_apic_override *lapic_addr_ovr = NULL;
|
|
|
|
lapic_addr_ovr = (struct acpi_madt_local_apic_override *)header;
|
|
@@ -308,6 +309,7 @@ acpi_parse_lapic_addr_ovr(struct acpi_su
|
|
return -EINVAL;
|
|
|
|
acpi_lapic_addr = lapic_addr_ovr->address;
|
|
+#endif
|
|
|
|
return 0;
|
|
}
|
|
--- head-2011-03-11.orig/arch/x86/kernel/irq-xen.c 2011-02-02 15:09:43.000000000 +0100
|
|
+++ head-2011-03-11/arch/x86/kernel/irq-xen.c 2011-02-03 14:34:58.000000000 +0100
|
|
@@ -16,9 +16,9 @@
|
|
#include <asm/mce.h>
|
|
#include <asm/hw_irq.h>
|
|
|
|
+#ifndef CONFIG_XEN
|
|
atomic_t irq_err_count;
|
|
|
|
-#ifndef CONFIG_XEN
|
|
/* Function pointer for generic interrupt vector handling */
|
|
void (*x86_platform_ipi_callback)(void) = NULL;
|
|
#endif
|
|
@@ -58,7 +58,7 @@ static int show_other_interrupts(struct
|
|
for_each_online_cpu(j)
|
|
seq_printf(p, "%10u ", irq_stats(j)->__nmi_count);
|
|
seq_printf(p, " Non-maskable interrupts\n");
|
|
-#ifdef CONFIG_X86_LOCAL_APIC
|
|
+#if defined(CONFIG_X86_LOCAL_APIC) && !defined(CONFIG_XEN)
|
|
seq_printf(p, "%*s: ", prec, "LOC");
|
|
for_each_online_cpu(j)
|
|
seq_printf(p, "%10u ", irq_stats(j)->apic_timer_irqs);
|
|
@@ -128,10 +128,12 @@ static int show_other_interrupts(struct
|
|
seq_printf(p, "%10u ", per_cpu(mce_poll_count, j));
|
|
seq_printf(p, " Machine check polls\n");
|
|
#endif
|
|
+#ifndef CONFIG_XEN
|
|
seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count));
|
|
#if defined(CONFIG_X86_IO_APIC)
|
|
seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read(&irq_mis_count));
|
|
#endif
|
|
+#endif
|
|
return 0;
|
|
}
|
|
|
|
@@ -229,12 +231,16 @@ u64 arch_irq_stat_cpu(unsigned int cpu)
|
|
|
|
u64 arch_irq_stat(void)
|
|
{
|
|
+#ifndef CONFIG_XEN
|
|
u64 sum = atomic_read(&irq_err_count);
|
|
|
|
#ifdef CONFIG_X86_IO_APIC
|
|
sum += atomic_read(&irq_mis_count);
|
|
#endif
|
|
return sum;
|
|
+#else
|
|
+ return 0;
|
|
+#endif
|
|
}
|
|
|
|
|
|
--- head-2011-03-11.orig/drivers/xen/core/smpboot.c 2011-02-02 15:10:16.000000000 +0100
|
|
+++ head-2011-03-11/drivers/xen/core/smpboot.c 2011-03-03 16:50:49.000000000 +0100
|
|
@@ -283,7 +283,7 @@ void __init smp_prepare_cpus(unsigned in
|
|
* Here we can be sure that there is an IO-APIC in the system. Let's
|
|
* go and set it up:
|
|
*/
|
|
- if (!skip_ioapic_setup && nr_ioapics)
|
|
+ if (cpu_has_apic && !skip_ioapic_setup && nr_ioapics)
|
|
setup_IO_APIC();
|
|
#endif
|
|
}
|