Skip to content

Commit d164868

Browse files
committed
perf beauty: Update copy of linux/socket.h with the kernel sources
To pick the changes in: 8f0b3cc ("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>
1 parent dc1e764 commit d164868

2 files changed

Lines changed: 5 additions & 0 deletions

File tree

tools/perf/trace/beauty/include/linux/socket.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -327,6 +327,7 @@ struct ucred {
327327
* plain text and require encryption
328328
*/
329329

330+
#define MSG_SOCK_DEVMEM 0x2000000 /* Receive devmem skbs as cmsg */
330331
#define MSG_ZEROCOPY 0x4000000 /* Use user data in kernel path */
331332
#define MSG_SPLICE_PAGES 0x8000000 /* Splice the pages from the iterator in sendmsg() */
332333
#define MSG_FASTOPEN 0x20000000 /* Send data in TCP SYN */

tools/perf/trace/beauty/msg_flags.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111
#ifndef MSG_BATCH
1212
#define MSG_BATCH 0x40000
1313
#endif
14+
#ifndef MSG_SOCK_DEVMEM
15+
#define MSG_SOCK_DEVMEM 0x2000000
16+
#endif
1417
#ifndef MSG_ZEROCOPY
1518
#define MSG_ZEROCOPY 0x4000000
1619
#endif
@@ -57,6 +60,7 @@ static size_t syscall_arg__scnprintf_msg_flags(char *bf, size_t size,
5760
P_MSG_FLAG(MORE);
5861
P_MSG_FLAG(WAITFORONE);
5962
P_MSG_FLAG(BATCH);
63+
P_MSG_FLAG(SOCK_DEVMEM);
6064
P_MSG_FLAG(ZEROCOPY);
6165
P_MSG_FLAG(SPLICE_PAGES);
6266
P_MSG_FLAG(FASTOPEN);

0 commit comments

Comments
 (0)