Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <12b0c61d-1270-ab34-63bf-a5c389fd45bc@gmail.com>
Date:   Wed, 14 Jun 2023 12:50:34 -0700
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.11.0
Subject: Re: [PATCH] tracing/probes: Fix tracepoint event with $arg* to fetch
 correct argument
Content-Language: en-US
To:     "Masami Hiramatsu (Google)" <mhiramat@kernel.org>,
        linux-trace-kernel@vger.kernel.org
Cc:     linux-kernel@vger.kernel.org, Steven Rostedt <rostedt@goodmis.org>,
        Florent Revest <revest@chromium.org>,
        Mark Rutland <mark.rutland@arm.com>,
        Will Deacon <will@kernel.org>,
        Mathieu Desnoyers <mathieu.desnoyers@efficios.com>,
        Martin KaFai Lau <martin.lau@linux.dev>, bpf@vger.kernel.org,
        Bagas Sanjaya <bagasdotme@gmail.com>,
        kernel test robot <lkp@intel.com>
References: <168657113778.3038017.12245893750241701312.stgit@mhiramat.roam.corp.google.com>
From:   Kui-Feng Lee <sinquersw@gmail.com>
In-Reply-To: <168657113778.3038017.12245893750241701312.stgit@mhiramat.roam.corp.google.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk


On 6/12/23 04:58, Masami Hiramatsu (Google) wrote:
> From: Masami Hiramatsu (Google) <mhiramat@kernel.org>
> 
> 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) <mhiramat@kernel.org>
> ---
>   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?