0e022f5bf7
To pick the changes in:
b848b26c6672c9b9 ("net: Kill MSG_SENDPAGE_NOTLAST")
5e2ff6704a275be0 ("scm: add SO_PASSPIDFD and SCM_PIDFD")
4fe38acdac8a71f7 ("net: Block MSG_SENDPAGE_* from being passed to sendmsg() by userspace")
b841b901c452d926 ("net: Declare MSG_SPLICE_PAGES internal sendmsg() flag")
That don't result in any changes in the tables generated from that
header.
But while updating I noticed we were not handling MSG_BATCH and MSG_ZEROCOPY in the
hard coded table for the msg flags table, add them.
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
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Mikhalitsyn <alexander@mihalicyn.com>
Cc: David Howells <dhowells@redhat.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: Ian Rogers <irogers@google.com>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: https://lore.kernel.org/lkml/ZLFGuHDwUGDGXdoR@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
73 lines
1.6 KiB
C
73 lines
1.6 KiB
C
// SPDX-License-Identifier: LGPL-2.1
|
|
#include <sys/types.h>
|
|
#include <sys/socket.h>
|
|
|
|
#ifndef MSG_PROBE
|
|
#define MSG_PROBE 0x10
|
|
#endif
|
|
#ifndef MSG_WAITFORONE
|
|
#define MSG_WAITFORONE 0x10000
|
|
#endif
|
|
#ifndef MSG_BATCH
|
|
#define MSG_BATCH 0x40000
|
|
#endif
|
|
#ifndef MSG_ZEROCOPY
|
|
#define MSG_ZEROCOPY 0x4000000
|
|
#endif
|
|
#ifndef MSG_SPLICE_PAGES
|
|
#define MSG_SPLICE_PAGES 0x8000000
|
|
#endif
|
|
#ifndef MSG_FASTOPEN
|
|
#define MSG_FASTOPEN 0x20000000
|
|
#endif
|
|
#ifndef MSG_CMSG_CLOEXEC
|
|
# define MSG_CMSG_CLOEXEC 0x40000000
|
|
#endif
|
|
|
|
static size_t syscall_arg__scnprintf_msg_flags(char *bf, size_t size,
|
|
struct syscall_arg *arg)
|
|
{
|
|
bool show_prefix = arg->show_string_prefix;
|
|
const char *prefix = "MSG_";
|
|
int printed = 0, flags = arg->val;
|
|
|
|
if (flags == 0)
|
|
return scnprintf(bf, size, "NONE");
|
|
#define P_MSG_FLAG(n) \
|
|
if (flags & MSG_##n) { \
|
|
printed += scnprintf(bf + printed, size - printed, "%s%s%s", printed ? "|" : "", show_prefix ? prefix : "", #n); \
|
|
flags &= ~MSG_##n; \
|
|
}
|
|
|
|
P_MSG_FLAG(OOB);
|
|
P_MSG_FLAG(PEEK);
|
|
P_MSG_FLAG(DONTROUTE);
|
|
P_MSG_FLAG(CTRUNC);
|
|
P_MSG_FLAG(PROBE);
|
|
P_MSG_FLAG(TRUNC);
|
|
P_MSG_FLAG(DONTWAIT);
|
|
P_MSG_FLAG(EOR);
|
|
P_MSG_FLAG(WAITALL);
|
|
P_MSG_FLAG(FIN);
|
|
P_MSG_FLAG(SYN);
|
|
P_MSG_FLAG(CONFIRM);
|
|
P_MSG_FLAG(RST);
|
|
P_MSG_FLAG(ERRQUEUE);
|
|
P_MSG_FLAG(NOSIGNAL);
|
|
P_MSG_FLAG(MORE);
|
|
P_MSG_FLAG(WAITFORONE);
|
|
P_MSG_FLAG(BATCH);
|
|
P_MSG_FLAG(ZEROCOPY);
|
|
P_MSG_FLAG(SPLICE_PAGES);
|
|
P_MSG_FLAG(FASTOPEN);
|
|
P_MSG_FLAG(CMSG_CLOEXEC);
|
|
#undef P_MSG_FLAG
|
|
|
|
if (flags)
|
|
printed += scnprintf(bf + printed, size - printed, "%s%#x", printed ? "|" : "", flags);
|
|
|
|
return printed;
|
|
}
|
|
|
|
#define SCA_MSG_FLAGS syscall_arg__scnprintf_msg_flags
|