UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

bpf: Eliminate rlimit-based memory accounting for cgroup storage maps 

Do not use rlimit-based memory accounting for cgroup storage maps.
It has been replaced with the memcg-based memory accounting.

Signed-off-by: Roman Gushchin <guro@fb.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Acked-by: Song Liu <songliubraving@fb.com>
Link: https://lore.kernel.org/bpf/20201201215900.3569844-22-guro@fb.com
This commit is contained in:
Roman Gushchin 2020-12-01 13:58:47 -08:00 committed by Alexei Starovoitov
parent 711cabaf14
commit 087b0d39fe
1 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
kernel/bpf/local_storage.c
View File

@ -287,8 +287,6 @@ static struct bpf_map *cgroup_storage_map_alloc(union bpf_attr *attr)
{ {
int numa_node = bpf_map_attr_numa_node(attr); int numa_node = bpf_map_attr_numa_node(attr);
struct bpf_cgroup_storage_map *map; struct bpf_cgroup_storage_map *map;
struct bpf_map_memory mem;
int ret;
if (attr->key_size != sizeof(struct bpf_cgroup_storage_key) && if (attr->key_size != sizeof(struct bpf_cgroup_storage_key) &&
attr->key_size != sizeof(__u64)) attr->key_size != sizeof(__u64))
@ -308,18 +306,10 @@ static struct bpf_map *cgroup_storage_map_alloc(union bpf_attr *attr)
/* max_entries is not used and enforced to be 0 */ /* max_entries is not used and enforced to be 0 */
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
ret = bpf_map_charge_init(&mem, sizeof(struct bpf_cgroup_storage_map));
if (ret < 0)
return ERR_PTR(ret);
map = kmalloc_node(sizeof(struct bpf_cgroup_storage_map), map = kmalloc_node(sizeof(struct bpf_cgroup_storage_map),
__GFP_ZERO | GFP_USER | __GFP_ACCOUNT, numa_node); __GFP_ZERO | GFP_USER | __GFP_ACCOUNT, numa_node);
if (!map) { if (!map)
bpf_map_charge_finish(&mem);
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
}
bpf_map_charge_move(&map->map.memory, &mem);
/* copy mandatory map attributes */ /* copy mandatory map attributes */
bpf_map_init_from_attr(&map->map, attr); bpf_map_init_from_attr(&map->map, attr);
@ -508,9 +498,6 @@ struct bpf_cgroup_storage *bpf_cgroup_storage_alloc(struct bpf_prog *prog,
size = bpf_cgroup_storage_calculate_size(map, &pages); size = bpf_cgroup_storage_calculate_size(map, &pages);
if (bpf_map_charge_memlock(map, pages))
return ERR_PTR(-EPERM);
storage = bpf_map_kmalloc_node(map, sizeof(struct bpf_cgroup_storage), storage = bpf_map_kmalloc_node(map, sizeof(struct bpf_cgroup_storage),
gfp, map->numa_node); gfp, map->numa_node);
if (!storage) if (!storage)
@ -533,7 +520,6 @@ struct bpf_cgroup_storage *bpf_cgroup_storage_alloc(struct bpf_prog *prog,
return storage; return storage;
enomem: enomem:
bpf_map_uncharge_memlock(map, pages);
kfree(storage); kfree(storage);
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
} }
@ -560,16 +546,11 @@ void bpf_cgroup_storage_free(struct bpf_cgroup_storage *storage)
{ {
enum bpf_cgroup_storage_type stype; enum bpf_cgroup_storage_type stype;
struct bpf_map *map; struct bpf_map *map;
u32 pages;
if (!storage) if (!storage)
return; return;
map = &storage->map->map; map = &storage->map->map;
bpf_cgroup_storage_calculate_size(map, &pages);
bpf_map_uncharge_memlock(map, pages);
stype = cgroup_storage_type(map); stype = cgroup_storage_type(map);
if (stype == BPF_CGROUP_STORAGE_SHARED) if (stype == BPF_CGROUP_STORAGE_SHARED)
call_rcu(&storage->rcu, free_shared_cgroup_storage_rcu); call_rcu(&storage->rcu, free_shared_cgroup_storage_rcu);