Skip to contentSkip to conversation

bpftool: use btf_vlen()/btf_kind()/btf_kflag() helpers consistently

PATCH Superseded [email protected] 5 participants 7 messages Jul 1 – Jul 2

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 bpftool: use btf_vlen()/btf_kind()/btf_kflag() helpers consistently

From: luoliang <[email protected]>

The btf_vlen(), btf_kind() and btf_kflag() inline helpers defined in tools/lib/bpf/btf.h are thin wrappers around the BTF_INFO_VLEN(), BTF_INFO_KIND() and BTF_INFO_KFLAG() UAPI macros - each one simply returns the corresponding macro applied to t->info.

bpftool already uses these helpers in most places, but 13 call sites in btf.c and btf_dumper.c still open-code the raw macros. Use the helpers consistently, matching the rest of bpftool as well as libbpf.

No functional change.

---
 tools/bpf/bpftool/btf.c        | 12 ++++++------
 tools/bpf/bpftool/btf_dumper.c | 14 +++++++-------
 2 files changed, 13 insertions(+), 13 deletions(-)
tools/bpf/bpftool/btf.c +6 -6
index 6ef908adf3a4..24e4cb600b3f 100644
@@ -179,7 +179,7 @@ static int dump_btf_type(const struct btf *btf, __u32 id,
 	case BTF_KIND_STRUCT:
 	case BTF_KIND_UNION: {
 		const struct btf_member *m = (const void *)(t + 1);
-		__u32 i, vlen = BTF_INFO_VLEN(t->info);
+		__u32 i, vlen = btf_vlen(t);
 
 		if (json_output) {
 			jsonw_uint_field(w, "size", t->size);
@@ -193,7 +193,7 @@ static int dump_btf_type(const struct btf *btf, __u32 id,
 			const char *name = btf_str(btf, m->name_off);
 			__u32 bit_off, bit_sz;
 
-			if (BTF_INFO_KFLAG(t->info)) {
+			if (btf_kflag(t)) {
 				bit_off = BTF_MEMBER_BIT_OFFSET(m->offset);
 				bit_sz = BTF_MEMBER_BITFIELD_SIZE(m->offset);
 			} else {
@@ -224,7 +224,7 @@ static int dump_btf_type(const struct btf *btf, __u32 id,
 	}
 	case BTF_KIND_ENUM: {
 		const struct btf_enum *v = (const void *)(t + 1);
-		__u32 i, vlen = BTF_INFO_VLEN(t->info);
+		__u32 i, vlen = btf_vlen(t);
 		const char *encoding;
 
 		encoding = btf_kflag(t) ? "SIGNED" : "UNSIGNED";
@@ -300,7 +300,7 @@ static int dump_btf_type(const struct btf *btf, __u32 id,
 		break;
 	}
 	case BTF_KIND_FWD: {
-		const char *fwd_kind = BTF_INFO_KFLAG(t->info) ? "union"
+		const char *fwd_kind = btf_kflag(t) ? "union"
 							       : "struct";
 
 		if (json_output)
@@ -322,7 +322,7 @@ static int dump_btf_type(const struct btf *btf, __u32 id,
 	}
 	case BTF_KIND_FUNC_PROTO: {
 		const struct btf_param *p = (const void *)(t + 1);
-		__u32 i, vlen = BTF_INFO_VLEN(t->info);
+		__u32 i, vlen = btf_vlen(t);
 
 		if (json_output) {
 			jsonw_uint_field(w, "ret_type_id", t->type);
@@ -365,7 +365,7 @@ static int dump_btf_type(const struct btf *btf, __u32 id,
 	case BTF_KIND_DATASEC: {
 		const struct btf_var_secinfo *v = (const void *)(t + 1);
 		const struct btf_type *vt;
-		__u32 i, vlen = BTF_INFO_VLEN(t->info);
+		__u32 i, vlen = btf_vlen(t);
 
 		if (json_output) {
 			jsonw_uint_field(w, "size", t->size);
tools/bpf/bpftool/btf_dumper.c +7 -7
index 9dc8425b1789..e4075824343f 100644
@@ -476,8 +476,8 @@ static int btf_dumper_struct(const struct btf_dumper *d, __u32 type_id,
 	if (!t)
 		return -EINVAL;
 
-	kind_flag = BTF_INFO_KFLAG(t->info);
-	vlen = BTF_INFO_VLEN(t->info);
+	kind_flag = btf_kflag(t);
+	vlen = btf_vlen(t);
 	jsonw_start_object(d->jw);
 	m = (struct btf_member *)(t + 1);
 
@@ -535,7 +535,7 @@ static int btf_dumper_datasec(const struct btf_dumper *d, __u32 type_id,
 	if (!t)
 		return -EINVAL;
 
-	vlen = BTF_INFO_VLEN(t->info);
+	vlen = btf_vlen(t);
 	vsi = (struct btf_var_secinfo *)(t + 1);
 
 	jsonw_start_object(d->jw);
@@ -557,7 +557,7 @@ static int btf_dumper_do_type(const struct btf_dumper *d, __u32 type_id,
 {
 	const struct btf_type *t = btf__type_by_id(d->btf, type_id);
 
-	switch (BTF_INFO_KIND(t->info)) {
+	switch (btf_kind(t)) {
 	case BTF_KIND_INT:
 		return btf_dumper_int(t, bit_offset, data, d->jw,
 				     d->is_plain_text);
@@ -631,7 +631,7 @@ static int __btf_dumper_type_only(const struct btf *btf, __u32 type_id,
 
 	t = btf__type_by_id(btf, type_id);
 
-	switch (BTF_INFO_KIND(t->info)) {
+	switch (btf_kind(t)) {
 	case BTF_KIND_INT:
 	case BTF_KIND_TYPEDEF:
 	case BTF_KIND_FLOAT:
@@ -661,7 +661,7 @@ static int __btf_dumper_type_only(const struct btf *btf, __u32 type_id,
 		break;
 	case BTF_KIND_FWD:
 		BTF_PRINT_ARG("%s %s ",
-			      BTF_INFO_KFLAG(t->info) ? "union" : "struct",
+			      btf_kflag(t) ? "union" : "struct",
 			      btf__name_by_offset(btf, t->name_off));
 		break;
 	case BTF_KIND_VOLATILE:
@@ -718,7 +718,7 @@ static int btf_dump_func(const struct btf *btf, char *func_sig,
 		BTF_PRINT_ARG("%s(", btf__name_by_offset(btf, func->name_off));
 	else
 		BTF_PRINT_ARG("(");
-	vlen = BTF_INFO_VLEN(func_proto->info);
+	vlen = btf_vlen(func_proto);
 	for (i = 0; i < vlen; i++) {
 		struct btf_param *arg = &((struct btf_param *)(func_proto + 1))[i];
 
Signature · 1 line
2.43.0
maintainer Reviewed-by on v1 1/1
#1 lore raw
Quoted 7 lines · On 01/07/2026 07:25, [email protected] wrote:

From: luoliang <[email protected]>

The btf_vlen(), btf_kind() and btf_kflag() inline helpers defined in tools/lib/bpf/btf.h are thin wrappers around the BTF_INFO_VLEN(), BTF_INFO_KIND() and BTF_INFO_KFLAG() UAPI macros - each one simply returns the corresponding macro applied to t->info.

Quoted 7 lines

bpftool already uses these helpers in most places, but 13 call sites in btf.c and btf_dumper.c still open-code the raw macros. Use the helpers consistently, matching the rest of bpftool as well as libbpf.

No functional change.

Thank you

#2 lore raw
In reply to [email protected]
Quoted 51 lines · On Wed, 2026-07-01 at 14:25 +0800, [email protected] wrote:

From: luoliang <[email protected]>

The btf_vlen(), btf_kind() and btf_kflag() inline helpers defined in tools/lib/bpf/btf.h are thin wrappers around the BTF_INFO_VLEN(), BTF_INFO_KIND() and BTF_INFO_KFLAG() UAPI macros - each one simply returns the corresponding macro applied to t->info.

bpftool already uses these helpers in most places, but 13 call sites in btf.c and btf_dumper.c still open-code the raw macros. Use the helpers consistently, matching the rest of bpftool as well as libbpf.

No functional change.

---
 tools/bpf/bpftool/btf.c        | 12 ++++++------ tools/bpf/bpftool/btf_dumper.c | 14 +++++++-------

 2 files changed, 13 insertions(+), 13 deletions(-)
tools/bpf/bpftool/btf.c +0 -0
index 6ef908adf3a4..24e4cb600b3f 100644
@@ -179,7 +179,7 @@ static int dump_btf_type(const struct btf *btf, __u32 id,

  case BTF_KIND_STRUCT:
  case BTF_KIND_UNION: {
  const struct btf_member *m = (const void *)(t + 1);

tools/bpf/bpftool/btf.c +1 -1
-		__u32 i, vlen = BTF_INFO_VLEN(t->info);
+		__u32 i, vlen = btf_vlen(t);


  if (json_output) { jsonw_uint_field(w, "size", t->size);

tools/bpf/bpftool/btf.c +0 -0
@@ -193,7 +193,7 @@ static int dump_btf_type(const struct btf *btf, __u32 id,
  			const char *name = btf_str(btf, m->name_off);
  			__u32 bit_off, bit_sz;

tools/bpf/bpftool/btf.c +1 -1
-			if (BTF_INFO_KFLAG(t->info)) {
+			if (btf_kflag(t)) {

  bit_off = BTF_MEMBER_BIT_OFFSET(m->offset); bit_sz = BTF_MEMBER_BITFIELD_SIZE(m->offset); } else {

tools/bpf/bpftool/btf.c +1 -1
@@ -224,7 +224,7 @@ static int dump_btf_type(const struct btf *btf, __u32 id,
  	}
  	case BTF_KIND_ENUM: {
  		const struct btf_enum *v = (const void *)(t + 1);
-		__u32 i, vlen = BTF_INFO_VLEN(t->info);
+		__u32 i, vlen = btf_vlen(t);
  		const char *encoding;


  encoding = btf_kflag(t) ? "SIGNED" : "UNSIGNED";

tools/bpf/bpftool/btf.c static int dump_btf_type(const struct btf *btf, __u32 id, · line 304

Quoted 6 lines
tools/bpf/bpftool/btf.c +1 -1
@@ -300,7 +300,7 @@ static int dump_btf_type(const struct btf *btf, __u32 id,
  		break;
  	}
  	case BTF_KIND_FWD: {
-		const char *fwd_kind = BTF_INFO_KFLAG(t->info) ? "union"
+		const char *fwd_kind = btf_kflag(t) ? "union"
  							       : "struct";

nit: coding style, and can be one line.

Quoted 80 lines


  if (json_output)

tools/bpf/bpftool/btf.c +1 -1
@@ -322,7 +322,7 @@ static int dump_btf_type(const struct btf *btf, __u32 id,
  	}
  	case BTF_KIND_FUNC_PROTO: {
  		const struct btf_param *p = (const void *)(t + 1);
-		__u32 i, vlen = BTF_INFO_VLEN(t->info);
+		__u32 i, vlen = btf_vlen(t);


  if (json_output) {
  jsonw_uint_field(w, "ret_type_id", t->type);

tools/bpf/bpftool/btf.c +1 -1
@@ -365,7 +365,7 @@ static int dump_btf_type(const struct btf *btf, __u32 id,
  	case BTF_KIND_DATASEC: {
  		const struct btf_var_secinfo *v = (const void *)(t + 1);
  		const struct btf_type *vt;
-		__u32 i, vlen = BTF_INFO_VLEN(t->info);
+		__u32 i, vlen = btf_vlen(t);


  if (json_output) { jsonw_uint_field(w, "size", t->size);

tools/bpf/bpftool/btf_dumper.c +0 -0
index 9dc8425b1789..e4075824343f 100644
@@ -476,8 +476,8 @@ static int btf_dumper_struct(const struct btf_dumper *d, __u32 type_id,
  	if (!t)
  		return -EINVAL;

tools/bpf/bpftool/btf_dumper.c +2 -2
-	kind_flag = BTF_INFO_KFLAG(t->info);
-	vlen = BTF_INFO_VLEN(t->info);
+	kind_flag = btf_kflag(t);
+	vlen = btf_vlen(t);

  jsonw_start_object(d->jw);
  m = (struct btf_member *)(t + 1);

tools/bpf/bpftool/btf_dumper.c +0 -0
@@ -535,7 +535,7 @@ static int btf_dumper_datasec(const struct btf_dumper *d, __u32 type_id,
  	if (!t)
  		return -EINVAL;

tools/bpf/bpftool/btf_dumper.c +1 -1
-	vlen = BTF_INFO_VLEN(t->info);
+	vlen = btf_vlen(t);

  vsi = (struct btf_var_secinfo *)(t + 1);

  jsonw_start_object(d->jw);

tools/bpf/bpftool/btf_dumper.c +0 -0
@@ -557,7 +557,7 @@ static int btf_dumper_do_type(const struct btf_dumper *d, __u32 type_id,
  {
  	const struct btf_type *t = btf__type_by_id(d->btf, type_id);

tools/bpf/bpftool/btf_dumper.c +1 -1
-	switch (BTF_INFO_KIND(t->info)) {
+	switch (btf_kind(t)) {

  case BTF_KIND_INT:
  return btf_dumper_int(t, bit_offset, data, d->jw, d->is_plain_text);

tools/bpf/bpftool/btf_dumper.c +0 -0
@@ -631,7 +631,7 @@ static int __btf_dumper_type_only(const struct btf *btf, __u32 type_id,


  t = btf__type_by_id(btf, type_id);

tools/bpf/bpftool/btf_dumper.c +1 -1
-	switch (BTF_INFO_KIND(t->info)) {
+	switch (btf_kind(t)) {

  case BTF_KIND_INT:
  case BTF_KIND_TYPEDEF:
  case BTF_KIND_FLOAT:

tools/bpf/bpftool/btf_dumper.c +0 -0
@@ -661,7 +661,7 @@ static int __btf_dumper_type_only(const struct btf *btf, __u32 type_id,
  		break;

  case BTF_KIND_FWD:
  BTF_PRINT_ARG("%s %s ",

tools/bpf/bpftool/btf_dumper.c +1 -1
-			      BTF_INFO_KFLAG(t->info) ? "union" : "struct",
+			      btf_kflag(t) ? "union" : "struct",

        btf__name_by_offset(btf, t->name_off)); break;
  case BTF_KIND_VOLATILE:

tools/bpf/bpftool/btf_dumper.c +0 -0
@@ -718,7 +718,7 @@ static int btf_dump_func(const struct btf *btf, char *func_sig,
  		BTF_PRINT_ARG("%s(", btf__name_by_offset(btf, func->name_off));

  else
  BTF_PRINT_ARG("(");

tools/bpf/bpftool/btf_dumper.c +1 -1
-	vlen = BTF_INFO_VLEN(func_proto->info);
+	vlen = btf_vlen(func_proto);

  for (i = 0; i < vlen; i++) {
  struct btf_param *arg = &((struct btf_param *)(func_proto + 1))[i];

#3 lore raw
Quoted 51 lines · KaFai Wan
Quoted 49 lines · On Wed, 2026-07-01 at 14:25 +0800, [email protected] wrote:

From: luoliang <[email protected]>

The btf_vlen(), btf_kind() and btf_kflag() inline helpers defined in tools/lib/bpf/btf.h are thin wrappers around the BTF_INFO_VLEN(), BTF_INFO_KIND() and BTF_INFO_KFLAG() UAPI macros - each one simply returns the corresponding macro applied to t->info.

bpftool already uses these helpers in most places, but 13 call sites in btf.c and btf_dumper.c still open-code the raw macros. Use the helpers consistently, matching the rest of bpftool as well as libbpf.

No functional change.

---
 tools/bpf/bpftool/btf.c        | 12 ++++++------
 tools/bpf/bpftool/btf_dumper.c | 14 +++++++-------
 2 files changed, 13 insertions(+), 13 deletions(-)
tools/bpf/bpftool/btf.c +3 -3
index 6ef908adf3a4..24e4cb600b3f 100644
@@ -179,7 +179,7 @@ static int dump_btf_type(const struct btf *btf, __u32 id,
      case BTF_KIND_STRUCT:
      case BTF_KIND_UNION: {
              const struct btf_member *m = (const void *)(t + 1);
-             __u32 i, vlen = BTF_INFO_VLEN(t->info);
+             __u32 i, vlen = btf_vlen(t);
 
              if (json_output) {
                      jsonw_uint_field(w, "size", t->size);
@@ -193,7 +193,7 @@ static int dump_btf_type(const struct btf *btf, __u32 id,
                      const char *name = btf_str(btf, m->name_off);
                      __u32 bit_off, bit_sz;
 
-                     if (BTF_INFO_KFLAG(t->info)) {
+                     if (btf_kflag(t)) {
                              bit_off = BTF_MEMBER_BIT_OFFSET(m->offset);
                              bit_sz = BTF_MEMBER_BITFIELD_SIZE(m->offset);
                      } else {
@@ -224,7 +224,7 @@ static int dump_btf_type(const struct btf *btf, __u32 id,
      }
      case BTF_KIND_ENUM: {
              const struct btf_enum *v = (const void *)(t + 1);
-             __u32 i, vlen = BTF_INFO_VLEN(t->info);
+             __u32 i, vlen = btf_vlen(t);
              const char *encoding;
 
Quoted 9 lines

tools/bpf/bpftool/btf.c static int dump_btf_type(const struct btf *btf, __u32 id, · line 304

Quoted 8 lines
tools/bpf/bpftool/btf.c +1 -1
              encoding = btf_kflag(t) ? "SIGNED" : "UNSIGNED";
@@ -300,7 +300,7 @@ static int dump_btf_type(const struct btf *btf, __u32 id,
              break;
      }
      case BTF_KIND_FWD: {
-             const char *fwd_kind = BTF_INFO_KFLAG(t->info) ? "union"
+             const char *fwd_kind = btf_kflag(t) ? "union"
                                                             : "struct";

nit: coding style, and can be one line.

this is the only line that would benefit from a tiny amount of human touch and judgement call, and yet...

pw-bot: cr

Quoted 81 lines
Quoted 80 lines
tools/bpf/bpftool/btf.c +2 -2
              if (json_output)
@@ -322,7 +322,7 @@ static int dump_btf_type(const struct btf *btf, __u32 id,
      }
      case BTF_KIND_FUNC_PROTO: {
              const struct btf_param *p = (const void *)(t + 1);
-             __u32 i, vlen = BTF_INFO_VLEN(t->info);
+             __u32 i, vlen = btf_vlen(t);
 
              if (json_output) {
                      jsonw_uint_field(w, "ret_type_id", t->type);
@@ -365,7 +365,7 @@ static int dump_btf_type(const struct btf *btf, __u32 id,
      case BTF_KIND_DATASEC: {
              const struct btf_var_secinfo *v = (const void *)(t + 1);
              const struct btf_type *vt;
-             __u32 i, vlen = BTF_INFO_VLEN(t->info);
+             __u32 i, vlen = btf_vlen(t);
 
              if (json_output) {
                      jsonw_uint_field(w, "size", t->size);
tools/bpf/bpftool/btf_dumper.c +7 -7
index 9dc8425b1789..e4075824343f 100644
@@ -476,8 +476,8 @@ static int btf_dumper_struct(const struct btf_dumper *d, __u32 type_id,
      if (!t)
              return -EINVAL;
 
-     kind_flag = BTF_INFO_KFLAG(t->info);
-     vlen = BTF_INFO_VLEN(t->info);
+     kind_flag = btf_kflag(t);
+     vlen = btf_vlen(t);
      jsonw_start_object(d->jw);
      m = (struct btf_member *)(t + 1);
 
@@ -535,7 +535,7 @@ static int btf_dumper_datasec(const struct btf_dumper *d, __u32 type_id,
      if (!t)
              return -EINVAL;
 
-     vlen = BTF_INFO_VLEN(t->info);
+     vlen = btf_vlen(t);
      vsi = (struct btf_var_secinfo *)(t + 1);
 
      jsonw_start_object(d->jw);
@@ -557,7 +557,7 @@ static int btf_dumper_do_type(const struct btf_dumper *d, __u32 type_id,
 {
      const struct btf_type *t = btf__type_by_id(d->btf, type_id);
 
-     switch (BTF_INFO_KIND(t->info)) {
+     switch (btf_kind(t)) {
      case BTF_KIND_INT:
              return btf_dumper_int(t, bit_offset, data, d->jw,
                                   d->is_plain_text);
@@ -631,7 +631,7 @@ static int __btf_dumper_type_only(const struct btf *btf, __u32 type_id,
 
      t = btf__type_by_id(btf, type_id);
 
-     switch (BTF_INFO_KIND(t->info)) {
+     switch (btf_kind(t)) {
      case BTF_KIND_INT:
      case BTF_KIND_TYPEDEF:
      case BTF_KIND_FLOAT:
@@ -661,7 +661,7 @@ static int __btf_dumper_type_only(const struct btf *btf, __u32 type_id,
              break;
      case BTF_KIND_FWD:
              BTF_PRINT_ARG("%s %s ",
-                           BTF_INFO_KFLAG(t->info) ? "union" : "struct",
+                           btf_kflag(t) ? "union" : "struct",
                            btf__name_by_offset(btf, t->name_off));
              break;
      case BTF_KIND_VOLATILE:
@@ -718,7 +718,7 @@ static int btf_dump_func(const struct btf *btf, char *func_sig,
              BTF_PRINT_ARG("%s(", btf__name_by_offset(btf, func->name_off));
      else
              BTF_PRINT_ARG("(");
-     vlen = BTF_INFO_VLEN(func_proto->info);
+     vlen = btf_vlen(func_proto);
      for (i = 0; i < vlen; i++) {
              struct btf_param *arg = &((struct btf_param *)(func_proto + 1))[i];
 
#4 lore raw
Quoted 4 lines · Andrii Nakryiko

this is the only line that would benefit from a tiny amount of human touch and judgement call, and yet...

pw-bot: cr

Thanks Andrii (and KaFai for spotting this). Folded into v2, sent as a reply to the original patch.

#5 lore raw

PATCH v2 1/1 bpftool: use btf_vlen()/btf_kind()/btf_kflag() helpers consistently

In reply to [email protected]

From: luoliang <[email protected]>

The btf_vlen(), btf_kind() and btf_kflag() inline helpers defined in tools/lib/bpf/btf.h are thin wrappers around the BTF_INFO_VLEN(), BTF_INFO_KIND() and BTF_INFO_KFLAG() UAPI macros - each one simply returns the corresponding macro applied to t->info.

bpftool already uses these helpers in most places, but 13 call sites in btf.c and btf_dumper.c still open-code the raw macros. Use the helpers consistently, matching the rest of bpftool as well as libbpf.

No functional change.

---

Changes in v2:
- Collapse the BTF_KIND_FWD fwd_kind assignment to a single line now that btf_kflag(t) is short enough, as suggested by KaFai Wan and requested by Andrii Nakryiko.

---
 tools/bpf/bpftool/btf.c        | 13 ++++++-------
 tools/bpf/bpftool/btf_dumper.c | 14 +++++++-------
 2 files changed, 13 insertions(+), 14 deletions(-)
tools/bpf/bpftool/btf.c +6 -7
index 6ef908adf3a4..c9589026da8d 100644
@@ -179,7 +179,7 @@ static int dump_btf_type(const struct btf *btf, __u32 id,
 	case BTF_KIND_STRUCT:
 	case BTF_KIND_UNION: {
 		const struct btf_member *m = (const void *)(t + 1);
-		__u32 i, vlen = BTF_INFO_VLEN(t->info);
+		__u32 i, vlen = btf_vlen(t);
 
 		if (json_output) {
 			jsonw_uint_field(w, "size", t->size);
@@ -193,7 +193,7 @@ static int dump_btf_type(const struct btf *btf, __u32 id,
 			const char *name = btf_str(btf, m->name_off);
 			__u32 bit_off, bit_sz;
 
-			if (BTF_INFO_KFLAG(t->info)) {
+			if (btf_kflag(t)) {
 				bit_off = BTF_MEMBER_BIT_OFFSET(m->offset);
 				bit_sz = BTF_MEMBER_BITFIELD_SIZE(m->offset);
 			} else {
@@ -224,7 +224,7 @@ static int dump_btf_type(const struct btf *btf, __u32 id,
 	}
 	case BTF_KIND_ENUM: {
 		const struct btf_enum *v = (const void *)(t + 1);
-		__u32 i, vlen = BTF_INFO_VLEN(t->info);
+		__u32 i, vlen = btf_vlen(t);
 		const char *encoding;
 
 		encoding = btf_kflag(t) ? "SIGNED" : "UNSIGNED";
@@ -300,8 +300,7 @@ static int dump_btf_type(const struct btf *btf, __u32 id,
 		break;
 	}
 	case BTF_KIND_FWD: {
-		const char *fwd_kind = BTF_INFO_KFLAG(t->info) ? "union"
-							       : "struct";
+		const char *fwd_kind = btf_kflag(t) ? "union" : "struct";
 
 		if (json_output)
 			jsonw_string_field(w, "fwd_kind", fwd_kind);
@@ -322,7 +321,7 @@ static int dump_btf_type(const struct btf *btf, __u32 id,
 	}
 	case BTF_KIND_FUNC_PROTO: {
 		const struct btf_param *p = (const void *)(t + 1);
-		__u32 i, vlen = BTF_INFO_VLEN(t->info);
+		__u32 i, vlen = btf_vlen(t);
 
 		if (json_output) {
 			jsonw_uint_field(w, "ret_type_id", t->type);
@@ -365,7 +364,7 @@ static int dump_btf_type(const struct btf *btf, __u32 id,
 	case BTF_KIND_DATASEC: {
 		const struct btf_var_secinfo *v = (const void *)(t + 1);
 		const struct btf_type *vt;
-		__u32 i, vlen = BTF_INFO_VLEN(t->info);
+		__u32 i, vlen = btf_vlen(t);
 
 		if (json_output) {
 			jsonw_uint_field(w, "size", t->size);
tools/bpf/bpftool/btf_dumper.c +7 -7
index 9dc8425b1789..e4075824343f 100644
@@ -476,8 +476,8 @@ static int btf_dumper_struct(const struct btf_dumper *d, __u32 type_id,
 	if (!t)
 		return -EINVAL;
 
-	kind_flag = BTF_INFO_KFLAG(t->info);
-	vlen = BTF_INFO_VLEN(t->info);
+	kind_flag = btf_kflag(t);
+	vlen = btf_vlen(t);
 	jsonw_start_object(d->jw);
 	m = (struct btf_member *)(t + 1);
 
@@ -535,7 +535,7 @@ static int btf_dumper_datasec(const struct btf_dumper *d, __u32 type_id,
 	if (!t)
 		return -EINVAL;
 
-	vlen = BTF_INFO_VLEN(t->info);
+	vlen = btf_vlen(t);
 	vsi = (struct btf_var_secinfo *)(t + 1);
 
 	jsonw_start_object(d->jw);
@@ -557,7 +557,7 @@ static int btf_dumper_do_type(const struct btf_dumper *d, __u32 type_id,
 {
 	const struct btf_type *t = btf__type_by_id(d->btf, type_id);
 
-	switch (BTF_INFO_KIND(t->info)) {
+	switch (btf_kind(t)) {
 	case BTF_KIND_INT:
 		return btf_dumper_int(t, bit_offset, data, d->jw,
 				     d->is_plain_text);
@@ -631,7 +631,7 @@ static int __btf_dumper_type_only(const struct btf *btf, __u32 type_id,
 
 	t = btf__type_by_id(btf, type_id);
 
-	switch (BTF_INFO_KIND(t->info)) {
+	switch (btf_kind(t)) {
 	case BTF_KIND_INT:
 	case BTF_KIND_TYPEDEF:
 	case BTF_KIND_FLOAT:
@@ -661,7 +661,7 @@ static int __btf_dumper_type_only(const struct btf *btf, __u32 type_id,
 		break;
 	case BTF_KIND_FWD:
 		BTF_PRINT_ARG("%s %s ",
-			      BTF_INFO_KFLAG(t->info) ? "union" : "struct",
+			      btf_kflag(t) ? "union" : "struct",
 			      btf__name_by_offset(btf, t->name_off));
 		break;
 	case BTF_KIND_VOLATILE:
@@ -718,7 +718,7 @@ static int btf_dump_func(const struct btf *btf, char *func_sig,
 		BTF_PRINT_ARG("%s(", btf__name_by_offset(btf, func->name_off));
 	else
 		BTF_PRINT_ARG("(");
-	vlen = BTF_INFO_VLEN(func_proto->info);
+	vlen = btf_vlen(func_proto);
 	for (i = 0; i < vlen; i++) {
 		struct btf_param *arg = &((struct btf_param *)(func_proto + 1))[i];
 
Signature · 1 line
2.43.0
#6 lore raw
This patch was applied to bpf/bpf-next.git (master) by Andrii Nakryiko <[email protected]>:

Hello:

This patch was applied to bpf/bpf-next.git (master) by Andrii Nakryiko <[email protected]>:

Quoted 8 lines · On Thu, 2 Jul 2026 09:23:11 +0800 you wrote:

From: luoliang <[email protected]>

The btf_vlen(), btf_kind() and btf_kflag() inline helpers defined in tools/lib/bpf/btf.h are thin wrappers around the BTF_INFO_VLEN(), BTF_INFO_KIND() and BTF_INFO_KFLAG() UAPI macros - each one simply returns the corresponding macro applied to t->info.

[...]

Here is the summary with links:
- [v2] bpftool: use btf_vlen()/btf_kind()/btf_kflag() helpers consistently

    https://git.kernel.org/bpf/bpf-next/c/bb4e90e91ba1

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html