From: "Masami Hiramatsu (Google)" <mhiramat@kernel.org>
To: linux-trace-kernel@vger.kernel.org
Cc: linux-kernel@vger.kernel.org,
Steven Rostedt <rostedt@goodmis.org>,
mhiramat@kernel.org, Martin KaFai Lau <martin.lau@linux.dev>,
bpf@vger.kernel.org, Sven Schnelle <svens@linux.ibm.com>,
Alexei Starovoitov <ast@kernel.org>
Subject: [PATCH v4 3/9] bpf/btf: Add a function to search a member of a struct/union
Date: Mon, 31 Jul 2023 16:30:34 +0900 [thread overview]
Message-ID: <169078863449.173706.2322042687021909241.stgit@devnote2> (raw)
In-Reply-To: <169078860386.173706.3091034523220945605.stgit@devnote2>
From: Masami Hiramatsu (Google) <mhiramat@kernel.org>
Add btf_find_struct_member() API to search a member of a given data structure
or union from the member's name.
Signed-off-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
Reviewed-by: Alan Maguire <alan.maguire@oracle.com>
---
Changes in v3:
- Remove simple input check.
- Fix unneeded IS_ERR_OR_NULL() check for btf_type_by_id().
- Move the code next to btf_get_func_param().
- Use for_each_member() macro instead of for-loop.
- Use btf_type_skip_modifiers() instead of btf_type_by_id().
Changes in v4:
- Use a stack for searching in anonymous members instead of nested call.
---
include/linux/btf.h | 3 +++
kernel/bpf/btf.c | 40 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 43 insertions(+)
diff --git a/include/linux/btf.h b/include/linux/btf.h
index 20e3a07eef8f..4b10d57ceee0 100644
--- a/include/linux/btf.h
+++ b/include/linux/btf.h
@@ -226,6 +226,9 @@ const struct btf_type *btf_find_func_proto(const char *func_name,
struct btf **btf_p);
const struct btf_param *btf_get_func_param(const struct btf_type *func_proto,
s32 *nr);
+const struct btf_member *btf_find_struct_member(struct btf *btf,
+ const struct btf_type *type,
+ const char *member_name);
#define for_each_member(i, struct_type, member) \
for (i = 0, member = btf_type_member(struct_type); \
diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c
index f7b25c615269..8d81a4ffa67b 100644
--- a/kernel/bpf/btf.c
+++ b/kernel/bpf/btf.c
@@ -958,6 +958,46 @@ const struct btf_param *btf_get_func_param(const struct btf_type *func_proto, s3
return NULL;
}
+#define BTF_ANON_STACK_MAX 16
+
+/*
+ * Find a member of data structure/union by name and return it.
+ * Return NULL if not found, or -EINVAL if parameter is invalid.
+ */
+const struct btf_member *btf_find_struct_member(struct btf *btf,
+ const struct btf_type *type,
+ const char *member_name)
+{
+ const struct btf_type *anon_stack[BTF_ANON_STACK_MAX];
+ const struct btf_member *member;
+ const char *name;
+ int i, top = 0;
+
+retry:
+ if (!btf_type_is_struct(type))
+ return ERR_PTR(-EINVAL);
+
+ for_each_member(i, type, member) {
+ if (!member->name_off) {
+ /* Anonymous union/struct: push it for later use */
+ type = btf_type_skip_modifiers(btf, member->type, NULL);
+ if (type && top < BTF_ANON_STACK_MAX)
+ anon_stack[top++] = type;
+ } else {
+ name = btf_name_by_offset(btf, member->name_off);
+ if (name && !strcmp(member_name, name))
+ return member;
+ }
+ }
+ if (top > 0) {
+ /* Pop from the anonymous stack and retry */
+ type = anon_stack[--top];
+ goto retry;
+ }
+
+ return NULL;
+}
+
#define BTF_SHOW_MAX_ITER 10
#define BTF_KIND_BIT(kind) (1ULL << kind)
next prev parent reply other threads:[~2023-07-31 7:32 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-31 7:30 [PATCH v4 0/9] tracing: Improbe BTF support on probe events Masami Hiramatsu (Google)
2023-07-31 7:30 ` [PATCH v4 1/9] tracing/probes: Support BTF argument on module functions Masami Hiramatsu (Google)
2023-07-31 7:30 ` [PATCH v4 2/9] bpf/btf: tracing: Move finding func-proto API and getting func-param API to BTF Masami Hiramatsu (Google)
2023-07-31 7:30 ` Masami Hiramatsu (Google) [this message]
2023-07-31 21:59 ` [PATCH v4 3/9] bpf/btf: Add a function to search a member of a struct/union Alexei Starovoitov
2023-07-31 23:57 ` Masami Hiramatsu
2023-08-01 0:29 ` Alexei Starovoitov
2023-08-01 15:02 ` Masami Hiramatsu
2023-08-01 15:20 ` Steven Rostedt
2023-08-01 15:32 ` Steven Rostedt
2023-08-01 22:18 ` Alexei Starovoitov
2023-08-01 23:09 ` Steven Rostedt
2023-08-01 23:44 ` Alexei Starovoitov
2023-08-02 0:21 ` Masami Hiramatsu
2023-08-02 0:40 ` Steven Rostedt
2023-08-02 0:44 ` Steven Rostedt
2023-08-02 2:22 ` Alexei Starovoitov
2023-08-02 2:32 ` Steven Rostedt
2023-08-02 14:07 ` Masami Hiramatsu
2023-08-02 15:08 ` Florent Revest
2023-08-02 13:56 ` Masami Hiramatsu
2023-08-02 14:48 ` Florent Revest
2023-08-02 15:47 ` Florent Revest
2023-08-03 1:55 ` Masami Hiramatsu
2023-08-02 18:24 ` Alexei Starovoitov
2023-08-02 18:38 ` Steven Rostedt
2023-08-02 19:48 ` Alexei Starovoitov
2023-08-02 20:12 ` Steven Rostedt
2023-08-02 21:28 ` Alexei Starovoitov
2023-08-02 14:44 ` Florent Revest
2023-08-02 16:11 ` Steven Rostedt
2023-08-03 15:42 ` Masami Hiramatsu
2023-08-03 16:37 ` Florent Revest
2023-08-07 20:48 ` Jiri Olsa
2023-08-08 14:32 ` Masami Hiramatsu
2023-08-01 1:15 ` Steven Rostedt
2023-08-01 2:24 ` Alexei Starovoitov
2023-08-01 13:35 ` Steven Rostedt
2023-08-01 15:18 ` Masami Hiramatsu
2023-08-01 22:21 ` Alexei Starovoitov
2023-08-01 23:17 ` Masami Hiramatsu
2023-07-31 7:30 ` [PATCH v4 4/9] tracing/probes: Support BTF based data structure field access Masami Hiramatsu (Google)
2023-07-31 7:30 ` [PATCH v4 5/9] tracing/probes: Support BTF field access from $retval Masami Hiramatsu (Google)
2023-07-31 7:31 ` [PATCH v4 6/9] tracing/probes: Add string type check with BTF Masami Hiramatsu (Google)
2023-07-31 7:31 ` [PATCH v4 7/9] tracing/fprobe-event: Assume fprobe is a return event by $retval Masami Hiramatsu (Google)
2023-07-31 7:31 ` [PATCH v4 8/9] selftests/ftrace: Add BTF fields access testcases Masami Hiramatsu (Google)
2023-07-31 7:31 ` [PATCH v4 9/9] Documentation: tracing: Update fprobe event example with BTF field Masami Hiramatsu (Google)
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=169078863449.173706.2322042687021909241.stgit@devnote2 \
--to=mhiramat@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-trace-kernel@vger.kernel.org \
--cc=martin.lau@linux.dev \
--cc=rostedt@goodmis.org \
--cc=svens@linux.ibm.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).