From: Matthieu Baerts <matthieu.baerts@tessares.net>
To: dhowells@redhat.com
Cc: acme@kernel.org, adrian.hunter@intel.com,
alexander.shishkin@linux.intel.com, bpf@vger.kernel.org,
davem@davemloft.net, irogers@google.com, jolsa@kernel.org,
kuba@kernel.org, linux-kernel@vger.kernel.org,
linux-next@vger.kernel.org, linux-perf-users@vger.kernel.org,
mark.rutland@arm.com, mingo@redhat.com, namhyung@kernel.org,
netdev@vger.kernel.org, peterz@infradead.org,
sfr@canb.auug.org.au,
Matthieu Baerts <matthieu.baerts@tessares.net>,
Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH net-next] perf trace: fix MSG_SPLICE_PAGES build error
Date: Mon, 26 Jun 2023 11:02:39 +0200 [thread overview]
Message-ID: <20230626090239.899672-1-matthieu.baerts@tessares.net> (raw)
In-Reply-To: <2947430.1687765706@warthog.procyon.org.uk>
Our MPTCP CI and Stephen got this 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);
| ^~~~~~~~~~
The fix is similar to what was done with MSG_FASTOPEN: the new macro is
defined if it is not defined in the system headers.
Fixes: b848b26c6672 ("net: Kill MSG_SENDPAGE_NOTLAST")
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Closes: https://lore.kernel.org/r/20230626112847.2ef3d422@canb.auug.org.au/
Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
---
Notes:
@David: I solved it like that in MPTCP tree. Does it work for you too?
I guess tools/perf/trace/beauty/include/linux/socket.h file still needs
to be updated, not just to add MSG_SPLICE_PAGES but also other
modifications done in this file. Maybe best to sync with Arnaldo because
he might do it soon during the coming merge window I guess.
Cc: David Howells <dhowells@redhat.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/trace/beauty/msg_flags.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/tools/perf/trace/beauty/msg_flags.c b/tools/perf/trace/beauty/msg_flags.c
index 5cdebd7ece7e..aa9934020232 100644
--- a/tools/perf/trace/beauty/msg_flags.c
+++ b/tools/perf/trace/beauty/msg_flags.c
@@ -8,6 +8,9 @@
#ifndef MSG_WAITFORONE
#define MSG_WAITFORONE 0x10000
#endif
+#ifndef MSG_SPLICE_PAGES
+#define MSG_SPLICE_PAGES 0x8000000
+#endif
#ifndef MSG_FASTOPEN
#define MSG_FASTOPEN 0x20000000
#endif
base-commit: 9ae440b8fdd6772b6c007fa3d3766530a09c9045
--
2.40.1
next prev parent reply other threads:[~2023-06-26 9:06 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-26 1:28 linux-next: build failure after merge of the net-next tree Stephen Rothwell
2023-06-26 7:48 ` David Howells
2023-06-26 8:12 ` Stephen Rothwell
2023-06-26 9:02 ` Matthieu Baerts [this message]
2023-06-26 21:27 ` [PATCH net-next] perf trace: fix MSG_SPLICE_PAGES build error Jakub Kicinski
2023-06-26 21:41 ` Namhyung Kim
2023-06-26 21:49 ` Jakub Kicinski
2023-06-27 3:31 ` Matthieu Baerts
2023-06-27 14:10 ` patchwork-bot+netdevbpf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230626090239.899672-1-matthieu.baerts@tessares.net \
--to=matthieu.baerts@tessares.net \
--cc=acme@kernel.org \
--cc=acme@redhat.com \
--cc=adrian.hunter@intel.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=bpf@vger.kernel.org \
--cc=davem@davemloft.net \
--cc=dhowells@redhat.com \
--cc=irogers@google.com \
--cc=jolsa@kernel.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).