[RFC bpf-next 05/15] bpftool: Add ability to dump LOC_PARAM, LOC_PROTO and LOCSEC

[Alan Maguire <alan.maguire@oracle.com>]

In raw mode ensure we can dump new BTF kinds in normal/json format.

Signed-off-by: Alan Maguire <alan.maguire@oracle.com>
---
 tools/bpf/bpftool/btf.c | 95 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 95 insertions(+)

diff --git a/tools/bpf/bpftool/btf.c b/tools/bpf/bpftool/btf.c
index 946612029dee..23b773659ad8 100644
--- a/tools/bpf/bpftool/btf.c
+++ b/tools/bpf/bpftool/btf.c
@@ -50,6 +50,9 @@ static const char * const btf_kind_str[NR_BTF_KINDS] = {
 	[BTF_KIND_DECL_TAG]	= "DECL_TAG",
 	[BTF_KIND_TYPE_TAG]	= "TYPE_TAG",
 	[BTF_KIND_ENUM64]	= "ENUM64",
+	[BTF_KIND_LOC_PARAM]	= "LOC_PARAM",
+	[BTF_KIND_LOC_PROTO]	= "LOC_PROTO",
+	[BTF_KIND_LOCSEC]	= "LOCSEC",
 };
 
 struct sort_datum {
@@ -420,6 +423,98 @@ static int dump_btf_type(const struct btf *btf, __u32 id,
 		}
 		break;
 	}
+	case BTF_KIND_LOC_PARAM: {
+		const struct btf_loc_param *p = btf_loc_param(t);
+		__s32 sz = (__s32)t->size;
+
+		if (btf_kflag(t)) {
+			__u64 uval = btf_loc_param_value(t);
+			__s64 sval = (__s64)uval;
+
+			if (json_output) {
+				jsonw_int_field(w, "size", sz);
+				if (sz >= 0)
+					jsonw_uint_field(w, "value", uval);
+				else
+					jsonw_int_field(w, "value", sval);
+			} else {
+				if (sz >= 0)
+					printf(" size=%d value=%llu", sz, uval);
+				else
+					printf(" size=%d value=%lld", sz, sval);
+			}
+		} else {
+			if (json_output) {
+				jsonw_int_field(w, "size", sz);
+				jsonw_uint_field(w, "reg", p->reg);
+				jsonw_uint_field(w, "flags", p->flags);
+				jsonw_int_field(w, "offset", p->offset);
+			} else {
+				printf(" size=%d reg=%u flags=0x%x offset=%d",
+				       sz, p->reg, p->flags, p->offset);
+			}
+		}
+		break;
+	}
+
+	case BTF_KIND_LOC_PROTO: {
+		__u32 *params = btf_loc_proto_params(t);
+		__u16 vlen = BTF_INFO_VLEN(t->info);
+		int i;
+
+		if (json_output) {
+			jsonw_uint_field(w, "vlen", vlen);
+			jsonw_name(w, "params");
+			jsonw_start_array(w);
+		} else {
+			printf(" vlen=%u", vlen);
+		}
+
+		for (i = 0; i < vlen; i++, params++) {
+			if (json_output) {
+				jsonw_start_object(w);
+				jsonw_uint_field(w, "type_id", *params);
+				jsonw_end_object(w);
+			} else {
+				printf("\n\t type_id=%u", *params);
+			}
+		}
+		if (json_output)
+			jsonw_end_array(w);
+		break;
+	}
+
+	case BTF_KIND_LOCSEC: {
+		__u16 vlen = BTF_INFO_VLEN(t->info);
+		struct btf_loc *locs = btf_locsec_locs(t);
+		int i;
+
+		if (json_output) {
+			jsonw_uint_field(w, "vlen", vlen);
+			jsonw_name(w, "locs");
+			jsonw_start_array(w);
+		} else {
+			printf(" vlen=%u", vlen);
+		}
+
+		for (i = 0; i < vlen; i++, locs++) {
+			if (json_output) {
+				jsonw_start_object(w);
+				jsonw_string_field(w, "name", btf_str(btf, locs->name_off));
+				jsonw_uint_field(w, "func_proto_type_id", locs->func_proto);
+				jsonw_uint_field(w, "loc_proto_type_id", locs->loc_proto);
+				jsonw_uint_field(w, "offset", locs->offset);
+				jsonw_end_object(w);
+			} else {
+				printf("\n\t '%s' func_proto_type_id=%u loc_proto_type_id=%u offset=%u",
+				       btf_str(btf, locs->name_off),
+				       locs->func_proto, locs->loc_proto, locs->offset);
+			}
+		}
+		if (json_output)
+			jsonw_end_array(w);
+		break;
+	}
 	default:
 		break;
 	}
-- 
2.39.3