bpf: btf: Rename btf_key_id and btf_value_id in bpf_map_info

In "struct bpf_map_info", the name "btf_id", "btf_key_id" and "btf_value_id"
could cause confusion because the "id" of "btf_id" means the BPF obj id
given to the BTF object while
"btf_key_id" and "btf_value_id" means the BTF type id within
that BTF object.

To make it clear, btf_key_id and btf_value_id are
renamed to btf_key_type_id and btf_value_type_id.

Suggested-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: Martin KaFai Lau <kafai@fb.com>
Acked-by: Yonghong Song <yhs@fb.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>

1 files changed, 9 insertions, 9 deletions

diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
index 2b29ef84ded3..0b4c94551001 100644
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
@@ -422,7 +422,7 @@ static int bpf_obj_name_cpy(char *dst, const char *src)
         return 0;
 }
 
-#define BPF_MAP_CREATE_LAST_FIELD btf_value_id
+#define BPF_MAP_CREATE_LAST_FIELD btf_value_type_id
 /* called via syscall */
 static int map_create(union bpf_attr *attr)
 {
@@ -457,10 +457,10 @@ static int map_create(union bpf_attr *attr)
         atomic_set(&map->usercnt, 1);
 
         if (bpf_map_support_seq_show(map) &&
-            (attr->btf_key_id || attr->btf_value_id)) {
+            (attr->btf_key_type_id || attr->btf_value_type_id)) {
                 struct btf *btf;
 
-                if (!attr->btf_key_id || !attr->btf_value_id) {
+                if (!attr->btf_key_type_id || !attr->btf_value_type_id) {
                         err = -EINVAL;
                         goto free_map_nouncharge;
                 }
@@ -471,16 +471,16 @@ static int map_create(union bpf_attr *attr)
                         goto free_map_nouncharge;
                 }
 
-                err = map->ops->map_check_btf(map, btf, attr->btf_key_id,
-                                              attr->btf_value_id);
+                err = map->ops->map_check_btf(map, btf, attr->btf_key_type_id,
+                                              attr->btf_value_type_id);
                 if (err) {
                         btf_put(btf);
                         goto free_map_nouncharge;
                 }
 
                 map->btf = btf;
-                map->btf_key_id = attr->btf_key_id;
-                map->btf_value_id = attr->btf_value_id;
+                map->btf_key_type_id = attr->btf_key_type_id;
+                map->btf_value_type_id = attr->btf_value_type_id;
         }
 
         err = security_bpf_map_alloc(map);
@@ -2013,8 +2013,8 @@ static int bpf_map_get_info_by_fd(struct bpf_map *map,
 
         if (map->btf) {
                 info.btf_id = btf_id(map->btf);
-                info.btf_key_id = map->btf_key_id;
-                info.btf_value_id = map->btf_value_id;
+                info.btf_key_type_id = map->btf_key_type_id;
+                info.btf_value_type_id = map->btf_value_type_id;
         }
 
         if (bpf_map_is_dev_bound(map)) {