Commit ed86525f authored by Namhyung Kim's avatar Namhyung Kim
Browse files

tools/include: Sync network socket headers with the kernel sources 



To pick up changes from:

  d25a92cc net/smc: Introduce IPPROTO_SMC
  060f4ba6 io_uring/net: move charging socket out of zc io_uring
  bb6aaf73 net: Split a __sys_listen helper for io_uring
  dc2e7797 net: Split a __sys_bind helper for io_uring

This should be used to beautify socket syscall arguments and it addresses
these tools/perf build warnings:

  Warning: Kernel ABI header differences:
  diff -u tools/include/uapi/linux/in.h include/uapi/linux/in.h
  diff -u tools/perf/trace/beauty/include/linux/socket.h include/linux/socket.h

Please see tools/include/uapi/README for details (it's in the first patch
of this series).

Cc: "David S. Miller" <davem@davemloft.net>
Cc: Eric Dumazet <edumazet@google.com>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Paolo Abeni <pabeni@redhat.com>
Cc: netdev@vger.kernel.org
Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
parent 568901e7

tools/include/uapi/linux/in.h

+2 −0
Original line number Diff line number Diff line
@@ -81,6 +81,8 @@ enum { 
#define IPPROTO_ETHERNET	IPPROTO_ETHERNET

  IPPROTO_RAW = 255,		/* Raw IP packets			*/

#define IPPROTO_RAW		IPPROTO_RAW

  IPPROTO_SMC = 256,		/* Shared Memory Communications		*/

#define IPPROTO_SMC		IPPROTO_SMC

  IPPROTO_MPTCP = 262,		/* Multipath TCP connection		*/

#define IPPROTO_MPTCP		IPPROTO_MPTCP

  IPPROTO_MAX

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

+4 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ struct msghdr { 
	__kernel_size_t	msg_controllen;	/* ancillary data buffer length */

	struct kiocb	*msg_iocb;	/* ptr to iocb for async requests */

	struct ubuf_info *msg_ubuf;

	int (*sg_from_iter)(struct sock *sk, struct sk_buff *skb,

	int (*sg_from_iter)(struct sk_buff *skb,

			    struct iov_iter *from, size_t length);

};
@@ -442,11 +442,14 @@ extern int __sys_accept4(int fd, struct sockaddr __user *upeer_sockaddr, 
extern int __sys_socket(int family, int type, int protocol);

extern struct file *__sys_socket_file(int family, int type, int protocol);

extern int __sys_bind(int fd, struct sockaddr __user *umyaddr, int addrlen);

extern int __sys_bind_socket(struct socket *sock, struct sockaddr_storage *address,

			     int addrlen);

extern int __sys_connect_file(struct file *file, struct sockaddr_storage *addr,

			      int addrlen, int file_flags);

extern int __sys_connect(int fd, struct sockaddr __user *uservaddr,

			 int addrlen);

extern int __sys_listen(int fd, int backlog);

extern int __sys_listen_socket(struct socket *sock, int backlog);

extern int __sys_getsockname(int fd, struct sockaddr __user *usockaddr,

			     int __user *usockaddr_len);

extern int __sys_getpeername(int fd, struct sockaddr __user *usockaddr,