All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH v2] x86/nmi: Remove the b2b parameter from nmi_handle
@ 2015-07-20 18:52 Andy Lutomirski
  2015-07-21  0:08 ` Andy Lutomirski
  2015-07-21  9:37 ` [tip:x86/asm] x86/nmi: Remove the 'b2b' parameter from nmi_handle () tip-bot for Andy Lutomirski
  0 siblings, 2 replies; 3+ messages in thread
From: Andy Lutomirski @ 2015-07-20 18:52 UTC (permalink / raw)
  To: Peter Zijlstra, Steven Rostedt
  Cc: security, X86 ML, linux-kernel, Andy Lutomirski, stable

It has never had any effect.  Remove it for comprehensibility.

Cc'd to stable because whatever to do with improve the NMI mess will
probably depend on this.

Cc: stable@vger.kernel.org
Signed-off-by: Andy Lutomirski <luto@kernel.org>
---
 arch/x86/kernel/nmi.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c
index d05bd2e2ee91..697f90db0e37 100644
--- a/arch/x86/kernel/nmi.c
+++ b/arch/x86/kernel/nmi.c
@@ -110,7 +110,7 @@ static void nmi_max_handler(struct irq_work *w)
 		a->handler, whole_msecs, decimal_msecs);
 }
 
-static int nmi_handle(unsigned int type, struct pt_regs *regs, bool b2b)
+static int nmi_handle(unsigned int type, struct pt_regs *regs)
 {
 	struct nmi_desc *desc = nmi_to_desc(type);
 	struct nmiaction *a;
@@ -213,7 +213,7 @@ static void
 pci_serr_error(unsigned char reason, struct pt_regs *regs)
 {
 	/* check to see if anyone registered against these types of errors */
-	if (nmi_handle(NMI_SERR, regs, false))
+	if (nmi_handle(NMI_SERR, regs))
 		return;
 
 	pr_emerg("NMI: PCI system error (SERR) for reason %02x on CPU %d.\n",
@@ -247,7 +247,7 @@ io_check_error(unsigned char reason, struct pt_regs *regs)
 	unsigned long i;
 
 	/* check to see if anyone registered against these types of errors */
-	if (nmi_handle(NMI_IO_CHECK, regs, false))
+	if (nmi_handle(NMI_IO_CHECK, regs))
 		return;
 
 	pr_emerg(
@@ -284,7 +284,7 @@ unknown_nmi_error(unsigned char reason, struct pt_regs *regs)
 	 * as only the first one is ever run (unless it can actually determine
 	 * if it caused the NMI)
 	 */
-	handled = nmi_handle(NMI_UNKNOWN, regs, false);
+	handled = nmi_handle(NMI_UNKNOWN, regs);
 	if (handled) {
 		__this_cpu_add(nmi_stats.unknown, handled);
 		return;
@@ -332,7 +332,7 @@ static void default_do_nmi(struct pt_regs *regs)
 
 	__this_cpu_write(last_nmi_rip, regs->ip);
 
-	handled = nmi_handle(NMI_LOCAL, regs, b2b);
+	handled = nmi_handle(NMI_LOCAL, regs);
 	__this_cpu_add(nmi_stats.normal, handled);
 	if (handled) {
 		/*
-- 
2.4.3


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH v2] x86/nmi: Remove the b2b parameter from nmi_handle
  2015-07-20 18:52 [PATCH v2] x86/nmi: Remove the b2b parameter from nmi_handle Andy Lutomirski
@ 2015-07-21  0:08 ` Andy Lutomirski
  2015-07-21  9:37 ` [tip:x86/asm] x86/nmi: Remove the 'b2b' parameter from nmi_handle () tip-bot for Andy Lutomirski
  1 sibling, 0 replies; 3+ messages in thread
From: Andy Lutomirski @ 2015-07-21  0:08 UTC (permalink / raw)
  To: Andy Lutomirski
  Cc: Peter Zijlstra, Steven Rostedt, security, X86 ML, linux-kernel, stable

On Mon, Jul 20, 2015 at 11:52 AM, Andy Lutomirski <luto@kernel.org> wrote:
> It has never had any effect.  Remove it for comprehensibility.
>
> Cc'd to stable because whatever to do with improve the NMI mess will
> probably depend on this.
>
> Cc: stable@vger.kernel.org

Peter, if you've already queued this up, can you remove the Cc: stable
and the comment about stable?  I have a totally different short-term
fix for the back-to-back NMI mess.  I make no guarantee at all that
it's a full fix, but it fixes the case my test exercises quite nicely.

I still think this patch makes sense as a cleanup.

--Andy

^ permalink raw reply	[flat|nested] 3+ messages in thread

* [tip:x86/asm] x86/nmi: Remove the 'b2b' parameter from nmi_handle ()
  2015-07-20 18:52 [PATCH v2] x86/nmi: Remove the b2b parameter from nmi_handle Andy Lutomirski
  2015-07-21  0:08 ` Andy Lutomirski
@ 2015-07-21  9:37 ` tip-bot for Andy Lutomirski
  1 sibling, 0 replies; 3+ messages in thread
From: tip-bot for Andy Lutomirski @ 2015-07-21  9:37 UTC (permalink / raw)
  To: linux-tip-commits
  Cc: bp, linux-kernel, dvlasenk, rostedt, luto, luto, mingo, hpa,
	brgerst, torvalds, peterz, tglx

Commit-ID:  bf9f2ee28d475ada0005c59382852cb70f1419ac
Gitweb:     http://git.kernel.org/tip/bf9f2ee28d475ada0005c59382852cb70f1419ac
Author:     Andy Lutomirski <luto@kernel.org>
AuthorDate: Mon, 20 Jul 2015 11:52:23 -0700
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Tue, 21 Jul 2015 08:02:32 +0200

x86/nmi: Remove the 'b2b' parameter from nmi_handle()

It has never had any effect. Remove it for comprehensibility.

Signed-off-by: Andy Lutomirski <luto@kernel.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/c91fa38507760d9e54a4b8737fa6409bde896b33.1437418322.git.luto@kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 arch/x86/kernel/nmi.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c
index c3e985d..f76d650 100644
--- a/arch/x86/kernel/nmi.c
+++ b/arch/x86/kernel/nmi.c
@@ -110,7 +110,7 @@ static void nmi_max_handler(struct irq_work *w)
 		a->handler, whole_msecs, decimal_msecs);
 }
 
-static int nmi_handle(unsigned int type, struct pt_regs *regs, bool b2b)
+static int nmi_handle(unsigned int type, struct pt_regs *regs)
 {
 	struct nmi_desc *desc = nmi_to_desc(type);
 	struct nmiaction *a;
@@ -213,7 +213,7 @@ static void
 pci_serr_error(unsigned char reason, struct pt_regs *regs)
 {
 	/* check to see if anyone registered against these types of errors */
-	if (nmi_handle(NMI_SERR, regs, false))
+	if (nmi_handle(NMI_SERR, regs))
 		return;
 
 	pr_emerg("NMI: PCI system error (SERR) for reason %02x on CPU %d.\n",
@@ -247,7 +247,7 @@ io_check_error(unsigned char reason, struct pt_regs *regs)
 	unsigned long i;
 
 	/* check to see if anyone registered against these types of errors */
-	if (nmi_handle(NMI_IO_CHECK, regs, false))
+	if (nmi_handle(NMI_IO_CHECK, regs))
 		return;
 
 	pr_emerg(
@@ -284,7 +284,7 @@ unknown_nmi_error(unsigned char reason, struct pt_regs *regs)
 	 * as only the first one is ever run (unless it can actually determine
 	 * if it caused the NMI)
 	 */
-	handled = nmi_handle(NMI_UNKNOWN, regs, false);
+	handled = nmi_handle(NMI_UNKNOWN, regs);
 	if (handled) {
 		__this_cpu_add(nmi_stats.unknown, handled);
 		return;
@@ -332,7 +332,7 @@ static void default_do_nmi(struct pt_regs *regs)
 
 	__this_cpu_write(last_nmi_rip, regs->ip);
 
-	handled = nmi_handle(NMI_LOCAL, regs, b2b);
+	handled = nmi_handle(NMI_LOCAL, regs);
 	__this_cpu_add(nmi_stats.normal, handled);
 	if (handled) {
 		/*

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2015-07-21  9:38 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-07-20 18:52 [PATCH v2] x86/nmi: Remove the b2b parameter from nmi_handle Andy Lutomirski
2015-07-21  0:08 ` Andy Lutomirski
2015-07-21  9:37 ` [tip:x86/asm] x86/nmi: Remove the 'b2b' parameter from nmi_handle () tip-bot for Andy Lutomirski

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.