9 files changed, 68 insertions, 4 deletions

diff --git a/arch/x86/kernel/apic_32.c b/arch/x86/kernel/apic_32.c
index 3d67ae18d762..793341fffc81 100644
--- a/arch/x86/kernel/apic_32.c
+++ b/arch/x86/kernel/apic_32.c
@@ -1277,6 +1277,7 @@ void smp_spurious_interrupt(struct pt_regs *regs)
         /* see sw-dev-man vol 3, chapter 7.4.13.5 */
         printk(KERN_INFO "spurious APIC interrupt on CPU#%d, "
                "should never happen.\n", smp_processor_id());
+        __get_cpu_var(irq_stat).irq_spurious_count++;
         irq_exit();
 }
 
diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c
index 2250c654eacc..f47bc493dba9 100644
--- a/arch/x86/kernel/apic_64.c
+++ b/arch/x86/kernel/apic_64.c
@@ -1140,6 +1140,7 @@ asmlinkage void smp_spurious_interrupt(void)
         if (v & (1 << (SPURIOUS_APIC_VECTOR & 0x1f)))
                 ack_APIC_irq();
 
+        add_pda(irq_spurious_count, 1);
         irq_exit();
 }
 
diff --git a/arch/x86/kernel/cpu/mcheck/p4.c b/arch/x86/kernel/cpu/mcheck/p4.c
index 1509edfb2313..be4dabfee1f5 100644
--- a/arch/x86/kernel/cpu/mcheck/p4.c
+++ b/arch/x86/kernel/cpu/mcheck/p4.c
@@ -61,6 +61,7 @@ fastcall void smp_thermal_interrupt(struct pt_regs *regs)
 {
         irq_enter();
         vendor_thermal_interrupt(regs);
+        __get_cpu_var(irq_stat).irq_thermal_count++;
         irq_exit();
 }
 
diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c
index e173b763f148..10f359021aae 100644
--- a/arch/x86/kernel/irq_32.c
+++ b/arch/x86/kernel/irq_32.c
@@ -280,14 +280,41 @@ skip:
                 seq_printf(p, "NMI: ");
                 for_each_online_cpu(j)
                         seq_printf(p, "%10u ", nmi_count(j));
-                seq_putc(p, '\n');
+                seq_printf(p, "  Non-maskable interrupts\n");
 #ifdef CONFIG_X86_LOCAL_APIC
                 seq_printf(p, "LOC: ");
                 for_each_online_cpu(j)
                         seq_printf(p, "%10u ",
                                 per_cpu(irq_stat,j).apic_timer_irqs);
-                seq_putc(p, '\n');
+                seq_printf(p, "  Local timer interrupts\n");
 #endif
+#ifdef CONFIG_SMP
+                seq_printf(p, "RES: ");
+                for_each_online_cpu(j)
+                        seq_printf(p, "%10u ",
+                                per_cpu(irq_stat,j).irq_resched_count);
+                seq_printf(p, "  Rescheduling interrupts\n");
+                seq_printf(p, "CAL: ");
+                for_each_online_cpu(j)
+                        seq_printf(p, "%10u ",
+                                per_cpu(irq_stat,j).irq_call_count);
+                seq_printf(p, "  function call interrupts\n");
+                seq_printf(p, "TLB: ");
+                for_each_online_cpu(j)
+                        seq_printf(p, "%10u ",
+                                per_cpu(irq_stat,j).irq_tlb_count);
+                seq_printf(p, "  TLB shootdowns\n");
+#endif
+                seq_printf(p, "TRM: ");
+                for_each_online_cpu(j)
+                        seq_printf(p, "%10u ",
+                                per_cpu(irq_stat,j).irq_thermal_count);
+                seq_printf(p, "  Thermal event interrupts\n");
+                seq_printf(p, "SPU: ");
+                for_each_online_cpu(j)
+                        seq_printf(p, "%10u ",
+                                per_cpu(irq_stat,j).irq_spurious_count);
+                seq_printf(p, "  Spurious interrupts\n");
                 seq_printf(p, "ERR: %10u\n", atomic_read(&irq_err_count));
 #if defined(CONFIG_X86_IO_APIC)
                 seq_printf(p, "MIS: %10u\n", atomic_read(&irq_mis_count));
diff --git a/arch/x86/kernel/irq_64.c b/arch/x86/kernel/irq_64.c
index 865669efc540..3881189df8ee 100644
--- a/arch/x86/kernel/irq_64.c
+++ b/arch/x86/kernel/irq_64.c
@@ -86,11 +86,37 @@ skip:
                 seq_printf(p, "NMI: ");
                 for_each_online_cpu(j)
                         seq_printf(p, "%10u ", cpu_pda(j)->__nmi_count);
-                seq_putc(p, '\n');
+                seq_printf(p, "  Non-maskable interrupts\n");
                 seq_printf(p, "LOC: ");
                 for_each_online_cpu(j)
                         seq_printf(p, "%10u ", cpu_pda(j)->apic_timer_irqs);
