Commit 9cd3e072 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

net: rename SOCK_ASYNC_NOSPACE and SOCK_ASYNC_WAITDATA 



This patch is a cleanup to make following patch easier to
review.

Goal is to move SOCK_ASYNC_NOSPACE and SOCK_ASYNC_WAITDATA
from (struct socket)->flags to a (struct socket_wq)->flags
to benefit from RCU protection in sock_wake_async()

To ease backports, we rename both constants.

Two new helpers, sk_set_bit(int nr, struct sock *sk)
and sk_clear_bit(int net, struct sock *sk) are added so that
following patch can change their implementation.

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5738a09d

crypto/algif_aead.c

+2 −2
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ static int aead_wait_for_data(struct sock *sk, unsigned flags) 
	if (flags & MSG_DONTWAIT)

		return -EAGAIN;



	set_bit(SOCK_ASYNC_WAITDATA, &sk->sk_socket->flags);

	sk_set_bit(SOCKWQ_ASYNC_WAITDATA, sk);



	for (;;) {

		if (signal_pending(current))
@@ -139,7 +139,7 @@ static int aead_wait_for_data(struct sock *sk, unsigned flags) 
	}

	finish_wait(sk_sleep(sk), &wait);



	clear_bit(SOCK_ASYNC_WAITDATA, &sk->sk_socket->flags);

	sk_clear_bit(SOCKWQ_ASYNC_WAITDATA, sk);



	return err;

}

crypto/algif_skcipher.c

+3 −3
Original line number Diff line number Diff line
@@ -212,7 +212,7 @@ static int skcipher_wait_for_wmem(struct sock *sk, unsigned flags) 
	if (flags & MSG_DONTWAIT)

		return -EAGAIN;



	set_bit(SOCK_ASYNC_NOSPACE, &sk->sk_socket->flags);

	sk_set_bit(SOCKWQ_ASYNC_NOSPACE, sk);



	for (;;) {

		if (signal_pending(current))
@@ -258,7 +258,7 @@ static int skcipher_wait_for_data(struct sock *sk, unsigned flags) 
		return -EAGAIN;

	}



	set_bit(SOCK_ASYNC_WAITDATA, &sk->sk_socket->flags);

	sk_set_bit(SOCKWQ_ASYNC_WAITDATA, sk);



	for (;;) {

		if (signal_pending(current))
@@ -272,7 +272,7 @@ static int skcipher_wait_for_data(struct sock *sk, unsigned flags) 
	}

	finish_wait(sk_sleep(sk), &wait);



	clear_bit(SOCK_ASYNC_WAITDATA, &sk->sk_socket->flags);

	sk_clear_bit(SOCKWQ_ASYNC_WAITDATA, sk);



	return err;

}

drivers/net/macvtap.c

+2 −2
Original line number Diff line number Diff line
@@ -498,7 +498,7 @@ static void macvtap_sock_write_space(struct sock *sk) 
	wait_queue_head_t *wqueue;



	if (!sock_writeable(sk) ||

	    !test_and_clear_bit(SOCK_ASYNC_NOSPACE, &sk->sk_socket->flags))

	    !test_and_clear_bit(SOCKWQ_ASYNC_NOSPACE, &sk->sk_socket->flags))

		return;



	wqueue = sk_sleep(sk);
@@ -585,7 +585,7 @@ static unsigned int macvtap_poll(struct file *file, poll_table * wait) 
		mask |= POLLIN | POLLRDNORM;



	if (sock_writeable(&q->sk) ||

	    (!test_and_set_bit(SOCK_ASYNC_NOSPACE, &q->sock.flags) &&

	    (!test_and_set_bit(SOCKWQ_ASYNC_NOSPACE, &q->sock.flags) &&

	     sock_writeable(&q->sk)))

		mask |= POLLOUT | POLLWRNORM;

drivers/net/tun.c

+2 −2
Original line number Diff line number Diff line
@@ -1040,7 +1040,7 @@ static unsigned int tun_chr_poll(struct file *file, poll_table *wait) 
		mask |= POLLIN | POLLRDNORM;



	if (sock_writeable(sk) ||

	    (!test_and_set_bit(SOCK_ASYNC_NOSPACE, &sk->sk_socket->flags) &&

	    (!test_and_set_bit(SOCKWQ_ASYNC_NOSPACE, &sk->sk_socket->flags) &&

	     sock_writeable(sk)))

		mask |= POLLOUT | POLLWRNORM;
@@ -1488,7 +1488,7 @@ static void tun_sock_write_space(struct sock *sk) 
	if (!sock_writeable(sk))

		return;



	if (!test_and_clear_bit(SOCK_ASYNC_NOSPACE, &sk->sk_socket->flags))

	if (!test_and_clear_bit(SOCKWQ_ASYNC_NOSPACE, &sk->sk_socket->flags))

		return;



	wqueue = sk_sleep(sk);

fs/dlm/lowcomms.c

+2 −2
Original line number Diff line number Diff line
@@ -421,7 +421,7 @@ static void lowcomms_write_space(struct sock *sk) 


	if (test_and_clear_bit(CF_APP_LIMITED, &con->flags)) {

		con->sock->sk->sk_write_pending--;

		clear_bit(SOCK_ASYNC_NOSPACE, &con->sock->flags);

		clear_bit(SOCKWQ_ASYNC_NOSPACE, &con->sock->flags);

	}



	if (!test_and_set_bit(CF_WRITE_PENDING, &con->flags))
@@ -1448,7 +1448,7 @@ static void send_to_sock(struct connection *con) 
					      msg_flags);

			if (ret == -EAGAIN || ret == 0) {

				if (ret == -EAGAIN &&

				    test_bit(SOCK_ASYNC_NOSPACE, &con->sock->flags) &&

				    test_bit(SOCKWQ_ASYNC_NOSPACE, &con->sock->flags) &&

				    !test_and_set_bit(CF_APP_LIMITED, &con->flags)) {

					/* Notify TCP that we're limited by the

					 * application window size.

CRA Git | Maintained and supported by SUSTech CRA and CCSE