x86/apic changes for v4.10
Subsystems (3)
Linus,
Please pull the latest x86-apic-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-apic-for-linus
# HEAD: 5d07c2cc1962facb2f5d57b7b62987c213643724 x86/msr: Cleanup/streamline MSR helpers
Misc changes:
- Optimize (reduce) IRQ handler tracing overhead (Wanpeng Li)
- Clean up MSR helpers (Borislav Petkov)
- Fix build warning on some configs (Sebastian Andrzej Siewior)
Thanks,
Ingo
------------------>
Borislav Petkov (1):
x86/msr: Cleanup/streamline MSR helpers
Sebastian Andrzej Siewior (1):
x86/apic: Get rid of "warning: 'acpi_ioapic_lock' defined but not used"
Wanpeng Li (2):
x86/msr: Add wrmsr_notrace()
x86/apic: Prevent tracing on apic_msr_write_eoi()
arch/x86/include/asm/apic.h | 3 ++- arch/x86/include/asm/msr.h | 46 +++++++++++++++++++++++++++++---------------- arch/x86/kernel/acpi/boot.c | 2 ++ arch/x86/kernel/apic/apic.c | 1 + arch/x86/kernel/kvm.c | 4 ++-- arch/x86/kernel/smp.c | 2 -- arch/x86/lib/msr.c | 4 ++-- 7 files changed, 39 insertions(+), 23 deletions(-)
arch/x86/include/asm/apic.h +2 -1
@@ -196,7 +196,7 @@ static inline void native_apic_msr_write(u32 reg, u32 v)static inline void native_apic_msr_eoi_write (u32 reg,u32 v) { -wrmsr (APIC_BASE_MSR + (APIC_EOI >>4 ),APIC_EOI_ACK ,0 ); +wrmsr_notrace (APIC_BASE_MSR + (APIC_EOI >>4 ),APIC_EOI_ACK ,0 ); }static inline u32 native_apic_msr_read (u32 reg)
@@ -332,6 +332,7 @@ struct apic {* on write for EOI. */ void (*eoi_write)(u32 reg,u32 v); +void (*native_eoi_write)(u32 reg,u32 v);u64 (*icr_read)(void);void (*icr_write)(u32 low,u32 high);void (*wait_icr_idle)(void );
arch/x86/include/asm/msr.h +30 -16
105 lines not on this page · raw message
arch/x86/kernel/acpi/boot.c +2 -0
@@ -76,6 +76,7 @@ int acpi_fix_pin2_polarity __initdata;static u64 acpi_lapic_addr__initdata =APIC_DEFAULT_PHYS_BASE ;#endif +#ifdef CONFIG_X86_IO_APIC /* * Locks related to IOAPIC hotplug * Hotplug side:
@@ -88,6 +89,7 @@ static u64 acpi_lapic_addr __initdata = APIC_DEFAULT_PHYS_BASE;* ->ioapic_lock */ static DEFINE_MUTEX (acpi_ioapic_lock); +#endif /* -------------------------------------------------------------------------- Boot-time Configuration
arch/x86/kernel/apic/apic.c +1 -0
@@ -2263,6 +2263,7 @@ void __init apic_set_eoi_write(void (*eoi_write)(u32 reg, u32 v))for (drv = __apicdrivers; drv < __apicdrivers_end; drv++) {/* Should happen once for each apic */ WARN_ON ((*drv)->eoi_write == eoi_write); + (*drv)->native_eoi_write = (*drv)->eoi_write; (*drv)->eoi_write = eoi_write; } }
arch/x86/kernel/kvm.c +2 -2
@@ -308,7 +308,7 @@ static void kvm_register_steal_time(void) static DEFINE_PER_CPU(unsigned long, kvm_apic_eoi) = KVM_PV_EOI_DISABLED; -static void kvm_guest_apic_eoi_write (u32 reg,u32 val) +static notrace void kvm_guest_apic_eoi_write(u32 reg, u32 val) {/** * This relies on __test_and_clear_bit to modify the memory
@@ -319,7 +319,7 @@ static void kvm_guest_apic_eoi_write(u32 reg, u32 val)*/ if (__test_and_clear_bit (KVM_PV_EOI_BIT ,this_cpu_ptr (&kvm_apic_eoi)))return ; -apic_write (APIC_EOI ,APIC_EOI_ACK ); + apic->native_eoi_write (APIC_EOI ,APIC_EOI_ACK ); }static void kvm_guest_cpu_init (void )
arch/x86/kernel/smp.c +0 -2
@@ -261,10 +261,8 @@ static inline void __smp_reschedule_interrupt(void) __visible void smp_reschedule_interrupt(struct pt_regs *regs) { -irq_enter ();ack_APIC_irq ();__smp_reschedule_interrupt (); -irq_exit ();/* * KVM uses this interrupt to force a cpu out of guest mode */
arch/x86/lib/msr.c +2 -2
@@ -113,14 +113,14 @@ int msr_clear_bit(u32 msr, u8 bit) }#ifdef CONFIG_TRACEPOINTS -void do_trace_write_msr (unsigned msr,u64 val,int failed) +void do_trace_write_msr (unsigned int msr,u64 val,int failed) {trace_write_msr (msr, val, failed); }EXPORT_SYMBOL (do_trace_write_msr);EXPORT_TRACEPOINT_SYMBOL (write_msr); -void do_trace_read_msr (unsigned msr,u64 val,int failed) +void do_trace_read_msr (unsigned int msr,u64 val,int failed) {trace_read_msr (msr, val, failed); }