From: Masami Hiramatsu (Google) <mhiramat@kernel.org>
To: Ye Bin <yebin10@huawei.com>
Cc: <rostedt@goodmis.org>, <mathieu.desnoyers@efficios.com>,
<linux-trace-kernel@vger.kernel.org>,
<linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v4 2/7] tracing/probes: add traceprobe_expand_dentry_args() helper
Date: Tue, 23 Jan 2024 23:26:29 +0900 [thread overview]
Message-ID: <20240123232629.ddac164019a6bab84b223d96@kernel.org> (raw)
In-Reply-To: <20240123092139.3698375-3-yebin10@huawei.com>
Hi Ye,
On Tue, 23 Jan 2024 17:21:34 +0800
Ye Bin <yebin10@huawei.com> wrote:
> Add traceprobe_expand_dentry_args() to expand dentry args. this API is
> prepare to support "%pd" print format for kprobe.
>
> Signed-off-by: Ye Bin <yebin10@huawei.com>
> ---
> kernel/trace/trace_probe.c | 36 ++++++++++++++++++++++++++++++++++++
> kernel/trace/trace_probe.h | 2 ++
> 2 files changed, 38 insertions(+)
>
> diff --git a/kernel/trace/trace_probe.c b/kernel/trace/trace_probe.c
> index 4dc74d73fc1d..cc8bd7ea5341 100644
> --- a/kernel/trace/trace_probe.c
> +++ b/kernel/trace/trace_probe.c
> @@ -1565,6 +1565,42 @@ const char **traceprobe_expand_meta_args(int argc, const char *argv[],
> return ERR_PTR(ret);
> }
>
> +int traceprobe_expand_dentry_args(int argc, const char *argv[], char *buf,
> + int bufsize)
> +{
> + int i, used, ret;
> +
> + used = 0;
> + for (i = 0; i < argc; i++) {
> + size_t idx;
> +
> + if (str_has_suffix(argv[i], ":%pd", &idx)) {
Instead of using this, I recommend to use `glob_match("*:%pd", argv[i])`
so that you can simply expand the pattern as `glob_match("*:%p[dD]",...)`
(glob_match means wildcard match like shell does)
Thank you,
> + char *tmp = kstrdup(argv[i], GFP_KERNEL);
> + char *equal;
> +
> + if (!tmp)
> + return -ENOMEM;
> +
> + equal = strchr(tmp, '=');
> + if (equal)
> + *equal = '\0';
> + tmp[idx] = '\0';
> + ret = snprintf(buf + used, bufsize - used,
nb> + "%s%s+0x0(+0x%zx(%s)):string",
> + equal ? tmp : "", equal ? "=" : "",
> + offsetof(struct dentry, d_name.name),
> + equal ? equal + 1 : tmp);
> + kfree(tmp);
> + if (ret >= bufsize - used)
> + return -ENOMEM;
> + argv[i] = buf + used;
> + used += ret + 1;
> + }
> + }
> +
> + return 0;
> +}
> +
> void traceprobe_finish_parse(struct traceprobe_parse_context *ctx)
> {
> clear_btf_context(ctx);
> diff --git a/kernel/trace/trace_probe.h b/kernel/trace/trace_probe.h
> index 850d9ecb6765..553371a4e0b1 100644
> --- a/kernel/trace/trace_probe.h
> +++ b/kernel/trace/trace_probe.h
> @@ -402,6 +402,8 @@ extern int traceprobe_parse_probe_arg(struct trace_probe *tp, int i,
> const char **traceprobe_expand_meta_args(int argc, const char *argv[],
> int *new_argc, char *buf, int bufsize,
> struct traceprobe_parse_context *ctx);
> +extern int traceprobe_expand_dentry_args(int argc, const char *argv[], char *buf,
> + int bufsize);
>
> extern int traceprobe_update_arg(struct probe_arg *arg);
> extern void traceprobe_free_probe_arg(struct probe_arg *arg);
> --
> 2.31.1
>
>
--
Masami Hiramatsu (Google) <mhiramat@kernel.org>
next prev parent reply other threads:[~2024-01-23 14:26 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-23 9:21 [PATCH v4 0/7] support '%pd' and '%pD' for print file name Ye Bin
2024-01-23 9:21 ` [PATCH v4 1/7] string.h: add str_has_suffix() helper for test string ends with specify string Ye Bin
2024-01-23 9:21 ` [PATCH v4 2/7] tracing/probes: add traceprobe_expand_dentry_args() helper Ye Bin
2024-01-23 14:26 ` Masami Hiramatsu [this message]
2024-01-23 9:21 ` [PATCH v4 3/7] tracing/probes: support '%pd' type for print struct dentry's name Ye Bin
2024-01-23 14:40 ` Masami Hiramatsu
2024-01-24 2:46 ` yebin (H)
2024-01-24 12:27 ` Masami Hiramatsu
2024-01-23 9:21 ` [PATCH v4 4/7] tracing/probes: support '%pD' type for print struct file's name Ye Bin
2024-01-23 9:21 ` [PATCH v4 5/7] tracing: add new type "%pd/%pD" in readme_msg[] Ye Bin
2024-01-23 9:21 ` [PATCH v4 6/7] Documentation: tracing: add new type '%pd' and '%pD' for kprobe Ye Bin
2024-01-23 13:07 ` Masami Hiramatsu
2024-01-23 9:21 ` [PATCH v4 7/7] selftests/ftrace: add test cases for VFS type "%pd" and "%pD" Ye Bin
2024-01-24 1:32 ` Masami Hiramatsu
2024-01-24 1:53 ` yebin (H)
2024-01-24 3:21 ` yebin (H)
2024-01-24 23:30 ` Masami Hiramatsu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240123232629.ddac164019a6bab84b223d96@kernel.org \
--to=mhiramat@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-trace-kernel@vger.kernel.org \
--cc=mathieu.desnoyers@efficios.com \
--cc=rostedt@goodmis.org \
--cc=yebin10@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).