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

Commit f1d6cb2d authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

tools headers: Fixup tools/include/uapi/linux/bpf.h copy of kernel ABI header 

In 04df41e3 ("bpf: update tools/include/uapi/linux/bpf.h") the files
added in 40304b2a ("bpf: BPF support for sock_ops") were added to
tools/include, but not in a verbatim way, missing the comments, which
ends up triggering this warning when build tools/perf/:

  make: Entering directory '/home/acme/git/linux/tools/perf'
    BUILD:   Doing 'make -j4' parallel build
  Warning: Kernel ABI header at 'tools/include/uapi/linux/bpf.h' differs from latest version at 'include/uapi/linux/bpf.h'

Make sure the the lines are equal, to fix the simple header copy
drift detector in tools/perf/.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Cc: David Ahern <dsahern@gmail.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Lawrence Brakmo <brakmo@fb.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Fixes: 04df41e3 ("bpf: update tools/include/uapi/linux/bpf.h")
Link: http://lkml.kernel.org/n/tip-z9qyyqht9qq3yyxu76sfy0dh@git.kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 470de0f3

tools/include/uapi/linux/bpf.h

+8 −6
Original line number Diff line number Diff line
@@ -750,6 +750,8 @@ struct bpf_map_info { 


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

 * and their replies.

 * Some of this fields are in network (bigendian) byte order and may need

 * to be converted before use (bpf_ntohl() defined in samples/bpf/bpf_endian.h).

 * New fields can only be added at the end of this structure

 */

struct bpf_sock_ops {
@@ -759,12 +761,12 @@ struct bpf_sock_ops { 
		__u32 replylong[4];

	};

	__u32 family;

	__u32 remote_ip4;

	__u32 local_ip4;

	__u32 remote_ip6[4];

	__u32 local_ip6[4];

	__u32 remote_port;

	__u32 local_port;

	__u32 remote_ip4;	/* Stored in network byte order */

	__u32 local_ip4;	/* Stored in network byte order */

	__u32 remote_ip6[4];	/* Stored in network byte order */

	__u32 local_ip6[4];	/* Stored in network byte order */

	__u32 remote_port;	/* Stored in network byte order */

	__u32 local_port;	/* stored in host byte order */

};



/* List of known BPF sock_ops operators.