Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote: > After merging the net-next tree, today's linux-next build (native perf) > failed like this: > > In file included from builtin-trace.c:907: > trace/beauty/msg_flags.c: In function 'syscall_arg__scnprintf_msg_flags': > trace/beauty/msg_flags.c:28:21: error: 'MSG_SPLICE_PAGES' undeclared (first use in this function) I tried applying the attached patch, but it doesn't make any difference. Any idea what I've missed? Also, why do we have duplicates of all the kernel headers in the tools/ directory? David --- commit 878ff45f5f746f6773224ff952c490b5812462f2 Author: David Howells <dhowells@xxxxxxxxxx> Date: Mon Jun 26 08:08:12 2023 +0100 tools: Fix MSG_SPLICE_PAGES build error in trace tools Fix the following error: In file included from builtin-trace.c:907: trace/beauty/msg_flags.c: In function 'syscall_arg__scnprintf_msg_flags': trace/beauty/msg_flags.c:28:21: error: 'MSG_SPLICE_PAGES' undeclared (first use in this function) 28 | if (flags & MSG_##n) { \ | ^~~~ trace/beauty/msg_flags.c:50:9: note: in expansion of macro 'P_MSG_FLAG' 50 | P_MSG_FLAG(SPLICE_PAGES); | ^~~~~~~~~~ trace/beauty/msg_flags.c:28:21: note: each undeclared identifier is reported only once for each function it appears in 28 | if (flags & MSG_##n) { \ | ^~~~ trace/beauty/msg_flags.c:50:9: note: in expansion of macro 'P_MSG_FLAG' 50 | P_MSG_FLAG(SPLICE_PAGES); | ^~~~~~~~~~ There is no MSG_SPLICE_PAGES in tools/perf/trace/beauty/include/linux/socket.h Fixes: b848b26c6672 ("net: Kill MSG_SENDPAGE_NOTLAST") Reported-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> Link: https://lore.kernel.org/r/20230626112847.2ef3d422@xxxxxxxxxxxxxxxx/ Signed-off-by: David Howells <dhowells@xxxxxxxxxx> cc: "David S. Miller" <davem@xxxxxxxxxxxxx> cc: Eric Dumazet <edumazet@xxxxxxxxxx> cc: Jakub Kicinski <kuba@xxxxxxxxxx> cc: Paolo Abeni <pabeni@xxxxxxxxxx> cc: Jens Axboe <axboe@xxxxxxxxx> cc: Matthew Wilcox <willy@xxxxxxxxxxxxx> cc: bpf@xxxxxxxxxxxxxxx cc: dccp@xxxxxxxxxxxxxxx cc: linux-afs@xxxxxxxxxxxxxxxxxxx cc: linux-arm-msm@xxxxxxxxxxxxxxx cc: linux-can@xxxxxxxxxxxxxxx cc: linux-crypto@xxxxxxxxxxxxxxx cc: linux-doc@xxxxxxxxxxxxxxx cc: linux-hams@xxxxxxxxxxxxxxx cc: linux-perf-users@xxxxxxxxxxxxxxx cc: linux-rdma@xxxxxxxxxxxxxxx cc: linux-sctp@xxxxxxxxxxxxxxx cc: linux-wpan@xxxxxxxxxxxxxxx cc: linux-x25@xxxxxxxxxxxxxxx cc: mptcp@xxxxxxxxxxxxxxx cc: netdev@xxxxxxxxxxxxxxx cc: rds-devel@xxxxxxxxxxxxxx cc: tipc-discussion@xxxxxxxxxxxxxxxxxxxxx cc: virtualization@xxxxxxxxxxxxxxxxxxxxxxxxxx diff --git a/tools/perf/trace/beauty/include/linux/socket.h b/tools/perf/trace/beauty/include/linux/socket.h index 3bef212a24d7..77cb707a566a 100644 --- a/tools/perf/trace/beauty/include/linux/socket.h +++ b/tools/perf/trace/beauty/include/linux/socket.h @@ -326,6 +326,7 @@ struct ucred { */ #define MSG_ZEROCOPY 0x4000000 /* Use user data in kernel path */ +#define MSG_SPLICE_PAGES 0x8000000 /* Splice the pages from the iterator in sendmsg() */ #define MSG_FASTOPEN 0x20000000 /* Send data in TCP SYN */ #define MSG_CMSG_CLOEXEC 0x40000000 /* Set close_on_exec for file descriptor received through