Improvements of BTF sanitizing for old kernels
I'm very sorry, but I found a small typo in 2nd patch, here's a quick fix for one.
From: Timur Chernykh <[email protected]>
To: [email protected]
Subject: Improvements of BTF sanitizing for old kernels
PATCH 2/2 libbpf: add check if kernel supports kind flag and fix the bitfield members in union and structs if not
Signed-off-by Timur Chernykh <[email protected]>
--- tools/lib/bpf/features.c | 30 ++++++++++++++++ tools/lib/bpf/libbpf.c | 62 ++++++++++++++++++++++++++++++++- tools/lib/bpf/libbpf_internal.h | 2 ++ 3 files changed, 93 insertions(+), 1 deletion(-)
tools/lib/bpf/features.c +30 -0
@@ -507,6 +507,33 @@ static int probe_kern_arg_ctx_tag(int token_fd)return probe_fd (prog_fd); } +static int probe_kern_btf_type_kind_flag (int token_fd) +{ +const char strs[] ="\0bpf_spin_lock\0val\0cnt\0l" ; +/* struct bpf_spin_lock { +* int val; +* }; +* struct val { +* int cnt; +* struct bpf_spin_lock l; +* }; +*/ +__u32 types[] = { +/* int */ +BTF_TYPE_INT_ENC (0 ,BTF_INT_SIGNED ,0 ,32 ,4 ),/* [1] */ +/* struct bpf_spin_lock */ /* [2] */ +BTF_TYPE_ENC (1 ,BTF_INFO_ENC (BTF_KIND_STRUCT ,1 /* kind bit */ ,1 ),4 ), +BTF_MEMBER_ENC (15 ,1 ,0 ),/* int val; */ +/* struct val */ /* [3] */ +BTF_TYPE_ENC (15 ,BTF_INFO_ENC (BTF_KIND_STRUCT ,1 /* kind bit */ ,2 ),8 ), +BTF_MEMBER_ENC (19 ,1 ,0 ),/* int cnt; */ +BTF_MEMBER_ENC (23 ,2 ,32 ),/* struct bpf_spin_lock l; */ + }; + +return probe_fd (libbpf__load_raw_btf ((char *)types,sizeof (types), + strs,sizeof (strs), token_fd)); +} +typedef int (*feature_probe_fn )(int /* token_fd */ );static struct kern_feature_cache feature_cache;
@@ -582,6 +609,9 @@ static struct kern_feature_desc { [FEAT_BTF_QMARK_DATASEC ] = {"BTF DATASEC names starting from '?'" , probe_kern_btf_qmark_datasec, }, + [FEAT_BTF_TYPE_KIND_FLAG ] = { +"BTF btf_type can have the kind flags set" , probe_kern_btf_type_kind_flag, + }, };bool feat_supported (struct kern_feature_cache *cache,enum kern_feature_id feat_id)
tools/lib/bpf/libbpf.c +61 -1
82 lines not on this page · raw message
tools/lib/bpf/libbpf_internal.h +2 -0
@@ -380,6 +380,8 @@ enum kern_feature_id {FEAT_ARG_CTX_TAG ,/* Kernel supports '?' at the front of datasec names */ FEAT_BTF_QMARK_DATASEC , +/* Kernel supports kind flag */ +FEAT_BTF_TYPE_KIND_FLAG , __FEAT_CNT, };
Signature · 1 line
2.49.0