af_unix: Move internal definitions to net/unix/.

net/af_unix.h is included by core and some LSMs, but most definitions
need not be.

Let's move struct unix_{vertex,edge} to net/unix/garbage.c and other
definitions to net/unix/af_unix.h.

Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Reviewed-by: Joe Damato <jdamato@fastly.com>
Link: https://patch.msgid.link/20250318034934.86708-3-kuniyu@amazon.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/include/net/af_unix.h b/include/net/af_unix.h
index c8dfdb41916d96d8f59f35d7dca4a190d29f91ca..b5d70baba52bcd1e3f496a0e02bf12465c179774 100644 (file)
--- a/include/net/af_unix.h
+++ b/include/net/af_unix.h
@@ -17,61 +17,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 +40,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 +51,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

diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index 1ff0ac99f3f3510edd5f48cd48238198cd93444a..6390e04fe91641f51398fea70e2464bac2f4a042 100644 (file)
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -118,6 +118,8 @@
 #include <net/sock.h>
 #include <net/tcp_states.h>
 
+#include "af_unix.h"
+
 static atomic_long_t unix_nr_socks;
 static struct hlist_head bsd_socket_buckets[UNIX_HASH_SIZE / 2];
 static spinlock_t bsd_socket_locks[UNIX_HASH_SIZE / 2];

diff --git a/net/unix/af_unix.h b/net/unix/af_unix.h
new file mode 100644 (file)
index 0000000..ed4aedc
--- /dev/null
+++ b/net/unix/af_unix.h
@@ -0,0 +1,75 @@
+/* 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

diff --git a/net/unix/diag.c b/net/unix/diag.c
index ba715507556a391b68eae05d7dec7c11e8be4137..c7e8c7d008f67298518870b4f03edf5494543da6 100644 (file)
--- a/net/unix/diag.c
+++ b/net/unix/diag.c
@@ -12,6 +12,8 @@
 #include <net/sock.h>
 #include <net/tcp_states.h>
 
+#include "af_unix.h"
+
 static int sk_diag_dump_name(struct sock *sk, struct sk_buff *nlskb)
 {
        /* might or might not have a hash table lock */

diff --git a/net/unix/garbage.c b/net/unix/garbage.c
index 6a641d4b55421dcf1fe16d3d94a482e5bf1b6385..8c8c7360349d27d46b54262e409b73cffd90136f 100644 (file)
--- a/net/unix/garbage.c
+++ b/net/unix/garbage.c
@@ -80,6 +80,24 @@
 #include <net/sock.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);

diff --git a/net/unix/sysctl_net_unix.c b/net/unix/sysctl_net_unix.c
index 55118ae897d615aded934cf8fa39f052e3803f7f..236b7faa92546f1a033ca1cda3a2b43dfe2ddd63 100644 (file)
--- a/net/unix/sysctl_net_unix.c
+++ b/net/unix/sysctl_net_unix.c
@@ -10,6 +10,8 @@
 #include <linux/sysctl.h>
 #include <net/af_unix.h>
 
+#include "af_unix.h"
+
 static struct ctl_table unix_table[] = {
        {
                .procname       = "max_dgram_qlen",

diff --git a/net/unix/unix_bpf.c b/net/unix/unix_bpf.c
index 86598a959eaab83048262eac1f664fe26003efbe..979dd4c4261aeba890a6b5a7b4505dc2635e056e 100644 (file)
--- a/net/unix/unix_bpf.c
+++ b/net/unix/unix_bpf.c
@@ -6,6 +6,8 @@
 #include <net/af_unix.h>
 #include <net/sock.h>
 
+#include "af_unix.h"
+
 #define unix_sk_has_data(__sk, __psock)                                        \
                ({      !skb_queue_empty(&__sk->sk_receive_queue) ||    \
                        !skb_queue_empty(&__psock->ingress_skb) ||      \