-                seq_putc(p, '\n');
+                seq_printf(p, "  Local timer interrupts\n");
+#ifdef CONFIG_SMP
+                seq_printf(p, "RES: ");
+                for_each_online_cpu(j)
+                        seq_printf(p, "%10u ", cpu_pda(j)->irq_resched_count);
+                seq_printf(p, "  Rescheduling interrupts\n");
+                seq_printf(p, "CAL: ");
+                for_each_online_cpu(j)
+                        seq_printf(p, "%10u ", cpu_pda(j)->irq_call_count);
+                seq_printf(p, "  function call interrupts\n");
+                seq_printf(p, "TLB: ");
+                for_each_online_cpu(j)
+                        seq_printf(p, "%10u ", cpu_pda(j)->irq_tlb_count);
+                seq_printf(p, "  TLB shootdowns\n");
+#endif
+                seq_printf(p, "TRM: ");
+                for_each_online_cpu(j)
+                        seq_printf(p, "%10u ", cpu_pda(j)->irq_thermal_count);
+                seq_printf(p, "  Thermal event interrupts\n");
+                seq_printf(p, "THR: ");
+                for_each_online_cpu(j)
+                        seq_printf(p, "%10u ", cpu_pda(j)->irq_threshold_count);
+                seq_printf(p, "  Threshold APIC interrupts\n");
+                seq_printf(p, "SPU: ");
+                for_each_online_cpu(j)
+                        seq_printf(p, "%10u ", cpu_pda(j)->irq_spurious_count);
+                seq_printf(p, "  Spurious interrupts\n");
                 seq_printf(p, "ERR: %10u\n", atomic_read(&irq_err_count));
         }
         return 0;
diff --git a/arch/x86/kernel/mce_amd_64.c b/arch/x86/kernel/mce_amd_64.c
index 805b62b1e0df..0d2afd96aca4 100644
--- a/arch/x86/kernel/mce_amd_64.c
+++ b/arch/x86/kernel/mce_amd_64.c
@@ -237,6 +237,7 @@ asmlinkage void mce_threshold_interrupt(void)
                 }
         }
 out:
+        add_pda(irq_threshold_count, 1);
         irq_exit();
 }
 
diff --git a/arch/x86/kernel/mce_intel_64.c b/arch/x86/kernel/mce_intel_64.c
index 6551505d8a2c..c17eaf5dd6dd 100644
--- a/arch/x86/kernel/mce_intel_64.c
+++ b/arch/x86/kernel/mce_intel_64.c
@@ -26,6 +26,7 @@ asmlinkage void smp_thermal_interrupt(void)
         if (therm_throt_process(msr_val & 1))
                 mce_log_therm_throt_event(smp_processor_id(), msr_val);
 
+        add_pda(irq_thermal_count, 1);
         irq_exit();
 }
 
diff --git a/arch/x86/kernel/smp_32.c b/arch/x86/kernel/smp_32.c
index eebc6e82576c..791d9f8036ae 100644
--- a/arch/x86/kernel/smp_32.c
+++ b/arch/x86/kernel/smp_32.c
@@ -342,6 +342,7 @@ fastcall void smp_invalidate_interrupt(struct pt_regs *regs)
         smp_mb__after_clear_bit();
 out:
         put_cpu_no_resched();
+        __get_cpu_var(irq_stat).irq_tlb_count++;
 }
 
 void native_flush_tlb_others(const cpumask_t *cpumaskp, struct mm_struct *mm,
@@ -640,6 +641,7 @@ static void native_smp_send_stop(void)
 fastcall void smp_reschedule_interrupt(struct pt_regs *regs)
 {
         ack_APIC_irq();
+        __get_cpu_var(irq_stat).irq_resched_count++;
 }
 
 fastcall void smp_call_function_interrupt(struct pt_regs *regs)
@@ -660,6 +662,7 @@ fastcall void smp_call_function_interrupt(struct pt_regs *regs)
          */
         irq_enter();
         (*func)(info);
+        __get_cpu_var(irq_stat).irq_call_count++;
         irq_exit();
 
         if (wait) {
diff --git a/arch/x86/kernel/smp_64.c b/arch/x86/kernel/smp_64.c
index df4a82812adb..5c2964727d19 100644
--- a/arch/x86/kernel/smp_64.c
+++ b/arch/x86/kernel/smp_64.c
@@ -163,6 +163,7 @@ asmlinkage void smp_invalidate_interrupt(struct pt_regs *regs)
 out:
         ack_APIC_irq();
         cpu_clear(cpu, f->flush_cpumask);
+        add_pda(irq_tlb_count, 1);
 }
 
 static void flush_tlb_others(cpumask_t cpumask, struct mm_struct *mm,
@@ -493,6 +494,7 @@ void smp_send_stop(void)
 asmlinkage void smp_reschedule_interrupt(void)
 {
         ack_APIC_irq();
+        add_pda(irq_resched_count, 1);
 }
 
 asmlinkage void smp_call_function_interrupt(void)
@@ -514,6 +516,7 @@ asmlinkage void smp_call_function_interrupt(void)
         exit_idle();
         irq_enter();
         (*func)(info);
+        add_pda(irq_call_count, 1);
         irq_exit();
         if (wait) {
                 mb();