mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-07-10 16:42:21 +00:00
bpf: arraymap: move checks out of alloc function
Use the new callback to perform allocation checks for array maps. The fd maps don't need a special allocation callback, they only need a special check callback. Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com> Reviewed-by: Quentin Monnet <quentin.monnet@netronome.com> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
This commit is contained in:
parent
0c91c4239d
commit
ad46061fca
1 changed files with 34 additions and 20 deletions
|
@ -49,6 +49,27 @@ static int bpf_array_alloc_percpu(struct bpf_array *array)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Called from syscall */
|
/* Called from syscall */
|
||||||
|
static int array_map_alloc_check(union bpf_attr *attr)
|
||||||
|
{
|
||||||
|
bool percpu = attr->map_type == BPF_MAP_TYPE_PERCPU_ARRAY;
|
||||||
|
int numa_node = bpf_map_attr_numa_node(attr);
|
||||||
|
|
||||||
|
/* check sanity of attributes */
|
||||||
|
if (attr->max_entries == 0 || attr->key_size != 4 ||
|
||||||
|
attr->value_size == 0 ||
|
||||||
|
attr->map_flags & ~ARRAY_CREATE_FLAG_MASK ||
|
||||||
|
(percpu && numa_node != NUMA_NO_NODE))
|
||||||
|
return -EINVAL;
|
||||||
|
|
||||||
|
if (attr->value_size > KMALLOC_MAX_SIZE)
|
||||||
|
/* if value_size is bigger, the user space won't be able to
|
||||||
|
* access the elements.
|
||||||
|
*/
|
||||||
|
return -E2BIG;
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
static struct bpf_map *array_map_alloc(union bpf_attr *attr)
|
static struct bpf_map *array_map_alloc(union bpf_attr *attr)
|
||||||
{
|
{
|
||||||
bool percpu = attr->map_type == BPF_MAP_TYPE_PERCPU_ARRAY;
|
bool percpu = attr->map_type == BPF_MAP_TYPE_PERCPU_ARRAY;
|
||||||
|
@ -58,19 +79,6 @@ static struct bpf_map *array_map_alloc(union bpf_attr *attr)
|
||||||
struct bpf_array *array;
|
struct bpf_array *array;
|
||||||
u64 array_size, mask64;
|
u64 array_size, mask64;
|
||||||
|
|
||||||
/* check sanity of attributes */
|
|
||||||
if (attr->max_entries == 0 || attr->key_size != 4 ||
|
|
||||||
attr->value_size == 0 ||
|
|
||||||
attr->map_flags & ~ARRAY_CREATE_FLAG_MASK ||
|
|
||||||
(percpu && numa_node != NUMA_NO_NODE))
|
|
||||||
return ERR_PTR(-EINVAL);
|
|
||||||
|
|
||||||
if (attr->value_size > KMALLOC_MAX_SIZE)
|
|
||||||
/* if value_size is bigger, the user space won't be able to
|
|
||||||
* access the elements.
|
|
||||||
*/
|
|
||||||
return ERR_PTR(-E2BIG);
|
|
||||||
|
|
||||||
elem_size = round_up(attr->value_size, 8);
|
elem_size = round_up(attr->value_size, 8);
|
||||||
|
|
||||||
max_entries = attr->max_entries;
|
max_entries = attr->max_entries;
|
||||||
|
@ -327,6 +335,7 @@ static void array_map_free(struct bpf_map *map)
|
||||||
}
|
}
|
||||||
|
|
||||||
const struct bpf_map_ops array_map_ops = {
|
const struct bpf_map_ops array_map_ops = {
|
||||||
|
.map_alloc_check = array_map_alloc_check,
|
||||||
.map_alloc = array_map_alloc,
|
.map_alloc = array_map_alloc,
|
||||||
.map_free = array_map_free,
|
.map_free = array_map_free,
|
||||||
.map_get_next_key = array_map_get_next_key,
|
.map_get_next_key = array_map_get_next_key,
|
||||||
|
@ -337,6 +346,7 @@ const struct bpf_map_ops array_map_ops = {
|
||||||
};
|
};
|
||||||
|
|
||||||
const struct bpf_map_ops percpu_array_map_ops = {
|
const struct bpf_map_ops percpu_array_map_ops = {
|
||||||
|
.map_alloc_check = array_map_alloc_check,
|
||||||
.map_alloc = array_map_alloc,
|
.map_alloc = array_map_alloc,
|
||||||
.map_free = array_map_free,
|
.map_free = array_map_free,
|
||||||
.map_get_next_key = array_map_get_next_key,
|
.map_get_next_key = array_map_get_next_key,
|
||||||
|
@ -345,12 +355,12 @@ const struct bpf_map_ops percpu_array_map_ops = {
|
||||||
.map_delete_elem = array_map_delete_elem,
|
.map_delete_elem = array_map_delete_elem,
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct bpf_map *fd_array_map_alloc(union bpf_attr *attr)
|
static int fd_array_map_alloc_check(union bpf_attr *attr)
|
||||||
{
|
{
|
||||||
/* only file descriptors can be stored in this type of map */
|
/* only file descriptors can be stored in this type of map */
|
||||||
if (attr->value_size != sizeof(u32))
|
if (attr->value_size != sizeof(u32))
|
||||||
return ERR_PTR(-EINVAL);
|
return -EINVAL;
|
||||||
return array_map_alloc(attr);
|
return array_map_alloc_check(attr);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void fd_array_map_free(struct bpf_map *map)
|
static void fd_array_map_free(struct bpf_map *map)
|
||||||
|
@ -474,7 +484,8 @@ void bpf_fd_array_map_clear(struct bpf_map *map)
|
||||||
}
|
}
|
||||||
|
|
||||||
const struct bpf_map_ops prog_array_map_ops = {
|
const struct bpf_map_ops prog_array_map_ops = {
|
||||||
.map_alloc = fd_array_map_alloc,
|
.map_alloc_check = fd_array_map_alloc_check,
|
||||||
|
.map_alloc = array_map_alloc,
|
||||||
.map_free = fd_array_map_free,
|
.map_free = fd_array_map_free,
|
||||||
.map_get_next_key = array_map_get_next_key,
|
.map_get_next_key = array_map_get_next_key,
|
||||||
.map_lookup_elem = fd_array_map_lookup_elem,
|
.map_lookup_elem = fd_array_map_lookup_elem,
|
||||||
|
@ -561,7 +572,8 @@ static void perf_event_fd_array_release(struct bpf_map *map,
|
||||||
}
|
}
|
||||||
|
|
||||||
const struct bpf_map_ops perf_event_array_map_ops = {
|
const struct bpf_map_ops perf_event_array_map_ops = {
|
||||||
.map_alloc = fd_array_map_alloc,
|
.map_alloc_check = fd_array_map_alloc_check,
|
||||||
|
.map_alloc = array_map_alloc,
|
||||||
.map_free = fd_array_map_free,
|
.map_free = fd_array_map_free,
|
||||||
.map_get_next_key = array_map_get_next_key,
|
.map_get_next_key = array_map_get_next_key,
|
||||||
.map_lookup_elem = fd_array_map_lookup_elem,
|
.map_lookup_elem = fd_array_map_lookup_elem,
|
||||||
|
@ -592,7 +604,8 @@ static void cgroup_fd_array_free(struct bpf_map *map)
|
||||||
}
|
}
|
||||||
|
|
||||||
const struct bpf_map_ops cgroup_array_map_ops = {
|
const struct bpf_map_ops cgroup_array_map_ops = {
|
||||||
.map_alloc = fd_array_map_alloc,
|
.map_alloc_check = fd_array_map_alloc_check,
|
||||||
|
.map_alloc = array_map_alloc,
|
||||||
.map_free = cgroup_fd_array_free,
|
.map_free = cgroup_fd_array_free,
|
||||||
.map_get_next_key = array_map_get_next_key,
|
.map_get_next_key = array_map_get_next_key,
|
||||||
.map_lookup_elem = fd_array_map_lookup_elem,
|
.map_lookup_elem = fd_array_map_lookup_elem,
|
||||||
|
@ -610,7 +623,7 @@ static struct bpf_map *array_of_map_alloc(union bpf_attr *attr)
|
||||||
if (IS_ERR(inner_map_meta))
|
if (IS_ERR(inner_map_meta))
|
||||||
return inner_map_meta;
|
return inner_map_meta;
|
||||||
|
|
||||||
map = fd_array_map_alloc(attr);
|
map = array_map_alloc(attr);
|
||||||
if (IS_ERR(map)) {
|
if (IS_ERR(map)) {
|
||||||
bpf_map_meta_free(inner_map_meta);
|
bpf_map_meta_free(inner_map_meta);
|
||||||
return map;
|
return map;
|
||||||
|
@ -673,6 +686,7 @@ static u32 array_of_map_gen_lookup(struct bpf_map *map,
|
||||||
}
|
}
|
||||||
|
|
||||||
const struct bpf_map_ops array_of_maps_map_ops = {
|
const struct bpf_map_ops array_of_maps_map_ops = {
|
||||||
|
.map_alloc_check = fd_array_map_alloc_check,
|
||||||
.map_alloc = array_of_map_alloc,
|
.map_alloc = array_of_map_alloc,
|
||||||
.map_free = array_of_map_free,
|
.map_free = array_of_map_free,
|
||||||
.map_get_next_key = array_map_get_next_key,
|
.map_get_next_key = array_map_get_next_key,
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue