Commit 84960bf2 authored by Kuniyuki Iwashima's avatar Kuniyuki Iwashima Committed by Jakub Kicinski
Browse files

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: default avatarKuniyuki Iwashima <kuniyu@amazon.com>
Reviewed-by: default avatarJoe Damato <jdamato@fastly.com>
Link: https://patch.msgid.link/20250318034934.86708-3-kuniyu@amazon.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent f9af583a

include/net/af_unix.h

+1 −75
Original line number Diff line number Diff line
@@ -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

net/unix/af_unix.c

+2 −0
Original line number Diff line number Diff line
@@ -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];

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

+2 −0
Original line number Diff line number Diff line
@@ -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 */

net/unix/garbage.c

+18 −0
Original line number Diff line number Diff line
@@ -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);