Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ad17d0e6 authored by Martin KaFai Lau's avatar Martin KaFai Lau Committed by David S. Miller
Browse files

bpf: Allow numa selection in INNER_LRU_HASH_PREALLOC test of map_perf_test 



This patch makes the needed changes to allow each process of
the INNER_LRU_HASH_PREALLOC test to provide its numa node id
when creating the lru map.

Signed-off-by: default avatarMartin KaFai Lau <kafai@fb.com>
Acked-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Acked-by: default avatarAlexei Starovoitov <ast@fb.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 96eabe7a

samples/bpf/bpf_load.c

+13 −8
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ static int load_and_attach(const char *event, struct bpf_insn *prog, int size) 
static int load_maps(struct bpf_map_data *maps, int nr_maps,

		     fixup_map_cb fixup_map)

{

	int i;

	int i, numa_node;



	for (i = 0; i < nr_maps; i++) {

		if (fixup_map) {
@@ -213,21 +213,26 @@ static int load_maps(struct bpf_map_data *maps, int nr_maps, 
			}

		}



		numa_node = maps[i].def.map_flags & BPF_F_NUMA_NODE ?

			maps[i].def.numa_node : -1;



		if (maps[i].def.type == BPF_MAP_TYPE_ARRAY_OF_MAPS ||

		    maps[i].def.type == BPF_MAP_TYPE_HASH_OF_MAPS) {

			int inner_map_fd = map_fd[maps[i].def.inner_map_idx];



			map_fd[i] = bpf_create_map_in_map(maps[i].def.type,

			map_fd[i] = bpf_create_map_in_map_node(maps[i].def.type,

							maps[i].def.key_size,

							inner_map_fd,

							maps[i].def.max_entries,

							maps[i].def.map_flags);

							maps[i].def.map_flags,

							numa_node);

		} else {

			map_fd[i] = bpf_create_map(maps[i].def.type,

			map_fd[i] = bpf_create_map_node(maps[i].def.type,

							maps[i].def.key_size,

							maps[i].def.value_size,

							maps[i].def.max_entries,

						   maps[i].def.map_flags);

							maps[i].def.map_flags,

							numa_node);

		}

		if (map_fd[i] < 0) {

			printf("failed to create a map: %d %s\n",

samples/bpf/bpf_load.h

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ struct bpf_map_def { 
	unsigned int max_entries;

	unsigned int map_flags;

	unsigned int inner_map_idx;

	unsigned int numa_node;

};



struct bpf_map_data {

samples/bpf/map_perf_test_kern.c

+2 −0
Original line number Diff line number Diff line
@@ -40,6 +40,8 @@ struct bpf_map_def SEC("maps") inner_lru_hash_map = { 
	.key_size = sizeof(u32),

	.value_size = sizeof(long),

	.max_entries = MAX_ENTRIES,

	.map_flags = BPF_F_NUMA_NODE,

	.numa_node = 0,

};



struct bpf_map_def SEC("maps") array_of_lru_hashs = {

samples/bpf/map_perf_test_user.c

+9 −3
Original line number Diff line number Diff line
@@ -97,14 +97,20 @@ static void do_test_lru(enum test_type test, int cpu) 


	if (test == INNER_LRU_HASH_PREALLOC) {

		int outer_fd = map_fd[array_of_lru_hashs_idx];

		unsigned int mycpu, mynode;



		assert(cpu < MAX_NR_CPUS);



		if (cpu) {

			ret = syscall(__NR_getcpu, &mycpu, &mynode, NULL);

			assert(!ret);



			inner_lru_map_fds[cpu] =

				bpf_create_map(BPF_MAP_TYPE_LRU_HASH,

					       sizeof(uint32_t), sizeof(long),

					       inner_lru_hash_size, 0);

				bpf_create_map_node(BPF_MAP_TYPE_LRU_HASH,

						    sizeof(uint32_t),

						    sizeof(long),

						    inner_lru_hash_size, 0,

						    mynode);

			if (inner_lru_map_fds[cpu] == -1) {

				printf("cannot create BPF_MAP_TYPE_LRU_HASH %s(%d)\n",

				       strerror(errno), errno);

tools/include/uapi/linux/bpf.h

+9 −1
Original line number Diff line number Diff line
@@ -168,6 +168,7 @@ enum bpf_sockmap_flags { 
#define BPF_NOEXIST	1 /* create new element if it didn't exist */

#define BPF_EXIST	2 /* update existing element */



/* flags for BPF_MAP_CREATE command */

#define BPF_F_NO_PREALLOC	(1U << 0)

/* Instead of having one common LRU list in the

 * BPF_MAP_TYPE_LRU_[PERCPU_]HASH map, use a percpu LRU list
@@ -176,6 +177,8 @@ enum bpf_sockmap_flags { 
 * across different LRU lists.

 */

#define BPF_F_NO_COMMON_LRU	(1U << 1)

/* Specify numa node during map creation */

#define BPF_F_NUMA_NODE		(1U << 2)



union bpf_attr {

	struct { /* anonymous struct used by BPF_MAP_CREATE command */
@@ -183,8 +186,13 @@ union bpf_attr { 
		__u32	key_size;	/* size of key in bytes */

		__u32	value_size;	/* size of value in bytes */

		__u32	max_entries;	/* max number of entries in a map */

		__u32	map_flags;	/* prealloc or not */

		__u32	map_flags;	/* BPF_MAP_CREATE related

					 * flags defined above.

					 */

		__u32	inner_map_fd;	/* fd pointing to the inner map */

		__u32	numa_node;	/* numa node (effective only if

					 * BPF_F_NUMA_NODE is set).

					 */

	};



	struct { /* anonymous struct used by BPF_MAP_*_ELEM commands */