Skip to content

Commit ed86525

Browse files
committed
tools/include: Sync network socket headers with the kernel sources
To pick up changes from: d25a92c net/smc: Introduce IPPROTO_SMC 060f4ba io_uring/net: move charging socket out of zc io_uring bb6aaf7 net: Split a __sys_listen helper for io_uring dc2e779 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" <[email protected]> Cc: Eric Dumazet <[email protected]> Cc: Jakub Kicinski <[email protected]> Cc: Paolo Abeni <[email protected]> Cc: [email protected] Signed-off-by: Namhyung Kim <[email protected]>
1 parent 568901e commit ed86525

File tree

2 files changed

+6
-1
lines changed
  • tools
    • include/uapi/linux
    • perf/trace/beauty/include/linux

2 files changed

+6
-1
lines changed

tools/include/uapi/linux/in.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,8 @@ enum {
8181
#define IPPROTO_ETHERNET IPPROTO_ETHERNET
8282
IPPROTO_RAW = 255, /* Raw IP packets */
8383
#define IPPROTO_RAW IPPROTO_RAW
84+
IPPROTO_SMC = 256, /* Shared Memory Communications */
85+
#define IPPROTO_SMC IPPROTO_SMC
8486
IPPROTO_MPTCP = 262, /* Multipath TCP connection */
8587
#define IPPROTO_MPTCP IPPROTO_MPTCP
8688
IPPROTO_MAX

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ struct msghdr {
7676
__kernel_size_t msg_controllen; /* ancillary data buffer length */
7777
struct kiocb *msg_iocb; /* ptr to iocb for async requests */
7878
struct ubuf_info *msg_ubuf;
79-
int (*sg_from_iter)(struct sock *sk, struct sk_buff *skb,
79+
int (*sg_from_iter)(struct sk_buff *skb,
8080
struct iov_iter *from, size_t length);
8181
};
8282

@@ -442,11 +442,14 @@ extern int __sys_accept4(int fd, struct sockaddr __user *upeer_sockaddr,
442442
extern int __sys_socket(int family, int type, int protocol);
443443
extern struct file *__sys_socket_file(int family, int type, int protocol);
444444
extern int __sys_bind(int fd, struct sockaddr __user *umyaddr, int addrlen);
445+
extern int __sys_bind_socket(struct socket *sock, struct sockaddr_storage *address,
446+
int addrlen);
445447
extern int __sys_connect_file(struct file *file, struct sockaddr_storage *addr,
446448
int addrlen, int file_flags);
447449
extern int __sys_connect(int fd, struct sockaddr __user *uservaddr,
448450
int addrlen);
449451
extern int __sys_listen(int fd, int backlog);
452+
extern int __sys_listen_socket(struct socket *sock, int backlog);
450453
extern int __sys_getsockname(int fd, struct sockaddr __user *usockaddr,
451454
int __user *usockaddr_len);
452455
extern int __sys_getpeername(int fd, struct sockaddr __user *usockaddr,

0 commit comments

Comments
 (0)