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

bpf: libbpf: Provide basic API support to specify BPF obj name 



This patch extends the libbpf to provide API support to
allow specifying BPF object name.

In tools/lib/bpf/libbpf, the C symbol of the function
and the map is used.  Regarding section name, all maps are
under the same section named "maps".  Hence, section name
is not a good choice for map's name.  To be consistent with
map, bpf_prog also follows and uses its function symbol as
the prog's name.

This patch adds logic to collect function's symbols in libbpf.
There is existing codes to collect the map's symbols and no change
is needed.

The bpf_load_program_name() and bpf_map_create_name() are
added to take the name argument.  For the other bpf_map_create_xxx()
variants, a name argument is directly added to them.

In samples/bpf, bpf_load.c in particular, the symbol is also
used as the map's name and the map symbols has already been
collected in the existing code.  For bpf_prog, bpf_load.c does
not collect the function symbol name.  We can consider to collect
them later if there is a need to continue supporting the bpf_load.c.

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

samples/bpf/bpf_load.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -221,6 +221,7 @@ static int load_maps(struct bpf_map_data *maps, int nr_maps, 
			int inner_map_fd = map_fd[maps[i].def.inner_map_idx];

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





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

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

							maps[i].name,

							maps[i].def.key_size,

							maps[i].def.key_size,

							inner_map_fd,

							inner_map_fd,

							maps[i].def.max_entries,

							maps[i].def.max_entries,
@@ -228,6 +229,7 @@ static int load_maps(struct bpf_map_data *maps, int nr_maps, 
							numa_node);

							numa_node);

		} else {

		} else {

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

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

							maps[i].name,

							maps[i].def.key_size,

							maps[i].def.key_size,

							maps[i].def.value_size,

							maps[i].def.value_size,

							maps[i].def.max_entries,

							maps[i].def.max_entries,

samples/bpf/map_perf_test_user.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -137,6 +137,7 @@ static void do_test_lru(enum test_type test, int cpu) 




			inner_lru_map_fds[cpu] =

			inner_lru_map_fds[cpu] =

				bpf_create_map_node(BPF_MAP_TYPE_LRU_HASH,

				bpf_create_map_node(BPF_MAP_TYPE_LRU_HASH,

						    test_map_names[INNER_LRU_HASH_PREALLOC],

						    sizeof(uint32_t),

						    sizeof(uint32_t),

						    sizeof(long),

						    sizeof(long),

						    inner_lru_hash_size, 0,

						    inner_lru_hash_size, 0,

tools/include/uapi/linux/bpf.h

+10 −0
Original line number Original line Diff line number Diff line
@@ -175,6 +175,8 @@ enum bpf_attach_type { 
/* Specify numa node during map creation */

/* Specify numa node during map creation */

#define BPF_F_NUMA_NODE		(1U << 2)

#define BPF_F_NUMA_NODE		(1U << 2)





#define BPF_OBJ_NAME_LEN 16U



union bpf_attr {

union bpf_attr {

	struct { /* anonymous struct used by BPF_MAP_CREATE command */

	struct { /* anonymous struct used by BPF_MAP_CREATE command */

		__u32	map_type;	/* one of enum bpf_map_type */

		__u32	map_type;	/* one of enum bpf_map_type */
@@ -188,6 +190,7 @@ union bpf_attr { 
		__u32	numa_node;	/* numa node (effective only if

		__u32	numa_node;	/* numa node (effective only if

					 * BPF_F_NUMA_NODE is set).

					 * BPF_F_NUMA_NODE is set).

					 */

					 */

		__u8	map_name[BPF_OBJ_NAME_LEN];

	};

	};





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

	struct { /* anonymous struct used by BPF_MAP_*_ELEM commands */
@@ -210,6 +213,7 @@ union bpf_attr { 
		__aligned_u64	log_buf;	/* user supplied buffer */

		__aligned_u64	log_buf;	/* user supplied buffer */

		__u32		kern_version;	/* checked when prog_type=kprobe */

		__u32		kern_version;	/* checked when prog_type=kprobe */

		__u32		prog_flags;

		__u32		prog_flags;

		__u8		prog_name[BPF_OBJ_NAME_LEN];

	};

	};





	struct { /* anonymous struct used by BPF_OBJ_* commands */

	struct { /* anonymous struct used by BPF_OBJ_* commands */
@@ -812,6 +816,11 @@ struct bpf_prog_info { 
	__u32 xlated_prog_len;

	__u32 xlated_prog_len;

	__aligned_u64 jited_prog_insns;

	__aligned_u64 jited_prog_insns;

	__aligned_u64 xlated_prog_insns;

	__aligned_u64 xlated_prog_insns;

	__u64 load_time;	/* ns since boottime */

	__u32 created_by_uid;

	__u32 nr_map_ids;

	__aligned_u64 map_ids;

	__u8  name[BPF_OBJ_NAME_LEN];

} __attribute__((aligned(8)));

} __attribute__((aligned(8)));





struct bpf_map_info {

struct bpf_map_info {
@@ -821,6 +830,7 @@ struct bpf_map_info { 
	__u32 value_size;

	__u32 value_size;

	__u32 max_entries;

	__u32 max_entries;

	__u32 map_flags;

	__u32 map_flags;

	__u8  name[BPF_OBJ_NAME_LEN];

} __attribute__((aligned(8)));

} __attribute__((aligned(8)));





/* User bpf_sock_ops struct to access socket values and specify request ops

/* User bpf_sock_ops struct to access socket values and specify request ops

tools/lib/bpf/bpf.c

+44 −13
Original line number Original line Diff line number Diff line
@@ -46,6 +46,8 @@ 
# endif

# endif

#endif

#endif





#define min(x, y) ((x) < (y) ? (x) : (y))



static inline __u64 ptr_to_u64(const void *ptr)

static inline __u64 ptr_to_u64(const void *ptr)

{

{

	return (__u64) (unsigned long) ptr;

	return (__u64) (unsigned long) ptr;
@@ -57,10 +59,11 @@ static inline int sys_bpf(enum bpf_cmd cmd, union bpf_attr *attr, 
	return syscall(__NR_bpf, cmd, attr, size);

	return syscall(__NR_bpf, cmd, attr, size);

}

}





int bpf_create_map_node(enum bpf_map_type map_type, int key_size,

int bpf_create_map_node(enum bpf_map_type map_type, const char *name,

			int value_size, int max_entries, __u32 map_flags,

			int key_size, int value_size, int max_entries,

			int node)

			__u32 map_flags, int node)

{

{

	__u32 name_len = name ? strlen(name) : 0;

	union bpf_attr attr;

	union bpf_attr attr;





	memset(&attr, '\0', sizeof(attr));

	memset(&attr, '\0', sizeof(attr));
@@ -70,6 +73,8 @@ int bpf_create_map_node(enum bpf_map_type map_type, int key_size, 
	attr.value_size = value_size;

	attr.value_size = value_size;

	attr.max_entries = max_entries;

	attr.max_entries = max_entries;

	attr.map_flags = map_flags;

	attr.map_flags = map_flags;

	memcpy(attr.map_name, name, min(name_len, BPF_OBJ_NAME_LEN - 1));



	if (node >= 0) {

	if (node >= 0) {

		attr.map_flags |= BPF_F_NUMA_NODE;

		attr.map_flags |= BPF_F_NUMA_NODE;

		attr.numa_node = node;

		attr.numa_node = node;
@@ -81,14 +86,23 @@ int bpf_create_map_node(enum bpf_map_type map_type, int key_size, 
int bpf_create_map(enum bpf_map_type map_type, int key_size,

int bpf_create_map(enum bpf_map_type map_type, int key_size,

		   int value_size, int max_entries, __u32 map_flags)

		   int value_size, int max_entries, __u32 map_flags)

{

{

	return bpf_create_map_node(map_type, key_size, value_size,

	return bpf_create_map_node(map_type, NULL, key_size, value_size,

				   max_entries, map_flags, -1);

}



int bpf_create_map_name(enum bpf_map_type map_type, const char *name,

			int key_size, int value_size, int max_entries,

			__u32 map_flags)

{

	return bpf_create_map_node(map_type, name, key_size, value_size,

				   max_entries, map_flags, -1);

				   max_entries, map_flags, -1);

}

}





int bpf_create_map_in_map_node(enum bpf_map_type map_type, int key_size,

int bpf_create_map_in_map_node(enum bpf_map_type map_type, const char *name,

			       int inner_map_fd, int max_entries,

			       int key_size, int inner_map_fd, int max_entries,

			       __u32 map_flags, int node)

			       __u32 map_flags, int node)

{

{

	__u32 name_len = name ? strlen(name) : 0;

	union bpf_attr attr;

	union bpf_attr attr;





	memset(&attr, '\0', sizeof(attr));

	memset(&attr, '\0', sizeof(attr));
@@ -99,6 +113,8 @@ int bpf_create_map_in_map_node(enum bpf_map_type map_type, int key_size, 
	attr.inner_map_fd = inner_map_fd;

	attr.inner_map_fd = inner_map_fd;

	attr.max_entries = max_entries;

	attr.max_entries = max_entries;

	attr.map_flags = map_flags;

	attr.map_flags = map_flags;

	memcpy(attr.map_name, name, min(name_len, BPF_OBJ_NAME_LEN - 1));



	if (node >= 0) {

	if (node >= 0) {

		attr.map_flags |= BPF_F_NUMA_NODE;

		attr.map_flags |= BPF_F_NUMA_NODE;

		attr.numa_node = node;

		attr.numa_node = node;
@@ -107,19 +123,24 @@ int bpf_create_map_in_map_node(enum bpf_map_type map_type, int key_size, 
	return sys_bpf(BPF_MAP_CREATE, &attr, sizeof(attr));

	return sys_bpf(BPF_MAP_CREATE, &attr, sizeof(attr));

}

}





int bpf_create_map_in_map(enum bpf_map_type map_type, int key_size,

int bpf_create_map_in_map(enum bpf_map_type map_type, const char *name,

			  int inner_map_fd, int max_entries, __u32 map_flags)

			  int key_size, int inner_map_fd, int max_entries,

			  __u32 map_flags)

{

{

	return bpf_create_map_in_map_node(map_type, key_size, inner_map_fd,

	return bpf_create_map_in_map_node(map_type, name, key_size,

					  max_entries, map_flags, -1);

					  inner_map_fd, max_entries, map_flags,

					  -1);

}

}





int bpf_load_program(enum bpf_prog_type type, const struct bpf_insn *insns,

int bpf_load_program_name(enum bpf_prog_type type, const char *name,

			  const struct bpf_insn *insns,

			  size_t insns_cnt, const char *license,

			  size_t insns_cnt, const char *license,

		     __u32 kern_version, char *log_buf, size_t log_buf_sz)

			  __u32 kern_version, char *log_buf,

			  size_t log_buf_sz)

{

{

	int fd;

	int fd;

	union bpf_attr attr;

	union bpf_attr attr;

	__u32 name_len = name ? strlen(name) : 0;





	bzero(&attr, sizeof(attr));

	bzero(&attr, sizeof(attr));

	attr.prog_type = type;

	attr.prog_type = type;
@@ -130,6 +151,7 @@ int bpf_load_program(enum bpf_prog_type type, const struct bpf_insn *insns, 
	attr.log_size = 0;

	attr.log_size = 0;

	attr.log_level = 0;

	attr.log_level = 0;

	attr.kern_version = kern_version;

	attr.kern_version = kern_version;

	memcpy(attr.prog_name, name, min(name_len, BPF_OBJ_NAME_LEN - 1));





	fd = sys_bpf(BPF_PROG_LOAD, &attr, sizeof(attr));

	fd = sys_bpf(BPF_PROG_LOAD, &attr, sizeof(attr));

	if (fd >= 0 || !log_buf || !log_buf_sz)

	if (fd >= 0 || !log_buf || !log_buf_sz)
@@ -143,6 +165,15 @@ int bpf_load_program(enum bpf_prog_type type, const struct bpf_insn *insns, 
	return sys_bpf(BPF_PROG_LOAD, &attr, sizeof(attr));

	return sys_bpf(BPF_PROG_LOAD, &attr, sizeof(attr));

}

}





int bpf_load_program(enum bpf_prog_type type, const struct bpf_insn *insns,

		     size_t insns_cnt, const char *license,

		     __u32 kern_version, char *log_buf,

		     size_t log_buf_sz)

{

	return bpf_load_program_name(type, NULL, insns, insns_cnt, license,

				     kern_version, log_buf, log_buf_sz);

}



int bpf_verify_program(enum bpf_prog_type type, const struct bpf_insn *insns,

int bpf_verify_program(enum bpf_prog_type type, const struct bpf_insn *insns,

		       size_t insns_cnt, int strict_alignment,

		       size_t insns_cnt, int strict_alignment,

		       const char *license, __u32 kern_version,

		       const char *license, __u32 kern_version,

tools/lib/bpf/bpf.h

+16 −7
Original line number Original line Diff line number Diff line
@@ -24,19 +24,28 @@ 
#include <linux/bpf.h>

#include <linux/bpf.h>

#include <stddef.h>

#include <stddef.h>





int bpf_create_map_node(enum bpf_map_type map_type, int key_size,

int bpf_create_map_node(enum bpf_map_type map_type, const char *name,

			int value_size, int max_entries, __u32 map_flags,

			int key_size, int value_size, int max_entries,

			int node);

			__u32 map_flags, int node);

int bpf_create_map_name(enum bpf_map_type map_type, const char *name,

			int key_size, int value_size, int max_entries,

			__u32 map_flags);

int bpf_create_map(enum bpf_map_type map_type, int key_size, int value_size,

int bpf_create_map(enum bpf_map_type map_type, int key_size, int value_size,

		   int max_entries, __u32 map_flags);

		   int max_entries, __u32 map_flags);

int bpf_create_map_in_map_node(enum bpf_map_type map_type, int key_size,

int bpf_create_map_in_map_node(enum bpf_map_type map_type, const char *name,

			       int inner_map_fd, int max_entries,

			       int key_size, int inner_map_fd, int max_entries,

			       __u32 map_flags, int node);

			       __u32 map_flags, int node);

int bpf_create_map_in_map(enum bpf_map_type map_type, int key_size,

int bpf_create_map_in_map(enum bpf_map_type map_type, const char *name,

			  int inner_map_fd, int max_entries, __u32 map_flags);

			  int key_size, int inner_map_fd, int max_entries,

			  __u32 map_flags);





/* Recommend log buffer size */

/* Recommend log buffer size */

#define BPF_LOG_BUF_SIZE 65536

#define BPF_LOG_BUF_SIZE 65536

int bpf_load_program_name(enum bpf_prog_type type, const char *name,

			  const struct bpf_insn *insns,

			  size_t insns_cnt, const char *license,

			  __u32 kern_version, char *log_buf,

			  size_t log_buf_sz);

int bpf_load_program(enum bpf_prog_type type, const struct bpf_insn *insns,

int bpf_load_program(enum bpf_prog_type type, const struct bpf_insn *insns,

		     size_t insns_cnt, const char *license,

		     size_t insns_cnt, const char *license,

		     __u32 kern_version, char *log_buf,

		     __u32 kern_version, char *log_buf,

CRA Git | Maintained and supported by SUSTech CRA and CCSE