diff options
| author | Daniel Borkmann | 2018-05-23 12:03:33 +0200 |
|---|---|---|
| committer | Daniel Borkmann | 2018-05-23 12:03:34 +0200 |
| commit | ff4fb475cea8580eb0490d0a5d55ee02d95d26e1 (patch) | |
| tree | 10cf3d584e25f564d0cbc3653eb428dd21962f1d /include/uapi/linux/bpf.h | |
| parent | Merge branch 'bpf-fib-mtu-check' (diff) | |
| parent | bpf: btf: Add tests for the btf uapi changes (diff) | |
| download | kernel-qcow2-linux-ff4fb475cea8580eb0490d0a5d55ee02d95d26e1.tar.gz kernel-qcow2-linux-ff4fb475cea8580eb0490d0a5d55ee02d95d26e1.tar.xz kernel-qcow2-linux-ff4fb475cea8580eb0490d0a5d55ee02d95d26e1.zip | |
Merge branch 'btf-uapi-cleanups'
Martin KaFai Lau says:
====================
This patch set makes some changes to cleanup the unused
bits in BTF uapi. It also makes the btf_header extensible.
Please see individual patches for details.
v2:
- Remove NR_SECS from patch 2
- Remove "unsigned" check on array->index_type from patch 3
- Remove BTF_INT_VARARGS and further limit BTF_INT_ENCODING
from 8 bits to 4 bits in patch 4
- Adjustments in test_btf.c to reflect changes in v2
====================
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Diffstat (limited to 'include/uapi/linux/bpf.h')
| -rw-r--r-- | include/uapi/linux/bpf.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h index 97446bbe2ca5..c3e502d06bc3 100644 --- a/include/uapi/linux/bpf.h +++ b/include/uapi/linux/bpf.h @@ -284,8 +284,8 @@ union bpf_attr { char map_name[BPF_OBJ_NAME_LEN]; __u32 map_ifindex; /* ifindex of netdev to create on */ __u32 btf_fd; /* fd pointing to a BTF type data */ - __u32 btf_key_id; /* BTF type_id of the key */ - __u32 btf_value_id; /* BTF type_id of the value */ + __u32 btf_key_type_id; /* BTF type_id of the key */ + __u32 btf_value_type_id; /* BTF type_id of the value */ }; struct { /* anonymous struct used by BPF_MAP_*_ELEM commands */ @@ -2219,8 +2219,8 @@ struct bpf_map_info { __u64 netns_dev; __u64 netns_ino; __u32 btf_id; - __u32 btf_key_id; - __u32 btf_value_id; + __u32 btf_key_type_id; + __u32 btf_value_type_id; } __attribute__((aligned(8))); struct bpf_btf_info { |