bpf: Prepare btf_ctx_access for non raw_tp use case
Subsystems (7)
PATCH v2 1/1 bpf: Prepare btf_ctx_access for non raw_tp use case
This patch makes a few changes to btf_ctx_access() to prepare it for non raw_tp use case where the attach_btf_id is not necessary a BTF_KIND_TYPEDEF.
It moves the "btf_trace_" prefix check and typedef-follow logic to a new function "check_attach_btf_id()" which is called only once during bpf_check(). btf_ctx_access() only operates on a BTF_KIND_FUNC_PROTO type now. That should also be more efficient since it is done only one instead of every-time check_ctx_access() is called.
"check_attach_btf_id()" needs to find the func_proto type from the attach_btf_id. It needs to store the result into the newly added prog->aux->attach_func_proto. func_proto btf type has no name, so a proper name should be stored into "attach_func_name" also.
v2:
- Move the "btf_trace_" check to an earlier verifier phase (Alexei)
--- include/linux/bpf.h | 5 +++ include/linux/btf.h | 31 +++++++++++++++++ kernel/bpf/btf.c | 73 +++++++--------------------------------- kernel/bpf/syscall.c | 4 +-- kernel/bpf/verifier.c | 52 +++++++++++++++++++++++++++- kernel/trace/bpf_trace.c | 2 ++ 6 files changed, 103 insertions(+), 64 deletions(-)
include/linux/bpf.h +5 -0
@@ -392,6 +392,11 @@ struct bpf_prog_aux {u32 attach_btf_id;/* in-kernel BTF type id to attach to */ bool verifier_zext;/* Zero extensions has been inserted by verifier. */ bool offload_requested; +bool attach_btf_trace;/* true if attaching to BTF-enabled raw tp */ +/* BTF_KIND_FUNC_PROTO for valid attach_btf_id */ +const struct btf_type *attach_func_proto; +/* function name for valid attach_btf_id */ +const char *attach_func_name;struct bpf_prog **func;void *jit_data;/* JIT specific data. arch dependent */ struct latch_tree_node ksym_tnode;
include/linux/btf.h +31 -0
@@ -5,6 +5,7 @@#define _LINUX_BTF_H 1#include <linux/types.h> +#include <uapi/linux/btf.h> struct btf ;struct btf_member ;
@@ -53,6 +54,36 @@ bool btf_member_is_reg_int(const struct btf *btf, const struct btf_type *s,int btf_find_spin_lock (const struct btf *btf,const struct btf_type *t);bool btf_type_is_void (const struct btf_type *t); +static inline bool btf_type_is_ptr (const struct btf_type *t) +{ +return BTF_INFO_KIND (t->info) ==BTF_KIND_PTR ; +} + +static inline bool btf_type_is_int (const struct btf_type *t) +{ +return BTF_INFO_KIND (t->info) ==BTF_KIND_INT ; +} + +static inline bool btf_type_is_enum (const struct btf_type *t) +{ +return BTF_INFO_KIND (t->info) ==BTF_KIND_ENUM ; +} + +static inline bool btf_type_is_typedef (const struct btf_type *t) +{ +return BTF_INFO_KIND (t->info) ==BTF_KIND_TYPEDEF ; +} + +static inline bool btf_type_is_func (const struct btf_type *t) +{ +return BTF_INFO_KIND (t->info) ==BTF_KIND_FUNC ; +} + +static inline bool btf_type_is_func_proto (const struct btf_type *t) +{ +return BTF_INFO_KIND (t->info) ==BTF_KIND_FUNC_PROTO ; +} +#ifdef CONFIG_BPF_SYSCALL const struct btf_type *btf_type_by_id (const struct btf *btf,u32 type_id);const char *btf_name_by_offset (const struct btf *btf,u32 offset);
kernel/bpf/btf.c +13 -60
117 lines not on this page · raw message
kernel/bpf/syscall.c +1 -3
@@ -1848,9 +1848,7 @@ static int bpf_raw_tracepoint_open(const union bpf_attr *attr) goto out_put_prog; }/* raw_tp name is taken from type name instead */ - tp_name =kernel_type_name (prog->aux->attach_btf_id); -/* skip the prefix */ - tp_name +=sizeof ("btf_trace_" ) -1 ; + tp_name = prog->aux->attach_func_name; }else { if (strncpy_from_user(buf, u64_to_user_ptr(attr->raw_tracepoint.name),
kernel/bpf/verifier.c +51 -1
66 lines not on this page · raw message
kernel/trace/bpf_trace.c +2 -0
@@ -1080,6 +1080,8 @@ static bool raw_tp_prog_is_valid_access(int off, int size,return false;if (off % size !=0 )return false; +if (!prog->aux->attach_btf_id) +return true;return btf_ctx_access (off, size, type, prog, info); }
Signature · 1 line
2.17.1
Quoted 17 lines · Martin KaFai Lau
This patch makes a few changes to
btf_ctx_access()to prepare it for nonraw_tpuse case where theattach_btf_idis not necessary aBTF_KIND_TYPEDEF.It moves the "
btf_trace_" prefix check and typedef-follow logic to a new function "check_attach_btf_id()" which is called only once duringbpf_check().btf_ctx_access()only operates on aBTF_KIND_FUNC_PROTOtype now. That should also be more efficient since it is done only one instead of every-timecheck_ctx_access()is called."
check_attach_btf_id()" needs to find thefunc_prototype from theattach_btf_id. It needs to store the result into the newly addedprog->aux->attach_func_proto.func_protobtf type has no name, so a proper name should be stored into "attach_func_name" also.
Quoted 4 lines
v2:
- Move the "btf_trace_" check to an earlier verifier phase (Alexei)Signed-off-by Martin KaFai Lau <[email protected]>
Thank you for sending it early. It's right in the place that I'm hacking as well.
I'll refactor my work to base on this.
Applied. Thanks.