forked from mirrors/linux
		
	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: 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>
This commit is contained in:
		
							parent
							
								
									8f58ee54c2
								
							
						
					
					
						commit
						992c9e13f5
					
				
					 7 changed files with 9 additions and 9 deletions
				
			
		|  | @ -97,7 +97,7 @@ static struct bpf_map *cpu_map_alloc(union bpf_attr *attr) | ||||||
| 	    attr->map_flags & ~BPF_F_NUMA_NODE) | 	    attr->map_flags & ~BPF_F_NUMA_NODE) | ||||||
| 		return ERR_PTR(-EINVAL); | 		return ERR_PTR(-EINVAL); | ||||||
| 
 | 
 | ||||||
| 	cmap = kzalloc(sizeof(*cmap), GFP_USER | __GFP_ACCOUNT); | 	cmap = kzalloc(sizeof(*cmap), GFP_USER | __GFP_NOWARN |  __GFP_ACCOUNT); | ||||||
| 	if (!cmap) | 	if (!cmap) | ||||||
| 		return ERR_PTR(-ENOMEM); | 		return ERR_PTR(-ENOMEM); | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -163,7 +163,7 @@ static struct bpf_map *dev_map_alloc(union bpf_attr *attr) | ||||||
| 	if (!capable(CAP_NET_ADMIN)) | 	if (!capable(CAP_NET_ADMIN)) | ||||||
| 		return ERR_PTR(-EPERM); | 		return ERR_PTR(-EPERM); | ||||||
| 
 | 
 | ||||||
| 	dtab = kzalloc(sizeof(*dtab), GFP_USER | __GFP_ACCOUNT); | 	dtab = kzalloc(sizeof(*dtab), GFP_USER | __GFP_NOWARN | __GFP_ACCOUNT); | ||||||
| 	if (!dtab) | 	if (!dtab) | ||||||
| 		return ERR_PTR(-ENOMEM); | 		return ERR_PTR(-ENOMEM); | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -495,7 +495,7 @@ static struct bpf_map *htab_map_alloc(union bpf_attr *attr) | ||||||
| 	struct bpf_htab *htab; | 	struct bpf_htab *htab; | ||||||
| 	int err, i; | 	int err, i; | ||||||
| 
 | 
 | ||||||
| 	htab = kzalloc(sizeof(*htab), GFP_USER | __GFP_ACCOUNT); | 	htab = kzalloc(sizeof(*htab), GFP_USER | __GFP_NOWARN | __GFP_ACCOUNT); | ||||||
| 	if (!htab) | 	if (!htab) | ||||||
| 		return ERR_PTR(-ENOMEM); | 		return ERR_PTR(-ENOMEM); | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -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 */ | 		/* max_entries is not used and enforced to be 0 */ | ||||||
| 		return ERR_PTR(-EINVAL); | 		return ERR_PTR(-EINVAL); | ||||||
| 
 | 
 | ||||||
| 	map = kmalloc_node(sizeof(struct bpf_cgroup_storage_map), | 	map = kzalloc_node(sizeof(struct bpf_cgroup_storage_map), | ||||||
| 			   __GFP_ZERO | GFP_USER | __GFP_ACCOUNT, numa_node); | 			   GFP_USER | __GFP_NOWARN | __GFP_ACCOUNT, numa_node); | ||||||
| 	if (!map) | 	if (!map) | ||||||
| 		return ERR_PTR(-ENOMEM); | 		return ERR_PTR(-ENOMEM); | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -372,7 +372,7 @@ struct bpf_map *bpf_map_offload_map_alloc(union bpf_attr *attr) | ||||||
| 	    attr->map_type != BPF_MAP_TYPE_HASH) | 	    attr->map_type != BPF_MAP_TYPE_HASH) | ||||||
| 		return ERR_PTR(-EINVAL); | 		return ERR_PTR(-EINVAL); | ||||||
| 
 | 
 | ||||||
| 	offmap = kzalloc(sizeof(*offmap), GFP_USER); | 	offmap = kzalloc(sizeof(*offmap), GFP_USER | __GFP_NOWARN); | ||||||
| 	if (!offmap) | 	if (!offmap) | ||||||
| 		return ERR_PTR(-ENOMEM); | 		return ERR_PTR(-ENOMEM); | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -164,7 +164,7 @@ static struct bpf_map *ringbuf_map_alloc(union bpf_attr *attr) | ||||||
| 		return ERR_PTR(-E2BIG); | 		return ERR_PTR(-E2BIG); | ||||||
| #endif | #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) | 	if (!rb_map) | ||||||
| 		return ERR_PTR(-ENOMEM); | 		return ERR_PTR(-ENOMEM); | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -41,7 +41,7 @@ static struct bpf_map *sock_map_alloc(union bpf_attr *attr) | ||||||
| 	    attr->map_flags & ~SOCK_CREATE_FLAG_MASK) | 	    attr->map_flags & ~SOCK_CREATE_FLAG_MASK) | ||||||
| 		return ERR_PTR(-EINVAL); | 		return ERR_PTR(-EINVAL); | ||||||
| 
 | 
 | ||||||
| 	stab = kzalloc(sizeof(*stab), GFP_USER | __GFP_ACCOUNT); | 	stab = kzalloc(sizeof(*stab), GFP_USER | __GFP_NOWARN | __GFP_ACCOUNT); | ||||||
| 	if (!stab) | 	if (!stab) | ||||||
| 		return ERR_PTR(-ENOMEM); | 		return ERR_PTR(-ENOMEM); | ||||||
| 
 | 
 | ||||||
|  | @ -1076,7 +1076,7 @@ static struct bpf_map *sock_hash_alloc(union bpf_attr *attr) | ||||||
| 	if (attr->key_size > MAX_BPF_STACK) | 	if (attr->key_size > MAX_BPF_STACK) | ||||||
| 		return ERR_PTR(-E2BIG); | 		return ERR_PTR(-E2BIG); | ||||||
| 
 | 
 | ||||||
| 	htab = kzalloc(sizeof(*htab), GFP_USER | __GFP_ACCOUNT); | 	htab = kzalloc(sizeof(*htab), GFP_USER | __GFP_NOWARN | __GFP_ACCOUNT); | ||||||
| 	if (!htab) | 	if (!htab) | ||||||
| 		return ERR_PTR(-ENOMEM); | 		return ERR_PTR(-ENOMEM); | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
		Loading…
	
		Reference in a new issue
	
	 Yafang Shao
						Yafang Shao