Commit 333f7909 authored by Al Viro's avatar Al Viro Committed by David S. Miller
Browse files

coallocate socket_wq with socket itself 



socket->wq is assign-once, set when we are initializing both
struct socket it's in and struct socket_wq it points to.  As the
matter of fact, the only reason for separate allocation was the
ability to RCU-delay freeing of socket_wq.  RCU-delaying the
freeing of socket itself gets rid of that need, so we can just
fold struct socket_wq into the end of struct socket and simplify
the life both for sock_alloc_inode() (one allocation instead of
two) and for tun/tap oddballs, where we used to embed struct socket
and struct socket_wq into the same structure (now - embedding just
the struct socket).

Note that reference to struct socket_wq in struct sock does remain
a reference - that's unchanged.

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6d7855c5

drivers/net/tap.c

+2 −3
Original line number Diff line number Diff line
@@ -520,8 +520,7 @@ static int tap_open(struct inode *inode, struct file *file) 
		goto err;

	}



	RCU_INIT_POINTER(q->sock.wq, &q->wq);

	init_waitqueue_head(&q->wq.wait);

	init_waitqueue_head(&q->sock.wq.wait);

	q->sock.type = SOCK_RAW;

	q->sock.state = SS_CONNECTED;

	q->sock.file = file;
@@ -579,7 +578,7 @@ static __poll_t tap_poll(struct file *file, poll_table *wait) 
		goto out;



	mask = 0;

	poll_wait(file, &q->wq.wait, wait);

	poll_wait(file, &q->sock.wq.wait, wait);



	if (!ptr_ring_empty(&q->ring))

		mask |= EPOLLIN | EPOLLRDNORM;

drivers/net/tun.c

+3 −5
Original line number Diff line number Diff line
@@ -160,7 +160,6 @@ struct tun_pcpu_stats { 
struct tun_file {

	struct sock sk;

	struct socket socket;

	struct socket_wq wq;

	struct tun_struct __rcu *tun;

	struct fasync_struct *fasync;

	/* only used for fasnyc */
@@ -2165,7 +2164,7 @@ static void *tun_ring_recv(struct tun_file *tfile, int noblock, int *err) 
		goto out;

	}



	add_wait_queue(&tfile->wq.wait, &wait);

	add_wait_queue(&tfile->socket.wq.wait, &wait);



	while (1) {

		set_current_state(TASK_INTERRUPTIBLE);
@@ -2185,7 +2184,7 @@ static void *tun_ring_recv(struct tun_file *tfile, int noblock, int *err) 
	}



	__set_current_state(TASK_RUNNING);

	remove_wait_queue(&tfile->wq.wait, &wait);

	remove_wait_queue(&tfile->socket.wq.wait, &wait);



out:

	*err = error;
@@ -3415,8 +3414,7 @@ static int tun_chr_open(struct inode *inode, struct file * file) 
	tfile->flags = 0;

	tfile->ifindex = 0;



	init_waitqueue_head(&tfile->wq.wait);

	RCU_INIT_POINTER(tfile->socket.wq, &tfile->wq);

	init_waitqueue_head(&tfile->socket.wq.wait);



	tfile->socket.file = file;

	tfile->socket.ops = &tun_socket_ops;

include/linux/if_tap.h

+0 −1
Original line number Diff line number Diff line
@@ -62,7 +62,6 @@ struct tap_dev { 
struct tap_queue {

	struct sock sk;

	struct socket sock;

	struct socket_wq wq;

	int vnet_hdr_sz;

	struct tap_dev __rcu *tap;

	struct file *file;

include/linux/net.h

+2 −2
Original line number Diff line number Diff line
@@ -116,11 +116,11 @@ struct socket { 


	unsigned long		flags;



	struct socket_wq	*wq;



	struct file		*file;

	struct sock		*sk;

	const struct proto_ops	*ops;



	struct socket_wq	wq;

};



struct vm_area_struct;

include/net/sock.h

+2 −2
Original line number Diff line number Diff line
@@ -1822,7 +1822,7 @@ static inline void sock_graft(struct sock *sk, struct socket *parent) 
{

	WARN_ON(parent->sk);

	write_lock_bh(&sk->sk_callback_lock);

	rcu_assign_pointer(sk->sk_wq, parent->wq);

	rcu_assign_pointer(sk->sk_wq, &parent->wq);

	parent->sk = sk;

	sk_set_socket(sk, parent);

	sk->sk_uid = SOCK_INODE(parent)->i_uid;
@@ -2100,7 +2100,7 @@ static inline void sock_poll_wait(struct file *filp, struct socket *sock, 
				  poll_table *p)

{

	if (!poll_does_not_wait(p)) {

		poll_wait(filp, &sock->wq->wait, p);

		poll_wait(filp, &sock->wq.wait, p);

		/* We need to be sure we are in sync with the

		 * socket flags modification.

		 *

CRA Git | Maintained and supported by SUSTech CRA and CCSE