* [PATCH] Kprobes: wrapper to define jprobe.entry
@ 2004-11-18 10:26 Ananth N Mavinakayanahalli
2004-11-18 22:47 ` Andrew Morton
0 siblings, 1 reply; 6+ messages in thread
From: Ananth N Mavinakayanahalli @ 2004-11-18 10:26 UTC (permalink / raw)
To: linux-kernel; +Cc: linuxppc64-dev, akpm, davem, prasanna, suparna
Hi,
Here is a patch that adds a wrapper for defining jprobe.entry to make
it easy to handle the three dword function descriptors defined by the
PowerPC ELF ABI.
Current patch against 2.6.10-rc2-mm1 + kprobes patch for ppc64.
Changes for adding this wrapper for x86, ppc64 (tested) and x86_64
(untested) below. The earlier method of defining jprobe.entry will
continue to work.
Here is a pseudocode snippet to use jprobes with this patch.
............
struct jprobe jp;
jtcp_v4_rcv(struct skbuff *skb)
{
/* decode and log skb related details as required */
jprobe_return();
return 0;
}
init_module
{
jp.kp.addr = (kprobe_opcode_t *)<addr of tcp_v4_rcv>;
jp.entry = JPROBE_ENTRY(jtcp_v4_rcv);
register_jprobe(&jp);
return 0;
}
cleanup_module
{
unregister_jprobe(&jp);
}
............
Dave,
I am not aware of the semantics for sparc64 for making this change.
Thanks,
Ananth
Signed-off-by: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
diff -Naurp temp/linux-2.6.10-rc2/include/asm-i386/kprobes.h linux-2.6.10-rc2/include/asm-i386/kprobes.h
--- temp/linux-2.6.10-rc2/include/asm-i386/kprobes.h 2004-11-15 06:57:53.000000000 +0530
+++ linux-2.6.10-rc2/include/asm-i386/kprobes.h 2004-11-18 12:28:03.873952360 +0530
@@ -38,6 +38,8 @@ typedef u8 kprobe_opcode_t;
? (MAX_STACK_SIZE) \
: (((unsigned long)current_thread_info()) + THREAD_SIZE - (ADDR)))
+#define JPROBE_ENTRY(pentry) (kprobe_opcode_t *)pentry
+
/* Architecture specific copy of original instruction*/
struct arch_specific_insn {
/* copy of the original instruction */
diff -Naurp temp/linux-2.6.10-rc2/include/asm-ppc64/kprobes.h linux-2.6.10-rc2/include/asm-ppc64/kprobes.h
--- temp/linux-2.6.10-rc2/include/asm-ppc64/kprobes.h 2004-11-18 12:26:43.236962848 +0530
+++ linux-2.6.10-rc2/include/asm-ppc64/kprobes.h 2004-11-18 12:28:03.875952056 +0530
@@ -35,6 +35,8 @@ typedef unsigned int kprobe_opcode_t;
#define BREAKPOINT_INSTRUCTION 0x7fe00008 /* trap */
#define MAX_INSN_SIZE 1
+#define JPROBE_ENTRY(pentry) (kprobe_opcode_t *)((func_descr_t *)pentry)
+
/* Architecture specific copy of original instruction */
struct arch_specific_insn {
/* copy of original instruction */
diff -Naurp temp/linux-2.6.10-rc2/include/asm-x86_64/kprobes.h linux-2.6.10-rc2/include/asm-x86_64/kprobes.h
--- temp/linux-2.6.10-rc2/include/asm-x86_64/kprobes.h 2004-11-15 06:56:41.000000000 +0530
+++ linux-2.6.10-rc2/include/asm-x86_64/kprobes.h 2004-11-18 12:28:03.877951752 +0530
@@ -37,6 +37,8 @@ typedef u8 kprobe_opcode_t;
? (MAX_STACK_SIZE) \
: (((unsigned long)current_thread_info()) + THREAD_SIZE - (ADDR)))
+#define JPROBE_ENTRY(pentry) (kprobe_opcode_t *)pentry
+
/* Architecture specific copy of original instruction*/
struct arch_specific_insn {
/* copy of the original instruction */
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Kprobes: wrapper to define jprobe.entry
2004-11-18 22:47 ` Andrew Morton
@ 2004-11-18 22:43 ` David S. Miller
2004-11-19 6:52 ` Ananth N Mavinakayanahalli
1 sibling, 0 replies; 6+ messages in thread
From: David S. Miller @ 2004-11-18 22:43 UTC (permalink / raw)
To: Andrew Morton; +Cc: ananth, linux-kernel, linuxppc64-dev, prasanna, suparna
On Thu, 18 Nov 2004 14:47:46 -0800
Andrew Morton <akpm@osdl.org> wrote:
> Ananth N Mavinakayanahalli <ananth@in.ibm.com> wrote:
> > Changes for adding this wrapper for x86, ppc64 (tested) and x86_64
> > (untested) below. The earlier method of defining jprobe.entry will
> > continue to work.
>
> So what should I do with this? I'm inclined to drop it until the x86_64
> part has been tested and Dave has had a go at the sparc64 version.
Yes, now that we have kprobe support on 4 platforms, it is important
that anyone who changes public parts of this interface do the necessary
per-platform fixups necessary to coincide with such changes.
I think the person changing the data type should be the one fixing
up sparc64 :-)
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Kprobes: wrapper to define jprobe.entry
2004-11-18 10:26 [PATCH] Kprobes: wrapper to define jprobe.entry Ananth N Mavinakayanahalli
@ 2004-11-18 22:47 ` Andrew Morton
2004-11-18 22:43 ` David S. Miller
2004-11-19 6:52 ` Ananth N Mavinakayanahalli
0 siblings, 2 replies; 6+ messages in thread
From: Andrew Morton @ 2004-11-18 22:47 UTC (permalink / raw)
To: ananth; +Cc: linux-kernel, linuxppc64-dev, davem, prasanna, suparna
Ananth N Mavinakayanahalli <ananth@in.ibm.com> wrote:
>
> Here is a patch that adds a wrapper for defining jprobe.entry to make
> it easy to handle the three dword function descriptors defined by the
> PowerPC ELF ABI.
>
> Current patch against 2.6.10-rc2-mm1 + kprobes patch for ppc64.
I don't have the kprobes-for-ppc64 patch here.
> Changes for adding this wrapper for x86, ppc64 (tested) and x86_64
> (untested) below. The earlier method of defining jprobe.entry will
> continue to work.
So what should I do with this? I'm inclined to drop it until the x86_64
part has been tested and Dave has had a go at the sparc64 version.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Kprobes: wrapper to define jprobe.entry
2004-11-18 22:47 ` Andrew Morton
2004-11-18 22:43 ` David S. Miller
@ 2004-11-19 6:52 ` Ananth N Mavinakayanahalli
2004-11-19 7:05 ` Andrew Morton
1 sibling, 1 reply; 6+ messages in thread
From: Ananth N Mavinakayanahalli @ 2004-11-19 6:52 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-kernel, linuxppc64-dev, davem, prasanna, suparna
On Thu, Nov 18, 2004 at 02:47:46PM -0800, Andrew Morton wrote:
> Ananth N Mavinakayanahalli <ananth@in.ibm.com> wrote:
Hi Andrew,
> >
> > Here is a patch that adds a wrapper for defining jprobe.entry to make
> > it easy to handle the three dword function descriptors defined by the
> > PowerPC ELF ABI.
> >
> > Current patch against 2.6.10-rc2-mm1 + kprobes patch for ppc64.
>
> I don't have the kprobes-for-ppc64 patch here.
>
> > Changes for adding this wrapper for x86, ppc64 (tested) and x86_64
> > (untested) below. The earlier method of defining jprobe.entry will
> > continue to work.
>
> So what should I do with this? I'm inclined to drop it until the x86_64
> part has been tested and Dave has had a go at the sparc64 version.
I have now tested the patch succesfully on x86_64 and updated it for
sparc64 too (Dave says the change looks good).
Please apply.
Thanks,
Ananth
Signed-off-by: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
diff -Naurp temp/linux-2.6.10-rc2/include/asm-i386/kprobes.h linux-2.6.10-rc2/include/asm-i386/kprobes.h
--- temp/linux-2.6.10-rc2/include/asm-i386/kprobes.h 2004-11-19 10:14:44.000000000 +0530
+++ linux-2.6.10-rc2/include/asm-i386/kprobes.h 2004-11-19 10:05:16.000000000 +0530
@@ -38,6 +38,8 @@ typedef u8 kprobe_opcode_t;
? (MAX_STACK_SIZE) \
: (((unsigned long)current_thread_info()) + THREAD_SIZE - (ADDR)))
+#define JPROBE_ENTRY(pentry) (kprobe_opcode_t *)pentry
+
/* Architecture specific copy of original instruction*/
struct arch_specific_insn {
/* copy of the original instruction */
diff -Naurp temp/linux-2.6.10-rc2/include/asm-ppc64/kprobes.h linux-2.6.10-rc2/include/asm-ppc64/kprobes.h
--- temp/linux-2.6.10-rc2/include/asm-ppc64/kprobes.h 2004-11-19 10:14:44.000000000 +0530
+++ linux-2.6.10-rc2/include/asm-ppc64/kprobes.h 2004-11-19 10:05:16.000000000 +0530
@@ -35,6 +35,8 @@ typedef unsigned int kprobe_opcode_t;
#define BREAKPOINT_INSTRUCTION 0x7fe00008 /* trap */
#define MAX_INSN_SIZE 1
+#define JPROBE_ENTRY(pentry) (kprobe_opcode_t *)((func_descr_t *)pentry)
+
/* Architecture specific copy of original instruction */
struct arch_specific_insn {
/* copy of original instruction */
diff -Naurp temp/linux-2.6.10-rc2/include/asm-sparc64/kprobes.h linux-2.6.10-rc2/include/asm-sparc64/kprobes.h
--- temp/linux-2.6.10-rc2/include/asm-sparc64/kprobes.h 2004-11-15 06:57:53.000000000 +0530
+++ linux-2.6.10-rc2/include/asm-sparc64/kprobes.h 2004-11-19 10:07:24.000000000 +0530
@@ -10,6 +10,8 @@ typedef u32 kprobe_opcode_t;
#define BREAKPOINT_INSTRUCTION_2 0x91d02071 /* ta 0x71 */
#define MAX_INSN_SIZE 2
+#define JPROBE_ENTRY(pentry) (kprobe_opcode_t *)pentry
+
/* Architecture specific copy of original instruction*/
struct arch_specific_insn {
/* copy of the original instruction */
diff -Naurp temp/linux-2.6.10-rc2/include/asm-x86_64/kprobes.h linux-2.6.10-rc2/include/asm-x86_64/kprobes.h
--- temp/linux-2.6.10-rc2/include/asm-x86_64/kprobes.h 2004-11-19 10:14:44.000000000 +0530
+++ linux-2.6.10-rc2/include/asm-x86_64/kprobes.h 2004-11-19 10:05:16.000000000 +0530
@@ -37,6 +37,8 @@ typedef u8 kprobe_opcode_t;
? (MAX_STACK_SIZE) \
: (((unsigned long)current_thread_info()) + THREAD_SIZE - (ADDR)))
+#define JPROBE_ENTRY(pentry) (kprobe_opcode_t *)pentry
+
/* Architecture specific copy of original instruction*/
struct arch_specific_insn {
/* copy of the original instruction */
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Kprobes: wrapper to define jprobe.entry
2004-11-19 6:52 ` Ananth N Mavinakayanahalli
@ 2004-11-19 7:05 ` Andrew Morton
2004-11-19 9:03 ` Ananth N Mavinakayanahalli
0 siblings, 1 reply; 6+ messages in thread
From: Andrew Morton @ 2004-11-19 7:05 UTC (permalink / raw)
To: ananth; +Cc: linux-kernel, linuxppc64-dev, davem, prasanna, suparna
Ananth N Mavinakayanahalli <ananth@in.ibm.com> wrote:
>
> > >
> > > Here is a patch that adds a wrapper for defining jprobe.entry to make
> > > it easy to handle the three dword function descriptors defined by the
> > > PowerPC ELF ABI.
> > >
> > > Current patch against 2.6.10-rc2-mm1 + kprobes patch for ppc64.
> >
> > I don't have the kprobes-for-ppc64 patch here.
> >
> > > Changes for adding this wrapper for x86, ppc64 (tested) and x86_64
> > > (untested) below. The earlier method of defining jprobe.entry will
> > > continue to work.
> >
> > So what should I do with this? I'm inclined to drop it until the x86_64
> > part has been tested and Dave has had a go at the sparc64 version.
>
> I have now tested the patch succesfully on x86_64 and updated it for
> sparc64 too (Dave says the change looks good).
What is the review and testing status of the kprobes-for-ppc64 patch which
you sent?
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Kprobes: wrapper to define jprobe.entry
2004-11-19 7:05 ` Andrew Morton
@ 2004-11-19 9:03 ` Ananth N Mavinakayanahalli
0 siblings, 0 replies; 6+ messages in thread
From: Ananth N Mavinakayanahalli @ 2004-11-19 9:03 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-kernel, linuxppc64-dev, davem, prasanna, suparna
On Thu, Nov 18, 2004 at 11:05:06PM -0800, Andrew Morton wrote:
> Ananth N Mavinakayanahalli <ananth@in.ibm.com> wrote:
> >
> > > >
> > > > Here is a patch that adds a wrapper for defining jprobe.entry to make
> > > > it easy to handle the three dword function descriptors defined by the
> > > > PowerPC ELF ABI.
> > > >
> > > > Current patch against 2.6.10-rc2-mm1 + kprobes patch for ppc64.
> > >
> > > I don't have the kprobes-for-ppc64 patch here.
> > >
> > > > Changes for adding this wrapper for x86, ppc64 (tested) and x86_64
> > > > (untested) below. The earlier method of defining jprobe.entry will
> > > > continue to work.
> > >
> > > So what should I do with this? I'm inclined to drop it until the x86_64
> > > part has been tested and Dave has had a go at the sparc64 version.
> >
> > I have now tested the patch succesfully on x86_64 and updated it for
> > sparc64 too (Dave says the change looks good).
>
> What is the review and testing status of the kprobes-for-ppc64 patch which
> you sent?
>
The patch was earlier posted on the PPC64 mailing list for comments and
Paul had reviewed it. I had to update the patch to take care of the base
kprobe changes that were made to accomodate the x86_64 port.
The patch is tested on POWER3 (uni) and POWER4 (lpar).
Thanks,
Ananth
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2004-11-19 9:10 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-11-18 10:26 [PATCH] Kprobes: wrapper to define jprobe.entry Ananth N Mavinakayanahalli
2004-11-18 22:47 ` Andrew Morton
2004-11-18 22:43 ` David S. Miller
2004-11-19 6:52 ` Ananth N Mavinakayanahalli
2004-11-19 7:05 ` Andrew Morton
2004-11-19 9:03 ` Ananth N Mavinakayanahalli
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox