Commit 5555b34c authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'af_unix-clean-up-headers' 

Kuniyuki Iwashima says:

====================
af_unix: Clean up headers.

AF_UNIX files include many unnecessary headers (netdevice.h and
rtnetlink.h, etc), and this series cleans them up.

Note that there are still some headers included indirectly and
modifying them triggers rebuild, which seems mostly inevitable. [0]

  $ python3 include_graph.py net/unix/garbage.c linux/rtnetlink.h linux/netdevice.h
  ...
  include/net/af_unix.h
  | include/linux/net.h
  | | include/linux/once.h
  | | include/linux/sockptr.h
  | | include/uapi/linux/net.h
  | include/net/sock.h
  | | include/linux/netdevice.h   <---
  ...
  | | include/net/dst.h
  | | | include/linux/rtnetlink.h <---

[0]: https://gist.github.com/q2ven/9c5897f11a493145829029c0bfb364d0
====================

Link: https://patch.msgid.link/20250318034934.86708-1-kuniyu@amazon.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 0d14c394 0083e3e3

include/net/af_unix.h

+7 −77
Original line number Diff line number Diff line
@@ -2,11 +2,15 @@ 
#ifndef __LINUX_NET_AFUNIX_H

#define __LINUX_NET_AFUNIX_H



#include <linux/socket.h>

#include <linux/un.h>

#include <linux/atomic.h>

#include <linux/mutex.h>

#include <linux/net.h>

#include <linux/path.h>

#include <linux/refcount.h>

#include <linux/spinlock.h>

#include <linux/wait.h>

#include <net/sock.h>

#include <uapi/linux/un.h>



#if IS_ENABLED(CONFIG_UNIX)

struct unix_sock *unix_get_socket(struct file *filp);
@@ -17,61 +21,17 @@ static inline struct unix_sock *unix_get_socket(struct file *filp) 
}

#endif



extern unsigned int unix_tot_inflight;

void unix_add_edges(struct scm_fp_list *fpl, struct unix_sock *receiver);

void unix_del_edges(struct scm_fp_list *fpl);

void unix_update_edges(struct unix_sock *receiver);

int unix_prepare_fpl(struct scm_fp_list *fpl);

void unix_destroy_fpl(struct scm_fp_list *fpl);

void unix_gc(void);

void wait_for_unix_gc(struct scm_fp_list *fpl);



struct unix_vertex {

	struct list_head edges;

	struct list_head entry;

	struct list_head scc_entry;

	unsigned long out_degree;

	unsigned long index;

	unsigned long scc_index;

};



struct unix_edge {

	struct unix_sock *predecessor;

	struct unix_sock *successor;

	struct list_head vertex_entry;

	struct list_head stack_entry;

};



struct sock *unix_peer_get(struct sock *sk);



#define UNIX_HASH_MOD	(256 - 1)

#define UNIX_HASH_SIZE	(256 * 2)

#define UNIX_HASH_BITS	8



struct unix_address {

	refcount_t	refcnt;

	int		len;

	struct sockaddr_un name[];

};



struct unix_skb_parms {

	struct pid		*pid;		/* Skb credentials	*/

	kuid_t			uid;

	kgid_t			gid;

	struct scm_fp_list	*fp;		/* Passed files		*/

#ifdef CONFIG_SECURITY_NETWORK

	u32			secid;		/* Security ID		*/

#endif

	u32			consumed;

} __randomize_layout;



struct scm_stat {

	atomic_t nr_fds;

	unsigned long nr_unix_fds;

};



#define UNIXCB(skb)	(*(struct unix_skb_parms *)&((skb)->cb))



/* The AF_UNIX socket */

struct unix_sock {

