Commit 992c9e13 authored by Yafang Shao's avatar Yafang Shao Committed by Alexei Starovoitov
Browse files

bpf: Make __GFP_NOWARN consistent in bpf map creation 



Some of the bpf maps are created with __GFP_NOWARN, i.e. arraymap,
bloom_filter, bpf_local_storage, bpf_struct_ops, lpm_trie,
queue_stack_maps, reuseport_array, stackmap and xskmap, while others are
created without __GFP_NOWARN, i.e. cpumap, devmap, hashtab,
local_storage, offload, ringbuf and sock_map. But there are not key
differences between the creation of these maps. So let make this
allocation flag consistent in all bpf maps creation. Then we can use a
generic helper to alloc all bpf maps.

Signed-off-by: default avatarYafang Shao <laoar.shao@gmail.com>
Link: https://lore.kernel.org/r/20220810151840.16394-4-laoar.shao@gmail.com


Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent 8f58ee54

kernel/bpf/cpumap.c

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ static struct bpf_map *cpu_map_alloc(union bpf_attr *attr) 
	    attr->map_flags & ~BPF_F_NUMA_NODE)

		return ERR_PTR(-EINVAL);



	cmap = kzalloc(sizeof(*cmap), GFP_USER | __GFP_ACCOUNT);

	cmap = kzalloc(sizeof(*cmap), GFP_USER | __GFP_NOWARN |  __GFP_ACCOUNT);

	if (!cmap)

		return ERR_PTR(-ENOMEM);

kernel/bpf/devmap.c

+1 −1
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ static struct bpf_map *dev_map_alloc(union bpf_attr *attr) 
	if (!capable(CAP_NET_ADMIN))

		return ERR_PTR(-EPERM);



	dtab = kzalloc(sizeof(*dtab), GFP_USER | __GFP_ACCOUNT);

	dtab = kzalloc(sizeof(*dtab), GFP_USER | __GFP_NOWARN | __GFP_ACCOUNT);

	if (!dtab)

		return ERR_PTR(-ENOMEM);

kernel/bpf/hashtab.c

+1 −1
Original line number Diff line number Diff line
@@ -495,7 +495,7 @@ static struct bpf_map *htab_map_alloc(union bpf_attr *attr) 
	struct bpf_htab *htab;

	int err, i;



	htab = kzalloc(sizeof(*htab), GFP_USER | __GFP_ACCOUNT);

	htab = kzalloc(sizeof(*htab), GFP_USER | __GFP_NOWARN | __GFP_ACCOUNT);

	if (!htab)

		return ERR_PTR(-ENOMEM);

kernel/bpf/local_storage.c

+2 −2
Original line number Diff line number Diff line
@@ -313,8 +313,8 @@ static struct bpf_map *cgroup_storage_map_alloc(union bpf_attr *attr) 
		/* max_entries is not used and enforced to be 0 */

		return ERR_PTR(-EINVAL);



	map = kmalloc_node(sizeof(struct bpf_cgroup_storage_map),

			   __GFP_ZERO | GFP_USER | __GFP_ACCOUNT, numa_node);

	map = kzalloc_node(sizeof(struct bpf_cgroup_storage_map),

			   GFP_USER | __GFP_NOWARN | __GFP_ACCOUNT, numa_node);

	if (!map)

		return ERR_PTR(-ENOMEM);

kernel/bpf/offload.c

+1 −1
Original line number Diff line number Diff line
@@ -372,7 +372,7 @@ struct bpf_map *bpf_map_offload_map_alloc(union bpf_attr *attr) 
	    attr->map_type != BPF_MAP_TYPE_HASH)

		return ERR_PTR(-EINVAL);



	offmap = kzalloc(sizeof(*offmap), GFP_USER);

	offmap = kzalloc(sizeof(*offmap), GFP_USER | __GFP_NOWARN);

	if (!offmap)

		return ERR_PTR(-ENOMEM);