From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932477AbbHLQ5s (ORCPT ); Wed, 12 Aug 2015 12:57:48 -0400 Received: from mail-wi0-f181.google.com ([209.85.212.181]:37537 "EHLO mail-wi0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932195AbbHLQ5r (ORCPT ); Wed, 12 Aug 2015 12:57:47 -0400 From: Steve Capper To: linux-kernel@vger.kernel.org Cc: masami.hiramatsu.pt@hitachi.com, will.deacon@arm.com, sandeepa.s.prabhu@gmail.com, dave.long@linaro.org, catalin.marinas@arm.com, linux@arm.linux.org.uk, wcohen@redhat.com, tixy@linaro.org, ananth@in.ibm.com, anil.s.keshavamurthy@intel.com, davem@davemloft.net, broonie@kernel.org, Steve Capper Subject: [PATCH] kprobes: Update examples to target _do_fork Date: Wed, 12 Aug 2015 17:57:35 +0100 Message-Id: <1439398655-9357-1-git-send-email-steve.capper@linaro.org> X-Mailer: git-send-email 1.7.10.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In commit 3033f14ab78c ("clone: support passing tls argument via C rather than pt_regs magic"), the kernel calls _do_fork in places where it previously called do_fork. Unfortunately, the kprobe examples target do_fork; thus no events appear to fire when one runs the example modules. This commit updates the kprobe example code s.t. _do_fork is targeted instead, and the examples work as expected. Signed-off-by: Steve Capper --- samples/kprobes/jprobe_example.c | 8 ++++---- samples/kprobes/kprobe_example.c | 2 +- samples/kprobes/kretprobe_example.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/samples/kprobes/jprobe_example.c b/samples/kprobes/jprobe_example.c index 9119ac6..11dd54b 100644 --- a/samples/kprobes/jprobe_example.c +++ b/samples/kprobes/jprobe_example.c @@ -23,9 +23,9 @@ */ /* Proxy routine having the same arguments as actual do_fork() routine */ -static long jdo_fork(unsigned long clone_flags, unsigned long stack_start, +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) + 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); @@ -36,9 +36,9 @@ static long jdo_fork(unsigned long clone_flags, unsigned long stack_start, } static struct jprobe my_jprobe = { - .entry = jdo_fork, + .entry = j_do_fork, .kp = { - .symbol_name = "do_fork", + .symbol_name = "_do_fork", }, }; diff --git a/samples/kprobes/kprobe_example.c b/samples/kprobes/kprobe_example.c index 51d459c..597e101 100644 --- a/samples/kprobes/kprobe_example.c +++ b/samples/kprobes/kprobe_example.c @@ -16,7 +16,7 @@ /* For each probe you need to allocate a kprobe structure */ static struct kprobe kp = { - .symbol_name = "do_fork", + .symbol_name = "_do_fork", }; /* kprobe pre_handler: called just before the probed instruction is executed */ diff --git a/samples/kprobes/kretprobe_example.c b/samples/kprobes/kretprobe_example.c index 1041b67..a270535 100644 --- a/samples/kprobes/kretprobe_example.c +++ b/samples/kprobes/kretprobe_example.c @@ -25,7 +25,7 @@ #include #include -static char func_name[NAME_MAX] = "do_fork"; +static char func_name[NAME_MAX] = "_do_fork"; module_param_string(func, func_name, NAME_MAX, S_IRUGO); MODULE_PARM_DESC(func, "Function to kretprobe; this module will report the" " function's execution time"); -- 2.1.0