	/* WARNING: sk has to be the first member */
@@ -84,6 +44,7 @@ struct unix_sock { 
	struct unix_vertex	*vertex;

	spinlock_t		lock;

	struct socket_wq	peer_wq;

#define peer_wait		peer_wq.wait

	wait_queue_entry_t	peer_wake;

	struct scm_stat		scm_stat;

#if IS_ENABLED(CONFIG_AF_UNIX_OOB)
@@ -94,35 +55,4 @@ struct unix_sock { 
#define unix_sk(ptr) container_of_const(ptr, struct unix_sock, sk)

#define unix_peer(sk) (unix_sk(sk)->peer)



#define unix_state_lock(s)	spin_lock(&unix_sk(s)->lock)

#define unix_state_unlock(s)	spin_unlock(&unix_sk(s)->lock)



#define peer_wait peer_wq.wait



long unix_inq_len(struct sock *sk);

long unix_outq_len(struct sock *sk);



int __unix_dgram_recvmsg(struct sock *sk, struct msghdr *msg, size_t size,

			 int flags);

int __unix_stream_recvmsg(struct sock *sk, struct msghdr *msg, size_t size,

			  int flags);

#ifdef CONFIG_SYSCTL

int unix_sysctl_register(struct net *net);

void unix_sysctl_unregister(struct net *net);

#else

static inline int unix_sysctl_register(struct net *net) { return 0; }

static inline void unix_sysctl_unregister(struct net *net) {}

#endif



#ifdef CONFIG_BPF_SYSCALL

extern struct proto unix_dgram_proto;

extern struct proto unix_stream_proto;



int unix_dgram_bpf_update_proto(struct sock *sk, struct sk_psock *psock, bool restore);

int unix_stream_bpf_update_proto(struct sock *sk, struct sk_psock *psock, bool restore);

void __init unix_bpf_build_proto(void);

#else

static inline void __init unix_bpf_build_proto(void)

{}

#endif

#endif

net/unix/af_unix.c

+23 −32
Original line number Diff line number Diff line
@@ -77,46 +77,37 @@ 


#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <linux/module.h>

#include <linux/kernel.h>

#include <linux/signal.h>

#include <linux/sched/signal.h>

#include <linux/errno.h>

#include <linux/string.h>

#include <linux/stat.h>

#include <linux/bpf-cgroup.h>

#include <linux/btf_ids.h>

#include <linux/dcache.h>

#include <linux/namei.h>

#include <linux/socket.h>

#include <linux/un.h>

#include <linux/errno.h>

#include <linux/fcntl.h>

#include <linux/file.h>

#include <linux/filter.h>

#include <linux/termios.h>

#include <linux/sockios.h>

#include <linux/net.h>

#include <linux/in.h>

#include <linux/fs.h>

#include <linux/slab.h>

#include <linux/uaccess.h>

#include <linux/skbuff.h>

#include <linux/netdevice.h>

#include <net/net_namespace.h>

#include <net/sock.h>

#include <net/tcp_states.h>

#include <net/af_unix.h>

#include <linux/proc_fs.h>

#include <linux/seq_file.h>

#include <net/scm.h>

#include <linux/init.h>

#include <linux/poll.h>

#include <linux/rtnetlink.h>

#include <linux/kernel.h>

#include <linux/mount.h>

#include <net/checksum.h>

#include <linux/namei.h>

#include <linux/poll.h>

#include <linux/proc_fs.h>

#include <linux/sched/signal.h>

#include <linux/security.h>

#include <linux/seq_file.h>

#include <linux/skbuff.h>

#include <linux/slab.h>

#include <linux/socket.h>

#include <linux/splice.h>

#include <linux/freezer.h>

#include <linux/file.h>

#include <linux/btf_ids.h>

#include <linux/bpf-cgroup.h>

#include <linux/string.h>

#include <linux/uaccess.h>

#include <net/af_unix.h>

#include <net/net_namespace.h>

#include <net/scm.h>

#include <net/tcp_states.h>

#include <uapi/linux/sockios.h>

#include <uapi/linux/termios.h>



#include "af_unix.h"



static atomic_long_t unix_nr_socks;

static struct hlist_head bsd_socket_buckets[UNIX_HASH_SIZE / 2];

net/unix/af_unix.h

0 → 100644
+75 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef __AF_UNIX_H

#define __AF_UNIX_H



#include <linux/uidgid.h>



#define UNIX_HASH_MOD	(256 - 1)

#define UNIX_HASH_SIZE	(256 * 2)

#define UNIX_HASH_BITS	8



#define unix_state_lock(s)	spin_lock(&unix_sk(s)->lock)

#define unix_state_unlock(s)	spin_unlock(&unix_sk(s)->lock)



struct sock *unix_peer_get(struct sock *sk);



struct unix_skb_parms {

	struct pid		*pid;		/* skb credentials	*/

	kuid_t			uid;

	kgid_t			gid;

	struct scm_fp_list	*fp;		/* Passed files		*/

#ifdef CONFIG_SECURITY_NETWORK

	u32			secid;		/* Security ID		*/

#endif

	u32			consumed;

} __randomize_layout;



#define UNIXCB(skb)	(*(struct unix_skb_parms *)&((skb)->cb))



/* GC for SCM_RIGHTS */

extern unsigned int unix_tot_inflight;

void unix_add_edges(struct scm_fp_list *fpl, struct unix_sock *receiver);

void unix_del_edges(struct scm_fp_list *fpl);

void unix_update_edges(struct unix_sock *receiver);

int unix_prepare_fpl(struct scm_fp_list *fpl);

void unix_destroy_fpl(struct scm_fp_list *fpl);

void unix_gc(void);

void wait_for_unix_gc(struct scm_fp_list *fpl);



/* SOCK_DIAG */

long unix_inq_len(struct sock *sk);

long unix_outq_len(struct sock *sk);



/* sysctl */

#ifdef CONFIG_SYSCTL

int unix_sysctl_register(struct net *net);

void unix_sysctl_unregister(struct net *net);

#else

static inline int unix_sysctl_register(struct net *net)

{

	return 0;

}



static inline void unix_sysctl_unregister(struct net *net)

{

}

#endif



/* BPF SOCKMAP */

int __unix_dgram_recvmsg(struct sock *sk, struct msghdr *msg, size_t size, int flags);

int __unix_stream_recvmsg(struct sock *sk, struct msghdr *msg, size_t size, int flags);



#ifdef CONFIG_BPF_SYSCALL

extern struct proto unix_dgram_proto;

extern struct proto unix_stream_proto;



int unix_dgram_bpf_update_proto(struct sock *sk, struct sk_psock *psock, bool restore);

int unix_stream_bpf_update_proto(struct sock *sk, struct sk_psock *psock, bool restore);

void __init unix_bpf_build_proto(void);

#else

static inline void __init unix_bpf_build_proto(void)

{

}

#endif



#endif

net/unix/diag.c

+10 −8
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

#include <linux/types.h>

#include <linux/spinlock.h>

#include <linux/sock_diag.h>

#include <linux/unix_diag.h>

#include <linux/skbuff.h>



#include <linux/dcache.h>

#include <linux/module.h>

#include <linux/uidgid.h>

#include <net/netlink.h>

#include <linux/skbuff.h>

#include <linux/sock_diag.h>

#include <linux/types.h>

#include <linux/user_namespace.h>

#include <net/af_unix.h>

#include <net/netlink.h>

#include <net/tcp_states.h>

#include <net/sock.h>

#include <uapi/linux/unix_diag.h>



#include "af_unix.h"



static int sk_diag_dump_name(struct sock *sk, struct sk_buff *nlskb)

{

net/unix/garbage.c

+21 −12
Original line number Diff line number Diff line
@@ -63,24 +63,33 @@ 
 *		wrt receive and holding up unrelated socket operations.

 */



#include <linux/kernel.h>

#include <linux/string.h>

#include <linux/socket.h>

#include <linux/un.h>

#include <linux/net.h>

#include <linux/fs.h>

#include <linux/list.h>

#include <linux/skbuff.h>

#include <linux/netdevice.h>

#include <linux/file.h>

#include <linux/proc_fs.h>

#include <linux/mutex.h>

#include <linux/wait.h>



#include <net/sock.h>

#include <linux/socket.h>

#include <linux/workqueue.h>

#include <net/af_unix.h>

#include <net/scm.h>

#include <net/tcp_states.h>



#include "af_unix.h"



struct unix_vertex {

	struct list_head edges;

	struct list_head entry;

	struct list_head scc_entry;

	unsigned long out_degree;

	unsigned long index;

	unsigned long scc_index;

};



struct unix_edge {

	struct unix_sock *predecessor;

	struct unix_sock *successor;

	struct list_head vertex_entry;

	struct list_head stack_entry;

};



struct unix_sock *unix_get_socket(struct file *filp)

{

	struct inode *inode = file_inode(filp);