Skip to content

L
linux
Commit ff4fb475 authored by Daniel Borkmann's avatar Daniel Borkmann
Browse files
Options

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: default avatarDaniel Borkmann <daniel@iogearbox.net>
parents 3fb48d88 61746dbe
Hide whitespace changes
Inline Side-by-side
Showing with 753 additions and 284 deletions
include/linux/bpf.h
View file @ ff4fb475
...@@ -69,8 +69,8 @@ struct bpf_map { ...@@ -69,8 +69,8 @@ struct bpf_map {
u32 pages; u32 pages;
u32 id; u32 id;
int numa_node; int numa_node;
u32 btf_key_id; u32 btf_key_type_id;
u32 btf_value_id; u32 btf_value_type_id;
struct btf *btf; struct btf *btf;
bool unpriv_array; bool unpriv_array;
/* 55 bytes hole */ /* 55 bytes hole */
...@@ -463,6 +463,8 @@ int bpf_fd_htab_map_update_elem(struct bpf_map *map, struct file *map_file, ...@@ -463,6 +463,8 @@ int bpf_fd_htab_map_update_elem(struct bpf_map *map, struct file *map_file,
int bpf_fd_htab_map_lookup_elem(struct bpf_map *map, void *key, u32 *value); int bpf_fd_htab_map_lookup_elem(struct bpf_map *map, void *key, u32 *value);
int bpf_get_file_flag(int flags); int bpf_get_file_flag(int flags);
int bpf_check_uarg_tail_zero(void __user *uaddr, size_t expected_size,
size_t actual_size);
/* memcpy that is used with 8-byte aligned pointers, power-of-8 size and /* memcpy that is used with 8-byte aligned pointers, power-of-8 size and
* forced to use 'long' read/writes to try to atomically copy long counters. * forced to use 'long' read/writes to try to atomically copy long counters.
......
include/uapi/linux/bpf.h
View file @ ff4fb475
...@@ -284,8 +284,8 @@ union bpf_attr { ...@@ -284,8 +284,8 @@ union bpf_attr {
char map_name[BPF_OBJ_NAME_LEN]; char map_name[BPF_OBJ_NAME_LEN];
__u32 map_ifindex; /* ifindex of netdev to create on */ __u32 map_ifindex; /* ifindex of netdev to create on */
__u32 btf_fd; /* fd pointing to a BTF type data */ __u32 btf_fd; /* fd pointing to a BTF type data */
__u32 btf_key_id; /* BTF type_id of the key */ __u32 btf_key_type_id; /* BTF type_id of the key */
__u32 btf_value_id; /* BTF type_id of the value */ __u32 btf_value_type_id; /* BTF type_id of the value */
}; };
struct { /* anonymous struct used by BPF_MAP_*_ELEM commands */ struct { /* anonymous struct used by BPF_MAP_*_ELEM commands */
...@@ -2219,8 +2219,8 @@ struct bpf_map_info { ...@@ -2219,8 +2219,8 @@ struct bpf_map_info {
__u64 netns_dev; __u64 netns_dev;
__u64 netns_ino; __u64 netns_ino;
__u32 btf_id; __u32 btf_id;
__u32 btf_key_id; __u32 btf_key_type_id;
__u32 btf_value_id; __u32 btf_value_type_id;
} __attribute__((aligned(8))); } __attribute__((aligned(8)));
struct bpf_btf_info { struct bpf_btf_info {
......
include/uapi/linux/btf.h
View file @ ff4fb475
...@@ -12,42 +12,29 @@ struct btf_header { ...@@ -12,42 +12,29 @@ struct btf_header {
__u16 magic; __u16 magic;
__u8 version; __u8 version;
__u8 flags; __u8 flags;
__u32 hdr_len;
__u32 parent_label;
__u32 parent_name;
/* All offsets are in bytes relative to the end of this header */ /* All offsets are in bytes relative to the end of this header */
__u32 label_off; /* offset of label section */
__u32 object_off; /* offset of data object section*/
__u32 func_off; /* offset of function section */
__u32 type_off; /* offset of type section */ __u32 type_off; /* offset of type section */
__u32 type_len; /* length of type section */
__u32 str_off; /* offset of string section */ __u32 str_off; /* offset of string section */
__u32 str_len; /* length of string section */ __u32 str_len; /* length of string section */
}; };
/* Max # of type identifier */ /* Max # of type identifier */
#define BTF_MAX_TYPE 0x7fffffff #define BTF_MAX_TYPE 0x0000ffff
/* Max offset into the string section */ /* Max offset into the string section */
#define BTF_MAX_NAME_OFFSET 0x7fffffff #define BTF_MAX_NAME_OFFSET 0x0000ffff
/* Max # of struct/union/enum members or func args */ /* Max # of struct/union/enum members or func args */
#define BTF_MAX_VLEN 0xffff #define BTF_MAX_VLEN 0xffff
/* The type id is referring to a parent BTF */
#define BTF_TYPE_PARENT(id) (((id) >> 31) & 0x1)
#define BTF_TYPE_ID(id) ((id) & BTF_MAX_TYPE)
/* String is in the ELF string section */
#define BTF_STR_TBL_ELF_ID(ref) (((ref) >> 31) & 0x1)
#define BTF_STR_OFFSET(ref) ((ref) & BTF_MAX_NAME_OFFSET)
struct btf_type { struct btf_type {
__u32 name_off; __u32 name_off;
/* "info" bits arrangement /* "info" bits arrangement
* bits 0-15: vlen (e.g. # of struct's members) * bits 0-15: vlen (e.g. # of struct's members)
* bits 16-23: unused * bits 16-23: unused
* bits 24-28: kind (e.g. int, ptr, array...etc) * bits 24-27: kind (e.g. int, ptr, array...etc)
* bits 29-30: unused * bits 28-31: unused
* bits 31: root
*/ */
__u32 info; __u32 info;
/* "size" is used by INT, ENUM, STRUCT and UNION. /* "size" is used by INT, ENUM, STRUCT and UNION.
...@@ -62,8 +49,7 @@ struct btf_type { ...@@ -62,8 +49,7 @@ struct btf_type {
}; };
}; };
#define BTF_INFO_KIND(info) (((info) >> 24) & 0x1f) #define BTF_INFO_KIND(info) (((info) >> 24) & 0x0f)
#define BTF_INFO_ISROOT(info) (!!(((info) >> 24) & 0x80))
#define BTF_INFO_VLEN(info) ((info) & 0xffff) #define BTF_INFO_VLEN(info) ((info) & 0xffff)
#define BTF_KIND_UNKN 0 /* Unknown */ #define BTF_KIND_UNKN 0 /* Unknown */
...@@ -88,15 +74,14 @@ struct btf_type { ...@@ -88,15 +74,14 @@ struct btf_type {
/* BTF_KIND_INT is followed by a u32 and the following /* BTF_KIND_INT is followed by a u32 and the following
* is the 32 bits arrangement: * is the 32 bits arrangement:
*/ */
#define BTF_INT_ENCODING(VAL) (((VAL) & 0xff000000) >> 24) #define BTF_INT_ENCODING(VAL) (((VAL) & 0x0f000000) >> 24)
#define BTF_INT_OFFSET(VAL) (((VAL & 0x00ff0000)) >> 16) #define BTF_INT_OFFSET(VAL) (((VAL & 0x00ff0000)) >> 16)
#define BTF_INT_BITS(VAL) ((VAL) & 0x0000ffff) #define BTF_INT_BITS(VAL) ((VAL) & 0x0000ffff)
/* Attributes stored in the BTF_INT_ENCODING */ /* Attributes stored in the BTF_INT_ENCODING */
#define BTF_INT_SIGNED 0x1 #define BTF_INT_SIGNED (1 << 0)
#define BTF_INT_CHAR 0x2 #define BTF_INT_CHAR (1 << 1)
#define BTF_INT_BOOL 0x4 #define BTF_INT_BOOL (1 << 2)
#define BTF_INT_VARARGS 0x8
/* BTF_KIND_ENUM is followed by multiple "struct btf_enum". /* BTF_KIND_ENUM is followed by multiple "struct btf_enum".
* The exact number of btf_enum is stored in the vlen (of the * The exact number of btf_enum is stored in the vlen (of the
......
kernel/bpf/arraymap.c
View file @ ff4fb475
...@@ -352,7 +352,7 @@ static void array_map_seq_show_elem(struct bpf_map *map, void *key, ...@@ -352,7 +352,7 @@ static void array_map_seq_show_elem(struct bpf_map *map, void *key,
} }
seq_printf(m, "%u: ", *(u32 *)key); seq_printf(m, "%u: ", *(u32 *)key);
btf_type_seq_show(map->btf, map->btf_value_id, value, m); btf_type_seq_show(map->btf, map->btf_value_type_id, value, m);
seq_puts(m, "\n"); seq_puts(m, "\n");
rcu_read_unlock(); rcu_read_unlock();
......
kernel/bpf/btf.c
View file @ ff4fb475
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/idr.h> #include <linux/idr.h>
#include <linux/sort.h>
#include <linux/bpf_verifier.h> #include <linux/bpf_verifier.h>
#include <linux/btf.h> #include <linux/btf.h>
...@@ -162,13 +163,16 @@ ...@@ -162,13 +163,16 @@
#define BITS_ROUNDUP_BYTES(bits) \ #define BITS_ROUNDUP_BYTES(bits) \
(BITS_ROUNDDOWN_BYTES(bits) + !!BITS_PER_BYTE_MASKED(bits)) (BITS_ROUNDDOWN_BYTES(bits) + !!BITS_PER_BYTE_MASKED(bits))
#define BTF_INFO_MASK 0x0f00ffff
#define BTF_INT_MASK 0x0fffffff
#define BTF_TYPE_ID_VALID(type_id) ((type_id) <= BTF_MAX_TYPE)
#define BTF_STR_OFFSET_VALID(name_off) ((name_off) <= BTF_MAX_NAME_OFFSET)
/* 16MB for 64k structs and each has 16 members and /* 16MB for 64k structs and each has 16 members and
* a few MB spaces for the string section. * a few MB spaces for the string section.
* The hard limit is S32_MAX. * The hard limit is S32_MAX.
*/ */
#define BTF_MAX_SIZE (16 * 1024 * 1024) #define BTF_MAX_SIZE (16 * 1024 * 1024)
/* 64k. We can raise it later. The hard limit is S32_MAX. */
#define BTF_MAX_NR_TYPES 65535
#define for_each_member(i, struct_type, member) \ #define for_each_member(i, struct_type, member) \
for (i = 0, member = btf_type_member(struct_type); \ for (i = 0, member = btf_type_member(struct_type); \
...@@ -184,15 +188,13 @@ static DEFINE_IDR(btf_idr); ...@@ -184,15 +188,13 @@ static DEFINE_IDR(btf_idr);
static DEFINE_SPINLOCK(btf_idr_lock); static DEFINE_SPINLOCK(btf_idr_lock);
struct btf { struct btf {
union { void *data;
struct btf_header *hdr;
void *data;
};
struct btf_type **types; struct btf_type **types;
u32 *resolved_ids; u32 *resolved_ids;
u32 *resolved_sizes; u32 *resolved_sizes;
const char *strings; const char *strings;
void *nohdr_data; void *nohdr_data;
struct btf_header hdr;
u32 nr_types; u32 nr_types;
u32 types_size; u32 types_size;
u32 data_size; u32 data_size;
...@@ -228,6 +230,11 @@ enum resolve_mode { ...@@ -228,6 +230,11 @@ enum resolve_mode {
#define MAX_RESOLVE_DEPTH 32 #define MAX_RESOLVE_DEPTH 32
struct btf_sec_info {
u32 off;
u32 len;
};
struct btf_verifier_env { struct btf_verifier_env {
struct btf *btf; struct btf *btf;
u8 *visit_states; u8 *visit_states;
...@@ -379,8 +386,6 @@ static const char *btf_int_encoding_str(u8 encoding) ...@@ -379,8 +386,6 @@ static const char *btf_int_encoding_str(u8 encoding)
return "CHAR"; return "CHAR";
else if (encoding == BTF_INT_BOOL) else if (encoding == BTF_INT_BOOL)
return "BOOL"; return "BOOL";
else if (encoding == BTF_INT_VARARGS)
return "VARARGS";
else else
return "UNKN"; return "UNKN";
} }
...@@ -417,16 +422,16 @@ static const struct btf_kind_operations *btf_type_ops(const struct btf_type *t) ...@@ -417,16 +422,16 @@ static const struct btf_kind_operations *btf_type_ops(const struct btf_type *t)
static bool btf_name_offset_valid(const struct btf *btf, u32 offset) static bool btf_name_offset_valid(const struct btf *btf, u32 offset)
{ {
return !BTF_STR_TBL_ELF_ID(offset) && return BTF_STR_OFFSET_VALID(offset) &&
BTF_STR_OFFSET(offset) < btf->hdr->str_len; offset < btf->hdr.str_len;
} }
static const char *btf_name_by_offset(const struct btf *btf, u32 offset) static const char *btf_name_by_offset(const struct btf *btf, u32 offset)
{ {
if (!BTF_STR_OFFSET(offset)) if (!offset)
return "(anon)"; return "(anon)";
else if (BTF_STR_OFFSET(offset) < btf->hdr->str_len) else if (offset < btf->hdr.str_len)
return &btf->strings[BTF_STR_OFFSET(offset)]; return &btf->strings[offset];
else else
return "(invalid-name-offset)"; return "(invalid-name-offset)";
} }
...@@ -439,6 +444,28 @@ static const struct btf_type *btf_type_by_id(const struct btf *btf, u32 type_id) ...@@ -439,6 +444,28 @@ static const struct btf_type *btf_type_by_id(const struct btf *btf, u32 type_id)
return btf->types[type_id]; return btf->types[type_id];
} }
/*
* Regular int is not a bit field and it must be either
* u8/u16/u32/u64.
*/
static bool btf_type_int_is_regular(const struct btf_type *t)
{
u16 nr_bits, nr_bytes;
u32 int_data;
int_data = btf_type_int(t);
nr_bits = BTF_INT_BITS(int_data);
nr_bytes = BITS_ROUNDUP_BYTES(nr_bits);
if (BITS_PER_BYTE_MASKED(nr_bits) ||
BTF_INT_OFFSET(int_data) ||
(nr_bytes != sizeof(u8) && nr_bytes != sizeof(u16) &&
nr_bytes != sizeof(u32) && nr_bytes != sizeof(u64))) {
return false;
}
return true;
}
__printf(2, 3) static void __btf_verifier_log(struct bpf_verifier_log *log, __printf(2, 3) static void __btf_verifier_log(struct bpf_verifier_log *log,
const char *fmt, ...) const char *fmt, ...)
{ {
...@@ -536,7 +563,8 @@ static void btf_verifier_log_member(struct btf_verifier_env *env, ...@@ -536,7 +563,8 @@ static void btf_verifier_log_member(struct btf_verifier_env *env,
__btf_verifier_log(log, "\n"); __btf_verifier_log(log, "\n");
} }
static void btf_verifier_log_hdr(struct btf_verifier_env *env) static void btf_verifier_log_hdr(struct btf_verifier_env *env,
u32 btf_data_size)
{ {
struct bpf_verifier_log *log = &env->log; struct bpf_verifier_log *log = &env->log;
const struct btf *btf = env->btf; const struct btf *btf = env->btf;
...@@ -545,19 +573,16 @@ static void btf_verifier_log_hdr(struct btf_verifier_env *env) ...@@ -545,19 +573,16 @@ static void btf_verifier_log_hdr(struct btf_verifier_env *env)
if (!bpf_verifier_log_needed(log)) if (!bpf_verifier_log_needed(log))
return; return;
hdr = btf->hdr; hdr = &btf->hdr;
__btf_verifier_log(log, "magic: 0x%x\n", hdr->magic); __btf_verifier_log(log, "magic: 0x%x\n", hdr->magic);
__btf_verifier_log(log, "version: %u\n", hdr->version); __btf_verifier_log(log, "version: %u\n", hdr->version);
__btf_verifier_log(log, "flags: 0x%x\n", hdr->flags); __btf_verifier_log(log, "flags: 0x%x\n", hdr->flags);
__btf_verifier_log(log, "parent_label: %u\n", hdr->parent_label); __btf_verifier_log(log, "hdr_len: %u\n", hdr->hdr_len);
__btf_verifier_log(log, "parent_name: %u\n", hdr->parent_name);
__btf_verifier_log(log, "label_off: %u\n", hdr->label_off);
__btf_verifier_log(log, "object_off: %u\n", hdr->object_off);
__btf_verifier_log(log, "func_off: %u\n", hdr->func_off);
__btf_verifier_log(log, "type_off: %u\n", hdr->type_off); __btf_verifier_log(log, "type_off: %u\n", hdr->type_off);
__btf_verifier_log(log, "type_len: %u\n", hdr->type_len);
__btf_verifier_log(log, "str_off: %u\n", hdr->str_off); __btf_verifier_log(log, "str_off: %u\n", hdr->str_off);
__btf_verifier_log(log, "str_len: %u\n", hdr->str_len); __btf_verifier_log(log, "str_len: %u\n", hdr->str_len);
__btf_verifier_log(log, "btf_total_size: %u\n", btf->data_size); __btf_verifier_log(log, "btf_total_size: %u\n", btf_data_size);
} }
static int btf_add_type(struct btf_verifier_env *env, struct btf_type *t) static int btf_add_type(struct btf_verifier_env *env, struct btf_type *t)
...@@ -574,13 +599,13 @@ static int btf_add_type(struct btf_verifier_env *env, struct btf_type *t) ...@@ -574,13 +599,13 @@ static int btf_add_type(struct btf_verifier_env *env, struct btf_type *t)
struct btf_type **new_types; struct btf_type **new_types;
u32 expand_by, new_size; u32 expand_by, new_size;
if (btf->types_size == BTF_MAX_NR_TYPES) { if (btf->types_size == BTF_MAX_TYPE) {
btf_verifier_log(env, "Exceeded max num of types"); btf_verifier_log(env, "Exceeded max num of types");
return -E2BIG; return -E2BIG;
} }
expand_by = max_t(u32, btf->types_size >> 2, 16); expand_by = max_t(u32, btf->types_size >> 2, 16);
new_size = min_t(u32, BTF_MAX_NR_TYPES, new_size = min_t(u32, BTF_MAX_TYPE,
btf->types_size + expand_by); btf->types_size + expand_by);
new_types = kvzalloc(new_size * sizeof(*new_types), new_types = kvzalloc(new_size * sizeof(*new_types),
...@@ -910,6 +935,12 @@ static s32 btf_int_check_meta(struct btf_verifier_env *env, ...@@ -910,6 +935,12 @@ static s32 btf_int_check_meta(struct btf_verifier_env *env,
} }
int_data = btf_type_int(t); int_data = btf_type_int(t);
if (int_data & ~BTF_INT_MASK) {
btf_verifier_log_basic(env, t, "Invalid int_data:%x",
int_data);
return -EINVAL;
}
nr_bits = BTF_INT_BITS(int_data) + BTF_INT_OFFSET(int_data); nr_bits = BTF_INT_BITS(int_data) + BTF_INT_OFFSET(int_data);
if (nr_bits > BITS_PER_U64) { if (nr_bits > BITS_PER_U64) {
...@@ -923,12 +954,17 @@ static s32 btf_int_check_meta(struct btf_verifier_env *env, ...@@ -923,12 +954,17 @@ static s32 btf_int_check_meta(struct btf_verifier_env *env,
return -EINVAL; return -EINVAL;
} }
/*
* Only one of the encoding bits is allowed and it
* should be sufficient for the pretty print purpose (i.e. decoding).
* Multiple bits can be allowed later if it is found
* to be insufficient.
*/
encoding = BTF_INT_ENCODING(int_data); encoding = BTF_INT_ENCODING(int_data);
if (encoding && if (encoding &&
encoding != BTF_INT_SIGNED && encoding != BTF_INT_SIGNED &&
encoding != BTF_INT_CHAR && encoding != BTF_INT_CHAR &&
encoding != BTF_INT_BOOL && encoding != BTF_INT_BOOL) {
encoding != BTF_INT_VARARGS) {
btf_verifier_log_type(env, t, "Unsupported encoding"); btf_verifier_log_type(env, t, "Unsupported encoding");
return -ENOTSUPP; return -ENOTSUPP;
} }
...@@ -1102,7 +1138,7 @@ static int btf_ref_type_check_meta(struct btf_verifier_env *env, ...@@ -1102,7 +1138,7 @@ static int btf_ref_type_check_meta(struct btf_verifier_env *env,
return -EINVAL; return -EINVAL;
} }
if (BTF_TYPE_PARENT(t->type)) { if (!BTF_TYPE_ID_VALID(t->type)) {
btf_verifier_log_type(env, t, "Invalid type_id"); btf_verifier_log_type(env, t, "Invalid type_id");
return -EINVAL; return -EINVAL;
} }
...@@ -1306,14 +1342,16 @@ static s32 btf_array_check_meta(struct btf_verifier_env *env, ...@@ -1306,14 +1342,16 @@ static s32 btf_array_check_meta(struct btf_verifier_env *env,
return -EINVAL; return -EINVAL;
} }
/* We are a little forgiving on array->index_type since /* Array elem type and index type cannot be in type void,
* the kernel is not using it. * so !array->type and !array->index_type are not allowed.
*/
/* Array elem cannot be in type void,
* so !array->type is not allowed.
*/ */
if (!array->type || BTF_TYPE_PARENT(array->type)) { if (!array->type || !BTF_TYPE_ID_VALID(array->type)) {
btf_verifier_log_type(env, t, "Invalid type_id"); btf_verifier_log_type(env, t, "Invalid elem");
return -EINVAL;
}
if (!array->index_type || !BTF_TYPE_ID_VALID(array->index_type)) {
btf_verifier_log_type(env, t, "Invalid index");
return -EINVAL; return -EINVAL;
} }
...@@ -1326,11 +1364,32 @@ static int btf_array_resolve(struct btf_verifier_env *env, ...@@ -1326,11 +1364,32 @@ static int btf_array_resolve(struct btf_verifier_env *env,
const struct resolve_vertex *v) const struct resolve_vertex *v)
{ {
const struct btf_array *array = btf_type_array(v->t); const struct btf_array *array = btf_type_array(v->t);
const struct btf_type *elem_type; const struct btf_type *elem_type, *index_type;
u32 elem_type_id = array->type; u32 elem_type_id, index_type_id;
struct btf *btf = env->btf; struct btf *btf = env->btf;
u32 elem_size; u32 elem_size;
/* Check array->index_type */
index_type_id = array->index_type;
index_type = btf_type_by_id(btf, index_type_id);
if (btf_type_is_void_or_null(index_type)) {
btf_verifier_log_type(env, v->t, "Invalid index");
return -EINVAL;
}
if (!env_type_is_resolve_sink(env, index_type) &&
!env_type_is_resolved(env, index_type_id))
return env_stack_push(env, index_type, index_type_id);
index_type = btf_type_id_size(btf, &index_type_id, NULL);
if (!index_type || !btf_type_is_int(index_type) ||
!btf_type_int_is_regular(index_type)) {
btf_verifier_log_type(env, v->t, "Invalid index");
return -EINVAL;
}
/* Check array->type */
elem_type_id = array->type;
elem_type = btf_type_by_id(btf, elem_type_id); elem_type = btf_type_by_id(btf, elem_type_id);
if (btf_type_is_void_or_null(elem_type)) { if (btf_type_is_void_or_null(elem_type)) {
btf_verifier_log_type(env, v->t, btf_verifier_log_type(env, v->t,
...@@ -1348,22 +1407,9 @@ static int btf_array_resolve(struct btf_verifier_env *env, ...@@ -1348,22 +1407,9 @@ static int btf_array_resolve(struct btf_verifier_env *env,
return -EINVAL; return -EINVAL;
} }
if (btf_type_is_int(elem_type)) { if (btf_type_is_int(elem_type) && !btf_type_int_is_regular(elem_type)) {
int int_type_data = btf_type_int(elem_type); btf_verifier_log_type(env, v->t, "Invalid array of int");
u16 nr_bits = BTF_INT_BITS(int_type_data); return -EINVAL;
u16 nr_bytes = BITS_ROUNDUP_BYTES(nr_bits);
/* Put more restriction on array of int. The int cannot
* be a bit field and it must be either u8/u16/u32/u64.
*/
if (BITS_PER_BYTE_MASKED(nr_bits) ||
BTF_INT_OFFSET(int_type_data) ||
(nr_bytes != sizeof(u8) && nr_bytes != sizeof(u16) &&
nr_bytes != sizeof(u32) && nr_bytes != sizeof(u64))) {
btf_verifier_log_type(env, v->t,
"Invalid array of int");
return -EINVAL;
}
} }
if (array->nelems && elem_size > U32_MAX / array->nelems) { if (array->nelems && elem_size > U32_MAX / array->nelems) {
...@@ -1473,7 +1519,7 @@ static s32 btf_struct_check_meta(struct btf_verifier_env *env, ...@@ -1473,7 +1519,7 @@ static s32 btf_struct_check_meta(struct btf_verifier_env *env,
} }
/* A member cannot be in type void */ /* A member cannot be in type void */
if (!member->type || BTF_TYPE_PARENT(member->type)) { if (!member->type || !BTF_TYPE_ID_VALID(member->type)) {
btf_verifier_log_member(env, t, member, btf_verifier_log_member(env, t, member,
"Invalid type_id"); "Invalid type_id");
return -EINVAL; return -EINVAL;
...@@ -1726,6 +1772,12 @@ static s32 btf_check_meta(struct btf_verifier_env *env, ...@@ -1726,6 +1772,12 @@ static s32 btf_check_meta(struct btf_verifier_env *env,
} }
meta_left -= sizeof(*t); meta_left -= sizeof(*t);
if (t->info & ~BTF_INFO_MASK) {
btf_verifier_log(env, "[%u] Invalid btf_info:%x",
env->log_type_id, t->info);
return -EINVAL;
}
if (BTF_INFO_KIND(t->info) > BTF_KIND_MAX || if (BTF_INFO_KIND(t->info) > BTF_KIND_MAX ||
BTF_INFO_KIND(t->info) == BTF_KIND_UNKN) { BTF_INFO_KIND(t->info) == BTF_KIND_UNKN) {
btf_verifier_log(env, "[%u] Invalid kind:%u", btf_verifier_log(env, "[%u] Invalid kind:%u",
...@@ -1754,9 +1806,9 @@ static int btf_check_all_metas(struct btf_verifier_env *env) ...@@ -1754,9 +1806,9 @@ static int btf_check_all_metas(struct btf_verifier_env *env)
struct btf_header *hdr; struct btf_header *hdr;
void *cur, *end; void *cur, *end;
hdr = btf->hdr; hdr = &btf->hdr;
cur = btf->nohdr_data + hdr->type_off; cur = btf->nohdr_data + hdr->type_off;
end = btf->nohdr_data + hdr->str_off; end = btf->nohdr_data + hdr->type_len;
env->log_type_id = 1; env->log_type_id = 1;
while (cur < end) { while (cur < end) {
...@@ -1866,8 +1918,20 @@ static int btf_check_all_types(struct btf_verifier_env *env) ...@@ -1866,8 +1918,20 @@ static int btf_check_all_types(struct btf_verifier_env *env)
static int btf_parse_type_sec(struct btf_verifier_env *env) static int btf_parse_type_sec(struct btf_verifier_env *env)
{ {
const struct btf_header *hdr = &env->btf->hdr;
int err; int err;
/* Type section must align to 4 bytes */
if (hdr->type_off & (sizeof(u32) - 1)) {
btf_verifier_log(env, "Unaligned type_off");
return -EINVAL;
}
if (!hdr->type_len) {
btf_verifier_log(env, "No type found");
return -EINVAL;
}
err = btf_check_all_metas(env); err = btf_check_all_metas(env);
if (err) if (err)
return err; return err;
...@@ -1881,10 +1945,15 @@ static int btf_parse_str_sec(struct btf_verifier_env *env) ...@@ -1881,10 +1945,15 @@ static int btf_parse_str_sec(struct btf_verifier_env *env)
struct btf *btf = env->btf; struct btf *btf = env->btf;
const char *start, *end; const char *start, *end;
hdr = btf->hdr; hdr = &btf->hdr;
start = btf->nohdr_data + hdr->str_off; start = btf->nohdr_data + hdr->str_off;
end = start + hdr->str_len; end = start + hdr->str_len;
if (end != btf->data + btf->data_size) {
btf_verifier_log(env, "String section is not at the end");
return -EINVAL;
}
if (!hdr->str_len || hdr->str_len - 1 > BTF_MAX_NAME_OFFSET || if (!hdr->str_len || hdr->str_len - 1 > BTF_MAX_NAME_OFFSET ||
start[0] || end[-1]) { start[0] || end[-1]) {
btf_verifier_log(env, "Invalid string section"); btf_verifier_log(env, "Invalid string section");
...@@ -1896,20 +1965,122 @@ static int btf_parse_str_sec(struct btf_verifier_env *env) ...@@ -1896,20 +1965,122 @@ static int btf_parse_str_sec(struct btf_verifier_env *env)
return 0; return 0;
} }
static int btf_parse_hdr(struct btf_verifier_env *env) static const size_t btf_sec_info_offset[] = {
offsetof(struct btf_header, type_off),
offsetof(struct btf_header, str_off),
};
static int btf_sec_info_cmp(const void *a, const void *b)
{
const struct btf_sec_info *x = a;
const struct btf_sec_info *y = b;
return (int)(x->off - y->off) ? : (int)(x->len - y->len);
}
static int btf_check_sec_info(struct btf_verifier_env *env,
u32 btf_data_size)
{ {
const unsigned int nr_secs = ARRAY_SIZE(btf_sec_info_offset);
struct btf_sec_info secs[nr_secs];
u32 total, expected_total, i;
const struct btf_header *hdr; const struct btf_header *hdr;
struct btf *btf = env->btf; const struct btf *btf;
u32 meta_left;
btf = env->btf;
hdr = &btf->hdr;
if (btf->data_size < sizeof(*hdr)) { /* Populate the secs from hdr */
for (i = 0; i < nr_secs; i++)
secs[i] = *(struct btf_sec_info *)((void *)hdr +
btf_sec_info_offset[i]);
sort(secs, nr_secs, sizeof(struct btf_sec_info),
btf_sec_info_cmp, NULL);
/* Check for gaps and overlap among sections */
total = 0;
expected_total = btf_data_size - hdr->hdr_len;
for (i = 0; i < nr_secs; i++) {
if (expected_total < secs[i].off) {
btf_verifier_log(env, "Invalid section offset");
return -EINVAL;
}
if (total < secs[i].off) {
/* gap */
btf_verifier_log(env, "Unsupported section found");
return -EINVAL;
}
if (total > secs[i].off) {
btf_verifier_log(env, "Section overlap found");
return -EINVAL;
}
if (expected_total - total < secs[i].len) {
btf_verifier_log(env,
"Total section length too long");
return -EINVAL;
}
total += secs[i].len;
}
/* There is data other than hdr and known sections */
if (expected_total != total) {
btf_verifier_log(env, "Unsupported section found");
return -EINVAL;
}
return 0;
}
static int btf_parse_hdr(struct btf_verifier_env *env, void __user *btf_data,
u32 btf_data_size)
{
const struct btf_header *hdr;
u32 hdr_len, hdr_copy;
/*
* Minimal part of the "struct btf_header" that
* contains the hdr_len.
*/
struct btf_min_header {
u16 magic;
u8 version;
u8 flags;
u32 hdr_len;
} __user *min_hdr;
struct btf *btf;
int err;
btf = env->btf;
min_hdr = btf_data;
if (btf_data_size < sizeof(*min_hdr)) {
btf_verifier_log(env, "hdr_len not found");
return -EINVAL;
}
if (get_user(hdr_len, &min_hdr->hdr_len))
return -EFAULT;
if (btf_data_size < hdr_len) {
btf_verifier_log(env, "btf_header not found"); btf_verifier_log(env, "btf_header not found");
return -EINVAL; return -EINVAL;
} }
btf_verifier_log_hdr(env); err = bpf_check_uarg_tail_zero(btf_data, sizeof(btf->hdr), hdr_len);
if (err) {
if (err == -E2BIG)
btf_verifier_log(env, "Unsupported btf_header");
return err;
}
hdr_copy = min_t(u32, hdr_len, sizeof(btf->hdr));
if (copy_from_user(&btf->hdr, btf_data, hdr_copy))
return -EFAULT;
hdr = &btf->hdr;
btf_verifier_log_hdr(env, btf_data_size);
hdr = btf->hdr;
if (hdr->magic != BTF_MAGIC) { if (hdr->magic != BTF_MAGIC) {
btf_verifier_log(env, "Invalid magic"); btf_verifier_log(env, "Invalid magic");
return -EINVAL; return -EINVAL;
...@@ -1925,26 +2096,14 @@ static int btf_parse_hdr(struct btf_verifier_env *env) ...@@ -1925,26 +2096,14 @@ static int btf_parse_hdr(struct btf_verifier_env *env)
return -ENOTSUPP; return -ENOTSUPP;
} }
meta_left = btf->data_size - sizeof(*hdr); if (btf_data_size == hdr->hdr_len) {
if (!meta_left) {
btf_verifier_log(env, "No data"); btf_verifier_log(env, "No data");
return -EINVAL; return -EINVAL;
} }
if (meta_left < hdr->type_off || hdr->str_off <= hdr->type_off || err = btf_check_sec_info(env, btf_data_size);
/* Type section must align to 4 bytes */ if (err)
hdr->type_off & (sizeof(u32) - 1)) { return err;
btf_verifier_log(env, "Invalid type_off");
return -EINVAL;
}
if (meta_left < hdr->str_off ||
meta_left - hdr->str_off < hdr->str_len) {
btf_verifier_log(env, "Invalid str_off or str_len");
return -EINVAL;
}
btf->nohdr_data = btf->hdr + 1;
return 0; return 0;
} }
...@@ -1987,6 +2146,11 @@ static struct btf *btf_parse(void __user *btf_data, u32 btf_data_size, ...@@ -1987,6 +2146,11 @@ static struct btf *btf_parse(void __user *btf_data, u32 btf_data_size,
err = -ENOMEM; err = -ENOMEM;
goto errout; goto errout;
} }
env->btf = btf;
err = btf_parse_hdr(env, btf_data, btf_data_size);
if (err)
goto errout;
data = kvmalloc(btf_data_size, GFP_KERNEL | __GFP_NOWARN); data = kvmalloc(btf_data_size, GFP_KERNEL | __GFP_NOWARN);
if (!data) { if (!data) {
...@@ -1996,18 +2160,13 @@ static struct btf *btf_parse(void __user *btf_data, u32 btf_data_size, ...@@ -1996,18 +2160,13 @@ static struct btf *btf_parse(void __user *btf_data, u32 btf_data_size,
btf->data = data; btf->data = data;
btf->data_size = btf_data_size; btf->data_size = btf_data_size;
btf->nohdr_data = btf->data + btf->hdr.hdr_len;
if (copy_from_user(data, btf_data, btf_data_size)) { if (copy_from_user(data, btf_data, btf_data_size)) {
err = -EFAULT; err = -EFAULT;
goto errout; goto errout;
} }
env->btf = btf;
err = btf_parse_hdr(env);
if (err)
goto errout;
err = btf_parse_str_sec(env); err = btf_parse_str_sec(env);
if (err) if (err)
goto errout; goto errout;
...@@ -2016,16 +2175,14 @@ static struct btf *btf_parse(void __user *btf_data, u32 btf_data_size, ...@@ -2016,16 +2175,14 @@ static struct btf *btf_parse(void __user *btf_data, u32 btf_data_size,
if (err) if (err)
goto errout; goto errout;
if (!err && log->level && bpf_verifier_log_full(log)) { if (log->level && bpf_verifier_log_full(log)) {
err = -ENOSPC; err = -ENOSPC;
goto errout; goto errout;
} }
if (!err) { btf_verifier_env_free(env);
btf_verifier_env_free(env); refcount_set(&btf->refcnt, 1);
refcount_set(&btf->refcnt, 1); return btf;
return btf;
}
errout: errout:
btf_verifier_env_free(env); btf_verifier_env_free(env);
......
kernel/bpf/syscall.c
View file @ ff4fb475
...@@ -65,9 +65,9 @@ static const struct bpf_map_ops * const bpf_map_types[] = { ...@@ -65,9 +65,9 @@ static const struct bpf_map_ops * const bpf_map_types[] = {
* copy_from_user() call. However, this is not a concern since this function is * copy_from_user() call. However, this is not a concern since this function is
* meant to be a future-proofing of bits. * meant to be a future-proofing of bits.
*/ */
static int check_uarg_tail_zero(void __user *uaddr, int bpf_check_uarg_tail_zero(void __user *uaddr,
size_t expected_size, size_t expected_size,
size_t actual_size) size_t actual_size)
{ {
unsigned char __user *addr; unsigned char __user *addr;
unsigned char __user *end; unsigned char __user *end;
...@@ -422,7 +422,7 @@ static int bpf_obj_name_cpy(char *dst, const char *src) ...@@ -422,7 +422,7 @@ static int bpf_obj_name_cpy(char *dst, const char *src)
return 0; return 0;
} }
#define BPF_MAP_CREATE_LAST_FIELD btf_value_id #define BPF_MAP_CREATE_LAST_FIELD btf_value_type_id
/* called via syscall */ /* called via syscall */
static int map_create(union bpf_attr *attr) static int map_create(union bpf_attr *attr)
{ {
...@@ -457,10 +457,10 @@ 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); atomic_set(&map->usercnt, 1);
if (bpf_map_support_seq_show(map) && 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; 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; err = -EINVAL;
goto free_map_nouncharge; goto free_map_nouncharge;
} }
...@@ -471,16 +471,16 @@ static int map_create(union bpf_attr *attr) ...@@ -471,16 +471,16 @@ static int map_create(union bpf_attr *attr)
goto free_map_nouncharge; goto free_map_nouncharge;
} }
err = map->ops->map_check_btf(map, btf, attr->btf_key_id, err = map->ops->map_check_btf(map, btf, attr->btf_key_type_id,
attr->btf_value_id); attr->btf_value_type_id);
if (err) { if (err) {
btf_put(btf); btf_put(btf);
goto free_map_nouncharge; goto free_map_nouncharge;
} }
map->btf = btf; map->btf = btf;
map->btf_key_id = attr->btf_key_id; map->btf_key_type_id = attr->btf_key_type_id;
map->btf_value_id = attr->btf_value_id; map->btf_value_type_id = attr->btf_value_type_id;
} }
err = security_bpf_map_alloc(map); err = security_bpf_map_alloc(map);
...@@ -1899,7 +1899,7 @@ static int bpf_prog_get_info_by_fd(struct bpf_prog *prog, ...@@ -1899,7 +1899,7 @@ static int bpf_prog_get_info_by_fd(struct bpf_prog *prog,
u32 ulen; u32 ulen;
int err; int err;
err = check_uarg_tail_zero(uinfo, sizeof(info), info_len); err = bpf_check_uarg_tail_zero(uinfo, sizeof(info), info_len);
if (err) if (err)
return err; return err;
info_len = min_t(u32, sizeof(info), info_len); info_len = min_t(u32, sizeof(info), info_len);
...@@ -1998,7 +1998,7 @@ static int bpf_map_get_info_by_fd(struct bpf_map *map, ...@@ -1998,7 +1998,7 @@ static int bpf_map_get_info_by_fd(struct bpf_map *map,
u32 info_len = attr->info.info_len; u32 info_len = attr->info.info_len;
int err; int err;
err = check_uarg_tail_zero(uinfo, sizeof(info), info_len); err = bpf_check_uarg_tail_zero(uinfo, sizeof(info), info_len);
if (err) if (err)
return err; return err;
info_len = min_t(u32, sizeof(info), info_len); info_len = min_t(u32, sizeof(info), info_len);
...@@ -2013,8 +2013,8 @@ static int bpf_map_get_info_by_fd(struct bpf_map *map, ...@@ -2013,8 +2013,8 @@ static int bpf_map_get_info_by_fd(struct bpf_map *map,
if (map->btf) { if (map->btf) {
info.btf_id = btf_id(map->btf); info.btf_id = btf_id(map->btf);
info.btf_key_id = map->btf_key_id; info.btf_key_type_id = map->btf_key_type_id;
info.btf_value_id = map->btf_value_id; info.btf_value_type_id = map->btf_value_type_id;
} }
if (bpf_map_is_dev_bound(map)) { if (bpf_map_is_dev_bound(map)) {
...@@ -2038,7 +2038,7 @@ static int bpf_btf_get_info_by_fd(struct btf *btf, ...@@ -2038,7 +2038,7 @@ static int bpf_btf_get_info_by_fd(struct btf *btf,
u32 info_len = attr->info.info_len; u32 info_len = attr->info.info_len;
int err; int err;
err = check_uarg_tail_zero(uinfo, sizeof(*uinfo), info_len); err = bpf_check_uarg_tail_zero(uinfo, sizeof(*uinfo), info_len);
if (err) if (err)
return err; return err;
...@@ -2110,7 +2110,7 @@ SYSCALL_DEFINE3(bpf, int, cmd, union bpf_attr __user *, uattr, unsigned int, siz ...@@ -2110,7 +2110,7 @@ SYSCALL_DEFINE3(bpf, int, cmd, union bpf_attr __user *, uattr, unsigned int, siz
if (sysctl_unprivileged_bpf_disabled && !capable(CAP_SYS_ADMIN)) if (sysctl_unprivileged_bpf_disabled && !capable(CAP_SYS_ADMIN))
return -EPERM; return -EPERM;
err = check_uarg_tail_zero(uattr, sizeof(attr), size); err = bpf_check_uarg_tail_zero(uattr, sizeof(attr), size);
if (err) if (err)
return err; return err;
size = min_t(u32, size, sizeof(attr)); size = min_t(u32, size, sizeof(attr));
......
tools/include/uapi/linux/bpf.h
View file @ ff4fb475
...@@ -284,8 +284,8 @@ union bpf_attr { ...@@ -284,8 +284,8 @@ union bpf_attr {
char map_name[BPF_OBJ_NAME_LEN]; char map_name[BPF_OBJ_NAME_LEN];
__u32 map_ifindex; /* ifindex of netdev to create on */ __u32 map_ifindex; /* ifindex of netdev to create on */
__u32 btf_fd; /* fd pointing to a BTF type data */ __u32 btf_fd; /* fd pointing to a BTF type data */
__u32 btf_key_id; /* BTF type_id of the key */ __u32 btf_key_type_id; /* BTF type_id of the key */
__u32 btf_value_id; /* BTF type_id of the value */ __u32 btf_value_type_id; /* BTF type_id of the value */
}; };
struct { /* anonymous struct used by BPF_MAP_*_ELEM commands */ struct { /* anonymous struct used by BPF_MAP_*_ELEM commands */
...@@ -2219,8 +2219,8 @@ struct bpf_map_info { ...@@ -2219,8 +2219,8 @@ struct bpf_map_info {
__u64 netns_dev; __u64 netns_dev;
__u64 netns_ino; __u64 netns_ino;
__u32 btf_id; __u32 btf_id;
__u32 btf_key_id; __u32 btf_key_type_id;
__u32 btf_value_id; __u32 btf_value_type_id;
} __attribute__((aligned(8))); } __attribute__((aligned(8)));
struct bpf_btf_info { struct bpf_btf_info {
......
tools/include/uapi/linux/btf.h
View file @ ff4fb475
...@@ -12,42 +12,29 @@ struct btf_header { ...@@ -12,42 +12,29 @@ struct btf_header {
__u16 magic; __u16 magic;
__u8 version; __u8 version;
__u8 flags; __u8 flags;
__u32 hdr_len;
__u32 parent_label;
__u32 parent_name;
/* All offsets are in bytes relative to the end of this header */ /* All offsets are in bytes relative to the end of this header */
__u32 label_off; /* offset of label section */
__u32 object_off; /* offset of data object section*/
__u32 func_off; /* offset of function section */
__u32 type_off; /* offset of type section */ __u32 type_off; /* offset of type section */
__u32 type_len; /* length of type section */
__u32 str_off; /* offset of string section */ __u32 str_off; /* offset of string section */
__u32 str_len; /* length of string section */ __u32 str_len; /* length of string section */
}; };
/* Max # of type identifier */ /* Max # of type identifier */
#define BTF_MAX_TYPE 0x7fffffff #define BTF_MAX_TYPE 0x0000ffff
/* Max offset into the string section */ /* Max offset into the string section */
#define BTF_MAX_NAME_OFFSET 0x7fffffff #define BTF_MAX_NAME_OFFSET 0x0000ffff
/* Max # of struct/union/enum members or func args */ /* Max # of struct/union/enum members or func args */
#define BTF_MAX_VLEN 0xffff #define BTF_MAX_VLEN 0xffff
/* The type id is referring to a parent BTF */
#define BTF_TYPE_PARENT(id) (((id) >> 31) & 0x1)
#define BTF_TYPE_ID(id) ((id) & BTF_MAX_TYPE)
/* String is in the ELF string section */
#define BTF_STR_TBL_ELF_ID(ref) (((ref) >> 31) & 0x1)
#define BTF_STR_OFFSET(ref) ((ref) & BTF_MAX_NAME_OFFSET)
struct btf_type { struct btf_type {
__u32 name_off; __u32 name_off;
/* "info" bits arrangement /* "info" bits arrangement
* bits 0-15: vlen (e.g. # of struct's members) * bits 0-15: vlen (e.g. # of struct's members)
* bits 16-23: unused * bits 16-23: unused
* bits 24-28: kind (e.g. int, ptr, array...etc) * bits 24-27: kind (e.g. int, ptr, array...etc)
* bits 29-30: unused * bits 28-31: unused
* bits 31: root
*/ */
__u32 info; __u32 info;
/* "size" is used by INT, ENUM, STRUCT and UNION. /* "size" is used by INT, ENUM, STRUCT and UNION.
...@@ -62,8 +49,7 @@ struct btf_type { ...@@ -62,8 +49,7 @@ struct btf_type {
}; };
}; };
#define BTF_INFO_KIND(info) (((info) >> 24) & 0x1f) #define BTF_INFO_KIND(info) (((info) >> 24) & 0x0f)
#define BTF_INFO_ISROOT(info) (!!(((info) >> 24) & 0x80))
#define BTF_INFO_VLEN(info) ((info) & 0xffff) #define BTF_INFO_VLEN(info) ((info) & 0xffff)
#define BTF_KIND_UNKN 0 /* Unknown */ #define BTF_KIND_UNKN 0 /* Unknown */
...@@ -88,15 +74,14 @@ struct btf_type { ...@@ -88,15 +74,14 @@ struct btf_type {
/* BTF_KIND_INT is followed by a u32 and the following /* BTF_KIND_INT is followed by a u32 and the following
* is the 32 bits arrangement: * is the 32 bits arrangement:
*/ */
#define BTF_INT_ENCODING(VAL) (((VAL) & 0xff000000) >> 24) #define BTF_INT_ENCODING(VAL) (((VAL) & 0x0f000000) >> 24)
#define BTF_INT_OFFSET(VAL) (((VAL & 0x00ff0000)) >> 16) #define BTF_INT_OFFSET(VAL) (((VAL & 0x00ff0000)) >> 16)
#define BTF_INT_BITS(VAL) ((VAL) & 0x0000ffff) #define BTF_INT_BITS(VAL) ((VAL) & 0x0000ffff)
/* Attributes stored in the BTF_INT_ENCODING */ /* Attributes stored in the BTF_INT_ENCODING */
#define BTF_INT_SIGNED 0x1 #define BTF_INT_SIGNED (1 << 0)
#define BTF_INT_CHAR 0x2 #define BTF_INT_CHAR (1 << 1)
#define BTF_INT_BOOL 0x4 #define BTF_INT_BOOL (1 << 2)
#define BTF_INT_VARARGS 0x8
/* BTF_KIND_ENUM is followed by multiple "struct btf_enum". /* BTF_KIND_ENUM is followed by multiple "struct btf_enum".
* The exact number of btf_enum is stored in the vlen (of the * The exact number of btf_enum is stored in the vlen (of the
......
tools/lib/bpf/bpf.c
View file @ ff4fb475
...@@ -89,8 +89,8 @@ int bpf_create_map_xattr(const struct bpf_create_map_attr *create_attr) ...@@ -89,8 +89,8 @@ int bpf_create_map_xattr(const struct bpf_create_map_attr *create_attr)
min(name_len, BPF_OBJ_NAME_LEN - 1)); min(name_len, BPF_OBJ_NAME_LEN - 1));
attr.numa_node = create_attr->numa_node; attr.numa_node = create_attr->numa_node;
attr.btf_fd = create_attr->btf_fd; attr.btf_fd = create_attr->btf_fd;
attr.btf_key_id = create_attr->btf_key_id; attr.btf_key_type_id = create_attr->btf_key_type_id;
attr.btf_value_id = create_attr->btf_value_id; attr.btf_value_type_id = create_attr->btf_value_type_id;
attr.map_ifindex = create_attr->map_ifindex; attr.map_ifindex = create_attr->map_ifindex;
return sys_bpf(BPF_MAP_CREATE, &attr, sizeof(attr)); return sys_bpf(BPF_MAP_CREATE, &attr, sizeof(attr));
......
tools/lib/bpf/bpf.h
View file @ ff4fb475
...@@ -36,8 +36,8 @@ struct bpf_create_map_attr { ...@@ -36,8 +36,8 @@ struct bpf_create_map_attr {
__u32 max_entries; __u32 max_entries;
__u32 numa_node; __u32 numa_node;
__u32 btf_fd; __u32 btf_fd;
__u32 btf_key_id; __u32 btf_key_type_id;
__u32 btf_value_id; __u32 btf_value_type_id;
__u32 map_ifindex; __u32 map_ifindex;
}; };
......
tools/lib/bpf/btf.c
View file @ ff4fb475
...@@ -35,9 +35,8 @@ struct btf { ...@@ -35,9 +35,8 @@ struct btf {
static const char *btf_name_by_offset(const struct btf *btf, uint32_t offset) static const char *btf_name_by_offset(const struct btf *btf, uint32_t offset)
{ {
if (!BTF_STR_TBL_ELF_ID(offset) && if (offset < btf->hdr->str_len)
BTF_STR_OFFSET(offset) < btf->hdr->str_len) return &btf->strings[offset];
return &btf->strings[BTF_STR_OFFSET(offset)];
else else
return NULL; return NULL;
} }
......
tools/lib/bpf/libbpf.c
View file @ ff4fb475
...@@ -216,8 +216,8 @@ struct bpf_map { ...@@ -216,8 +216,8 @@ struct bpf_map {
size_t offset; size_t offset;
int map_ifindex; int map_ifindex;
struct bpf_map_def def; struct bpf_map_def def;
uint32_t btf_key_id; uint32_t btf_key_type_id;
uint32_t btf_value_id; uint32_t btf_value_type_id;
void *priv; void *priv;
bpf_map_clear_priv_t clear_priv; bpf_map_clear_priv_t clear_priv;
}; };
...@@ -1074,8 +1074,8 @@ static int bpf_map_find_btf_info(struct bpf_map *map, const struct btf *btf) ...@@ -1074,8 +1074,8 @@ static int bpf_map_find_btf_info(struct bpf_map *map, const struct btf *btf)
return -EINVAL; return -EINVAL;
} }
map->btf_key_id = key_id; map->btf_key_type_id = key_id;
map->btf_value_id = value_id; map->btf_value_type_id = value_id;
return 0; return 0;
} }
...@@ -1100,24 +1100,24 @@ bpf_object__create_maps(struct bpf_object *obj) ...@@ -1100,24 +1100,24 @@ bpf_object__create_maps(struct bpf_object *obj)
create_attr.value_size = def->value_size; create_attr.value_size = def->value_size;
create_attr.max_entries = def->max_entries; create_attr.max_entries = def->max_entries;
create_attr.btf_fd = 0; create_attr.btf_fd = 0;
create_attr.btf_key_id = 0; create_attr.btf_key_type_id = 0;
create_attr.btf_value_id = 0; create_attr.btf_value_type_id = 0;
if (obj->btf && !bpf_map_find_btf_info(map, obj->btf)) { if (obj->btf && !bpf_map_find_btf_info(map, obj->btf)) {
create_attr.btf_fd = btf__fd(obj->btf); create_attr.btf_fd = btf__fd(obj->btf);
create_attr.btf_key_id = map->btf_key_id; create_attr.btf_key_type_id = map->btf_key_type_id;
create_attr.btf_value_id = map->btf_value_id; create_attr.btf_value_type_id = map->btf_value_type_id;
} }
*pfd = bpf_create_map_xattr(&create_attr); *pfd = bpf_create_map_xattr(&create_attr);
if (*pfd < 0 && create_attr.btf_key_id) { if (*pfd < 0 && create_attr.btf_key_type_id) {
pr_warning("Error in bpf_create_map_xattr(%s):%s(%d). Retrying without BTF.\n", pr_warning("Error in bpf_create_map_xattr(%s):%s(%d). Retrying without BTF.\n",
map->name, strerror(errno), errno); map->name, strerror(errno), errno);
create_attr.btf_fd = 0; create_attr.btf_fd = 0;
create_attr.btf_key_id = 0; create_attr.btf_key_type_id = 0;
create_attr.btf_value_id = 0; create_attr.btf_value_type_id = 0;
map->btf_key_id = 0; map->btf_key_type_id = 0;
map->btf_value_id = 0; map->btf_value_type_id = 0;
*pfd = bpf_create_map_xattr(&create_attr); *pfd = bpf_create_map_xattr(&create_attr);
} }
...@@ -2085,14 +2085,14 @@ const char *bpf_map__name(struct bpf_map *map) ...@@ -2085,14 +2085,14 @@ const char *bpf_map__name(struct bpf_map *map)
return map ? map->name : NULL; return map ? map->name : NULL;
} }
uint32_t bpf_map__btf_key_id(const struct bpf_map *map) uint32_t bpf_map__btf_key_type_id(const struct bpf_map *map)
{ {
return map ? map->btf_key_id : 0; return map ? map->btf_key_type_id : 0;
} }
uint32_t bpf_map__btf_value_id(const struct bpf_map *map) uint32_t bpf_map__btf_value_type_id(const struct bpf_map *map)
{ {
return map ? map->btf_value_id : 0; return map ? map->btf_value_type_id : 0;
} }
int bpf_map__set_priv(struct bpf_map *map, void *priv, int bpf_map__set_priv(struct bpf_map *map, void *priv,
......
tools/lib/bpf/libbpf.h
View file @ ff4fb475
...@@ -244,8 +244,8 @@ bpf_map__next(struct bpf_map *map, struct bpf_object *obj); ...@@ -244,8 +244,8 @@ bpf_map__next(struct bpf_map *map, struct bpf_object *obj);
int bpf_map__fd(struct bpf_map *map); int bpf_map__fd(struct bpf_map *map);
const struct bpf_map_def *bpf_map__def(struct bpf_map *map); const struct bpf_map_def *bpf_map__def(struct bpf_map *map);
const char *bpf_map__name(struct bpf_map *map); const char *bpf_map__name(struct bpf_map *map);
uint32_t bpf_map__btf_key_id(const struct bpf_map *map); uint32_t bpf_map__btf_key_type_id(const struct bpf_map *map);
uint32_t bpf_map__btf_value_id(const struct bpf_map *map); uint32_t bpf_map__btf_value_type_id(const struct bpf_map *map);
typedef void (*bpf_map_clear_priv_t)(struct bpf_map *, void *); typedef void (*bpf_map_clear_priv_t)(struct bpf_map *, void *);
int bpf_map__set_priv(struct bpf_map *map, void *priv, int bpf_map__set_priv(struct bpf_map *map, void *priv,
......
tools/testing/selftests/bpf/test_btf.c
View file @ ff4fb475
...@@ -113,22 +113,25 @@ static char btf_log_buf[BTF_LOG_BUF_SIZE]; ...@@ -113,22 +113,25 @@ static char btf_log_buf[BTF_LOG_BUF_SIZE];
static struct btf_header hdr_tmpl = { static struct btf_header hdr_tmpl = {
.magic = BTF_MAGIC, .magic = BTF_MAGIC,
.version = BTF_VERSION, .version = BTF_VERSION,
.hdr_len = sizeof(struct btf_header),
}; };
struct btf_raw_test { struct btf_raw_test {
const char *descr; const char *descr;
const char *str_sec; const char *str_sec;
const char *map_name; const char *map_name;
const char *err_str;
__u32 raw_types[MAX_NR_RAW_TYPES]; __u32 raw_types[MAX_NR_RAW_TYPES];
__u32 str_sec_size; __u32 str_sec_size;
enum bpf_map_type map_type; enum bpf_map_type map_type;
__u32 key_size; __u32 key_size;
__u32 value_size; __u32 value_size;
__u32 key_id; __u32 key_type_id;
__u32 value_id; __u32 value_type_id;
__u32 max_entries; __u32 max_entries;
bool btf_load_err; bool btf_load_err;
bool map_create_err; bool map_create_err;
int hdr_len_delta;
int type_off_delta; int type_off_delta;
int str_off_delta; int str_off_delta;
int str_len_delta; int str_len_delta;
...@@ -141,8 +144,8 @@ static struct btf_raw_test raw_tests[] = { ...@@ -141,8 +144,8 @@ static struct btf_raw_test raw_tests[] = {
* }; * };
* *
* struct A { * struct A {
* int m; * unsigned long long m;
* unsigned long long n; * int n;
* char o; * char o;
* [3 bytes hole] * [3 bytes hole]
* int p[8]; * int p[8];
...@@ -163,8 +166,8 @@ static struct btf_raw_test raw_tests[] = { ...@@ -163,8 +166,8 @@ static struct btf_raw_test raw_tests[] = {
BTF_TYPE_ARRAY_ENC(1, 1, 8), /* [4] */ BTF_TYPE_ARRAY_ENC(1, 1, 8), /* [4] */
/* struct A { */ /* [5] */ /* struct A { */ /* [5] */
BTF_TYPE_ENC(NAME_TBD, BTF_INFO_ENC(BTF_KIND_STRUCT, 0, 6), 180), BTF_TYPE_ENC(NAME_TBD, BTF_INFO_ENC(BTF_KIND_STRUCT, 0, 6), 180),
BTF_MEMBER_ENC(NAME_TBD, 1, 0), /* int m; */ BTF_MEMBER_ENC(NAME_TBD, 2, 0), /* unsigned long long m;*/
BTF_MEMBER_ENC(NAME_TBD, 2, 32),/* unsigned long long n;*/ BTF_MEMBER_ENC(NAME_TBD, 1, 64),/* int n; */
BTF_MEMBER_ENC(NAME_TBD, 3, 96),/* char o; */ BTF_MEMBER_ENC(NAME_TBD, 3, 96),/* char o; */
BTF_MEMBER_ENC(NAME_TBD, 4, 128),/* int p[8] */ BTF_MEMBER_ENC(NAME_TBD, 4, 128),/* int p[8] */
BTF_MEMBER_ENC(NAME_TBD, 6, 384),/* int q[4][8] */ BTF_MEMBER_ENC(NAME_TBD, 6, 384),/* int q[4][8] */
...@@ -172,6 +175,7 @@ static struct btf_raw_test raw_tests[] = { ...@@ -172,6 +175,7 @@ static struct btf_raw_test raw_tests[] = {
/* } */ /* } */
/* int[4][8] */ /* int[4][8] */
BTF_TYPE_ARRAY_ENC(4, 1, 4), /* [6] */ BTF_TYPE_ARRAY_ENC(4, 1, 4), /* [6] */
/* enum E */ /* [7] */
BTF_TYPE_ENC(NAME_TBD, BTF_INFO_ENC(BTF_KIND_ENUM, 0, 2), sizeof(int)), BTF_TYPE_ENC(NAME_TBD, BTF_INFO_ENC(BTF_KIND_ENUM, 0, 2), sizeof(int)),
BTF_ENUM_ENC(NAME_TBD, 0), BTF_ENUM_ENC(NAME_TBD, 0),
BTF_ENUM_ENC(NAME_TBD, 1), BTF_ENUM_ENC(NAME_TBD, 1),
...@@ -183,8 +187,8 @@ static struct btf_raw_test raw_tests[] = { ...@@ -183,8 +187,8 @@ static struct btf_raw_test raw_tests[] = {
.map_name = "struct_test1_map", .map_name = "struct_test1_map",
.key_size = sizeof(int), .key_size = sizeof(int),
.value_size = 180, .value_size = 180,
.key_id = 1, .key_type_id = 1,
.value_id = 5, .value_type_id = 5,
.max_entries = 4, .max_entries = 4,
}, },
...@@ -238,8 +242,8 @@ static struct btf_raw_test raw_tests[] = { ...@@ -238,8 +242,8 @@ static struct btf_raw_test raw_tests[] = {
.map_name = "struct_test2_map", .map_name = "struct_test2_map",
.key_size = sizeof(int), .key_size = sizeof(int),
.value_size = 68, .value_size = 68,
.key_id = 1, .key_type_id = 1,
.value_id = 3, .value_type_id = 3,
.max_entries = 4, .max_entries = 4,
}, },
...@@ -258,7 +262,7 @@ static struct btf_raw_test raw_tests[] = { ...@@ -258,7 +262,7 @@ static struct btf_raw_test raw_tests[] = {
/* struct A { */ /* [2] */ /* struct A { */ /* [2] */
BTF_TYPE_ENC(NAME_TBD, BTF_INFO_ENC(BTF_KIND_STRUCT, 0, 2), sizeof(int) * 2 - 1), BTF_TYPE_ENC(NAME_TBD, BTF_INFO_ENC(BTF_KIND_STRUCT, 0, 2), sizeof(int) * 2 - 1),
BTF_MEMBER_ENC(NAME_TBD, 1, 0), /* int m; */ BTF_MEMBER_ENC(NAME_TBD, 1, 0), /* int m; */
BTF_MEMBER_ENC(NAME_TBD, 2, 32),/* int n; */ BTF_MEMBER_ENC(NAME_TBD, 1, 32),/* int n; */
/* } */ /* } */
BTF_END_RAW, BTF_END_RAW,
}, },
...@@ -268,10 +272,11 @@ static struct btf_raw_test raw_tests[] = { ...@@ -268,10 +272,11 @@ static struct btf_raw_test raw_tests[] = {
.map_name = "size_check1_map", .map_name = "size_check1_map",
.key_size = sizeof(int), .key_size = sizeof(int),
.value_size = 1, .value_size = 1,
.key_id = 1, .key_type_id = 1,
.value_id = 2, .value_type_id = 2,
.max_entries = 4, .max_entries = 4,
.btf_load_err = true, .btf_load_err = true,
.err_str = "Member exceeds struct_size",
}, },
/* Test member exeeds the size of struct /* Test member exeeds the size of struct
...@@ -301,11 +306,11 @@ static struct btf_raw_test raw_tests[] = { ...@@ -301,11 +306,11 @@ static struct btf_raw_test raw_tests[] = {
.map_name = "size_check2_map", .map_name = "size_check2_map",
.key_size = sizeof(int), .key_size = sizeof(int),
.value_size = 1, .value_size = 1,
.key_id = 1, .key_type_id = 1,
.value_id = 3, .value_type_id = 3,
.max_entries = 4, .max_entries = 4,
.btf_load_err = true, .btf_load_err = true,
.err_str = "Member exceeds struct_size",
}, },
/* Test member exeeds the size of struct /* Test member exeeds the size of struct
...@@ -335,10 +340,11 @@ static struct btf_raw_test raw_tests[] = { ...@@ -335,10 +340,11 @@ static struct btf_raw_test raw_tests[] = {
.map_name = "size_check3_map", .map_name = "size_check3_map",
.key_size = sizeof(int), .key_size = sizeof(int),
.value_size = 1, .value_size = 1,
.key_id = 1, .key_type_id = 1,
.value_id = 3, .value_type_id = 3,
.max_entries = 4, .max_entries = 4,
.btf_load_err = true, .btf_load_err = true,
.err_str = "Member exceeds struct_size",
}, },
/* Test member exceeds the size of struct /* Test member exceeds the size of struct
...@@ -376,10 +382,11 @@ static struct btf_raw_test raw_tests[] = { ...@@ -376,10 +382,11 @@ static struct btf_raw_test raw_tests[] = {
.map_name = "size_check4_map", .map_name = "size_check4_map",
.key_size = sizeof(int), .key_size = sizeof(int),
.value_size = 1, .value_size = 1,
.key_id = 1, .key_type_id = 1,
.value_id = 3, .value_type_id = 3,
.max_entries = 4, .max_entries = 4,
.btf_load_err = true, .btf_load_err = true,
.err_str = "Member exceeds struct_size",
}, },
/* typedef const void * const_void_ptr; /* typedef const void * const_void_ptr;
...@@ -411,8 +418,8 @@ static struct btf_raw_test raw_tests[] = { ...@@ -411,8 +418,8 @@ static struct btf_raw_test raw_tests[] = {
.map_name = "void_test1_map", .map_name = "void_test1_map",
.key_size = sizeof(int), .key_size = sizeof(int),
.value_size = sizeof(void *), .value_size = sizeof(void *),
.key_id = 1, .key_type_id = 1,
.value_id = 4, .value_type_id = 4,
.max_entries = 4, .max_entries = 4,
}, },
...@@ -440,10 +447,11 @@ static struct btf_raw_test raw_tests[] = { ...@@ -440,10 +447,11 @@ static struct btf_raw_test raw_tests[] = {
.map_name = "void_test2_map", .map_name = "void_test2_map",
.key_size = sizeof(int), .key_size = sizeof(int),
.value_size = sizeof(void *), .value_size = sizeof(void *),
.key_id = 1, .key_type_id = 1,
.value_id = 3, .value_type_id = 3,
.max_entries = 4, .max_entries = 4,
.btf_load_err = true, .btf_load_err = true,
.err_str = "Invalid member",
}, },
/* typedef const void * const_void_ptr; /* typedef const void * const_void_ptr;
...@@ -458,9 +466,9 @@ static struct btf_raw_test raw_tests[] = { ...@@ -458,9 +466,9 @@ static struct btf_raw_test raw_tests[] = {
BTF_TYPE_ENC(0, BTF_INFO_ENC(BTF_KIND_CONST, 0, 0), 0), BTF_TYPE_ENC(0, BTF_INFO_ENC(BTF_KIND_CONST, 0, 0), 0),
/* const void* */ /* [3] */ /* const void* */ /* [3] */
BTF_TYPE_ENC(0, BTF_INFO_ENC(BTF_KIND_PTR, 0, 0), 2), BTF_TYPE_ENC(0, BTF_INFO_ENC(BTF_KIND_PTR, 0, 0), 2),
/* typedef const void * const_void_ptr */ /* typedef const void * const_void_ptr */ /* [4] */
BTF_TYPE_ENC(NAME_TBD, BTF_INFO_ENC(BTF_KIND_PTR, 0, 0), 3), BTF_TYPE_ENC(NAME_TBD, BTF_INFO_ENC(BTF_KIND_PTR, 0, 0), 3),
/* const_void_ptr[4] */ /* [4] */ /* const_void_ptr[4] */ /* [5] */
BTF_TYPE_ARRAY_ENC(3, 1, 4), BTF_TYPE_ARRAY_ENC(3, 1, 4),
BTF_END_RAW, BTF_END_RAW,
}, },
...@@ -470,8 +478,8 @@ static struct btf_raw_test raw_tests[] = { ...@@ -470,8 +478,8 @@ static struct btf_raw_test raw_tests[] = {
.map_name = "void_test3_map", .map_name = "void_test3_map",
.key_size = sizeof(int), .key_size = sizeof(int),
.value_size = sizeof(void *) * 4, .value_size = sizeof(void *) * 4,
.key_id = 1, .key_type_id = 1,
.value_id = 4, .value_type_id = 4,
.max_entries = 4, .max_entries = 4,
}, },
...@@ -493,10 +501,11 @@ static struct btf_raw_test raw_tests[] = { ...@@ -493,10 +501,11 @@ static struct btf_raw_test raw_tests[] = {
.map_name = "void_test4_map", .map_name = "void_test4_map",
.key_size = sizeof(int), .key_size = sizeof(int),
.value_size = sizeof(void *) * 4, .value_size = sizeof(void *) * 4,
.key_id = 1, .key_type_id = 1,
.value_id = 3, .value_type_id = 3,
.max_entries = 4, .max_entries = 4,
.btf_load_err = true, .btf_load_err = true,
.err_str = "Invalid elem",
}, },
/* Array_A <------------------+ /* Array_A <------------------+
...@@ -523,10 +532,11 @@ static struct btf_raw_test raw_tests[] = { ...@@ -523,10 +532,11 @@ static struct btf_raw_test raw_tests[] = {
.map_name = "loop_test1_map", .map_name = "loop_test1_map",
.key_size = sizeof(int), .key_size = sizeof(int),
.value_size = sizeof(sizeof(int) * 8), .value_size = sizeof(sizeof(int) * 8),
.key_id = 1, .key_type_id = 1,
.value_id = 2, .value_type_id = 2,
.max_entries = 4, .max_entries = 4,
.btf_load_err = true, .btf_load_err = true,
.err_str = "Loop detected",
}, },
/* typedef is _before_ the BTF type of Array_A and Array_B /* typedef is _before_ the BTF type of Array_A and Array_B
...@@ -551,7 +561,6 @@ static struct btf_raw_test raw_tests[] = { ...@@ -551,7 +561,6 @@ static struct btf_raw_test raw_tests[] = {
BTF_TYPE_ARRAY_ENC(2, 1, 8), /* [3] */ BTF_TYPE_ARRAY_ENC(2, 1, 8), /* [3] */
/* Array_B */ /* Array_B */
BTF_TYPE_ARRAY_ENC(3, 1, 8), /* [4] */ BTF_TYPE_ARRAY_ENC(3, 1, 8), /* [4] */
BTF_END_RAW, BTF_END_RAW,
}, },
.str_sec = "\0int_array\0", .str_sec = "\0int_array\0",
...@@ -560,10 +569,11 @@ static struct btf_raw_test raw_tests[] = { ...@@ -560,10 +569,11 @@ static struct btf_raw_test raw_tests[] = {
.map_name = "loop_test2_map", .map_name = "loop_test2_map",
.key_size = sizeof(int), .key_size = sizeof(int),
.value_size = sizeof(sizeof(int) * 8), .value_size = sizeof(sizeof(int) * 8),
.key_id = 1, .key_type_id = 1,
.value_id = 2, .value_type_id = 2,
.max_entries = 4, .max_entries = 4,
.btf_load_err = true, .btf_load_err = true,
.err_str = "Loop detected",
}, },
/* Array_A <------------------+ /* Array_A <------------------+
...@@ -582,7 +592,6 @@ static struct btf_raw_test raw_tests[] = { ...@@ -582,7 +592,6 @@ static struct btf_raw_test raw_tests[] = {
BTF_TYPE_ARRAY_ENC(3, 1, 8), BTF_TYPE_ARRAY_ENC(3, 1, 8),
/* Array_B */ /* [3] */ /* Array_B */ /* [3] */
BTF_TYPE_ARRAY_ENC(2, 1, 8), BTF_TYPE_ARRAY_ENC(2, 1, 8),
BTF_END_RAW, BTF_END_RAW,
}, },
.str_sec = "", .str_sec = "",
...@@ -591,10 +600,11 @@ static struct btf_raw_test raw_tests[] = { ...@@ -591,10 +600,11 @@ static struct btf_raw_test raw_tests[] = {
.map_name = "loop_test3_map", .map_name = "loop_test3_map",
.key_size = sizeof(int), .key_size = sizeof(int),
.value_size = sizeof(sizeof(int) * 8), .value_size = sizeof(sizeof(int) * 8),
.key_id = 1, .key_type_id = 1,
.value_id = 2, .value_type_id = 2,
.max_entries = 4, .max_entries = 4,
.btf_load_err = true, .btf_load_err = true,
.err_str = "Loop detected",
}, },
/* typedef is _between_ the BTF type of Array_A and Array_B /* typedef is _between_ the BTF type of Array_A and Array_B
...@@ -627,10 +637,11 @@ static struct btf_raw_test raw_tests[] = { ...@@ -627,10 +637,11 @@ static struct btf_raw_test raw_tests[] = {
.map_name = "loop_test4_map", .map_name = "loop_test4_map",
.key_size = sizeof(int), .key_size = sizeof(int),
.value_size = sizeof(sizeof(int) * 8), .value_size = sizeof(sizeof(int) * 8),
.key_id = 1, .key_type_id = 1,
.value_id = 2, .value_type_id = 2,
.max_entries = 4, .max_entries = 4,
.btf_load_err = true, .btf_load_err = true,
.err_str = "Loop detected",
}, },
/* typedef struct B Struct_B /* typedef struct B Struct_B
...@@ -668,10 +679,11 @@ static struct btf_raw_test raw_tests[] = { ...@@ -668,10 +679,11 @@ static struct btf_raw_test raw_tests[] = {
.map_name = "loop_test5_map", .map_name = "loop_test5_map",
.key_size = sizeof(int), .key_size = sizeof(int),
.value_size = 8, .value_size = 8,
.key_id = 1, .key_type_id = 1,
.value_id = 2, .value_type_id = 2,
.max_entries = 4, .max_entries = 4,
.btf_load_err = true, .btf_load_err = true,
.err_str = "Loop detected",
}, },
/* struct A { /* struct A {
...@@ -697,10 +709,11 @@ static struct btf_raw_test raw_tests[] = { ...@@ -697,10 +709,11 @@ static struct btf_raw_test raw_tests[] = {
.map_name = "loop_test6_map", .map_name = "loop_test6_map",
.key_size = sizeof(int), .key_size = sizeof(int),
.value_size = 8, .value_size = 8,
.key_id = 1, .key_type_id = 1,
.value_id = 2, .value_type_id = 2,
.max_entries = 4, .max_entries = 4,
.btf_load_err = true, .btf_load_err = true,
.err_str = "Loop detected",
}, },
{ {
...@@ -724,10 +737,11 @@ static struct btf_raw_test raw_tests[] = { ...@@ -724,10 +737,11 @@ static struct btf_raw_test raw_tests[] = {
.map_name = "loop_test7_map", .map_name = "loop_test7_map",
.key_size = sizeof(int), .key_size = sizeof(int),
.value_size = sizeof(void *), .value_size = sizeof(void *),
.key_id = 1, .key_type_id = 1,
.value_id = 2, .value_type_id = 2,
.max_entries = 4, .max_entries = 4,
.btf_load_err = true, .btf_load_err = true,
.err_str = "Loop detected",
}, },
{ {
...@@ -759,34 +773,73 @@ static struct btf_raw_test raw_tests[] = { ...@@ -759,34 +773,73 @@ static struct btf_raw_test raw_tests[] = {
.map_name = "loop_test8_map", .map_name = "loop_test8_map",
.key_size = sizeof(int), .key_size = sizeof(int),
.value_size = sizeof(void *), .value_size = sizeof(void *),
.key_id = 1, .key_type_id = 1,
.value_id = 2, .value_type_id = 2,
.max_entries = 4, .max_entries = 4,
.btf_load_err = true, .btf_load_err = true,
.err_str = "Loop detected",
}, },
{ {
.descr = "type_off == str_off", .descr = "string section does not end with null",
.raw_types = { .raw_types = {
/* int */ /* [1] */ /* int */ /* [1] */
BTF_TYPE_INT_ENC(NAME_TBD, BTF_INT_SIGNED, 0, 32, 4), BTF_TYPE_INT_ENC(NAME_TBD, BTF_INT_SIGNED, 0, 32, 4),
BTF_END_RAW, BTF_END_RAW,
}, },
.str_sec = "\0int", .str_sec = "\0int",
.str_sec_size = sizeof("\0int") - 1,
.map_type = BPF_MAP_TYPE_ARRAY,
.map_name = "hdr_test_map",
.key_size = sizeof(int),
.value_size = sizeof(int),
.key_type_id = 1,
.value_type_id = 1,
.max_entries = 4,
.btf_load_err = true,
.err_str = "Invalid string section",
},
{
.descr = "empty string section",
.raw_types = {
/* int */ /* [1] */
BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4),
BTF_END_RAW,
},
.str_sec = "",
.str_sec_size = 0,
.map_type = BPF_MAP_TYPE_ARRAY,
.map_name = "hdr_test_map",
.key_size = sizeof(int),
.value_size = sizeof(int),
.key_type_id = 1,
.value_type_id = 1,
.max_entries = 4,
.btf_load_err = true,
.err_str = "Invalid string section",
},
{
.descr = "empty type section",
.raw_types = {
BTF_END_RAW,
},
.str_sec = "\0int",
.str_sec_size = sizeof("\0int"), .str_sec_size = sizeof("\0int"),
.map_type = BPF_MAP_TYPE_ARRAY, .map_type = BPF_MAP_TYPE_ARRAY,
.map_name = "hdr_test_map", .map_name = "hdr_test_map",
.key_size = sizeof(int), .key_size = sizeof(int),
.value_size = sizeof(int), .value_size = sizeof(int),
.key_id = 1, .key_type_id = 1,
.value_id = 1, .value_type_id = 1,
.max_entries = 4, .max_entries = 4,
.btf_load_err = true, .btf_load_err = true,
.type_off_delta = sizeof(struct btf_type) + sizeof(int) + sizeof("\0int"), .err_str = "No type found",
}, },
{ {
.descr = "Unaligned type_off", .descr = "btf_header test. Longer hdr_len",
.raw_types = { .raw_types = {
/* int */ /* [1] */ /* int */ /* [1] */
BTF_TYPE_INT_ENC(NAME_TBD, BTF_INT_SIGNED, 0, 32, 4), BTF_TYPE_INT_ENC(NAME_TBD, BTF_INT_SIGNED, 0, 32, 4),
...@@ -798,15 +851,16 @@ static struct btf_raw_test raw_tests[] = { ...@@ -798,15 +851,16 @@ static struct btf_raw_test raw_tests[] = {
.map_name = "hdr_test_map", .map_name = "hdr_test_map",
.key_size = sizeof(int), .key_size = sizeof(int),
.value_size = sizeof(int), .value_size = sizeof(int),
.key_id = 1, .key_type_id = 1,
.value_id = 1, .value_type_id = 1,
.max_entries = 4, .max_entries = 4,
.btf_load_err = true, .btf_load_err = true,
.type_off_delta = 1, .hdr_len_delta = 4,
.err_str = "Unsupported btf_header",
}, },
{ {
.descr = "str_off beyonds btf size", .descr = "btf_header test. Gap between hdr and type",
.raw_types = { .raw_types = {
/* int */ /* [1] */ /* int */ /* [1] */
BTF_TYPE_INT_ENC(NAME_TBD, BTF_INT_SIGNED, 0, 32, 4), BTF_TYPE_INT_ENC(NAME_TBD, BTF_INT_SIGNED, 0, 32, 4),
...@@ -818,15 +872,16 @@ static struct btf_raw_test raw_tests[] = { ...@@ -818,15 +872,16 @@ static struct btf_raw_test raw_tests[] = {
.map_name = "hdr_test_map", .map_name = "hdr_test_map",
.key_size = sizeof(int), .key_size = sizeof(int),
.value_size = sizeof(int), .value_size = sizeof(int),
.key_id = 1, .key_type_id = 1,
.value_id = 1, .value_type_id = 1,
.max_entries = 4, .max_entries = 4,
.btf_load_err = true, .btf_load_err = true,
.str_off_delta = sizeof("\0int") + 1, .type_off_delta = 4,
.err_str = "Unsupported section found",
}, },
{ {
.descr = "str_len beyonds btf size", .descr = "btf_header test. Gap between type and str",
.raw_types = { .raw_types = {
/* int */ /* [1] */ /* int */ /* [1] */
BTF_TYPE_INT_ENC(NAME_TBD, BTF_INT_SIGNED, 0, 32, 4), BTF_TYPE_INT_ENC(NAME_TBD, BTF_INT_SIGNED, 0, 32, 4),
...@@ -838,15 +893,16 @@ static struct btf_raw_test raw_tests[] = { ...@@ -838,15 +893,16 @@ static struct btf_raw_test raw_tests[] = {
.map_name = "hdr_test_map", .map_name = "hdr_test_map",
.key_size = sizeof(int), .key_size = sizeof(int),
.value_size = sizeof(int), .value_size = sizeof(int),
.key_id = 1, .key_type_id = 1,
.value_id = 1, .value_type_id = 1,
.max_entries = 4, .max_entries = 4,
.btf_load_err = true, .btf_load_err = true,
.str_len_delta = 1, .str_off_delta = 4,
.err_str = "Unsupported section found",
}, },
{ {
.descr = "String section does not end with null", .descr = "btf_header test. Overlap between type and str",
.raw_types = { .raw_types = {
/* int */ /* [1] */ /* int */ /* [1] */
BTF_TYPE_INT_ENC(NAME_TBD, BTF_INT_SIGNED, 0, 32, 4), BTF_TYPE_INT_ENC(NAME_TBD, BTF_INT_SIGNED, 0, 32, 4),
...@@ -858,15 +914,16 @@ static struct btf_raw_test raw_tests[] = { ...@@ -858,15 +914,16 @@ static struct btf_raw_test raw_tests[] = {
.map_name = "hdr_test_map", .map_name = "hdr_test_map",
.key_size = sizeof(int), .key_size = sizeof(int),
.value_size = sizeof(int), .value_size = sizeof(int),
.key_id = 1, .key_type_id = 1,
.value_id = 1, .value_type_id = 1,
.max_entries = 4, .max_entries = 4,
.btf_load_err = true, .btf_load_err = true,
.str_len_delta = -1, .str_off_delta = -4,
.err_str = "Section overlap found",
}, },
{ {
.descr = "Empty string section", .descr = "btf_header test. Larger BTF size",
.raw_types = { .raw_types = {
/* int */ /* [1] */ /* int */ /* [1] */
BTF_TYPE_INT_ENC(NAME_TBD, BTF_INT_SIGNED, 0, 32, 4), BTF_TYPE_INT_ENC(NAME_TBD, BTF_INT_SIGNED, 0, 32, 4),
...@@ -878,11 +935,288 @@ static struct btf_raw_test raw_tests[] = { ...@@ -878,11 +935,288 @@ static struct btf_raw_test raw_tests[] = {
.map_name = "hdr_test_map", .map_name = "hdr_test_map",
.key_size = sizeof(int), .key_size = sizeof(int),
.value_size = sizeof(int), .value_size = sizeof(int),
.key_id = 1, .key_type_id = 1,
.value_id = 1, .value_type_id = 1,
.max_entries = 4,
.btf_load_err = true,
.str_len_delta = -4,
.err_str = "Unsupported section found",
},
{
.descr = "btf_header test. Smaller BTF size",
.raw_types = {
/* int */ /* [1] */
BTF_TYPE_INT_ENC(NAME_TBD, BTF_INT_SIGNED, 0, 32, 4),
BTF_END_RAW,
},
.str_sec = "\0int",
.str_sec_size = sizeof("\0int"),
.map_type = BPF_MAP_TYPE_ARRAY,
.map_name = "hdr_test_map",
.key_size = sizeof(int),
.value_size = sizeof(int),
.key_type_id = 1,
.value_type_id = 1,
.max_entries = 4,
.btf_load_err = true,
.str_len_delta = 4,
.err_str = "Total section length too long",
},
{
.descr = "array test. index_type/elem_type \"int\"",
.raw_types = {
/* int */ /* [1] */
BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4),
/* int[16] */ /* [2] */
BTF_TYPE_ARRAY_ENC(1, 1, 16),
BTF_END_RAW,
},
.str_sec = "",
.str_sec_size = sizeof(""),
.map_type = BPF_MAP_TYPE_ARRAY,
.map_name = "array_test_map",
.key_size = sizeof(int),
.value_size = sizeof(int),
.key_type_id = 1,
.value_type_id = 1,
.max_entries = 4,
},
{
.descr = "array test. index_type/elem_type \"const int\"",
.raw_types = {
/* int */ /* [1] */
BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4),
/* int[16] */ /* [2] */
BTF_TYPE_ARRAY_ENC(3, 3, 16),
/* CONST type_id=1 */ /* [3] */
BTF_TYPE_ENC(0, BTF_INFO_ENC(BTF_KIND_CONST, 0, 0), 1),
BTF_END_RAW,
},
.str_sec = "",
.str_sec_size = sizeof(""),
.map_type = BPF_MAP_TYPE_ARRAY,
.map_name = "array_test_map",
.key_size = sizeof(int),
.value_size = sizeof(int),
.key_type_id = 1,
.value_type_id = 1,
.max_entries = 4,
},
{
.descr = "array test. index_type \"const int:31\"",
.raw_types = {
/* int */ /* [1] */
BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4),
/* int:31 */ /* [2] */
BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 31, 4),
/* int[16] */ /* [3] */
BTF_TYPE_ARRAY_ENC(1, 4, 16),
/* CONST type_id=2 */ /* [4] */
BTF_TYPE_ENC(0, BTF_INFO_ENC(BTF_KIND_CONST, 0, 0), 2),
BTF_END_RAW,
},
.str_sec = "",
.str_sec_size = sizeof(""),
.map_type = BPF_MAP_TYPE_ARRAY,
.map_name = "array_test_map",
.key_size = sizeof(int),
.value_size = sizeof(int),
.key_type_id = 1,
.value_type_id = 1,
.max_entries = 4,
.btf_load_err = true,
.err_str = "Invalid index",
},
{
.descr = "array test. elem_type \"const int:31\"",
.raw_types = {
/* int */ /* [1] */
BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4),
/* int:31 */ /* [2] */
BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 31, 4),
/* int[16] */ /* [3] */
BTF_TYPE_ARRAY_ENC(4, 1, 16),
/* CONST type_id=2 */ /* [4] */
BTF_TYPE_ENC(0, BTF_INFO_ENC(BTF_KIND_CONST, 0, 0), 2),
BTF_END_RAW,
},
.str_sec = "",
.str_sec_size = sizeof(""),
.map_type = BPF_MAP_TYPE_ARRAY,
.map_name = "array_test_map",
.key_size = sizeof(int),
.value_size = sizeof(int),
.key_type_id = 1,
.value_type_id = 1,
.max_entries = 4,
.btf_load_err = true,
.err_str = "Invalid array of int",
},
{
.descr = "array test. index_type \"void\"",
.raw_types = {
/* int */ /* [1] */
BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4),
/* int[16] */ /* [2] */
BTF_TYPE_ARRAY_ENC(1, 0, 16),
BTF_END_RAW,
},
.str_sec = "",
.str_sec_size = sizeof(""),
.map_type = BPF_MAP_TYPE_ARRAY,
.map_name = "array_test_map",
.key_size = sizeof(int),
.value_size = sizeof(int),
.key_type_id = 1,
.value_type_id = 1,
.max_entries = 4,
.btf_load_err = true,
.err_str = "Invalid index",
},
{
.descr = "array test. index_type \"const void\"",
.raw_types = {
/* int */ /* [1] */
BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4),
/* int[16] */ /* [2] */
BTF_TYPE_ARRAY_ENC(1, 3, 16),
/* CONST type_id=0 (void) */ /* [3] */
BTF_TYPE_ENC(0, BTF_INFO_ENC(BTF_KIND_CONST, 0, 0), 0),
BTF_END_RAW,
},
.str_sec = "",
.str_sec_size = sizeof(""),
.map_type = BPF_MAP_TYPE_ARRAY,
.map_name = "array_test_map",
.key_size = sizeof(int),
.value_size = sizeof(int),
.key_type_id = 1,
.value_type_id = 1,
.max_entries = 4,
.btf_load_err = true,
.err_str = "Invalid index",
},
{
.descr = "array test. elem_type \"const void\"",
.raw_types = {
/* int */ /* [1] */
BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4),
/* int[16] */ /* [2] */
BTF_TYPE_ARRAY_ENC(3, 1, 16),
/* CONST type_id=0 (void) */ /* [3] */
BTF_TYPE_ENC(0, BTF_INFO_ENC(BTF_KIND_CONST, 0, 0), 0),
BTF_END_RAW,
},
.str_sec = "",
.str_sec_size = sizeof(""),
.map_type = BPF_MAP_TYPE_ARRAY,
.map_name = "array_test_map",
.key_size = sizeof(int),
.value_size = sizeof(int),
.key_type_id = 1,
.value_type_id = 1,
.max_entries = 4,
.btf_load_err = true,
.err_str = "Invalid elem",
},
{
.descr = "array test. elem_type \"const void *\"",
.raw_types = {
/* int */ /* [1] */
BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4),
/* const void *[16] */ /* [2] */
BTF_TYPE_ARRAY_ENC(3, 1, 16),
/* CONST type_id=4 */ /* [3] */
BTF_TYPE_ENC(0, BTF_INFO_ENC(BTF_KIND_CONST, 0, 0), 4),
/* void* */ /* [4] */
BTF_TYPE_ENC(0, BTF_INFO_ENC(BTF_KIND_PTR, 0, 0), 0),
BTF_END_RAW,
},
.str_sec = "",
.str_sec_size = sizeof(""),
.map_type = BPF_MAP_TYPE_ARRAY,
.map_name = "array_test_map",
.key_size = sizeof(int),
.value_size = sizeof(int),
.key_type_id = 1,
.value_type_id = 1,
.max_entries = 4,
},
{
.descr = "array test. index_type \"const void *\"",
.raw_types = {
/* int */ /* [1] */
BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4),
/* const void *[16] */ /* [2] */
BTF_TYPE_ARRAY_ENC(3, 3, 16),
/* CONST type_id=4 */ /* [3] */
BTF_TYPE_ENC(0, BTF_INFO_ENC(BTF_KIND_CONST, 0, 0), 4),
/* void* */ /* [4] */
BTF_TYPE_ENC(0, BTF_INFO_ENC(BTF_KIND_PTR, 0, 0), 0),
BTF_END_RAW,
},
.str_sec = "",
.str_sec_size = sizeof(""),
.map_type = BPF_MAP_TYPE_ARRAY,
.map_name = "array_test_map",
.key_size = sizeof(int),
.value_size = sizeof(int),
.key_type_id = 1,
.value_type_id = 1,
.max_entries = 4, .max_entries = 4,
.btf_load_err = true, .btf_load_err = true,
.str_len_delta = 0 - (int)sizeof("\0int"), .err_str = "Invalid index",
},
{
.descr = "int test. invalid int_data",
.raw_types = {
BTF_TYPE_ENC(0, BTF_INFO_ENC(BTF_KIND_INT, 0, 0), 4),
0x10000000,
BTF_END_RAW,
},
.str_sec = "",
.str_sec_size = sizeof(""),
.map_type = BPF_MAP_TYPE_ARRAY,
.map_name = "array_test_map",
.key_size = sizeof(int),
.value_size = sizeof(int),
.key_type_id = 1,
.value_type_id = 1,
.max_entries = 4,
.btf_load_err = true,
.err_str = "Invalid int_data",
},
{
.descr = "invalid BTF_INFO",
.raw_types = {
/* int */ /* [1] */
BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4),
BTF_TYPE_ENC(0, 0x10000000, 4),
BTF_END_RAW,
},
.str_sec = "",
.str_sec_size = sizeof(""),
.map_type = BPF_MAP_TYPE_ARRAY,
.map_name = "array_test_map",
.key_size = sizeof(int),
.value_size = sizeof(int),
.key_type_id = 1,
.value_type_id = 1,
.max_entries = 4,
.btf_load_err = true,
.err_str = "Invalid btf_info",
}, },
}; /* struct btf_raw_test raw_tests[] */ }; /* struct btf_raw_test raw_tests[] */
...@@ -951,6 +1285,7 @@ static void *btf_raw_create(const struct btf_header *hdr, ...@@ -951,6 +1285,7 @@ static void *btf_raw_create(const struct btf_header *hdr,
memcpy(raw_btf + offset, str, str_sec_size); memcpy(raw_btf + offset, str, str_sec_size);
ret_hdr = (struct btf_header *)raw_btf; ret_hdr = (struct btf_header *)raw_btf;
ret_hdr->type_len = type_sec_size;
ret_hdr->str_off = type_sec_size; ret_hdr->str_off = type_sec_size;
ret_hdr->str_len = str_sec_size; ret_hdr->str_len = str_sec_size;
...@@ -981,6 +1316,7 @@ static int do_test_raw(unsigned int test_num) ...@@ -981,6 +1316,7 @@ static int do_test_raw(unsigned int test_num)
hdr = raw_btf; hdr = raw_btf;
hdr->hdr_len = (int)hdr->hdr_len + test->hdr_len_delta;
hdr->type_off = (int)hdr->type_off + test->type_off_delta; hdr->type_off = (int)hdr->type_off + test->type_off_delta;
hdr->str_off = (int)hdr->str_off + test->str_off_delta; hdr->str_off = (int)hdr->str_off + test->str_off_delta;
hdr->str_len = (int)hdr->str_len + test->str_len_delta; hdr->str_len = (int)hdr->str_len + test->str_len_delta;
...@@ -992,8 +1328,13 @@ static int do_test_raw(unsigned int test_num) ...@@ -992,8 +1328,13 @@ static int do_test_raw(unsigned int test_num)
free(raw_btf); free(raw_btf);
err = ((btf_fd == -1) != test->btf_load_err); err = ((btf_fd == -1) != test->btf_load_err);
CHECK(err, "btf_fd:%d test->btf_load_err:%u", if (CHECK(err, "btf_fd:%d test->btf_load_err:%u",
btf_fd, test->btf_load_err); btf_fd, test->btf_load_err) ||
CHECK(test->err_str && !strstr(btf_log_buf, test->err_str),
"expected err_str:%s", test->err_str)) {
err = -1;
goto done;
}
if (err || btf_fd == -1) if (err || btf_fd == -1)
goto done; goto done;
...@@ -1004,8 +1345,8 @@ static int do_test_raw(unsigned int test_num) ...@@ -1004,8 +1345,8 @@ static int do_test_raw(unsigned int test_num)
create_attr.value_size = test->value_size; create_attr.value_size = test->value_size;
create_attr.max_entries = test->max_entries; create_attr.max_entries = test->max_entries;
create_attr.btf_fd = btf_fd; create_attr.btf_fd = btf_fd;
create_attr.btf_key_id = test->key_id; create_attr.btf_key_type_id = test->key_type_id;
create_attr.btf_value_id = test->value_id; create_attr.btf_value_type_id = test->value_type_id;
map_fd = bpf_create_map_xattr(&create_attr); map_fd = bpf_create_map_xattr(&create_attr);
...@@ -1267,8 +1608,8 @@ static int test_btf_id(unsigned int test_num) ...@@ -1267,8 +1608,8 @@ static int test_btf_id(unsigned int test_num)
create_attr.value_size = sizeof(unsigned int); create_attr.value_size = sizeof(unsigned int);
create_attr.max_entries = 4; create_attr.max_entries = 4;
create_attr.btf_fd = btf_fd[0]; create_attr.btf_fd = btf_fd[0];
create_attr.btf_key_id = 1; create_attr.btf_key_type_id = 1;
create_attr.btf_value_id = 2; create_attr.btf_value_type_id = 2;
map_fd = bpf_create_map_xattr(&create_attr); map_fd = bpf_create_map_xattr(&create_attr);
if (CHECK(map_fd == -1, "errno:%d", errno)) { if (CHECK(map_fd == -1, "errno:%d", errno)) {
...@@ -1279,10 +1620,10 @@ static int test_btf_id(unsigned int test_num) ...@@ -1279,10 +1620,10 @@ static int test_btf_id(unsigned int test_num)
info_len = sizeof(map_info); info_len = sizeof(map_info);
err = bpf_obj_get_info_by_fd(map_fd, &map_info, &info_len); err = bpf_obj_get_info_by_fd(map_fd, &map_info, &info_len);
if (CHECK(err || map_info.btf_id != info[0].id || if (CHECK(err || map_info.btf_id != info[0].id ||
map_info.btf_key_id != 1 || map_info.btf_value_id != 2, map_info.btf_key_type_id != 1 || map_info.btf_value_type_id != 2,
"err:%d errno:%d info.id:%u btf_id:%u btf_key_id:%u btf_value_id:%u", "err:%d errno:%d info.id:%u btf_id:%u btf_key_type_id:%u btf_value_type_id:%u",
err, errno, info[0].id, map_info.btf_id, map_info.btf_key_id, err, errno, info[0].id, map_info.btf_id, map_info.btf_key_type_id,
map_info.btf_value_id)) { map_info.btf_value_type_id)) {
err = -1; err = -1;
goto done; goto done;
} }
...@@ -1542,10 +1883,10 @@ static int do_test_file(unsigned int test_num) ...@@ -1542,10 +1883,10 @@ static int do_test_file(unsigned int test_num)
goto done; goto done;
} }
err = (bpf_map__btf_key_id(map) == 0 || bpf_map__btf_value_id(map) == 0) err = (bpf_map__btf_key_type_id(map) == 0 || bpf_map__btf_value_type_id(map) == 0)
!= test->btf_kv_notfound; != test->btf_kv_notfound;
if (CHECK(err, "btf_key_id:%u btf_value_id:%u test->btf_kv_notfound:%u", if (CHECK(err, "btf_key_type_id:%u btf_value_type_id:%u test->btf_kv_notfound:%u",
bpf_map__btf_key_id(map), bpf_map__btf_value_id(map), bpf_map__btf_key_type_id(map), bpf_map__btf_value_type_id(map),
test->btf_kv_notfound)) test->btf_kv_notfound))
goto done; goto done;
...@@ -1615,7 +1956,7 @@ static struct btf_raw_test pprint_test = { ...@@ -1615,7 +1956,7 @@ static struct btf_raw_test pprint_test = {
/* 28 bits */ /* [7] */ /* 28 bits */ /* [7] */
BTF_TYPE_INT_ENC(0, 0, 0, 28, 4), BTF_TYPE_INT_ENC(0, 0, 0, 28, 4),
/* uint8_t[8] */ /* [8] */ /* uint8_t[8] */ /* [8] */
BTF_TYPE_ARRAY_ENC(9, 3, 8), BTF_TYPE_ARRAY_ENC(9, 1, 8),
/* typedef unsigned char uint8_t */ /* [9] */ /* typedef unsigned char uint8_t */ /* [9] */
BTF_TYPEDEF_ENC(NAME_TBD, 1), BTF_TYPEDEF_ENC(NAME_TBD, 1),
/* typedef unsigned short uint16_t */ /* [10] */ /* typedef unsigned short uint16_t */ /* [10] */
...@@ -1654,8 +1995,8 @@ static struct btf_raw_test pprint_test = { ...@@ -1654,8 +1995,8 @@ static struct btf_raw_test pprint_test = {
.map_name = "pprint_test", .map_name = "pprint_test",
.key_size = sizeof(unsigned int), .key_size = sizeof(unsigned int),
.value_size = sizeof(struct pprint_mapv), .value_size = sizeof(struct pprint_mapv),
.key_id = 3, /* unsigned int */ .key_type_id = 3, /* unsigned int */
.value_id = 16, /* struct pprint_mapv */ .value_type_id = 16, /* struct pprint_mapv */
.max_entries = 128 * 1024, .max_entries = 128 * 1024,
}; };
...@@ -1712,8 +2053,8 @@ static int test_pprint(void) ...@@ -1712,8 +2053,8 @@ static int test_pprint(void)
create_attr.value_size = test->value_size; create_attr.value_size = test->value_size;
create_attr.max_entries = test->max_entries; create_attr.max_entries = test->max_entries;
create_attr.btf_fd = btf_fd; create_attr.btf_fd = btf_fd;
create_attr.btf_key_id = test->key_id; create_attr.btf_key_type_id = test->key_type_id;
create_attr.btf_value_id = test->value_id; create_attr.btf_value_type_id = test->value_type_id;
map_fd = bpf_create_map_xattr(&create_attr); map_fd = bpf_create_map_xattr(&create_attr);
if (CHECK(map_fd == -1, "errno:%d", errno)) { if (CHECK(map_fd == -1, "errno:%d", errno)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7