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

bpf: Eliminate rlimit-based memory accounting for reuseport_array maps 



Do not use rlimit-based memory accounting for reuseport_array 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-27-guro@fb.com
parent a37fb7ef

kernel/bpf/reuseport_array.c

+2 −10
Original line number Diff line number Diff line
@@ -150,9 +150,8 @@ static void reuseport_array_free(struct bpf_map *map) 


static struct bpf_map *reuseport_array_alloc(union bpf_attr *attr)

{

	int err, numa_node = bpf_map_attr_numa_node(attr);

	int numa_node = bpf_map_attr_numa_node(attr);

	struct reuseport_array *array;

	struct bpf_map_memory mem;

	u64 array_size;



	if (!bpf_capable())
@@ -161,20 +160,13 @@ static struct bpf_map *reuseport_array_alloc(union bpf_attr *attr) 
	array_size = sizeof(*array);

	array_size += (u64)attr->max_entries * sizeof(struct sock *);



	err = bpf_map_charge_init(&mem, array_size);

	if (err)

		return ERR_PTR(err);



	/* allocate all map elements and zero-initialize them */

	array = bpf_map_area_alloc(array_size, numa_node);

	if (!array) {

		bpf_map_charge_finish(&mem);

	if (!array)

		return ERR_PTR(-ENOMEM);

	}



	/* copy mandatory map attributes */

	bpf_map_init_from_attr(&array->map, attr);

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



	return &array->map;

}