netdev - Re: linux-next: build failure after merge of the net-next tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <2947430.1687765706@warthog.procyon.org.uk>
Date: Mon, 26 Jun 2023 08:48:26 +0100
From: David Howells <dhowells@...hat.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: dhowells@...hat.com, Peter Zijlstra <peterz@...radead.org>,
    Ingo Molnar <mingo@...hat.com>,
    Arnaldo Carvalho de Melo <acme@...nel.org>,
    Mark Rutland <mark.rutland@....com>,
    Alexander Shishkin <alexander.shishkin@...ux.intel.com>,
    Jiri Olsa <jolsa@...nel.org>, Namhyung Kim <namhyung@...nel.org>,
    Ian Rogers <irogers@...gle.com>,
    Adrian Hunter <adrian.hunter@...el.com>,
    David Miller <davem@...emloft.net>,
    Networking <netdev@...r.kernel.org>,
    Jakub Kicinski <kuba@...nel.org>, linux-perf-users@...r.kernel.org,
    bpf@...r.kernel.org, linux-next@...r.kernel.org,
    linux-kernel@...r.kernel.org
Subject: Re: linux-next: build failure after merge of the net-next tree

Stephen Rothwell <sfr@...b.auug.org.au> 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@...hat.com>
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@...b.auug.org.au>
    Link: https://lore.kernel.org/r/20230626112847.2ef3d422@canb.auug.org.au/
    Signed-off-by: David Howells <dhowells@...hat.com>
    cc: "David S. Miller" <davem@...emloft.net>
    cc: Eric Dumazet <edumazet@...gle.com>
    cc: Jakub Kicinski <kuba@...nel.org>
    cc: Paolo Abeni <pabeni@...hat.com>
    cc: Jens Axboe <axboe@...nel.dk>
    cc: Matthew Wilcox <willy@...radead.org>
    cc: bpf@...r.kernel.org
    cc: dccp@...r.kernel.org
    cc: linux-afs@...ts.infradead.org
    cc: linux-arm-msm@...r.kernel.org
    cc: linux-can@...r.kernel.org
    cc: linux-crypto@...r.kernel.org
    cc: linux-doc@...r.kernel.org
    cc: linux-hams@...r.kernel.org
    cc: linux-perf-users@...r.kernel.org
    cc: linux-rdma@...r.kernel.org
    cc: linux-sctp@...r.kernel.org
    cc: linux-wpan@...r.kernel.org
    cc: linux-x25@...r.kernel.org
    cc: mptcp@...ts.linux.dev
    cc: netdev@...r.kernel.org
    cc: rds-devel@....oracle.com
    cc: tipc-discussion@...ts.sourceforge.net
    cc: virtualization@...ts.linux-foundation.org

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