Skip to content

Commit

Permalink
bpf: Eliminate rlimit-based memory accounting for stackmap maps
Browse files Browse the repository at this point in the history
Do not use rlimit-based memory accounting for stackmap maps.
It has been replaced with the memcg-based memory accounting.

Signed-off-by: Roman Gushchin <[email protected]>
Signed-off-by: Alexei Starovoitov <[email protected]>
Acked-by: Song Liu <[email protected]>
Link: https://lore.kernel.org/bpf/[email protected]
  • Loading branch information
rgushchin authored and Alexei Starovoitov committed Dec 3, 2020
1 parent 0d2c4f9 commit 3708681
Showing 1 changed file with 3 additions and 13 deletions.
16 changes: 3 additions & 13 deletions kernel/bpf/stackmap.c
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@ static struct bpf_map *stack_map_alloc(union bpf_attr *attr)
{
u32 value_size = attr->value_size;
struct bpf_stack_map *smap;
struct bpf_map_memory mem;
u64 cost, n_buckets;
int err;

Expand Down Expand Up @@ -119,36 +118,27 @@ static struct bpf_map *stack_map_alloc(union bpf_attr *attr)

cost = n_buckets * sizeof(struct stack_map_bucket *) + sizeof(*smap);
cost += n_buckets * (value_size + sizeof(struct stack_map_bucket));
err = bpf_map_charge_init(&mem, cost);
if (err)
return ERR_PTR(err);

smap = bpf_map_area_alloc(cost, bpf_map_attr_numa_node(attr));
if (!smap) {
bpf_map_charge_finish(&mem);
if (!smap)
return ERR_PTR(-ENOMEM);
}

bpf_map_init_from_attr(&smap->map, attr);
smap->map.value_size = value_size;
smap->n_buckets = n_buckets;

err = get_callchain_buffers(sysctl_perf_event_max_stack);
if (err)
goto free_charge;
goto free_smap;

err = prealloc_elems_and_freelist(smap);
if (err)
goto put_buffers;

bpf_map_charge_move(&smap->map.memory, &mem);

return &smap->map;

put_buffers:
put_callchain_buffers();
free_charge:
bpf_map_charge_finish(&mem);
free_smap:
bpf_map_area_free(smap);
return ERR_PTR(err);
}
Expand Down

0 comments on commit 3708681

Please sign in to comment.