Commit cf1258ac authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf beauty: Update copy of linux/socket.h with the kernel sources 

To pick the changes in:

  7fa875b8 ("net: copy from user before calling __copy_msghdr")
  ebe73a28 ("net: Allow custom iter handler in msghdr")
  7c701d92 ("skbuff: carry external ubuf_info in msghdr")
  c0424532 ("net: make __sys_accept4_file() static")

That don't result in any changes in the tables generated from that
header.

This silences this perf build warning:

  Warning: Kernel ABI header at 'tools/perf/trace/beauty/include/linux/socket.h' differs from latest version at 'include/linux/socket.h'
  diff -u tools/perf/trace/beauty/include/linux/socket.h include/linux/socket.h

Cc: David Ahern <dsahern@kernel.org>
Cc: David S. Miller <davem@davemloft.net>
Cc: Dylan Yudaken <dylany@fb.com>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Pavel Begunkov <asml.silence@gmail.com>
Cc: Yajun Deng <yajun.deng@linux.dev>
Link: https://lore.kernel.org/lkml/YvzYs+F+Xzq8Hvvp@kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent b2f10cd4

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

+8 −8
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ struct file; 
struct pid;

struct cred;

struct socket;

struct sock;

struct sk_buff;



#define __sockaddr_check_size(size)	\

	BUILD_BUG_ON(((size) > sizeof(struct __kernel_sockaddr_storage)))
@@ -69,6 +71,9 @@ struct msghdr { 
	unsigned int	msg_flags;	/* flags on received message */

	__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,

			    struct iov_iter *from, size_t length);

};



struct user_msghdr {
@@ -416,10 +421,9 @@ extern int recvmsg_copy_msghdr(struct msghdr *msg, 
			       struct user_msghdr __user *umsg, unsigned flags,

			       struct sockaddr __user **uaddr,

			       struct iovec **iov);

extern int __copy_msghdr_from_user(struct msghdr *kmsg,

				   struct user_msghdr __user *umsg,

				   struct sockaddr __user **save_addr,

				   struct iovec __user **uiov, size_t *nsegs);

extern int __copy_msghdr(struct msghdr *kmsg,

			 struct user_msghdr *umsg,

			 struct sockaddr __user **save_addr);



/* helpers which do the actual work for syscalls */

extern int __sys_recvfrom(int fd, void __user *ubuf, size_t size,
@@ -428,10 +432,6 @@ extern int __sys_recvfrom(int fd, void __user *ubuf, size_t size, 
extern int __sys_sendto(int fd, void __user *buff, size_t len,

			unsigned int flags, struct sockaddr __user *addr,

			int addr_len);

extern int __sys_accept4_file(struct file *file, unsigned file_flags,

			struct sockaddr __user *upeer_sockaddr,

			 int __user *upeer_addrlen, int flags,

			 unsigned long nofile);

extern struct file *do_accept(struct file *file, unsigned file_flags,

			      struct sockaddr __user *upeer_sockaddr,

			      int __user *upeer_addrlen, int flags);