linux-arch.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-arch@vger.kernel.org,
	Ananth N Mavinakayanahalli <ananth@in.ibm.com>,
	x86@kernel.org, lkml <linux-kernel@vger.kernel.org>,
	"Steven Rostedt (Red Hat)" <rostedt@goodmis.org>,
	virtualization@lists.linux-foundation.org,
	"David S. Miller" <davem@davemloft.net>
Subject: [PATCH -tip RFC v2 05/22] kprobes: Use NOKPROBE_SYMBOL() in sample modules
Date: Fri, 15 Nov 2013 04:53:30 +0000	[thread overview]
Message-ID: <20131115045330.27580.7377.stgit@kbuild-fedora.novalocal> (raw)
In-Reply-To: <20131115045312.27580.95902.stgit@kbuild-fedora.novalocal>

Use NOKPROBE_SYMBOL() to protect handlers from kprobes
in sample modules.

Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Ananth N Mavinakayanahalli <ananth@in.ibm.com>
---
 samples/kprobes/jprobe_example.c    |    1 +
 samples/kprobes/kprobe_example.c    |    3 +++
 samples/kprobes/kretprobe_example.c |    2 ++
 3 files changed, 6 insertions(+)

diff --git a/samples/kprobes/jprobe_example.c b/samples/kprobes/jprobe_example.c
index b754135..40114ac 100644
--- a/samples/kprobes/jprobe_example.c
+++ b/samples/kprobes/jprobe_example.c
@@ -35,6 +35,7 @@ static long jdo_fork(unsigned long clone_flags, unsigned long stack_start,
 	jprobe_return();
 	return 0;
 }
+NOKPROBE_SYMBOL(jdo_fork);
 
 static struct jprobe my_jprobe = {
 	.entry			= jdo_fork,
diff --git a/samples/kprobes/kprobe_example.c b/samples/kprobes/kprobe_example.c
index 366db1a..462d90f 100644
--- a/samples/kprobes/kprobe_example.c
+++ b/samples/kprobes/kprobe_example.c
@@ -46,6 +46,7 @@ static int handler_pre(struct kprobe *p, struct pt_regs *regs)
 	/* A dump_stack() here will give a stack backtrace */
 	return 0;
 }
+NOKPROBE_SYMBOL(handler_pre);
 
 /* kprobe post_handler: called after the probed instruction is executed */
 static void handler_post(struct kprobe *p, struct pt_regs *regs,
@@ -68,6 +69,7 @@ static void handler_post(struct kprobe *p, struct pt_regs *regs,
 		p->addr, regs->ex1);
 #endif
 }
+NOKPROBE_SYMBOL(handler_post);
 
 /*
  * fault_handler: this is called if an exception is generated for any
@@ -81,6 +83,7 @@ static int handler_fault(struct kprobe *p, struct pt_regs *regs, int trapnr)
 	/* Return 0 because we don't handle the fault. */
 	return 0;
 }
+NOKPROBE_SYMBOL(handler_fault);
 
 static int __init kprobe_init(void)
 {
diff --git a/samples/kprobes/kretprobe_example.c b/samples/kprobes/kretprobe_example.c
index 1041b67..d932c52 100644
--- a/samples/kprobes/kretprobe_example.c
+++ b/samples/kprobes/kretprobe_example.c
@@ -47,6 +47,7 @@ static int entry_handler(struct kretprobe_instance *ri, struct pt_regs *regs)
 	data->entry_stamp = ktime_get();
 	return 0;
 }
