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

Commit 3d9f69be authored by Martin KaFai Lau's avatar Martin KaFai Lau Committed by Harshit Jain
Browse files

BACKPORT: 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.

Change-Id: I599a8f1eccb0d63aa8d680b771fff1580c69cf75
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>
Signed-off-by: default avatarCyber Knight <cyberknight755@gmail.com>
parent c4bcd362

include/linux/bpf.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -74,7 +74,7 @@ struct bpf_map { 
	atomic_t refcnt;

	atomic_t refcnt;

	atomic_t usercnt;

	atomic_t usercnt;

	struct work_struct work;

	struct work_struct work;

	u8 name[BPF_OBJ_NAME_LEN];

	char name[BPF_OBJ_NAME_LEN];

};

};





/* function argument constraints */

/* function argument constraints */
@@ -209,7 +209,7 @@ struct bpf_prog_aux { 
	void *security;

	void *security;

#endif

#endif

	u64 load_time; /* ns since boottime */

	u64 load_time; /* ns since boottime */

	u8 name[BPF_OBJ_NAME_LEN];

	char name[BPF_OBJ_NAME_LEN];

	union {

	union {

		struct work_struct work;

		struct work_struct work;

		struct rcu_head	rcu;

		struct rcu_head	rcu;

include/uapi/linux/bpf.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -255,7 +255,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];

		char		prog_name[BPF_OBJ_NAME_LEN];

	};

	};





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

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

	__u32 created_by_uid;

	__u32 nr_map_ids;

	__u32 nr_map_ids;

	__aligned_u64 map_ids;

	__aligned_u64 map_ids;

	__u8  name[BPF_OBJ_NAME_LEN];

	char name[BPF_OBJ_NAME_LEN];

} __attribute__((aligned(8)));

} __attribute__((aligned(8)));





struct bpf_map_info {

struct bpf_map_info {