From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751835AbdJTMdj (ORCPT ); Fri, 20 Oct 2017 08:33:39 -0400 Received: from terminus.zytor.com ([65.50.211.136]:37713 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751031AbdJTMdh (ORCPT ); Fri, 20 Oct 2017 08:33:37 -0400 Date: Fri, 20 Oct 2017 05:27:00 -0700 From: tip-bot for Masami Hiramatsu Message-ID: Cc: ananth@linux.vnet.ibm.com, rostedt@goodmis.org, stephen@networkplumber.org, mingo@kernel.org, vyasevich@gmail.com, davem@davemloft.net, tglx@linutronix.de, ast@kernel.org, hpa@zytor.com, keescook@chromium.org, linux-kernel@vger.kernel.org, peterz@infradead.org, mhiramat@kernel.org, ian.mcdonald@jandi.co.nz, anil.s.keshavamurthy@intel.com, torvalds@linux-foundation.org, paulmck@linux.vnet.ibm.com Reply-To: davem@davemloft.net, tglx@linutronix.de, vyasevich@gmail.com, stephen@networkplumber.org, rostedt@goodmis.org, ananth@linux.vnet.ibm.com, mingo@kernel.org, anil.s.keshavamurthy@intel.com, torvalds@linux-foundation.org, paulmck@linux.vnet.ibm.com, ian.mcdonald@jandi.co.nz, mhiramat@kernel.org, linux-kernel@vger.kernel.org, peterz@infradead.org, ast@kernel.org, keescook@chromium.org, hpa@zytor.com In-Reply-To: <150724535709.5014.7261513316230565780.stgit@devbox> References: <150724535709.5014.7261513316230565780.stgit@devbox> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] kprobes: Remove the jprobes sample code Git-Commit-ID: 9be95bdc53c12ada23e39027237fd05e1393d893 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 9be95bdc53c12ada23e39027237fd05e1393d893 Gitweb: https://git.kernel.org/tip/9be95bdc53c12ada23e39027237fd05e1393d893 Author: Masami Hiramatsu AuthorDate: Fri, 6 Oct 2017 08:15:57 +0900 Committer: Ingo Molnar CommitDate: Fri, 20 Oct 2017 11:02:55 +0200 kprobes: Remove the jprobes sample code Remove the jprobes sample module because jprobes are deprecated. Signed-off-by: Masami Hiramatsu Cc: Alexei Starovoitov Cc: Ananth N Mavinakayanahalli Cc: Anil S Keshavamurthy Cc: David S . Miller Cc: Ian McDonald Cc: Kees Cook Cc: Linus Torvalds Cc: Paul E . McKenney Cc: Peter Zijlstra Cc: Stephen Hemminger Cc: Steven Rostedt Cc: Thomas Gleixner Cc: Vlad Yasevich Link: http://lkml.kernel.org/r/150724535709.5014.7261513316230565780.stgit@devbox Signed-off-by: Ingo Molnar --- samples/kprobes/Makefile | 2 +- samples/kprobes/jprobe_example.c | 67 ---------------------------------------- 2 files changed, 1 insertion(+), 68 deletions(-) diff --git a/samples/kprobes/Makefile b/samples/kprobes/Makefile index 68739bc..880e54d 100644 --- a/samples/kprobes/Makefile +++ b/samples/kprobes/Makefile @@ -1,5 +1,5 @@ # builds the kprobes example kernel modules; # then to use one (as root): insmod -obj-$(CONFIG_SAMPLE_KPROBES) += kprobe_example.o jprobe_example.o +obj-$(CONFIG_SAMPLE_KPROBES) += kprobe_example.o obj-$(CONFIG_SAMPLE_KRETPROBES) += kretprobe_example.o diff --git a/samples/kprobes/jprobe_example.c b/samples/kprobes/jprobe_example.c deleted file mode 100644 index e3c0a40..0000000 --- a/samples/kprobes/jprobe_example.c +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Here's a sample kernel module showing the use of jprobes to dump - * the arguments of _do_fork(). - * - * For more information on theory of operation of jprobes, see - * Documentation/kprobes.txt - * - * Build and insert the kernel module as done in the kprobe example. - * You will see the trace data in /var/log/messages and on the - * console whenever _do_fork() is invoked to create a new process. - * (Some messages may be suppressed if syslogd is configured to - * eliminate duplicate messages.) - */ - -#include -#include -#include - -/* - * Jumper probe for _do_fork. - * Mirror principle enables access to arguments of the probed routine - * from the probe handler. - */ - -/* Proxy routine having the same arguments as actual _do_fork() routine */ -static long j_do_fork(unsigned long clone_flags, unsigned long stack_start, - unsigned long stack_size, int __user *parent_tidptr, - int __user *child_tidptr, unsigned long tls) -{ - pr_info("jprobe: clone_flags = 0x%lx, stack_start = 0x%lx " - "stack_size = 0x%lx\n", clone_flags, stack_start, stack_size); - - /* Always end with a call to jprobe_return(). */ - jprobe_return(); - return 0; -} - -static struct jprobe my_jprobe = { - .entry = j_do_fork, - .kp = { - .symbol_name = "_do_fork", - }, -}; - -static int __init jprobe_init(void) -{ - int ret; - - ret = register_jprobe(&my_jprobe); - if (ret < 0) { - pr_err("register_jprobe failed, returned %d\n", ret); - return -1; - } - pr_info("Planted jprobe at %p, handler addr %p\n", - my_jprobe.kp.addr, my_jprobe.entry); - return 0; -} - -static void __exit jprobe_exit(void) -{ - unregister_jprobe(&my_jprobe); - pr_info("jprobe at %p unregistered\n", my_jprobe.kp.addr); -} - -module_init(jprobe_init) -module_exit(jprobe_exit) -MODULE_LICENSE("GPL");