Skip to content

Commit

Permalink
bpf: Make __GFP_NOWARN consistent in bpf map creation
Browse files Browse the repository at this point in the history
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: Yafang Shao <laoar.shao@gmail.com>
Link: https://lore.kernel.org/r/20220810151840.16394-4-laoar.shao@gmail.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
  • Loading branch information
Yafang Shao authored and Alexei Starovoitov committed Aug 10, 2022
1 parent 8f58ee5 commit 992c9e1
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion kernel/bpf/cpumap.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion kernel/bpf/devmap.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion kernel/bpf/hashtab.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
4 changes: 2 additions & 2 deletions kernel/bpf/local_storage.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion kernel/bpf/offload.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion kernel/bpf/ringbuf.c
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ static struct bpf_map *ringbuf_map_alloc(union bpf_attr *attr)
return ERR_PTR(-E2BIG);
#endif

rb_map = kzalloc(sizeof(*rb_map), GFP_USER | __GFP_ACCOUNT);
rb_map = kzalloc(sizeof(*rb_map), GFP_USER | __GFP_NOWARN | __GFP_ACCOUNT);
if (!rb_map)
return ERR_PTR(-ENOMEM);

Expand Down
4 changes: 2 additions & 2 deletions net/core/sock_map.c
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ static struct bpf_map *sock_map_alloc(union bpf_attr *attr)
attr->map_flags & ~SOCK_CREATE_FLAG_MASK)
return ERR_PTR(-EINVAL);

stab = kzalloc(sizeof(*stab), GFP_USER | __GFP_ACCOUNT);
stab = kzalloc(sizeof(*stab), GFP_USER | __GFP_NOWARN | __GFP_ACCOUNT);
if (!stab)
return ERR_PTR(-ENOMEM);

Expand Down Expand Up @@ -1076,7 +1076,7 @@ static struct bpf_map *sock_hash_alloc(union bpf_attr *attr)
if (attr->key_size > MAX_BPF_STACK)
return ERR_PTR(-E2BIG);

htab = kzalloc(sizeof(*htab), GFP_USER | __GFP_ACCOUNT);
htab = kzalloc(sizeof(*htab), GFP_USER | __GFP_NOWARN | __GFP_ACCOUNT);
if (!htab)
return ERR_PTR(-ENOMEM);

Expand Down

0 comments on commit 992c9e1

Please sign in to comment.