+NOKPROBE_SYMBOL(entry_handler);
 
 /*
  * Return-probe handler: Log the return value and duration. Duration may turn
@@ -66,6 +67,7 @@ static int ret_handler(struct kretprobe_instance *ri, struct pt_regs *regs)
 			func_name, retval, (long long)delta);
 	return 0;
 }
+NOKPROBE_SYMBOL(ret_handler);
 
 static struct kretprobe my_kretprobe = {
 	.handler		= ret_handler,

  parent reply	other threads:[~2013-11-15  4:53 UTC|newest]

Thread overview: 50+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-11-15  4:53 [PATCH -tip RFC v2 00/22] kprobes: introduce NOKPROBE_SYMBOL() and general cleaning of kprobe blacklist Masami Hiramatsu
2013-11-15  4:53 ` Masami Hiramatsu
2013-11-15  4:53 ` [PATCH -tip RFC v2 01/22] kprobes: Prohibit probing on .entry.text code Masami Hiramatsu
2013-11-15  4:53   ` Masami Hiramatsu
2013-11-15 16:43   ` Steven Rostedt
2013-11-15 16:43     ` Steven Rostedt
2013-11-15 17:46     ` Geert Uytterhoeven
2013-11-17  7:21       ` Masami Hiramatsu
2013-11-17  7:21         ` Masami Hiramatsu
2013-11-15  4:53 ` [PATCH -tip RFC v2 02/22] kprobes: Introduce NOKPROBE_SYMBOL() macro for blacklist Masami Hiramatsu
2013-11-15  4:53   ` Masami Hiramatsu
2013-11-15  4:53 ` [PATCH -tip RFC v2 03/22] kprobes: Show blacklist entries via debugfs Masami Hiramatsu
2013-11-15  4:53   ` Masami Hiramatsu
2013-11-15  4:53 ` [PATCH -tip RFC v2 04/22] kprobes: Support blacklist functions in module Masami Hiramatsu
2013-11-15  4:53   ` Masami Hiramatsu
2013-11-15  4:53 ` Masami Hiramatsu [this message]
2013-11-15  4:53   ` [PATCH -tip RFC v2 05/22] kprobes: Use NOKPROBE_SYMBOL() in sample modules Masami Hiramatsu
2013-11-15  4:53 ` [PATCH -tip RFC v2 06/22] kprobes/x86: Allow probe on some kprobe preparation functions Masami Hiramatsu
2013-11-15  4:53   ` Masami Hiramatsu
2013-11-15  4:53 ` [PATCH -tip RFC v2 07/22] kprobes/x86: Use NOKPROBE_SYMBOL instead of __kprobes Masami Hiramatsu
2013-11-15  4:53   ` Masami Hiramatsu
2013-11-15  4:53 ` [PATCH -tip RFC v2 08/22] kprobes: Allow probe on some kprobe functions Masami Hiramatsu
2013-11-15  4:53   ` Masami Hiramatsu
2013-11-15  4:53 ` [PATCH -tip RFC v2 09/22] kprobes: Use NOKPROBE_SYMBOL macro instead of __kprobes Masami Hiramatsu
2013-11-15  4:53   ` Masami Hiramatsu
2013-11-15  4:53 ` [PATCH -tip RFC v2 10/22] ftrace/kprobes: Allow probing on some preparation functions Masami Hiramatsu
2013-11-15  4:53   ` Masami Hiramatsu
2013-11-15  4:53 ` [PATCH -tip RFC v2 11/22] ftrace/kprobes: Use NOKPROBE_SYMBOL macro in ftrace Masami Hiramatsu
2013-11-15  4:53   ` Masami Hiramatsu
2013-11-15  4:53 ` [PATCH -tip RFC v2 12/22] x86/hw_breakpoint: Use NOKPROBE_SYMBOL macro in hw_breakpoint Masami Hiramatsu
2013-11-15  4:53 ` [PATCH -tip RFC v2 13/22] x86/trap: Use NOKPROBE_SYMBOL macro in trap.c Masami Hiramatsu
2013-11-15  4:53   ` Masami Hiramatsu
2013-11-15  4:53 ` [PATCH -tip RFC v2 14/22] x86/fault: Use NOKPROBE_SYMBOL macro in fault.c Masami Hiramatsu
2013-11-15  4:53   ` Masami Hiramatsu
2013-11-15  4:54 ` [PATCH -tip RFC v2 15/22] x86/alternative: Use NOKPROBE_SYMBOL macro in alternative.c Masami Hiramatsu
2013-11-15  4:54   ` Masami Hiramatsu
2013-11-15  4:54 ` [PATCH -tip RFC v2 16/22] x86/nmi: Use NOKPROBE_SYMBOL macro for nmi handlers Masami Hiramatsu
2013-11-15  4:54   ` Masami Hiramatsu
2013-11-15  4:54 ` [PATCH -tip RFC v2 17/22] x86/kvm: Use NOKPROBE_SYMBOL macro in kvm.c Masami Hiramatsu
2013-11-15  4:54   ` Masami Hiramatsu
2013-11-15  4:54 ` [PATCH -tip RFC v2 18/22] x86/dumpstack: Use NOKPROBE_SYMBOL macro in dumpstack.c Masami Hiramatsu
2013-11-15  4:54   ` Masami Hiramatsu
2013-11-15  4:54 ` [PATCH -tip RFC v2 19/22] [BUGFIX] kprobes/x86: Prohibit probing on debug_stack_* Masami Hiramatsu
2013-11-15  4:54   ` Masami Hiramatsu
2013-11-15  4:54 ` [PATCH -tip RFC v2 20/22] [BUGFIX] kprobes: Prohibit probing on func_ptr_is_kernel_text Masami Hiramatsu
2013-11-15  4:54   ` Masami Hiramatsu
2013-11-15  4:54 ` [PATCH -tip RFC v2 21/22] notifier: Use NOKPROBE_SYMBOL macro in notifier Masami Hiramatsu
2013-11-15  4:54   ` Masami Hiramatsu
2013-11-15  4:54 ` [PATCH -tip RFC v2 22/22] sched: Use NOKPROBE_SYMBOL macro in sched Masami Hiramatsu
2013-11-15  4:54   ` Masami Hiramatsu

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=20131115045330.27580.7377.stgit@kbuild-fedora.novalocal \
    --to=masami.hiramatsu.pt@hitachi.com \
    --cc=ananth@in.ibm.com \
    --cc=davem@davemloft.net \
    --cc=linux-arch@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=rostedt@goodmis.org \
    --cc=virtualization@lists.linux-foundation.org \
    --cc=x86@kernel.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).