From: Huang Ying <ying.huang@intel.com>
To: Ingo Molnar <mingo@elte.hu>, "H. Peter Anvin" <hpa@zytor.com>
Cc: linux-kernel@vger.kernel.org, Andi Kleen <andi@firstfloor.org>,
Peter Zijlstra <peterz@infradead.org>,
Huang Ying <ying.huang@intel.com>
Subject: [RFC 3/5] x86, trigger NMI return notifier soft_irq earlier
Date: Thu, 24 Jun 2010 11:04:56 +0800 [thread overview]
Message-ID: <1277348698-17311-3-git-send-email-ying.huang@intel.com> (raw)
In-Reply-To: <1277348698-17311-1-git-send-email-ying.huang@intel.com>
soft_irq is used to run NMI return notifiers. But it may be quite long
from soft_irq is raised in NMI handler to soft_irq is run actually. To
solve the issue, a self interrupt IPI is used to trigger the soft_irq
earlier.
Signed-off-by: Huang Ying <ying.huang@intel.com>
---
arch/x86/include/asm/hardirq.h | 1 +
arch/x86/include/asm/hw_irq.h | 1 +
arch/x86/include/asm/irq_vectors.h | 5 +++++
arch/x86/kernel/entry_64.S | 5 +++++
arch/x86/kernel/irq.c | 7 +++++++
arch/x86/kernel/irqinit.c | 3 +++
arch/x86/kernel/traps.c | 29 +++++++++++++++++++++++++++++
7 files changed, 51 insertions(+)
--- a/arch/x86/include/asm/hardirq.h
+++ b/arch/x86/include/asm/hardirq.h
@@ -11,6 +11,7 @@ typedef struct {
#ifdef CONFIG_X86_LOCAL_APIC
unsigned int apic_timer_irqs; /* arch dependent */
unsigned int irq_spurious_count;
+ unsigned int apic_nmi_return_notifier_irqs;
#endif
unsigned int x86_platform_ipis; /* arch dependent */
unsigned int apic_perf_irqs;
--- a/arch/x86/include/asm/hw_irq.h
+++ b/arch/x86/include/asm/hw_irq.h
@@ -35,6 +35,7 @@ extern void spurious_interrupt(void);
extern void thermal_interrupt(void);
extern void reschedule_interrupt(void);
extern void mce_self_interrupt(void);
+extern void nmi_return_notifier_interrupt(void);
extern void invalidate_interrupt(void);
extern void invalidate_interrupt0(void);
--- a/arch/x86/include/asm/irq_vectors.h
+++ b/arch/x86/include/asm/irq_vectors.h
@@ -125,6 +125,11 @@
*/
#define MCE_SELF_VECTOR 0xeb
+/*
+ * Self IPI vector for NMI return notifier
+ */
+#define NMI_RETURN_NOTIFIER_VECTOR 0xe9
+
#define NR_VECTORS 256
#define FPU_IRQ 13
--- a/arch/x86/kernel/entry_64.S
+++ b/arch/x86/kernel/entry_64.S
@@ -1009,6 +1009,11 @@ apicinterrupt MCE_SELF_VECTOR \
mce_self_interrupt smp_mce_self_interrupt
#endif
+#ifdef CONFIG_X86_LOCAL_APIC
+apicinterrupt NMI_RETURN_NOTIFIER_VECTOR \
+ nmi_return_notifier_interrupt smp_nmi_return_notifier_interrupt
+#endif
+
#ifdef CONFIG_SMP
apicinterrupt CALL_FUNCTION_SINGLE_VECTOR \
call_function_single_interrupt smp_call_function_single_interrupt
--- a/arch/x86/kernel/irq.c
+++ b/arch/x86/kernel/irq.c
@@ -63,6 +63,12 @@ static int show_other_interrupts(struct
for_each_online_cpu(j)
seq_printf(p, "%10u ", irq_stats(j)->irq_spurious_count);
seq_printf(p, " Spurious interrupts\n");
+
+ seq_printf(p, "%*s: ", prec, "NRN");
+ for_each_online_cpu(j)
+ seq_printf(p, "%10u ", irq_stats(j)->apic_nmi_return_notifier_irqs);
+ seq_printf(p, " NMI return notifier interrupts\n");
+
seq_printf(p, "%*s: ", prec, "PMI");
for_each_online_cpu(j)
seq_printf(p, "%10u ", irq_stats(j)->apic_perf_irqs);
@@ -184,6 +190,7 @@ u64 arch_irq_stat_cpu(unsigned int cpu)
#ifdef CONFIG_X86_LOCAL_APIC
sum += irq_stats(cpu)->apic_timer_irqs;
sum += irq_stats(cpu)->irq_spurious_count;
+ sum += irq_stats(cpu)->apic_nmi_return_notifier_irqs;
sum += irq_stats(cpu)->apic_perf_irqs;
sum += irq_stats(cpu)->apic_pending_irqs;
#endif
--- a/arch/x86/kernel/irqinit.c
+++ b/arch/x86/kernel/irqinit.c
@@ -212,6 +212,9 @@ static void __init apic_intr_init(void)
#if defined(CONFIG_X86_MCE) && defined(CONFIG_X86_LOCAL_APIC)
alloc_intr_gate(MCE_SELF_VECTOR, mce_self_interrupt);
#endif
+#ifdef CONFIG_X86_LOCAL_APIC
+ alloc_intr_gate(NMI_RETURN_NOTIFIER_VECTOR, nmi_return_notifier_interrupt);
+#endif
#if defined(CONFIG_X86_64) || defined(CONFIG_X86_LOCAL_APIC)
/* self generated IPI for local APIC timer */
--- a/arch/x86/kernel/traps.c
+++ b/arch/x86/kernel/traps.c
@@ -888,3 +888,32 @@ void __init trap_init(void)
x86_init.irqs.trap_init();
}
+
+#ifdef CONFIG_X86_LOCAL_APIC
+asmlinkage void smp_nmi_return_notifier_interrupt(struct pt_regs *regs)
+{
+ ack_APIC_irq();
+ irq_enter();
+ inc_irq_stat(apic_nmi_return_notifier_irqs);
+ irq_exit();
+}
+
+void arch_nmi_return_notifier_schedule(struct nmi_return_notifier *nrn)
+{
+ /* Without APIC, hope next soft_irq not too late*/
+ if (!cpu_has_apic)
+ return;
+
+ /*
+ * Use a self interrupt to trigger the soft_irq for NMI return
+ * notifiers
+ */
+ apic->send_IPI_self(NMI_RETURN_NOTIFIER_VECTOR);
+
+ /* Wait for idle afterward so that we don't leave the APIC in
+ * a non idle state because the normal APIC writes cannot
+ * exclude us.
+ */
+ apic_wait_icr_idle();
+}
+#endif
next prev parent reply other threads:[~2010-06-24 3:05 UTC|newest]
Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-24 3:04 [RFC 1/5] Make soft_irq NMI safe Huang Ying
2010-06-24 3:04 ` [RFC 2/5] NMI return notifier Huang Ying
2010-06-24 3:04 ` Huang Ying [this message]
2010-06-24 6:03 ` [RFC 3/5] x86, trigger NMI return notifier soft_irq earlier Peter Zijlstra
2010-06-24 3:04 ` [RFC 4/5] x86, Use NMI return notifier in MCE Huang Ying
2010-06-24 10:00 ` Andi Kleen
2010-06-24 3:04 ` [RFC 5/5] Use NMI return notifier in perf pending Huang Ying
2010-06-24 6:00 ` Peter Zijlstra
2010-06-24 6:09 ` [RFC 1/5] Make soft_irq NMI safe Peter Zijlstra
2010-06-24 6:45 ` Huang Ying
2010-06-24 6:35 ` [RFC][PATCH] irq_work Peter Zijlstra
2010-06-24 6:43 ` Huang Ying
2010-06-24 6:47 ` Peter Zijlstra
2010-06-24 6:50 ` Huang Ying
2010-06-24 6:58 ` Peter Zijlstra
2010-06-24 7:04 ` Huang Ying
2010-06-24 7:19 ` Peter Zijlstra
2010-06-24 7:27 ` Huang Ying
2010-06-24 7:32 ` Peter Zijlstra
2010-06-24 10:27 ` Andi Kleen
2010-06-24 10:30 ` Peter Zijlstra
2010-06-24 10:52 ` Andi Kleen
2010-06-24 10:58 ` Peter Zijlstra
2010-06-24 11:08 ` Andi Kleen
2010-06-24 11:10 ` Peter Zijlstra
2010-06-24 11:20 ` Andi Kleen
2010-06-24 11:33 ` Peter Zijlstra
2010-06-24 11:55 ` Andi Kleen
2010-06-24 11:57 ` Peter Zijlstra
2010-06-24 12:02 ` Andi Kleen
2010-06-24 12:18 ` Peter Zijlstra
2010-06-24 12:38 ` Andi Kleen
2010-06-25 10:38 ` Peter Zijlstra
2010-06-24 11:42 ` Peter Zijlstra
2010-06-24 11:58 ` Andi Kleen
2010-06-24 12:02 ` Peter Zijlstra
2010-06-24 11:23 ` Ingo Molnar
2010-06-24 11:34 ` Peter Zijlstra
2010-06-24 12:35 ` Ingo Molnar
2010-06-24 13:02 ` Andi Kleen
2010-06-24 13:20 ` Borislav Petkov
2010-06-24 13:33 ` Andi Kleen
2010-06-24 13:42 ` Ingo Molnar
2010-06-24 13:46 ` Ingo Molnar
2010-06-24 14:01 ` Andi Kleen
2010-06-24 15:41 ` Borislav Petkov
2010-06-24 16:09 ` Andi Kleen
2010-06-25 2:12 ` Huang Ying
2010-06-25 7:48 ` Peter Zijlstra
2010-06-25 9:17 ` Huang Ying
2010-06-25 9:23 ` Frederic Weisbecker
2010-06-25 9:30 ` Huang Ying
2010-06-25 9:44 ` Frederic Weisbecker
2010-06-25 9:30 ` Peter Zijlstra
2010-06-25 11:58 ` huang ying
2010-06-25 9:08 ` Andi Kleen
2010-06-25 18:30 ` [RFC][PATCH] irq_work -v2 Peter Zijlstra
2010-06-25 19:30 ` Andi Kleen
2010-06-25 19:39 ` Peter Zijlstra
2010-06-25 19:49 ` Peter Zijlstra
2010-06-25 22:29 ` Andi Kleen
2010-06-26 8:36 ` Peter Zijlstra
2010-06-26 10:08 ` Andi Kleen
2010-06-26 10:32 ` Peter Zijlstra
2010-06-25 19:47 ` Peter Zijlstra
2010-06-26 1:26 ` huang ying
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1277348698-17311-3-git-send-email-ying.huang@intel.com \
--to=ying.huang@intel.com \
--cc=andi@firstfloor.org \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=peterz@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).