Commit 567058d3 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'af_unix-remove-io_uring-dead-code-in-gc' 

Kuniyuki Iwashima says:

====================
af_unix: Remove io_uring dead code in GC.

I will post another series that rewrites the garbage collector for
AF_UNIX socket.

This is a prep series to clean up changes to GC made by io_uring but
now not necessary.
====================

Link: https://lore.kernel.org/r/20240129190435.57228-1-kuniyu@amazon.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 2dc23b6f 99a7a5b9

include/net/af_unix.h

+4 −4
Original line number Diff line number Diff line
@@ -17,20 +17,20 @@ static inline struct unix_sock *unix_get_socket(struct file *filp) 
}

#endif



extern spinlock_t unix_gc_lock;

extern unsigned int unix_tot_inflight;



void unix_inflight(struct user_struct *user, struct file *fp);

void unix_notinflight(struct user_struct *user, struct file *fp);

void unix_destruct_scm(struct sk_buff *skb);

void io_uring_destruct_scm(struct sk_buff *skb);

void unix_gc(void);

void wait_for_unix_gc(struct scm_fp_list *fpl);



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



extern unsigned int unix_tot_inflight;



struct unix_address {

	refcount_t	refcnt;

	int		len;

net/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ obj-$(CONFIG_NETFILTER) += netfilter/ 
obj-$(CONFIG_INET)		+= ipv4/

obj-$(CONFIG_TLS)		+= tls/

obj-$(CONFIG_XFRM)		+= xfrm/

obj-$(CONFIG_UNIX_SCM)		+= unix/

obj-$(CONFIG_UNIX)		+= unix/

obj-y				+= ipv6/

obj-$(CONFIG_PACKET)		+= packet/

obj-$(CONFIG_NET_KEY)		+= key/

net/unix/Kconfig

+0 −5
Original line number Diff line number Diff line
@@ -16,11 +16,6 @@ config UNIX 


	  Say Y unless you know what you are doing.



config UNIX_SCM

	bool

	depends on UNIX

	default y



config	AF_UNIX_OOB

	bool

	depends on UNIX

net/unix/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -11,5 +11,3 @@ unix-$(CONFIG_BPF_SYSCALL) += unix_bpf.o 


obj-$(CONFIG_UNIX_DIAG)	+= unix_diag.o

unix_diag-y		:= diag.o
 


obj-$(CONFIG_UNIX_SCM)	+= scm.o

net/unix/af_unix.c

+61 −2
Original line number Diff line number Diff line
@@ -118,8 +118,6 @@ 
#include <linux/btf_ids.h>

#include <linux/bpf-cgroup.h>



#include "scm.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];
@@ -1790,6 +1788,52 @@ static int unix_getname(struct socket *sock, struct sockaddr *uaddr, int peer) 
	return err;

}



/* The "user->unix_inflight" variable is protected by the garbage

 * collection lock, and we just read it locklessly here. If you go

 * over the limit, there might be a tiny race in actually noticing

 * it across threads. Tough.

 */

static inline bool too_many_unix_fds(struct task_struct *p)

{

	struct user_struct *user = current_user();



	if (unlikely(READ_ONCE(user->unix_inflight) > task_rlimit(p, RLIMIT_NOFILE)))

		return !capable(CAP_SYS_RESOURCE) && !capable(CAP_SYS_ADMIN);

	return false;

}



static int unix_attach_fds(struct scm_cookie *scm, struct sk_buff *skb)

{

	int i;



	if (too_many_unix_fds(current))

		return -ETOOMANYREFS;



	/* Need to duplicate file references for the sake of garbage

	 * collection.  Otherwise a socket in the fps might become a

	 * candidate for GC while the skb is not yet queued.

	 */

	UNIXCB(skb).fp = scm_fp_dup(scm->fp);

	if (!UNIXCB(skb).fp)

		return -ENOMEM;



	for (i = scm->fp->count - 1; i >= 0; i--)

		unix_inflight(scm->fp->user, scm->fp->fp[i]);



	return 0;

}



static void unix_detach_fds(struct scm_cookie *scm, struct sk_buff *skb)

{

	int i;



	scm->fp = UNIXCB(skb).fp;

	UNIXCB(skb).fp = NULL;



	for (i = scm->fp->count - 1; i >= 0; i--)

		unix_notinflight(scm->fp->user, scm->fp->fp[i]);

}



static void unix_peek_fds(struct scm_cookie *scm, struct sk_buff *skb)

{

	scm->fp = scm_fp_dup(UNIXCB(skb).fp);
@@ -1837,6 +1881,21 @@ static void unix_peek_fds(struct scm_cookie *scm, struct sk_buff *skb) 
	spin_unlock(&unix_gc_lock);

}



static void unix_destruct_scm(struct sk_buff *skb)

{

	struct scm_cookie scm;



	memset(&scm, 0, sizeof(scm));

	scm.pid  = UNIXCB(skb).pid;

	if (UNIXCB(skb).fp)

		unix_detach_fds(&scm, skb);



	/* Alas, it calls VFS */

	/* So fscking what? fput() had been SMP-safe since the last Summer */

	scm_destroy(&scm);

	sock_wfree(skb);

}



static int unix_scm_to_skb(struct scm_cookie *scm, struct sk_buff *skb, bool send_fds)

{

	int err = 0;