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

bpf: Use char in prog and map name 



Instead of u8, use char for prog and map name.  It can avoid the
userspace tool getting compiler's signess warning.  The
bpf_prog_aux, bpf_map, bpf_attr, bpf_prog_info and
bpf_map_info are changed.

Signed-off-by: default avatarMartin KaFai Lau <kafai@fb.com>
Cc: Jakub Kicinski <jakub.kicinski@netronome.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 473d9734

include/linux/bpf.h

+2 −2
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ struct bpf_map { 
	struct work_struct work;

	atomic_t usercnt;

	struct bpf_map *inner_map_meta;

	u8 name[BPF_OBJ_NAME_LEN];

	char name[BPF_OBJ_NAME_LEN];

};



/* function argument constraints */
@@ -189,7 +189,7 @@ struct bpf_prog_aux { 
	struct bpf_prog *prog;

	struct user_struct *user;

	u64 load_time; /* ns since boottime */

	u8 name[BPF_OBJ_NAME_LEN];

	char name[BPF_OBJ_NAME_LEN];

	union {

		struct work_struct work;

		struct rcu_head	rcu;

include/uapi/linux/bpf.h

+4 −4
Original line number Diff line number Diff line
@@ -230,7 +230,7 @@ union bpf_attr { 
		__u32	numa_node;	/* numa node (effective only if

					 * BPF_F_NUMA_NODE is set).

					 */

		__u8	map_name[BPF_OBJ_NAME_LEN];

		char	map_name[BPF_OBJ_NAME_LEN];

	};



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

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

		__u32		prog_flags;

		__u8		prog_name[BPF_OBJ_NAME_LEN];

		char		prog_name[BPF_OBJ_NAME_LEN];

	};



	struct { /* anonymous struct used by BPF_OBJ_* commands */
@@ -888,7 +888,7 @@ struct bpf_prog_info { 
	__u32 created_by_uid;

	__u32 nr_map_ids;

	__aligned_u64 map_ids;

	__u8  name[BPF_OBJ_NAME_LEN];

	char name[BPF_OBJ_NAME_LEN];

} __attribute__((aligned(8)));



struct bpf_map_info {
@@ -898,7 +898,7 @@ struct bpf_map_info { 
	__u32 value_size;

	__u32 max_entries;

	__u32 map_flags;

	__u8  name[BPF_OBJ_NAME_LEN];

	char  name[BPF_OBJ_NAME_LEN];

} __attribute__((aligned(8)));



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

tools/include/uapi/linux/bpf.h

+4 −4
Original line number Diff line number Diff line
@@ -230,7 +230,7 @@ union bpf_attr { 
		__u32	numa_node;	/* numa node (effective only if

					 * BPF_F_NUMA_NODE is set).

					 */

		__u8	map_name[BPF_OBJ_NAME_LEN];

		char	map_name[BPF_OBJ_NAME_LEN];

	};



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

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

		__u32		prog_flags;

		__u8		prog_name[BPF_OBJ_NAME_LEN];

		char		prog_name[BPF_OBJ_NAME_LEN];

	};



	struct { /* anonymous struct used by BPF_OBJ_* commands */
@@ -871,7 +871,7 @@ struct bpf_prog_info { 
	__u32 created_by_uid;

	__u32 nr_map_ids;

	__aligned_u64 map_ids;

	__u8  name[BPF_OBJ_NAME_LEN];

	char  name[BPF_OBJ_NAME_LEN];

} __attribute__((aligned(8)));



struct bpf_map_info {
@@ -881,7 +881,7 @@ struct bpf_map_info { 
	__u32 value_size;

	__u32 max_entries;

	__u32 map_flags;

	__u8  name[BPF_OBJ_NAME_LEN];

	char  name[BPF_OBJ_NAME_LEN];

} __attribute__((aligned(8)));



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

CRA Git | Maintained and supported by SUSTech CRA and CCSE