mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: heukelum@fastmail.fm
To: linux-kernel@vger.kernel.org, mingo@elte.hu, ak@suse.de
Cc: Alexander van Heukelum <heukelum@fastmail.fm>
Subject: [PATCH 4/24] i386: expand exception 3 DO_TRAP macro
Date: Tue,  9 Sep 2008 21:55:58 +0200	[thread overview]
Message-ID: <1220990178-29773-5-git-send-email-heukelum@fastmail.fm> (raw)
In-Reply-To: <1220990178-29773-4-git-send-email-heukelum@fastmail.fm>

From: Alexander van Heukelum <heukelum@fastmail.fm>

The int3 exception was already takes as an interrupt and
do_int3 does not fit in the new DO_ERROR macro. This patch
just expands the DO_TRAP macro and rearranges the code a
bit.

No functional changes intended.

Signed-off-by: Alexander van Heukelum <heukelum@fastmail.fm>
---
 arch/x86/kernel/traps_32.c |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/arch/x86/kernel/traps_32.c b/arch/x86/kernel/traps_32.c
index 97d193c..944641a 100644
--- a/arch/x86/kernel/traps_32.c
+++ b/arch/x86/kernel/traps_32.c
@@ -633,9 +633,6 @@ void do_##name(struct pt_regs *regs, long error_code)			\
 }
 
 DO_VM86_ERROR_INFO(0, SIGFPE, "divide error", divide_error, FPE_INTDIV, regs->ip)
-#ifndef CONFIG_KPROBES
-DO_VM86_TRAP(3, SIGTRAP, "int3", int3)
-#endif
 DO_VM86_TRAP(4, SIGSEGV, "overflow", overflow)
 DO_VM86_TRAP(5, SIGSEGV, "bounds", bounds)
 DO_TRAP_INFO(6, SIGILL, "invalid opcode", invalid_op, ILL_ILLOPN, regs->ip, 0)
@@ -907,9 +904,9 @@ void restart_nmi(void)
 	acpi_nmi_enable();
 }
 
-#ifdef CONFIG_KPROBES
 void __kprobes do_int3(struct pt_regs *regs, long error_code)
 {
+#ifdef CONFIG_KPROBES
 	trace_hardirqs_fixup();
 
 	if (notify_die(DIE_INT3, "int3", regs, error_code, 3, SIGTRAP)
@@ -920,10 +917,14 @@ void __kprobes do_int3(struct pt_regs *regs, long error_code)
 	 * disabled. Normal trap handlers don't.
 	 */
 	conditional_sti(regs);
+#else
+	if (notify_die(DIE_TRAP, "int3", regs, error_code, 3, SIGTRAP)
+			== NOTIFY_STOP)
+		return;
+#endif
 
 	do_trap(3, SIGTRAP, "int3", 1, regs, error_code, NULL);
 }
-#endif
 
 /*
  * Our handling of the processor debug registers is non-trivial.
-- 
1.5.4.3


  reply	other threads:[~2008-09-10  0:42 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-09-09 19:55 [RFC/PATCH] i386: handle all exceptions with interrupts off initially heukelum
2008-09-09 19:55 ` [PATCH 1/24] i386: remove kprobes' restore_interrupts in favour of conditional_sti heukelum
2008-09-09 19:55   ` [PATCH 2/24] i386: prepare to convert exceptions to interrupts heukelum
2008-09-09 19:55     ` [PATCH 3/24] i386: convert hardware exception 0 to an interrupt gate heukelum
2008-09-09 19:55       ` heukelum [this message]
2008-09-09 19:55         ` [PATCH 5/24] i386: convert hardware exception 4 " heukelum
2008-09-09 19:56           ` [PATCH 6/24] i386: convert hardware exception 5 " heukelum
2008-09-09 19:56             ` [PATCH 7/24] i386: convert hardware exception 6 " heukelum
2008-09-09 19:56               ` [PATCH 8/24] i386: convert hardware exception 7 " heukelum
2008-09-09 19:56                 ` [PATCH 9/24] i386: convert hardware exception 9 " heukelum
2008-09-09 19:56                   ` [PATCH 10/24] i386: convert hardware exception 10 " heukelum
2008-09-09 19:56                     ` [PATCH 11/24] i386: convert hardware exception 11 " heukelum
2008-09-09 19:56                       ` [PATCH 12/24] i386: convert hardware exception 12 " heukelum
2008-09-09 19:56                         ` [PATCH 13/24] i386: convert hardware exception 13 " heukelum
2008-09-09 19:56                           ` [PATCH 14/24] i386: convert hardware exception 15 " heukelum
2008-09-09 19:56                             ` [PATCH 15/24] i386: convert hardware exception 16 " heukelum
2008-09-09 19:56                               ` [PATCH 16/24] i386: convert hardware exception 17 " heukelum
2008-09-09 19:56                                 ` [PATCH 17/24] i386: convert hardware exception 18 " heukelum
2008-09-09 19:56                                   ` [PATCH 18/24] i386: convert hardware exception 19 " heukelum
2008-09-09 19:56                                     ` [PATCH 19/24] i386: remove temporary DO_TRAP macros, expanding the last one used heukelum
2008-09-09 19:56                                       ` [PATCH 20/24] i386: add TRACE_IRQS_OFF to entry_32.S in 'error_code' heukelum
2008-09-09 19:56                                         ` [PATCH 21/24] i386: add TRACE_IRQS_OFF for exception 1 (debug) heukelum
2008-09-09 19:56                                           ` [PATCH 22/24] i386: add TRACE_IRQS_OFF for the nmi heukelum
2008-09-09 19:56                                             ` [PATCH 23/24] i386: add TRACE_IRQS_OFF for the exception 3 (int3) heukelum
2008-09-09 19:56                                               ` [PATCH 24/24] i386: trace_hardirqs_fixup should now not be necessary: irqs are off heukelum
2009-01-12 17:21                                             ` [PATCH 22/24] i386: add TRACE_IRQS_OFF for the nmi Peter Zijlstra
2009-01-12 18:39                                               ` Ingo Molnar
2009-01-12 18:43                                                 ` Peter Zijlstra
2009-01-12 20:50                                                   ` Alexander van Heukelum
2008-09-10  3:27 ` [RFC/PATCH] i386: handle all exceptions with interrupts off initially H. Peter Anvin
2008-09-10  5:53   ` Ingo Molnar
2008-09-10  5:59     ` H. Peter Anvin
2008-09-10  7:00       ` Ingo Molnar
2008-09-10  7:24         ` Ingo Molnar
2008-09-10  9:36           ` Alexander van Heukelum

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=1220990178-29773-5-git-send-email-heukelum@fastmail.fm \
    --to=heukelum@fastmail.fm \
    --cc=ak@suse.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@elte.hu \
    /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

all inboxes | Powered by JetHome®