From: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
To: akpm@linux-foundation.org, Ingo Molnar <mingo@elte.hu>,
linux-kernel@vger.kernel.org
Cc: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>,
Ananth N Mavinakayanahalli <ananth@in.ibm.com>,
Christoph Hellwig <hch@infradead.org>,
prasanna@in.ibm.com, anil.s.keshavamurthy@intel.com,
davem@davemloft.net, Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>
Subject: [patch 19/24] Immediate Values - Move Kprobes x86 restore_interrupt to kdebug.h
Date: Thu, 20 Dec 2007 20:54:57 -0500 [thread overview]
Message-ID: <20071221015728.865660524@polymtl.ca> (raw)
In-Reply-To: 20071221015438.433195466@polymtl.ca
[-- Attachment #1: immediate-values-move-kprobes-x86-restore-interrupt-to-kdebug-h.patch --]
[-- Type: text/plain, Size: 3383 bytes --]
Since the breakpoint handler is useful both to kprobes and immediate values, it
makes sense to make the required restore_interrupt() available through
asm-i386/kdebug.h.
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Acked-by: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
CC: Christoph Hellwig <hch@infradead.org>
CC: prasanna@in.ibm.com
CC: anil.s.keshavamurthy@intel.com
CC: davem@davemloft.net
CC: Thomas Gleixner <tglx@linutronix.de>
CC: Ingo Molnar <mingo@redhat.com>
CC: H. Peter Anvin <hpa@zytor.com>
---
include/asm-x86/kdebug.h | 12 ++++++++++++
include/asm-x86/kprobes_32.h | 9 ---------
include/asm-x86/kprobes_64.h | 9 ---------
3 files changed, 12 insertions(+), 18 deletions(-)
Index: linux-2.6-lttng/include/asm-x86/kdebug.h
===================================================================
--- linux-2.6-lttng.orig/include/asm-x86/kdebug.h 2007-11-02 15:01:53.000000000 -0400
+++ linux-2.6-lttng/include/asm-x86/kdebug.h 2007-11-02 15:02:00.000000000 -0400
@@ -3,6 +3,9 @@
#include <linux/notifier.h>
+#include <linux/ptrace.h>
+#include <asm/system.h>
+
struct pt_regs;
/* Grossly misnamed. */
@@ -30,4 +33,13 @@ extern void dump_pagetable(unsigned long
extern unsigned long oops_begin(void);
extern void oops_end(unsigned long);
+/* trap3/1 are intr gates for kprobes. So, restore the status of IF,
+ * if necessary, before executing the original int3/1 (trap) handler.
+ */
+static inline void restore_interrupts(struct pt_regs *regs)
+{
+ if (regs->eflags & IF_MASK)
+ local_irq_enable();
+}
+
#endif
Index: linux-2.6-lttng/include/asm-x86/kprobes_32.h
===================================================================
--- linux-2.6-lttng.orig/include/asm-x86/kprobes_32.h 2007-11-02 15:01:53.000000000 -0400
+++ linux-2.6-lttng/include/asm-x86/kprobes_32.h 2007-11-02 15:02:00.000000000 -0400
@@ -79,15 +79,6 @@ struct kprobe_ctlblk {
struct prev_kprobe prev_kprobe;
};
-/* trap3/1 are intr gates for kprobes. So, restore the status of IF,
- * if necessary, before executing the original int3/1 (trap) handler.
- */
-static inline void restore_interrupts(struct pt_regs *regs)
-{
- if (regs->eflags & IF_MASK)
- local_irq_enable();
-}
-
extern int kprobe_exceptions_notify(struct notifier_block *self,
unsigned long val, void *data);
extern int kprobe_fault_handler(struct pt_regs *regs, int trapnr);
Index: linux-2.6-lttng/include/asm-x86/kprobes_64.h
===================================================================
--- linux-2.6-lttng.orig/include/asm-x86/kprobes_64.h 2007-11-02 15:02:10.000000000 -0400
+++ linux-2.6-lttng/include/asm-x86/kprobes_64.h 2007-11-02 15:02:22.000000000 -0400
@@ -72,15 +72,6 @@ struct kprobe_ctlblk {
struct prev_kprobe prev_kprobe;
};
-/* trap3/1 are intr gates for kprobes. So, restore the status of IF,
- * if necessary, before executing the original int3/1 (trap) handler.
- */
-static inline void restore_interrupts(struct pt_regs *regs)
-{
- if (regs->eflags & IF_MASK)
- local_irq_enable();
-}
-
extern int post_kprobe_handler(struct pt_regs *regs);
extern int kprobe_fault_handler(struct pt_regs *regs, int trapnr);
extern int kprobe_handler(struct pt_regs *regs);
--
Mathieu Desnoyers
Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal
OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68
next prev parent reply other threads:[~2007-12-21 2:00 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-12-21 1:54 [patch 00/24] Markers use immediate values, for 2.6.24-rc5-mm1 Mathieu Desnoyers
2007-12-21 1:54 ` [patch 01/24] Kprobes - use a mutex to protect the instruction pages list Mathieu Desnoyers
2007-12-21 1:54 ` [patch 02/24] Kprobes - do not use kprobes mutex in arch code Mathieu Desnoyers
2007-12-21 1:54 ` [patch 03/24] Kprobes - declare kprobe_mutex static Mathieu Desnoyers
2007-12-21 1:54 ` [patch 04/24] Add INIT_ARRAY() to kernel.h Mathieu Desnoyers
2007-12-21 1:54 ` [patch 05/24] Text Edit Lock - Architecture Independent Code Mathieu Desnoyers
2007-12-21 5:18 ` zhangxiliang
2007-12-21 6:01 ` zhangxiliang
2007-12-21 13:46 ` Mathieu Desnoyers
2007-12-21 1:54 ` [patch 06/24] Text Edit Lock - Alternative code for x86 Mathieu Desnoyers
2007-12-21 1:54 ` [patch 07/24] Text Edit Lock - kprobes architecture independent support Mathieu Desnoyers
2007-12-21 1:54 ` [patch 08/24] Text Edit Lock - kprobes x86_32 Mathieu Desnoyers
2007-12-21 1:54 ` [patch 09/24] Text Edit Lock - kprobes x86_64 Mathieu Desnoyers
2007-12-21 1:54 ` [patch 10/24] Text Edit Lock - x86_32 standardize debug rodata Mathieu Desnoyers
2007-12-21 1:54 ` [patch 11/24] Text Edit Lock - x86_64 " Mathieu Desnoyers
2007-12-21 1:54 ` [patch 12/24] Immediate Values - Architecture Independent Code Mathieu Desnoyers
2007-12-21 1:54 ` [patch 13/24] Immediate Values - Kconfig menu in EMBEDDED Mathieu Desnoyers
2007-12-21 1:54 ` [patch 14/24] Immediate Values - x86 Optimization Mathieu Desnoyers
2007-12-21 2:56 ` H. Peter Anvin
2007-12-21 3:19 ` Mathieu Desnoyers
2007-12-21 3:30 ` H. Peter Anvin
2007-12-21 13:16 ` [patch 14/24] Immediate Values - x86 Optimization (updated) Mathieu Desnoyers
2007-12-21 13:19 ` Mathieu Desnoyers
2007-12-21 1:54 ` [patch 15/24] Add text_poke and sync_core to powerpc Mathieu Desnoyers
2007-12-21 1:54 ` [patch 16/24] Immediate Values - Powerpc Optimization Mathieu Desnoyers
2007-12-21 1:54 ` [patch 17/24] Immediate Values - Documentation Mathieu Desnoyers
2007-12-21 1:54 ` [patch 18/24] Scheduler Profiling - Use Immediate Values Mathieu Desnoyers
2007-12-21 1:54 ` Mathieu Desnoyers [this message]
2007-12-21 1:54 ` [patch 20/24] Add __discard section to x86 Mathieu Desnoyers
2007-12-21 1:54 ` [patch 21/24] Immediate Values - x86 Optimization NMI and MCE support Mathieu Desnoyers
2007-12-21 13:25 ` [patch 21/24] Immediate Values - x86 Optimization NMI and MCE support (updated) Mathieu Desnoyers
2007-12-21 1:55 ` [patch 22/24] Immediate Values - Powerpc Optimization NMI MCE support Mathieu Desnoyers
2007-12-21 1:55 ` [patch 23/24] Immediate Values Use Arch NMI and MCE Support Mathieu Desnoyers
2007-12-21 1:55 ` [patch 24/24] Linux Kernel Markers - Use Immediate Values Mathieu Desnoyers
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=20071221015728.865660524@polymtl.ca \
--to=mathieu.desnoyers@polymtl.ca \
--cc=akpm@linux-foundation.org \
--cc=ananth@in.ibm.com \
--cc=anil.s.keshavamurthy@intel.com \
--cc=davem@davemloft.net \
--cc=hch@infradead.org \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=mingo@redhat.com \
--cc=prasanna@in.ibm.com \
--cc=tglx@linutronix.de \
/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