Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

perf beauty: Update copy of linux/socket.h with the kernel sources

To pick the changes in:

8f0b3cc9a4c102c2 ("tcp: RX path for devmem TCP")

That don't result in any changes in the tables generated from that
header.

But while updating I noticed we need to support the new MSG_SOCK_DEVMEM
flag in the hard coded table for the msg flags table, add it.

This silences this perf build warning:

Warning: Kernel ABI header differences:
diff -u tools/perf/trace/beauty/include/linux/socket.h include/linux/socket.h

Please see tools/include/uapi/README for details.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Mina Almasry <almasrymina@google.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: https://lore.kernel.org/lkml/ZvrO_eT9e_41xrNv@x1
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

+5
+1
tools/perf/trace/beauty/include/linux/socket.h
··· 327 327 * plain text and require encryption 328 328 */ 329 329 330 + #define MSG_SOCK_DEVMEM 0x2000000 /* Receive devmem skbs as cmsg */ 330 331 #define MSG_ZEROCOPY 0x4000000 /* Use user data in kernel path */ 331 332 #define MSG_SPLICE_PAGES 0x8000000 /* Splice the pages from the iterator in sendmsg() */ 332 333 #define MSG_FASTOPEN 0x20000000 /* Send data in TCP SYN */
+4
tools/perf/trace/beauty/msg_flags.c
··· 11 11 #ifndef MSG_BATCH 12 12 #define MSG_BATCH 0x40000 13 13 #endif 14 + #ifndef MSG_SOCK_DEVMEM 15 + #define MSG_SOCK_DEVMEM 0x2000000 16 + #endif 14 17 #ifndef MSG_ZEROCOPY 15 18 #define MSG_ZEROCOPY 0x4000000 16 19 #endif ··· 60 57 P_MSG_FLAG(MORE); 61 58 P_MSG_FLAG(WAITFORONE); 62 59 P_MSG_FLAG(BATCH); 60 + P_MSG_FLAG(SOCK_DEVMEM); 63 61 P_MSG_FLAG(ZEROCOPY); 64 62 P_MSG_FLAG(SPLICE_PAGES); 65 63 P_MSG_FLAG(FASTOPEN);