diff options
| author | Andi Kleen | 2006-12-07 02:14:07 +0100 |
|---|---|---|
| committer | Andi Kleen | 2006-12-07 02:14:07 +0100 |
| commit | 516d2836434d279fef164bb1b964e83425d312d2 (patch) | |
| tree | 924d47d91b7f75d407aa869dee2650102cc46a95 /arch/x86_64/kernel/io_apic.c | |
| parent | [PATCH] i386: Fix race in IO-APIC routing entry setup. (diff) | |
| download | kernel-qcow2-linux-516d2836434d279fef164bb1b964e83425d312d2.tar.gz kernel-qcow2-linux-516d2836434d279fef164bb1b964e83425d312d2.tar.xz kernel-qcow2-linux-516d2836434d279fef164bb1b964e83425d312d2.zip | |
[PATCH] x86-64: Fix race in IO-APIC routing entry setup.
Interrupt could happen between setting the IO-APIC entry
and setting its interrupt data.
Pointed out by Linus.
Signed-off-by: Andi Kleen <ak@suse.de>
Diffstat (limited to 'arch/x86_64/kernel/io_apic.c')
| -rw-r--r-- | arch/x86_64/kernel/io_apic.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/arch/x86_64/kernel/io_apic.c b/arch/x86_64/kernel/io_apic.c index 88fcc4ebbf6e..eaf0b708e67d 100644 --- a/arch/x86_64/kernel/io_apic.c +++ b/arch/x86_64/kernel/io_apic.c @@ -174,14 +174,20 @@ static struct IO_APIC_route_entry ioapic_read_entry(int apic, int pin) * the interrupt, and we need to make sure the entry is fully populated * before that happens. */ -static void ioapic_write_entry(int apic, int pin, struct IO_APIC_route_entry e) +static void +__ioapic_write_entry(int apic, int pin, struct IO_APIC_route_entry e) { - unsigned long flags; union entry_union eu; eu.entry = e; - spin_lock_irqsave(&ioapic_lock, flags); io_apic_write(apic, 0x11 + 2*pin, eu.w2); io_apic_write(apic, 0x10 + 2*pin, eu.w1); +} + +static void ioapic_write_entry(int apic, int pin, struct IO_APIC_route_entry e) +{ + unsigned long flags; + spin_lock_irqsave(&ioapic_lock, flags); + __ioapic_write_entry(apic, pin, e); spin_unlock_irqrestore(&ioapic_lock, flags); } |