perf_counter/x86: Remove the IRQ (non-NMI) handling bits
PATCH 1/1 perf_counter/x86: Remove the IRQ (non-NMI) handling bits
Remove the IRQ (non-NMI) handling bits as NMI will be used always.
Signed-off-by Yong Wang <[email protected]>
--- include/asm/entry_arch.h | 1 - include/asm/hw_irq.h | 1 - include/asm/irq_vectors.h | 5 ----- kernel/cpu/perf_counter.c | 21 ++++++--------------- kernel/entry_64.S | 2 -- kernel/irqinit.c | 1 - 6 files changed, 6 insertions(+), 25 deletions(-)
arch/x86/include/asm/entry_arch.h +0 -1
@@ -49,7 +49,6 @@ BUILD_INTERRUPT(error_interrupt,ERROR_APIC_VECTOR) BUILD_INTERRUPT(spurious_interrupt,SPURIOUS_APIC_VECTOR)#ifdef CONFIG_PERF_COUNTERS -BUILD_INTERRUPT(perf_counter_interrupt, LOCAL_PERF_VECTOR) BUILD_INTERRUPT(perf_pending_interrupt, LOCAL_PENDING_VECTOR)#endif
arch/x86/include/asm/hw_irq.h +0 -1
@@ -29,7 +29,6 @@extern void apic_timer_interrupt (void );extern void generic_interrupt (void );extern void error_interrupt (void ); -extern void perf_counter_interrupt (void );extern void perf_pending_interrupt (void );extern void spurious_interrupt (void );
arch/x86/include/asm/irq_vectors.h +0 -5
@@ -108,11 +108,6 @@#define LOCAL_TIMER_VECTOR 0xef/* -* Performance monitoring interrupt vector: -*/ -#define LOCAL_PERF_VECTOR 0xee - -/* * Generic system vector for platform specific use */ #define GENERIC_INTERRUPT_VECTOR 0xed
arch/x86/kernel/cpu/perf_counter.c +6 -15
@@ -40,7 +40,7 @@ struct cpu_hw_counters {struct x86_pmu {const char *name;int version; -int (*handle_irq)(struct pt_regs *,int ); +int (*handle_irq)(struct pt_regs *);void (*disable_all)(void );void (*enable_all)(void );void (*enable)(struct hw_perf_counter *,int );
@@ -755,7 +755,7 @@ static void intel_pmu_reset(void)* This handler is triggered by the local APIC, so the APIC IRQ handling * rules apply: */ -static int intel_pmu_handle_irq (struct pt_regs *regs,int nmi) +static int intel_pmu_handle_irq (struct pt_regs *regs) {struct cpu_hw_counters *cpuc;struct cpu_hw_counters ;
@@ -794,7 +794,7 @@ again:if (!intel_pmu_save_and_restart (counter))continue ; -if (perf_counter_overflow (counter, nmi, regs,0 )) +if (perf_counter_overflow (counter,1 , regs,0 ))intel_pmu_disable_counter (&counter->hw, bit); }
@@ -812,7 +812,7 @@ again:return 1 ; } -static int amd_pmu_handle_irq (struct pt_regs *regs,int nmi) +static int amd_pmu_handle_irq (struct pt_regs *regs) {int cpu, idx, handled =0 ;struct cpu_hw_counters *cpuc;
@@ -840,22 +840,13 @@ static int amd_pmu_handle_irq(struct pt_regs *regs, int nmi)if (!x86_perf_counter_set_period (counter, hwc, idx))continue ; -if (perf_counter_overflow (counter, nmi, regs,0 )) +if (perf_counter_overflow (counter,1 , regs,0 ))amd_pmu_disable_counter (hwc, idx); }return handled; } -void smp_perf_counter_interrupt (struct pt_regs *regs) -{ -irq_enter (); -apic_write (APIC_LVTPC ,LOCAL_PERF_VECTOR ); -ack_APIC_irq (); - x86_pmu.handle_irq (regs,0 ); -irq_exit (); -} -void smp_perf_pending_interrupt (struct pt_regs *regs) {irq_enter ();
@@ -910,7 +901,7 @@ perf_counter_nmi_handler(struct notifier_block *self,* If the first NMI handles both, the latter will be empty and daze * the CPU. */ - x86_pmu.handle_irq (regs,1 ); + x86_pmu.handle_irq (regs);return NOTIFY_STOP ; }
arch/x86/kernel/entry_64.S +0 -2
@@ -1013,8 +1013,6 @@ apicinterrupt SPURIOUS_APIC_VECTOR \ spurious_interrupt smp_spurious_interrupt #ifdef CONFIG_PERF_COUNTERS -apicinterrupt LOCAL_PERF_VECTOR \ - perf_counter_interrupt smp_perf_counter_interrupt apicinterrupt LOCAL_PENDING_VECTOR \ perf_pending_interrupt smp_perf_pending_interrupt #endif
arch/x86/kernel/irqinit.c +0 -1
@@ -201,7 +201,6 @@ static void __init apic_intr_init(void)/* Performance monitoring interrupts: */ # ifdef CONFIG_PERF_COUNTERS -alloc_intr_gate (LOCAL_PERF_VECTOR , perf_counter_interrupt);alloc_intr_gate (LOCAL_PENDING_VECTOR , perf_pending_interrupt);# endif
Commit-ID: a32881066e58346f2901afe0ebdfbf0c562877e5 Gitweb: http://git.kernel.org/tip/a32881066e58346f2901afe0ebdfbf0c562877e5 Author: Yong Wang <[email protected]> AuthorDate: Wed, 3 Jun 2009 13:12:55 +0800 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 3 Jun 2009 09:53:34 +0200
perf_counter/x86: Remove the IRQ (non-NMI) handling bits
Remove the IRQ (non-NMI) handling bits as NMI will be used always.
Signed-off-by Yong Wang <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Mike Galbraith <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Corey Ashford <[email protected]>
Cc Marcelo Tosatti <[email protected]>
Cc Arnaldo Carvalho de Melo <[email protected]>
Cc John Kacur <[email protected]>
LKML-Reference: <[email protected]>
Signed-off-by Ingo Molnar <[email protected]>
--- arch/x86/include/asm/entry_arch.h | 1 - arch/x86/include/asm/hw_irq.h | 1 - arch/x86/include/asm/irq_vectors.h | 5 ----- arch/x86/kernel/cpu/perf_counter.c | 21 ++++++--------------- arch/x86/kernel/entry_64.S | 2 -- arch/x86/kernel/irqinit_32.c | 1 - arch/x86/kernel/irqinit_64.c | 1 - 7 files changed, 6 insertions(+), 26 deletions(-)
arch/x86/include/asm/entry_arch.h +0 -1
@@ -49,7 +49,6 @@ BUILD_INTERRUPT(error_interrupt,ERROR_APIC_VECTOR) BUILD_INTERRUPT(spurious_interrupt,SPURIOUS_APIC_VECTOR)#ifdef CONFIG_PERF_COUNTERS -BUILD_INTERRUPT(perf_counter_interrupt, LOCAL_PERF_VECTOR) BUILD_INTERRUPT(perf_pending_interrupt, LOCAL_PENDING_VECTOR)#endif
arch/x86/include/asm/hw_irq.h +0 -1
@@ -29,7 +29,6 @@extern void apic_timer_interrupt (void );extern void generic_interrupt (void );extern void error_interrupt (void ); -extern void perf_counter_interrupt (void );extern void perf_pending_interrupt (void );extern void spurious_interrupt (void );
arch/x86/include/asm/irq_vectors.h +0 -5
@@ -107,11 +107,6 @@#define LOCAL_TIMER_VECTOR 0xef/* -* Performance monitoring interrupt vector: -*/ -#define LOCAL_PERF_VECTOR 0xee - -/* * Generic system vector for platform specific use */ #define GENERIC_INTERRUPT_VECTOR 0xed
arch/x86/kernel/cpu/perf_counter.c +6 -15
@@ -40,7 +40,7 @@ struct cpu_hw_counters {struct x86_pmu {const char *name;int version; -int (*handle_irq)(struct pt_regs *,int ); +int (*handle_irq)(struct pt_regs *);void (*disable_all)(void );void (*enable_all)(void );void (*enable)(struct hw_perf_counter *,int );
@@ -755,7 +755,7 @@ static void intel_pmu_reset(void)* This handler is triggered by the local APIC, so the APIC IRQ handling * rules apply: */ -static int intel_pmu_handle_irq (struct pt_regs *regs,int nmi) +static int intel_pmu_handle_irq (struct pt_regs *regs) {struct cpu_hw_counters *cpuc;struct cpu_hw_counters ;
@@ -794,7 +794,7 @@ again:if (!intel_pmu_save_and_restart (counter))continue ; -if (perf_counter_overflow (counter, nmi, regs,0 )) +if (perf_counter_overflow (counter,1 , regs,0 ))intel_pmu_disable_counter (&counter->hw, bit); }
@@ -812,7 +812,7 @@ again:return 1 ; } -static int amd_pmu_handle_irq (struct pt_regs *regs,int nmi) +static int amd_pmu_handle_irq (struct pt_regs *regs) {int cpu, idx, handled =0 ;struct cpu_hw_counters *cpuc;
@@ -840,22 +840,13 @@ static int amd_pmu_handle_irq(struct pt_regs *regs, int nmi)if (!x86_perf_counter_set_period (counter, hwc, idx))continue ; -if (perf_counter_overflow (counter, nmi, regs,0 )) +if (perf_counter_overflow (counter,1 , regs,0 ))amd_pmu_disable_counter (hwc, idx); }return handled; } -void smp_perf_counter_interrupt (struct pt_regs *regs) -{ -irq_enter (); -apic_write (APIC_LVTPC ,LOCAL_PERF_VECTOR ); -ack_APIC_irq (); - x86_pmu.handle_irq (regs,0 ); -irq_exit (); -} -void smp_perf_pending_interrupt (struct pt_regs *regs) {irq_enter ();
@@ -910,7 +901,7 @@ perf_counter_nmi_handler(struct notifier_block *self,* If the first NMI handles both, the latter will be empty and daze * the CPU. */ - x86_pmu.handle_irq (regs,1 ); + x86_pmu.handle_irq (regs);return NOTIFY_STOP ; }
arch/x86/kernel/entry_64.S +0 -2
@@ -1026,8 +1026,6 @@ apicinterrupt SPURIOUS_APIC_VECTOR \ spurious_interrupt smp_spurious_interrupt #ifdef CONFIG_PERF_COUNTERS -apicinterrupt LOCAL_PERF_VECTOR \ - perf_counter_interrupt smp_perf_counter_interrupt apicinterrupt LOCAL_PENDING_VECTOR \ perf_pending_interrupt smp_perf_pending_interrupt #endif
arch/x86/kernel/irqinit_32.c +0 -1
@@ -165,7 +165,6 @@ static void __init apic_intr_init(void)alloc_intr_gate (SPURIOUS_APIC_VECTOR , spurious_interrupt);alloc_intr_gate (ERROR_APIC_VECTOR , error_interrupt);# ifdef CONFIG_PERF_COUNTERS -alloc_intr_gate (LOCAL_PERF_VECTOR , perf_counter_interrupt);alloc_intr_gate (LOCAL_PENDING_VECTOR , perf_pending_interrupt);# endif
arch/x86/kernel/irqinit_64.c +0 -1
@@ -155,7 +155,6 @@ static void __init apic_intr_init(void)/* Performance monitoring interrupt: */ #ifdef CONFIG_PERF_COUNTERS -alloc_intr_gate (LOCAL_PERF_VECTOR , perf_counter_interrupt);alloc_intr_gate (LOCAL_PENDING_VECTOR , perf_pending_interrupt);#endif }