Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752656AbdF0Ijc (ORCPT ); Tue, 27 Jun 2017 04:39:32 -0400 Received: from mail.kernel.org ([198.145.29.99]:53706 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752579AbdF0Iij (ORCPT ); Tue, 27 Jun 2017 04:38:39 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E944C2170E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=mhiramat@kernel.org Date: Tue, 27 Jun 2017 17:38:30 +0900 From: Masami Hiramatsu To: Sabrina Dubroca Cc: linux-kernel@vger.kernel.org, Steven Rostedt , Ingo Molnar , Hannes Frederic Sowa Subject: Re: [PATCH] tracing/kprobes: allow to create probe with a module name starting with a digit Message-Id: <20170627173830.80e06e87716742a7cc4a6257@kernel.org> In-Reply-To: References: X-Mailer: Sylpheed 3.5.0 (GTK+ 2.24.31; x86_64-redhat-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1856 Lines: 65 On Thu, 22 Jun 2017 11:24:42 +0200 Sabrina Dubroca wrote: > Always try to parse an address, since kstrtoul() will safely fail when > given a symbol as input. If that fails (which will be the case for a > symbol), try to parse a symbol instead. > > This allows creating a probe such as: > > p:probe/vlan_gro_receive 8021q:vlan_gro_receive+0 > > Which is necessary for this command to work: > > perf probe -m 8021q -a vlan_gro_receive > Ah, I forgot that case. Nice catch! Acked-by: Masami Hiramatsu Thanks! > Signed-off-by: Sabrina Dubroca > --- > kernel/trace/trace_kprobe.c | 14 +++++--------- > 1 file changed, 5 insertions(+), 9 deletions(-) > > diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c > index c129fca6ec99..b53c8d369163 100644 > --- a/kernel/trace/trace_kprobe.c > +++ b/kernel/trace/trace_kprobe.c > @@ -707,20 +707,16 @@ static int create_trace_kprobe(int argc, char **argv) > pr_info("Probe point is not specified.\n"); > return -EINVAL; > } > - if (isdigit(argv[1][0])) { > - /* an address specified */ > - ret = kstrtoul(&argv[1][0], 0, (unsigned long *)&addr); > - if (ret) { > - pr_info("Failed to parse address.\n"); > - return ret; > - } > - } else { > + > + /* try to parse an address. if that fails, try to read the > + * input as a symbol. */ > + if (kstrtoul(argv[1], 0, (unsigned long *)&addr)) { > /* a symbol specified */ > symbol = argv[1]; > /* TODO: support .init module functions */ > ret = traceprobe_split_symbol_offset(symbol, &offset); > if (ret) { > - pr_info("Failed to parse symbol.\n"); > + pr_info("Failed to parse either an address or a symbol.\n"); > return ret; > } > if (offset && is_return && > -- > 2.13.1 > -- Masami Hiramatsu