Commit 73cf09a3 authored by Yafang Shao's avatar Yafang Shao Committed by Alexei Starovoitov
Browse files

bpf: Use bpf_map_area_alloc consistently on bpf map creation 



Let's use the generic helper bpf_map_area_alloc() instead of the
open-coded kzalloc helpers in bpf maps creation path.

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


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

kernel/bpf/bpf_local_storage.c

+3 −3
Original line number Diff line number Diff line
@@ -582,7 +582,7 @@ void bpf_local_storage_map_free(struct bpf_local_storage_map *smap, 
	synchronize_rcu();



	kvfree(smap->buckets);

	kfree(smap);

	bpf_map_area_free(smap);

}



int bpf_local_storage_map_alloc_check(union bpf_attr *attr)
@@ -610,7 +610,7 @@ struct bpf_local_storage_map *bpf_local_storage_map_alloc(union bpf_attr *attr) 
	unsigned int i;

	u32 nbuckets;



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

	smap = bpf_map_area_alloc(sizeof(*smap), NUMA_NO_NODE);

	if (!smap)

		return ERR_PTR(-ENOMEM);

	bpf_map_init_from_attr(&smap->map, attr);
@@ -623,7 +623,7 @@ struct bpf_local_storage_map *bpf_local_storage_map_alloc(union bpf_attr *attr) 
	smap->buckets = kvcalloc(sizeof(*smap->buckets), nbuckets,

				 GFP_USER | __GFP_NOWARN | __GFP_ACCOUNT);

	if (!smap->buckets) {

		kfree(smap);

		bpf_map_area_free(smap);

		return ERR_PTR(-ENOMEM);

	}

kernel/bpf/cpumap.c

+3 −3
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_NOWARN |  __GFP_ACCOUNT);

	cmap = bpf_map_area_alloc(sizeof(*cmap), NUMA_NO_NODE);

	if (!cmap)

		return ERR_PTR(-ENOMEM);
@@ -118,7 +118,7 @@ static struct bpf_map *cpu_map_alloc(union bpf_attr *attr) 


	return &cmap->map;

free_cmap:

	kfree(cmap);

	bpf_map_area_free(cmap);

	return ERR_PTR(err);

}
@@ -623,7 +623,7 @@ static void cpu_map_free(struct bpf_map *map) 
		__cpu_map_entry_replace(cmap, i, NULL); /* call_rcu */

	}

	bpf_map_area_free(cmap->cpu_map);

	kfree(cmap);

	bpf_map_area_free(cmap);

}



/* Elements are kept alive by RCU; either by rcu_read_lock() (from syscall) or

kernel/bpf/devmap.c

+3 −3
Original line number Diff line number Diff line
@@ -163,13 +163,13 @@ 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_NOWARN | __GFP_ACCOUNT);

	dtab = bpf_map_area_alloc(sizeof(*dtab), NUMA_NO_NODE);

	if (!dtab)

		return ERR_PTR(-ENOMEM);



	err = dev_map_init_map(dtab, attr);

	if (err) {

		kfree(dtab);

		bpf_map_area_free(dtab);

		return ERR_PTR(err);

	}
@@ -240,7 +240,7 @@ static void dev_map_free(struct bpf_map *map) 
		bpf_map_area_free(dtab->netdev_map);

	}



	kfree(dtab);

	bpf_map_area_free(dtab);

}



static int dev_map_get_next_key(struct bpf_map *map, void *key, void *next_key)

kernel/bpf/hashtab.c

+3 −3
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_NOWARN | __GFP_ACCOUNT);

	htab = bpf_map_area_alloc(sizeof(*htab), NUMA_NO_NODE);

	if (!htab)

		return ERR_PTR(-ENOMEM);
@@ -579,7 +579,7 @@ static struct bpf_map *htab_map_alloc(union bpf_attr *attr) 
	bpf_map_area_free(htab->buckets);

free_htab:

	lockdep_unregister_key(&htab->lockdep_key);

	kfree(htab);

	bpf_map_area_free(htab);

	return ERR_PTR(err);

}
@@ -1496,7 +1496,7 @@ static void htab_map_free(struct bpf_map *map) 
	for (i = 0; i < HASHTAB_MAP_LOCK_COUNT; i++)

		free_percpu(htab->map_locked[i]);

	lockdep_unregister_key(&htab->lockdep_key);

	kfree(htab);

	bpf_map_area_free(htab);

}



static void htab_map_seq_show_elem(struct bpf_map *map, void *key,

kernel/bpf/local_storage.c

+2 −3
Original line number Diff line number Diff line
@@ -313,8 +313,7 @@ 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 = kzalloc_node(sizeof(struct bpf_cgroup_storage_map),

			   GFP_USER | __GFP_NOWARN | __GFP_ACCOUNT, numa_node);

	map = bpf_map_area_alloc(sizeof(struct bpf_cgroup_storage_map), numa_node);

	if (!map)

		return ERR_PTR(-ENOMEM);
@@ -346,7 +345,7 @@ static void cgroup_storage_map_free(struct bpf_map *_map) 
	WARN_ON(!RB_EMPTY_ROOT(&map->root));

	WARN_ON(!list_empty(&map->list));



	kfree(map);

	bpf_map_area_free(map);

}



static int cgroup_storage_delete_elem(struct bpf_map *map, void *key)