From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 98E87EB64D7 for ; Thu, 22 Jun 2023 00:39:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229453AbjFVAjM (ORCPT ); Wed, 21 Jun 2023 20:39:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33402 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229521AbjFVAjL (ORCPT ); Wed, 21 Jun 2023 20:39:11 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 815AF1738; Wed, 21 Jun 2023 17:39:10 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id A13C261720; Thu, 22 Jun 2023 00:39:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E8F92C433C0; Thu, 22 Jun 2023 00:39:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1687394349; bh=ADfuTglLpoDdSOwtLMSK5Y7dt3qf8/05EDWHsVK5rSM=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=DX0CNIqmY5CYNtGeRLD0YVHIQlVVdUPWbV2YAu1buysLIy0ZSxLKDP0YbQMMYQYGi YElyvlmv8fG2fKKcCCu5A+qnEM3/uNCSeEA1yMLzXfRh2kSoIWMzymWeUYXn649z82 nRc+ijBZ/RPD3qGQO0oISxQr83E854IAhlpOYZoy330foH33q7LIW2xkt2LLIJEoyR w65wzkdKVOYrEW7NdHj0xeWj0MEqdHF/Tfh2aE5Izc5YaLYa/hSF9hm21DjkMqWPrp ATiITRvlfzIFZe0EuR1mL+ZREKWBqZR7PnCt4Q2jUPZNuu4YHR+QUnpgykKGQWeM40 gELQPDUzPTWIw== Date: Thu, 22 Jun 2023 09:39:05 +0900 From: Masami Hiramatsu (Google) To: Kui-Feng Lee Cc: linux-trace-kernel@vger.kernel.org, linux-kernel@vger.kernel.org, Steven Rostedt , Florent Revest , Mark Rutland , Will Deacon , Mathieu Desnoyers , Martin KaFai Lau , bpf@vger.kernel.org, Bagas Sanjaya , kernel test robot Subject: Re: [PATCH] tracing/probes: Fix tracepoint event with $arg* to fetch correct argument Message-Id: <20230622093905.e0619ea5e1fa3db9772d26eb@kernel.org> In-Reply-To: <12b0c61d-1270-ab34-63bf-a5c389fd45bc@gmail.com> References: <168657113778.3038017.12245893750241701312.stgit@mhiramat.roam.corp.google.com> <12b0c61d-1270-ab34-63bf-a5c389fd45bc@gmail.com> X-Mailer: Sylpheed 3.8.0beta1 (GTK+ 2.24.33; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-trace-kernel@vger.kernel.org On Wed, 14 Jun 2023 12:50:34 -0700 Kui-Feng Lee wrote: > > > On 6/12/23 04:58, Masami Hiramatsu (Google) wrote: > > From: Masami Hiramatsu (Google) > > > > To hide the first dummy 'data' argument on the tracepoint probe events, > > the BTF argument array was modified (skip the first argument for tracepoint), > > but the '$arg*' meta argument parser missed that. > > > > Fix to increment the argument index if it is tracepoint probe. And decrement > > the index when searching the type of the argument. > > > > Signed-off-by: Masami Hiramatsu (Google) > > --- > > kernel/trace/trace_probe.c | 10 ++++++++-- > > 1 file changed, 8 insertions(+), 2 deletions(-) > > > > diff --git a/kernel/trace/trace_probe.c b/kernel/trace/trace_probe.c > > index 473e1c43bc57..643aa3a51d5a 100644 > > --- a/kernel/trace/trace_probe.c > > +++ b/kernel/trace/trace_probe.c > > @@ -456,7 +456,10 @@ static int parse_btf_arg(const char *varname, struct fetch_insn *code, > > > > if (name && !strcmp(name, varname)) { > > code->op = FETCH_OP_ARG; > > - code->param = i; > > + if (ctx->flags & TPARG_FL_TPOINT) > > + code->param = i + 1; > > + else > > + code->param = i; > > return 0; > > } > > } > > @@ -470,8 +473,11 @@ static const struct fetch_type *parse_btf_arg_type(int arg_idx, > > struct btf *btf = traceprobe_get_btf(); > > const char *typestr = NULL; > > > > - if (btf && ctx->params) > > + if (btf && ctx->params) { > > + if (ctx->flags & TPARG_FL_TPOINT) > > + arg_idx--; > > typestr = type_from_btf_id(btf, ctx->params[arg_idx].type); > > + } > > > > return find_fetch_type(typestr, ctx->flags); > > } > > > > > > I failed to apply this patch. > Would you mind to rebase this patch? Ah, this is against for the probes/for-next branch on git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git Thanks, > -- Masami Hiramatsu (Google)