bpf: Add BTF_KIND_FLOAT to uapi

Add a new kind value and expand the kind bitfield.

Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Acked-by: Yonghong Song <yhs@fb.com>
Link: https://lore.kernel.org/bpf/20210226202256.116518-2-iii@linux.ibm.com

diff --git a/include/uapi/linux/btf.h b/include/uapi/linux/btf.h
index 5a667107ad2cce1980e01d3c7bd6273de8439990..d27b1708efe91995242327008202df43581a9fbe 100644 (file)
--- a/include/uapi/linux/btf.h
+++ b/include/uapi/linux/btf.h
@@ -52,7 +52,7 @@ struct btf_type {
        };
 };
 
-#define BTF_INFO_KIND(info)    (((info) >> 24) & 0x0f)
+#define BTF_INFO_KIND(info)    (((info) >> 24) & 0x1f)
 #define BTF_INFO_VLEN(info)    ((info) & 0xffff)
 #define BTF_INFO_KFLAG(info)   ((info) >> 31)
 
@@ -72,7 +72,8 @@ struct btf_type {
 #define BTF_KIND_FUNC_PROTO    13      /* Function Proto       */
 #define BTF_KIND_VAR           14      /* Variable     */
 #define BTF_KIND_DATASEC       15      /* Section      */
-#define BTF_KIND_MAX           BTF_KIND_DATASEC
+#define BTF_KIND_FLOAT         16      /* Floating point       */
+#define BTF_KIND_MAX           BTF_KIND_FLOAT
 #define NR_BTF_KINDS           (BTF_KIND_MAX + 1)
 
 /* For some specific BTF_KIND, "struct btf_type" is immediately

diff --git a/tools/include/uapi/linux/btf.h b/tools/include/uapi/linux/btf.h
index 5a667107ad2cce1980e01d3c7bd6273de8439990..d27b1708efe91995242327008202df43581a9fbe 100644 (file)
--- a/tools/include/uapi/linux/btf.h
+++ b/tools/include/uapi/linux/btf.h
@@ -52,7 +52,7 @@ struct btf_type {
        };
 };
 
-#define BTF_INFO_KIND(info)    (((info) >> 24) & 0x0f)
+#define BTF_INFO_KIND(info)    (((info) >> 24) & 0x1f)
 #define BTF_INFO_VLEN(info)    ((info) & 0xffff)
 #define BTF_INFO_KFLAG(info)   ((info) >> 31)
 
@@ -72,7 +72,8 @@ struct btf_type {
 #define BTF_KIND_FUNC_PROTO    13      /* Function Proto       */
 #define BTF_KIND_VAR           14      /* Variable     */
 #define BTF_KIND_DATASEC       15      /* Section      */
-#define BTF_KIND_MAX           BTF_KIND_DATASEC
+#define BTF_KIND_FLOAT         16      /* Floating point       */
+#define BTF_KIND_MAX           BTF_KIND_FLOAT
 #define NR_BTF_KINDS           (BTF_KIND_MAX + 1)
 
 /* For some specific BTF_KIND, "struct btf_type" is immediately