2 files changed, 30 insertions, 3 deletions

diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h
index aa582cd5bfcf..91c43884f295 100644
--- a/tools/include/uapi/linux/bpf.h
+++ b/tools/include/uapi/linux/bpf.h
@@ -133,6 +133,14 @@ enum bpf_map_type {
         BPF_MAP_TYPE_STACK,
 };
 
+/* Note that tracing related programs such as
+ * BPF_PROG_TYPE_{KPROBE,TRACEPOINT,PERF_EVENT,RAW_TRACEPOINT}
+ * are not subject to a stable API since kernel internal data
+ * structures can change from release to release and may
+ * therefore break existing tracing BPF programs. Tracing BPF
+ * programs correspond to /a/ specific kernel which is to be
+ * analyzed, and not /a/ specific kernel /and/ all future ones.
+ */
 enum bpf_prog_type {
         BPF_PROG_TYPE_UNSPEC,
         BPF_PROG_TYPE_SOCKET_FILTER,
@@ -343,7 +351,7 @@ union bpf_attr {
                 __u32           log_level;      /* verbosity level of verifier */
                 __u32           log_size;       /* size of user buffer */
                 __aligned_u64   log_buf;        /* user supplied buffer */
-                __u32           kern_version;   /* checked when prog_type=kprobe */
+                __u32           kern_version;   /* not used */
                 __u32           prog_flags;
                 char            prog_name[BPF_OBJ_NAME_LEN];
                 __u32           prog_ifindex;   /* ifindex of netdev to prep for */
@@ -2657,6 +2665,7 @@ struct sk_msg_md {
         __u32 local_ip6[4];     /* Stored in network byte order */
         __u32 remote_port;      /* Stored in network byte order */
         __u32 local_port;       /* stored in host byte order */
+        __u32 size;             /* Total size of sk_msg */
 };
 
 struct sk_reuseport_md {
@@ -2717,6 +2726,8 @@ struct bpf_prog_info {
         __u32 nr_jited_line_info;
         __u32 line_info_rec_size;
         __u32 jited_line_info_rec_size;
+        __u32 nr_prog_tags;
+        __aligned_u64 prog_tags;
 } __attribute__((aligned(8)));
 
 struct bpf_map_info {
diff --git a/tools/include/uapi/linux/btf.h b/tools/include/uapi/linux/btf.h
index 14f66948fc95..7b7475ef2f17 100644
--- a/tools/include/uapi/linux/btf.h
+++ b/tools/include/uapi/linux/btf.h
@@ -34,7 +34,9 @@ struct btf_type {
          * bits  0-15: vlen (e.g. # of struct's members)
          * bits 16-23: unused
          * bits 24-27: kind (e.g. int, ptr, array...etc)
-         * bits 28-31: unused
+         * bits 28-30: unused
+         * bit     31: kind_flag, currently used by
+         *             struct, union and fwd
          */
         __u32 info;
         /* "size" is used by INT, ENUM, STRUCT and UNION.
@@ -52,6 +54,7 @@ struct btf_type {
 
 #define BTF_INFO_KIND(info)     (((info) >> 24) & 0x0f)
 #define BTF_INFO_VLEN(info)     ((info) & 0xffff)
+#define BTF_INFO_KFLAG(info)    ((info) >> 31)
 
 #define BTF_KIND_UNKN           0       /* Unknown      */
 #define BTF_KIND_INT            1       /* Integer      */
@@ -110,9 +113,22 @@ struct btf_array {
 struct btf_member {
         __u32   name_off;
         __u32   type;
-        __u32   offset; /* offset in bits */
+        /* If the type info kind_flag is set, the btf_member offset
+         * contains both member bitfield size and bit offset. The
+         * bitfield size is set for bitfield members. If the type
+         * info kind_flag is not set, the offset contains only bit
+         * offset.
+         */
+        __u32   offset;
 };
 
+/* If the struct/union type info kind_flag is set, the
+ * following two macros are used to access bitfield_size
+ * and bit_offset from btf_member.offset.
+ */
+#define BTF_MEMBER_BITFIELD_SIZE(val)   ((val) >> 24)
+#define BTF_MEMBER_BIT_OFFSET(val)      ((val) & 0xffffff)
+
 /* BTF_KIND_FUNC_PROTO is followed by multiple "struct btf_param".
  * The exact number of btf_param is stored in the vlen (of the
  * info in "struct btf_type").