Re: [PATCH v1 07/12] perf beauty: Update copy of linux/socket.h with the kernel sources

[Mahe Tardy]

On Wed, Oct 21, 2026 at 06:30:01PM -0300, Arnaldo Carvalho de Melo wrote:
> From: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
> 
> To pick up the changes in:
> 
>   be3a5e06b962 ("net: add SO_PASSPIDFD_THREAD to get a thread-specific SCM_PIDFD")
>   5bd369c05576 ("net: Add connect_socket() helper")
> 
> That don't result in changes to the string tables generated from this header.
> 
> This addresses this perf build warning:
> 
>   Warning: Kernel ABI header differences:
>     diff -u tools/perf/trace/beauty/include/linux/socket.h include/linux/socket.h
> 
> Please see tools/include/uapi/README for further details.
> 
> Cc: Christian Brauner <brauner@xxxxxxxxxx>
> Cc: Mahe Tardy <mahe.tardy@xxxxxxxxx>
> Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>

Acked-by: Mahe Tardy <mahe.tardy@xxxxxxxxx>

Thank you Arnaldo.

> ---
>  tools/perf/trace/beauty/include/linux/socket.h | 11 +++++++----
>  1 file changed, 7 insertions(+), 4 deletions(-)
> 
> diff --git a/tools/perf/trace/beauty/include/linux/socket.h b/tools/perf/trace/beauty/include/linux/socket.h
> index 2a8d7b14f1d11959..b17fdb7d38a7734a 100644
> --- a/tools/perf/trace/beauty/include/linux/socket.h
> +++ b/tools/perf/trace/beauty/include/linux/socket.h
> @@ -189,10 +189,11 @@ static inline size_t msg_data_left(const struct msghdr *msg)
>  
>  /* "Socket"-level control message types: */
>  
> -#define	SCM_RIGHTS	0x01		/* rw: access rights (array of int) */
> -#define SCM_CREDENTIALS 0x02		/* rw: struct ucred		*/
> -#define SCM_SECURITY	0x03		/* rw: security label		*/
> -#define SCM_PIDFD	0x04		/* ro: pidfd (int)		*/
> +#define	SCM_RIGHTS		0x01	/* rw: access rights (array of int) */
> +#define SCM_CREDENTIALS		0x02	/* rw: struct ucred		*/
> +#define SCM_SECURITY		0x03	/* rw: security label		*/
> +#define SCM_PIDFD		0x04	/* ro: pidfd (int)		*/
> +#define SCM_PIDFD_THREAD	0x05	/* ro: thread pidfd (int)	*/
>  
>  struct ucred {
>  	__u32	pid;
> @@ -461,6 +462,8 @@ 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);
> +int connect_socket(struct socket *sock, struct sockaddr_storage *addr,
> +		   int addrlen, int flags);
>  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,
> -- 
> 2.56.0
>