Commit 711cabaf authored by Roman Gushchin's avatar Roman Gushchin Committed by Alexei Starovoitov
Browse files

bpf: Eliminate rlimit-based memory accounting for cpumap maps 



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

Signed-off-by: default avatarRoman Gushchin <guro@fb.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Acked-by: default avatarSong Liu <songliubraving@fb.com>
Link: https://lore.kernel.org/bpf/20201201215900.3569844-21-guro@fb.com
parent f043733f

kernel/bpf/cpumap.c

+1 −15
Original line number Diff line number Diff line
@@ -84,8 +84,6 @@ static struct bpf_map *cpu_map_alloc(union bpf_attr *attr) 
	u32 value_size = attr->value_size;

	struct bpf_cpu_map *cmap;

	int err = -ENOMEM;

	u64 cost;

	int ret;



	if (!bpf_capable())

		return ERR_PTR(-EPERM);
@@ -109,26 +107,14 @@ static struct bpf_map *cpu_map_alloc(union bpf_attr *attr) 
		goto free_cmap;

	}



	/* make sure page count doesn't overflow */

	cost = (u64) cmap->map.max_entries * sizeof(struct bpf_cpu_map_entry *);



	/* Notice returns -EPERM on if map size is larger than memlock limit */

	ret = bpf_map_charge_init(&cmap->map.memory, cost);

	if (ret) {

		err = ret;

		goto free_cmap;

	}



	/* Alloc array for possible remote "destination" CPUs */

	cmap->cpu_map = bpf_map_area_alloc(cmap->map.max_entries *

					   sizeof(struct bpf_cpu_map_entry *),

					   cmap->map.numa_node);

	if (!cmap->cpu_map)

		goto free_charge;

		goto free_cmap;



	return &cmap->map;

free_charge:

	bpf_map_charge_finish(&cmap->map.memory);

free_cmap:

	kfree(cmap);

	return ERR_PTR(err);