bpf: rename BTF_KIND_TAG to BTF_KIND_DECL_TAG
Subsystems (6)
PATCH v3 1/1 bpf: rename BTF_KIND_TAG to BTF_KIND_DECL_TAG
Patch set [1] introduced BTF_KIND_TAG to allow tagging declarations for struct/union, struct/union field, var, func and func arguments and these tags will be encoded into dwarf. They are also encoded to btf by llvm for the bpf target.
After BTF_KIND_TAG is introduced, we intended to use it for kernel __user attributes. But kernel __user is actually a type attribute. Upstream and internal discussion showed it is not a good idea to mix declaration attribute and type attribute. So we proposed to introduce btf_type_tag as a type attribute and existing btf_tag renamed to btf_decl_tag ([2]).
This patch renamed BTF_KIND_TAG to BTF_KIND_DECL_TAG and some other declarations with *_tag to *_decl_tag to make it clear the tag is for declaration. In the future, BTF_KIND_TYPE_TAG might be introduced per [3].
[1] https://lore.kernel.org/bpf/[email protected]/
[2] https://reviews.llvm.org/D111588
[3] https://reviews.llvm.org/D111199
--- Documentation/bpf/btf.rst | 24 +-- include/uapi/linux/btf.h | 8 +- kernel/bpf/btf.c | 44 ++--- tools/bpf/bpftool/btf.c | 6 +- tools/include/uapi/linux/btf.h | 8 +- tools/lib/bpf/btf.c | 36 ++-- tools/lib/bpf/btf.h | 12 +- tools/lib/bpf/btf_dump.c | 6 +- tools/lib/bpf/libbpf.c | 24 +-- tools/lib/bpf/libbpf.map | 2 +- tools/lib/bpf/libbpf_internal.h | 4 +- tools/testing/selftests/bpf/README.rst | 4 +- tools/testing/selftests/bpf/btf_helpers.c | 8 +- tools/testing/selftests/bpf/prog_tests/btf.c | 160 +++++++++--------- .../selftests/bpf/prog_tests/btf_write.c | 30 ++-- tools/testing/selftests/bpf/progs/tag.c | 6 +- tools/testing/selftests/bpf/test_btf.h | 4 +- 17 files changed, 193 insertions(+), 193 deletions(-)
Changelogs:
v2 -> v3:
- clang patch to rename btf_tag to btf_decl_tag has landed, so update selftests/bpf/progs/tag.c and selftests/bpf/README.rst accordingly.
v1 -> v2:
- add Fixes tags
Documentation/bpf/btf.rst +12 -12
@@ -85,7 +85,7 @@ sequentially and type id is assigned to each recognized type starting from id #define BTF_KIND_VAR 14 /* Variable */ #define BTF_KIND_DATASEC 15 /* Section */ #define BTF_KIND_FLOAT 16 /* Floating point */ - #define BTF_KIND_TAG 17 /* Tag */ + #define BTF_KIND_DECL_TAG 17 /* Decl Tag */ Note that the type section encodes debug info, not just pure types. ``BTF_KIND_FUNC`` is not a type, and it represents a defined subprogram.
@@ -107,7 +107,7 @@ Each type contains the following common data:: * "size" tells the size of the type it is describing. * * "type" is used by PTR, TYPEDEF, VOLATILE, CONST, RESTRICT, - * FUNC, FUNC_PROTO and TAG. + * FUNC, FUNC_PROTO and DECL_TAG. * "type" is a type_id referring to another type. */ union {
@@ -466,30 +466,30 @@ map definition. No additional type data follow ``btf_type``. -2.2.17 BTF_KIND_TAG -~~~~~~~~~~~~~~~~~~~ +2.2.17 BTF_KIND_DECL_TAG +~~~~~~~~~~~~~~~~~~~~~~~~ ``struct btf_type`` encoding requirement: * ``name_off``: offset to a non-empty string * ``info.kind_flag``: 0 - * ``info.kind``: BTF_KIND_TAG + * ``info.kind``: BTF_KIND_DECL_TAG * ``info.vlen``: 0 * ``type``: ``struct``, ``union``, ``func`` or ``var`` -``btf_type`` is followed by ``struct btf_tag``.:: +``btf_type`` is followed by ``struct btf_decl_tag``.:: - struct btf_tag { + struct btf_decl_tag { __u32 component_idx; }; -The ``name_off`` encodes btf_tag attribute string. +The ``name_off`` encodes btf_decl_tag attribute string. The ``type`` should be ``struct``, ``union``, ``func`` or ``var``. -For ``var`` type, ``btf_tag.component_idx`` must be ``-1``. -For the other three types, if the btf_tag attribute is +For ``var`` type, ``btf_decl_tag.component_idx`` must be ``-1``. +For the other three types, if the btf_decl_tag attribute is applied to the ``struct``, ``union`` or ``func`` itself, -``btf_tag.component_idx`` must be ``-1``. Otherwise, +``btf_decl_tag.component_idx`` must be ``-1``. Otherwise, the attribute is applied to a ``struct``/``union`` member or -a ``func`` argument, and ``btf_tag.component_idx`` should be a +a ``func`` argument, and ``btf_decl_tag.component_idx`` should be a valid index (starting from 0) pointing to a member or an argument. 3. BTF Kernel API
include/uapi/linux/btf.h +4 -4
@@ -43,7 +43,7 @@ struct btf_type {* "size" tells the size of the type it is describing. * * "type" is used by PTR, TYPEDEF, VOLATILE, CONST, RESTRICT, -* FUNC, FUNC_PROTO, VAR and TAG. +* FUNC, FUNC_PROTO, VAR and DECL_TAG. * "type" is a type_id referring to another type. */ union {
@@ -74,7 +74,7 @@ enum {BTF_KIND_VAR =14 ,/* Variable */ BTF_KIND_DATASEC =15 ,/* Section */ BTF_KIND_FLOAT =16 ,/* Floating point */ -BTF_KIND_TAG =17 ,/* Tag */ +BTF_KIND_DECL_TAG =17 ,/* Decl Tag */ NR_BTF_KINDS , BTF_KIND_MAX = NR_BTF_KINDS - 1,
@@ -174,14 +174,14 @@ struct btf_var_secinfo {__u32 size; }; -/* BTF_KIND_TAG is followed by a single "struct btf_tag" to describe +/* BTF_KIND_DECL_TAG is followed by a single "struct btf_decl_tag" to describe * additional information related to the tag applied location. * If component_idx == -1, the tag is applied to a struct, union, * variable or function. Otherwise, it is applied to a struct/union * member or a func argument, and component_idx indicates which member * or argument (0 ... vlen-1). */ -struct btf_tag { +struct btf_decl_tag {__s32 component_idx; };
kernel/bpf/btf.c +22 -22
135 lines not on this page · raw message
tools/bpf/bpftool/btf.c +3 -3
@@ -37,7 +37,7 @@ static const char * const btf_kind_str[NR_BTF_KINDS] = { [BTF_KIND_VAR] = "VAR", [BTF_KIND_DATASEC] = "DATASEC", [BTF_KIND_FLOAT] = "FLOAT", - [BTF_KIND_TAG] = "TAG", + [BTF_KIND_DECL_TAG] = "DECL_TAG", };struct btf_attach_table {
@@ -348,8 +348,8 @@ static int dump_btf_type(const struct btf *btf, __u32 id,printf (" size=%u" , t->size);break ; } -case BTF_KIND_TAG : { -const struct btf_tag *tag = (const void *)(t +1 ); +case BTF_KIND_DECL_TAG : { +const struct btf_decl_tag *tag = (const void *)(t +1 );if (json_output) {jsonw_uint_field (w,"type_id" , t->type);
tools/include/uapi/linux/btf.h +4 -4
@@ -43,7 +43,7 @@ struct btf_type {* "size" tells the size of the type it is describing. * * "type" is used by PTR, TYPEDEF, VOLATILE, CONST, RESTRICT, -* FUNC, FUNC_PROTO, VAR and TAG. +* FUNC, FUNC_PROTO, VAR and DECL_TAG. * "type" is a type_id referring to another type. */ union {
@@ -74,7 +74,7 @@ enum {BTF_KIND_VAR =14 ,/* Variable */ BTF_KIND_DATASEC =15 ,/* Section */ BTF_KIND_FLOAT =16 ,/* Floating point */ -BTF_KIND_TAG =17 ,/* Tag */ +BTF_KIND_DECL_TAG =17 ,/* Decl Tag */ NR_BTF_KINDS , BTF_KIND_MAX = NR_BTF_KINDS - 1,
@@ -174,14 +174,14 @@ struct btf_var_secinfo {__u32 size; }; -/* BTF_KIND_TAG is followed by a single "struct btf_tag" to describe +/* BTF_KIND_DECL_TAG is followed by a single "struct btf_decl_tag" to describe * additional information related to the tag applied location. * If component_idx == -1, the tag is applied to a struct, union, * variable or function. Otherwise, it is applied to a struct/union * member or a func argument, and component_idx indicates which member * or argument (0 ... vlen-1). */ -struct btf_tag { +struct btf_decl_tag {__s32 component_idx; };
tools/lib/bpf/btf.c +18 -18
@@ -309,8 +309,8 @@ static int btf_type_size(const struct btf_type *t)return base_size +sizeof (struct btf_var );case BTF_KIND_DATASEC :return base_size + vlen *sizeof (struct btf_var_secinfo ); -case BTF_KIND_TAG : -return base_size +sizeof (struct btf_tag ); +case BTF_KIND_DECL_TAG : +return base_size +sizeof (struct btf_decl_tag );default :pr_debug ("Unsupported BTF_KIND:%u\n" ,btf_kind (t));return -EINVAL ;
@@ -383,8 +383,8 @@ static int btf_bswap_type_rest(struct btf_type *t) v->size =bswap_32 (v->size); }return 0 ; -case BTF_KIND_TAG : -btf_tag (t)->component_idx =bswap_32 (btf_tag (t)->component_idx); +case BTF_KIND_DECL_TAG : +btf_decl_tag (t)->component_idx =bswap_32 (btf_decl_tag (t)->component_idx);return 0 ;default :pr_debug ("Unsupported BTF_KIND:%u\n" ,btf_kind (t));
@@ -596,7 +596,7 @@ __s64 btf__resolve_size(const struct btf *btf, __u32 type_id)case BTF_KIND_CONST :case BTF_KIND_RESTRICT :case BTF_KIND_VAR : -case BTF_KIND_TAG : +case BTF_KIND_DECL_TAG : type_id = t->type;break ;case BTF_KIND_ARRAY :
@@ -2569,7 +2569,7 @@ int btf__add_datasec_var_info(struct btf *btf, int var_type_id, __u32 offset, __ }/* -* Append new BTF_KIND_TAG type with: +* Append new BTF_KIND_DECL_TAG type with: * - *value* - non-empty/non-NULL string; * - *ref_type_id* - referenced type ID, it might not exist yet; * - *component_idx* - -1 for tagging reference type, otherwise struct/union
@@ -2578,7 +2578,7 @@ int btf__add_datasec_var_info(struct btf *btf, int var_type_id, __u32 offset, __* - >0, type ID of newly added BTF type; * - <0, on error. */ -int btf__add_tag (struct btf *btf,const char *value,int ref_type_id, +int btf__add_decl_tag (struct btf *btf,const char *value,int ref_type_id,int component_idx) {struct btf_type *t;
@@ -2593,7 +2593,7 @@ int btf__add_tag(struct btf *btf, const char *value, int ref_type_id,if (btf_ensure_modifiable (btf))return libbpf_err (-ENOMEM ); - sz =sizeof (struct btf_type ) +sizeof (struct btf_tag ); + sz =sizeof (struct btf_type ) +sizeof (struct btf_decl_tag ); t =btf_add_type_mem (btf, sz);if (!t)return libbpf_err (-ENOMEM );
@@ -2603,9 +2603,9 @@ int btf__add_tag(struct btf *btf, const char *value, int ref_type_id,return value_off; t->name_off = value_off; - t->info =btf_type_info (BTF_KIND_TAG ,0 , false); + t->info =btf_type_info (BTF_KIND_DECL_TAG ,0 , false); t->type = ref_type_id; -btf_tag (t)->component_idx = component_idx; +btf_decl_tag (t)->component_idx = component_idx;return btf_commit_type (btf, sz); }
@@ -3427,7 +3427,7 @@ static bool btf_equal_common(struct btf_type *t1, struct btf_type *t2) }/* Calculate type signature hash of INT or TAG. */ -static long btf_hash_int_tag (struct btf_type *t) +static long btf_hash_int_decl_tag (struct btf_type *t) {__u32 info = *(__u32 *)(t +1 );long h;
@@ -3705,8 +3705,8 @@ static int btf_dedup_prep(struct btf_dedup *d) h =btf_hash_common (t);break ;case BTF_KIND_INT : -case BTF_KIND_TAG : - h =btf_hash_int_tag (t); +case BTF_KIND_DECL_TAG : + h =btf_hash_int_decl_tag (t);break ;case BTF_KIND_ENUM : h =btf_hash_enum (t);
@@ -3761,11 +3761,11 @@ static int btf_dedup_prim_type(struct btf_dedup *d, __u32 type_id)case BTF_KIND_FUNC_PROTO :case BTF_KIND_VAR :case BTF_KIND_DATASEC : -case BTF_KIND_TAG : +case BTF_KIND_DECL_TAG :return 0 ;case BTF_KIND_INT : - h =btf_hash_int_tag (t); + h =btf_hash_int_decl_tag (t);for_each_dedup_cand (d, hash_entry, h) { cand_id = (__u32 )(long )hash_entry->value; cand =btf_type_by_id (d->btf, cand_id);
@@ -4382,13 +4382,13 @@ static int btf_dedup_ref_type(struct btf_dedup *d, __u32 type_id) }break ; -case BTF_KIND_TAG : +case BTF_KIND_DECL_TAG : ref_type_id =btf_dedup_ref_type (d, t->type);if (ref_type_id <0 )return ref_type_id; t->type = ref_type_id; - h =btf_hash_int_tag (t); + h =btf_hash_int_decl_tag (t);for_each_dedup_cand (d, hash_entry, h) { cand_id = (__u32 )(long )hash_entry->value; cand =btf_type_by_id (d->btf, cand_id);
@@ -4671,7 +4671,7 @@ int btf_type_visit_type_ids(struct btf_type *t, type_id_visit_fn visit, void *ctcase BTF_KIND_TYPEDEF :case BTF_KIND_FUNC :case BTF_KIND_VAR : -case BTF_KIND_TAG : +case BTF_KIND_DECL_TAG :return visit (&t->type, ctx);case BTF_KIND_ARRAY : {
tools/lib/bpf/btf.h +6 -6
@@ -236,7 +236,7 @@ LIBBPF_API int btf__add_datasec_var_info(struct btf *btf, int var_type_id, __u32 offset, __u32 byte_sz);/* tag construction API */ -LIBBPF_API int btf__add_tag(struct btf *btf, const char *value, int ref_type_id, +LIBBPF_API int btf__add_decl_tag(struct btf *btf, const char *value, int ref_type_id,int component_idx);struct btf_dedup_opts {
@@ -426,9 +426,9 @@ static inline bool btf_is_float(const struct btf_type *t)return btf_kind (t) ==BTF_KIND_FLOAT ; } -static inline bool btf_is_tag (const struct btf_type *t) +static inline bool btf_is_decl_tag (const struct btf_type *t) { -return btf_kind (t) ==BTF_KIND_TAG ; +return btf_kind (t) ==BTF_KIND_DECL_TAG ; }static inline __u8 btf_int_encoding (const struct btf_type *t)
@@ -499,10 +499,10 @@ btf_var_secinfos(const struct btf_type *t)return (struct btf_var_secinfo *)(t +1 ); } -struct btf_tag ; -static inline struct btf_tag *btf_tag (const struct btf_type *t) +struct btf_decl_tag ; +static inline struct btf_decl_tag *btf_decl_tag (const struct btf_type *t) { -return (struct btf_tag *)(t +1 ); +return (struct btf_decl_tag *)(t +1 ); }#ifdef __cplusplus
tools/lib/bpf/btf_dump.c +3 -3
@@ -316,7 +316,7 @@ static int btf_dump_mark_referenced(struct btf_dump *d)case BTF_KIND_TYPEDEF :case BTF_KIND_FUNC :case BTF_KIND_VAR : -case BTF_KIND_TAG : +case BTF_KIND_DECL_TAG : d->type_states[t->type].referenced =1 ;break ;
@@ -584,7 +584,7 @@ static int btf_dump_order_type(struct btf_dump *d, __u32 id, bool through_ptr)case BTF_KIND_FUNC :case BTF_KIND_VAR :case BTF_KIND_DATASEC : -case BTF_KIND_TAG : +case BTF_KIND_DECL_TAG : d->type_states[id].order_state =ORDERED ;return 0 ;
@@ -2217,7 +2217,7 @@ static int btf_dump_dump_type_data(struct btf_dump *d,case BTF_KIND_FWD :case BTF_KIND_FUNC :case BTF_KIND_FUNC_PROTO : -case BTF_KIND_TAG : +case BTF_KIND_DECL_TAG : err =btf_dump_unsupported_data (d, t, id);break ;case BTF_KIND_INT :
tools/lib/bpf/libbpf.c +12 -12
@@ -195,8 +195,8 @@ enum kern_feature_id {FEAT_BTF_FLOAT ,/* BPF perf link support */ FEAT_PERF_LINK , -/* BTF_KIND_TAG support */ -FEAT_BTF_TAG , +/* BTF_KIND_DECL_TAG support */ +FEAT_BTF_DECL_TAG , __FEAT_CNT, };
@@ -2024,7 +2024,7 @@ static const char *__btf_kind_str(__u16 kind)case BTF_KIND_VAR :return "var" ;case BTF_KIND_DATASEC :return "datasec" ;case BTF_KIND_FLOAT :return "float" ; -case BTF_KIND_TAG :return "tag" ; +case BTF_KIND_DECL_TAG :return "decl_tag" ;default :return "unknown" ; } }
@@ -2524,9 +2524,9 @@ static bool btf_needs_sanitization(struct bpf_object *obj)bool has_datasec =kernel_supports (obj,FEAT_BTF_DATASEC );bool has_float =kernel_supports (obj,FEAT_BTF_FLOAT );bool has_func =kernel_supports (obj,FEAT_BTF_FUNC ); -bool has_tag =kernel_supports (obj,FEAT_BTF_TAG ); +bool has_decl_tag =kernel_supports (obj,FEAT_BTF_DECL_TAG ); -return !has_func || !has_datasec || !has_func_global || !has_float || !has_tag; +return !has_func || !has_datasec || !has_func_global || !has_float || !has_decl_tag; }static void bpf_object__sanitize_btf (struct bpf_object *obj,struct btf *btf)
@@ -2535,15 +2535,15 @@ static void bpf_object__sanitize_btf(struct bpf_object *obj, struct btf *btf)bool has_datasec =kernel_supports (obj,FEAT_BTF_DATASEC );bool has_float =kernel_supports (obj,FEAT_BTF_FLOAT );bool has_func =kernel_supports (obj,FEAT_BTF_FUNC ); -bool has_tag =kernel_supports (obj,FEAT_BTF_TAG ); +bool has_decl_tag =kernel_supports (obj,FEAT_BTF_DECL_TAG );struct btf_type *t;int i, j, vlen;for (i =1 ; i <=btf__get_nr_types (btf); i++) { t = (struct btf_type *)btf__type_by_id (btf, i); -if ((!has_datasec &&btf_is_var (t)) || (!has_tag &&btf_is_tag (t))) { -/* replace VAR/TAG with INT */ +if ((!has_datasec &&btf_is_var (t)) || (!has_decl_tag &&btf_is_decl_tag (t))) { +/* replace VAR/DECL_TAG with INT */ t->info =BTF_INFO_ENC (BTF_KIND_INT ,0 ,0 );/* * using size = 1 is the safest choice, 4 will be too
@@ -4248,7 +4248,7 @@ static int probe_kern_btf_float(void) strs, sizeof(strs))); } -static int probe_kern_btf_tag (void ) +static int probe_kern_btf_decl_tag (void ) {static const char strs[] ="\0tag" ;__u32 types[] = {
@@ -4258,7 +4258,7 @@ static int probe_kern_btf_tag(void)BTF_TYPE_ENC (1 ,BTF_INFO_ENC (BTF_KIND_VAR ,0 ,0 ),1 ),BTF_VAR_STATIC ,/* attr */ - BTF_TYPE_TAG_ENC(1, 2, -1), + BTF_TYPE_DECL_TAG_ENC(1, 2, -1), }; return probe_fd(libbpf__load_raw_btf((char *)types, sizeof(types),
@@ -4481,8 +4481,8 @@ static struct kern_feature_desc { [FEAT_PERF_LINK ] = {"BPF perf link support" , probe_perf_link, }, - [FEAT_BTF_TAG ] = { -"BTF_KIND_TAG support" , probe_kern_btf_tag, + [FEAT_BTF_DECL_TAG ] = { +"BTF_KIND_DECL_TAG support" , probe_kern_btf_decl_tag, }, };
tools/lib/bpf/libbpf.map +1 -1
@@ -394,5 +394,5 @@ LIBBPF_0.6.0 { bpf_object__prev_map; bpf_object__prev_program; btf__add_btf; - btf__add_tag; + btf__add_decl_tag; } LIBBPF_0.5.0;
tools/lib/bpf/libbpf_internal.h +2 -2
@@ -69,8 +69,8 @@#define BTF_VAR_SECINFO_ENC (type, offset, size) (type), (offset), (size)#define BTF_TYPE_FLOAT_ENC (name, sz) \ BTF_TYPE_ENC(name, BTF_INFO_ENC(BTF_KIND_FLOAT, 0, 0), sz) -#define BTF_TYPE_TAG_ENC (value, type, component_idx) \ - BTF_TYPE_ENC(value, BTF_INFO_ENC(BTF_KIND_TAG, 0, 0), type), (component_idx) +#define BTF_TYPE_DECL_TAG_ENC (value, type, component_idx) \ + BTF_TYPE_ENC(value, BTF_INFO_ENC(BTF_KIND_DECL_TAG, 0, 0), type), (component_idx)#ifndef likely#define likely (x) __builtin_expect(!!(x), 1)
tools/testing/selftests/bpf/README.rst +2 -2
@@ -204,7 +204,7 @@ __ https://reviews.llvm.org/D93563 btf_tag test and Clang version ============================== -The btf_tag selftest require LLVM support to recognize the btf_tag attribute. +The btf_tag selftest require LLVM support to recognize the btf_decl_tag attribute. It was introduced in `Clang 14`__. Without it, the btf_tag selftest will be skipped and you will observe:
@@ -213,7 +213,7 @@ Without it, the btf_tag selftest will be skipped and you will observe: #<test_num> btf_tag:SKIP -__ https://reviews.llvm.org/D106614 +__ https://reviews.llvm.org/D111588 Clang dependencies for static linking tests ===========================================
tools/testing/selftests/bpf/btf_helpers.c +4 -4
@@ -24,12 +24,12 @@ static const char * const btf_kind_str_mapping[] = { [BTF_KIND_VAR] = "VAR", [BTF_KIND_DATASEC] = "DATASEC", [BTF_KIND_FLOAT] = "FLOAT", - [BTF_KIND_TAG] = "TAG", + [BTF_KIND_DECL_TAG] = "DECL_TAG", };static const char *btf_kind_str (__u16 kind) { -if (kind >BTF_KIND_TAG ) +if (kind >BTF_KIND_DECL_TAG )return "UNKNOWN" ;return btf_kind_str_mapping[kind]; }
@@ -178,9 +178,9 @@ int fprintf_btf_type_raw(FILE *out, const struct btf *btf, __u32 id)case BTF_KIND_FLOAT :fprintf (out," size=%u" , t->size);break ; -case BTF_KIND_TAG : +case BTF_KIND_DECL_TAG :fprintf (out," type_id=%u component_idx=%d" , - t->type,btf_tag (t)->component_idx); + t->type,btf_decl_tag (t)->component_idx);break ;default :break ;
tools/testing/selftests/bpf/prog_tests/btf.c +80 -80
364 lines not on this page · raw message
tools/testing/selftests/bpf/prog_tests/btf_write.c +15 -15
@@ -277,26 +277,26 @@ static void gen_btf(struct btf *btf)"[17] DATASEC 'datasec1' size=12 vlen=1\n" "\ttype_id=1 offset=4 size=8", "raw_dump"); -/* TAG */ - id =btf__add_tag (btf,"tag1" ,16 ,-1 ); +/* DECL_TAG */ + id =btf__add_decl_tag (btf,"tag1" ,16 ,-1 );ASSERT_EQ (id,18 ,"tag_id" ); t =btf__type_by_id (btf,18 );ASSERT_STREQ (btf__str_by_offset (btf, t->name_off),"tag1" ,"tag_value" ); -ASSERT_EQ (btf_kind (t),BTF_KIND_TAG ,"tag_kind" ); +ASSERT_EQ (btf_kind (t),BTF_KIND_DECL_TAG ,"tag_kind" );ASSERT_EQ (t->type,16 ,"tag_type" ); -ASSERT_EQ (btf_tag (t)->component_idx,-1 ,"tag_component_idx" ); +ASSERT_EQ (btf_decl_tag (t)->component_idx,-1 ,"tag_component_idx" );ASSERT_STREQ (btf_type_raw_dump (btf,18 ), -"[18] TAG 'tag1' type_id=16 component_idx=-1" ,"raw_dump" ); +"[18] DECL_TAG 'tag1' type_id=16 component_idx=-1" ,"raw_dump" ); - id =btf__add_tag (btf,"tag2" ,14 ,1 ); + id =btf__add_decl_tag (btf,"tag2" ,14 ,1 );ASSERT_EQ (id,19 ,"tag_id" ); t =btf__type_by_id (btf,19 );ASSERT_STREQ (btf__str_by_offset (btf, t->name_off),"tag2" ,"tag_value" ); -ASSERT_EQ (btf_kind (t),BTF_KIND_TAG ,"tag_kind" ); +ASSERT_EQ (btf_kind (t),BTF_KIND_DECL_TAG ,"tag_kind" );ASSERT_EQ (t->type,14 ,"tag_type" ); -ASSERT_EQ (btf_tag (t)->component_idx,1 ,"tag_component_idx" ); +ASSERT_EQ (btf_decl_tag (t)->component_idx,1 ,"tag_component_idx" );ASSERT_STREQ (btf_type_raw_dump (btf,19 ), -"[19] TAG 'tag2' type_id=14 component_idx=1" ,"raw_dump" ); +"[19] DECL_TAG 'tag2' type_id=14 component_idx=1" ,"raw_dump" ); }static void test_btf_add ()
@@ -336,8 +336,8 @@ static void test_btf_add()"[16] VAR 'var1' type_id=1, linkage=global-alloc" ,"[17] DATASEC 'datasec1' size=12 vlen=1\n" "\ttype_id=1 offset=4 size=8" , -"[18] TAG 'tag1' type_id=16 component_idx=-1" , - "[19] TAG 'tag2' type_id=14 component_idx=1"); +"[18] DECL_TAG 'tag1' type_id=16 component_idx=-1" , + "[19] DECL_TAG 'tag2' type_id=14 component_idx=1");btf__free (btf); }
@@ -389,8 +389,8 @@ static void test_btf_add_btf()"[16] VAR 'var1' type_id=1, linkage=global-alloc" ,"[17] DATASEC 'datasec1' size=12 vlen=1\n" "\ttype_id=1 offset=4 size=8" , -"[18] TAG 'tag1' type_id=16 component_idx=-1" , -"[19] TAG 'tag2' type_id=14 component_idx=1" , +"[18] DECL_TAG 'tag1' type_id=16 component_idx=-1" , +"[19] DECL_TAG 'tag2' type_id=14 component_idx=1" ,/* types appended from the second BTF */ "[20] INT 'int' size=4 bits_offset=0 nr_bits=32 encoding=SIGNED",
@@ -418,8 +418,8 @@ static void test_btf_add_btf()"[35] VAR 'var1' type_id=20, linkage=global-alloc" ,"[36] DATASEC 'datasec1' size=12 vlen=1\n" "\ttype_id=20 offset=4 size=8" , -"[37] TAG 'tag1' type_id=35 component_idx=-1" , - "[38] TAG 'tag2' type_id=33 component_idx=1"); +"[37] DECL_TAG 'tag1' type_id=35 component_idx=-1" , + "[38] DECL_TAG 'tag2' type_id=33 component_idx=1"); cleanup:btf__free (btf1);
tools/testing/selftests/bpf/progs/tag.c +3 -3
@@ -8,9 +8,9 @@#define __has_attribute (x) 0#endif -#if __has_attribute (btf_tag) -#define __tag1 __attribute__((btf_tag("tag1"))) -#define __tag2 __attribute__((btf_tag("tag2"))) +#if __has_attribute (btf_decl_tag) +#define __tag1 __attribute__((btf_decl_tag("tag1"))) +#define __tag2 __attribute__((btf_decl_tag("tag2"))) volatile const bool skip_tests __tag1 __tag2 = false;#else #define __tag1
tools/testing/selftests/bpf/test_btf.h +2 -2
@@ -69,7 +69,7 @@#define BTF_TYPE_FLOAT_ENC (name, sz) \ BTF_TYPE_ENC(name, BTF_INFO_ENC(BTF_KIND_FLOAT, 0, 0), sz) -#define BTF_TAG_ENC (value, type, component_idx) \ - BTF_TYPE_ENC(value, BTF_INFO_ENC(BTF_KIND_TAG, 0, 0), type), (component_idx) +#define BTF_DECL_TAG_ENC (value, type, component_idx) \ + BTF_TYPE_ENC(value, BTF_INFO_ENC(BTF_KIND_DECL_TAG, 0, 0), type), (component_idx)#endif /* _TEST_BTF_H */
Signature · 1 line
2.30.2
Quoted 23 lines · Yonghong Song
Patch set [1] introduced
BTF_KIND_TAGto allow tagging declarations for struct/union, struct/union field, var, func and func arguments and these tags will be encoded into dwarf. They are also encoded to btf by llvm for the bpf target.After
BTF_KIND_TAGis introduced, we intended to use it for kernel__userattributes. But kernel__useris actually a type attribute. Upstream and internal discussion showed it is not a good idea to mix declaration attribute and type attribute. So we proposed to introducebtf_type_tagas a type attribute and existingbtf_tagrenamed tobtf_decl_tag([2]).This patch renamed
BTF_KIND_TAGtoBTF_KIND_DECL_TAGand some other declarations with*_tagto*_decl_tagto make it clear the tag is for declaration. In the future,BTF_KIND_TYPE_TAGmight be introduced per [3].[1] https://lore.kernel.org/bpf/[email protected]/
[2] https://reviews.llvm.org/D111588
[3] https://reviews.llvm.org/D111199
Quoted 5 lines
Fixes b5ea834dde6b ("bpf: Support for new btf kind BTF_KIND_TAG")Fixes 5b84bd10363e ("libbpf: Add support for BTF_KIND_TAG")Fixes 5c07f2fec003 ("bpftool: Add support for BTF_KIND_TAG")Signed-off-by Yonghong Song <[email protected]>---
Patch bot missed this, but this was applied a while ago ([0]).
[...]