nlattr: add UID/GID netlink attribute decoders

[strace] / bpf_attr.h

diff --git a/bpf_attr.h b/bpf_attr.h
index 664968389d9c73bee256f49c62a65c0dc64cea89..45bb30a751e170de66e6cc9c94506a268a113eb4 100644 (file)
--- a/bpf_attr.h
+++ b/bpf_attr.h
@@ -28,6 +28,33 @@
 #ifndef STRACE_BPF_ATTR_H
 #define STRACE_BPF_ATTR_H
 
+/*
+ * The policy is that all fields of type uint64_t in this header file
+ * must have ATTRIBUTE_ALIGNED(8).
+ *
+ * This should not cause any contradictions with <linux/bpf.h>
+ * unless the latter is buggy.
+ *
+ * By word "buggy" I mean containing such changes as Linux kernel commit
+ * v4.16-rc1~123^2~109^2~5^2~4.
+ */
+
+#ifndef BPF_OBJ_NAME_LEN
+# define BPF_OBJ_NAME_LEN 16U
+#else
+# if BPF_OBJ_NAME_LEN != 16U
+#  error "Unexpected value of BPF_OBJ_NAME_LEN"
+# endif
+#endif
+
+#ifndef BPF_TAG_SIZE
+# define BPF_TAG_SIZE 8
+#else
+# if BPF_TAG_SIZE != 8
+#  error "Unexpected value of BPF_TAG_SIZE"
+# endif
+#endif
+
 struct BPF_MAP_CREATE_struct {
        uint32_t map_type;
        uint32_t key_size;
@@ -36,11 +63,13 @@ struct BPF_MAP_CREATE_struct {
        uint32_t map_flags;
        uint32_t inner_map_fd;
        uint32_t numa_node;
+       char     map_name[BPF_OBJ_NAME_LEN];
+       uint32_t map_ifindex;
 };
 
 #define BPF_MAP_CREATE_struct_size \
        sizeof(struct BPF_MAP_CREATE_struct)
-#define expected_BPF_MAP_CREATE_struct_size 28
+#define expected_BPF_MAP_CREATE_struct_size 48
 
 struct BPF_MAP_LOOKUP_ELEM_struct {
        uint32_t map_fd;
@@ -56,7 +85,7 @@ struct BPF_MAP_UPDATE_ELEM_struct {
        uint32_t map_fd;
        uint64_t ATTRIBUTE_ALIGNED(8) key;
        uint64_t ATTRIBUTE_ALIGNED(8) value;
-       uint64_t flags;
+       uint64_t ATTRIBUTE_ALIGNED(8) flags;
 };
 
 #define BPF_MAP_UPDATE_ELEM_struct_size \
@@ -92,11 +121,14 @@ struct BPF_PROG_LOAD_struct {
        uint64_t ATTRIBUTE_ALIGNED(8) log_buf;
        uint32_t kern_version;
        uint32_t prog_flags;
+       char     prog_name[BPF_OBJ_NAME_LEN];
+       uint32_t prog_ifindex;
+       uint32_t expected_attach_type;
 };
 
 #define BPF_PROG_LOAD_struct_size \
-       sizeof(struct BPF_PROG_LOAD_struct)
-#define expected_BPF_PROG_LOAD_struct_size 48
+       offsetofend(struct BPF_PROG_LOAD_struct, expected_attach_type)
+#define expected_BPF_PROG_LOAD_struct_size 72
 
 struct BPF_OBJ_PIN_struct {
        uint64_t ATTRIBUTE_ALIGNED(8) pathname;
@@ -190,4 +222,73 @@ struct BPF_OBJ_GET_INFO_BY_FD_struct /* info */ {
        sizeof(struct BPF_OBJ_GET_INFO_BY_FD_struct)
 #define expected_BPF_OBJ_GET_INFO_BY_FD_struct_size 16
 
+struct BPF_PROG_QUERY_struct /* query */ {
+       uint32_t target_fd;
+       uint32_t attach_type;
+       uint32_t query_flags;
+       uint32_t attach_flags;
+       uint64_t ATTRIBUTE_ALIGNED(8) prog_ids;
+       uint32_t prog_cnt;
+};
+
+#define BPF_PROG_QUERY_struct_size \
+       offsetofend(struct BPF_PROG_QUERY_struct, prog_cnt)
+#define expected_BPF_PROG_QUERY_struct_size 28
+
+struct BPF_RAW_TRACEPOINT_OPEN_struct /* raw_tracepoint */ {
+       uint64_t ATTRIBUTE_ALIGNED(8) name;
+       uint32_t prog_fd;
+};
+
+#define BPF_RAW_TRACEPOINT_OPEN_struct_size \
+       offsetofend(struct BPF_RAW_TRACEPOINT_OPEN_struct, prog_fd)
+#define expected_BPF_RAW_TRACEPOINT_OPEN_struct_size 12
+
+struct bpf_map_info_struct {
+       uint32_t type;
+       uint32_t id;
+       uint32_t key_size;
+       uint32_t value_size;
+       uint32_t max_entries;
+       uint32_t map_flags;
+       char     name[BPF_OBJ_NAME_LEN];
+       uint32_t ifindex;
+       /*
+        * The kernel UAPI is broken by Linux commit
+        * v4.16-rc1~123^2~109^2~5^2~4 .
+        */
+       uint64_t ATTRIBUTE_ALIGNED(8) netns_dev; /* skip check */
+       uint64_t ATTRIBUTE_ALIGNED(8) netns_ino; /* skip check */
+};
+
+#define bpf_map_info_struct_size \
+       sizeof(struct bpf_map_info_struct)
+#define expected_bpf_map_info_struct_size 64
+
+struct bpf_prog_info_struct {
+       uint32_t type;
+       uint32_t id;
+       uint8_t  tag[BPF_TAG_SIZE];
+       uint32_t jited_prog_len;
+       uint32_t xlated_prog_len;
+       uint64_t ATTRIBUTE_ALIGNED(8) jited_prog_insns;
+       uint64_t ATTRIBUTE_ALIGNED(8) xlated_prog_insns;
+       uint64_t ATTRIBUTE_ALIGNED(8) load_time;
+       uint32_t created_by_uid;
+       uint32_t nr_map_ids;
+       uint64_t ATTRIBUTE_ALIGNED(8) map_ids;
+       char     name[BPF_OBJ_NAME_LEN];
+       uint32_t ifindex;
+       /*
+        * The kernel UAPI is broken by Linux commit
+        * v4.16-rc1~123^2~227^2~5^2~2 .
+        */
+       uint64_t ATTRIBUTE_ALIGNED(8) netns_dev; /* skip check */
+       uint64_t ATTRIBUTE_ALIGNED(8) netns_ino; /* skip check */
+};
+
+#define bpf_prog_info_struct_size \
+       sizeof(struct bpf_prog_info_struct)
+#define expected_bpf_prog_info_struct_size 104
+
 #endif /* !STRACE_BPF_ATTR_H */