Commit 4651d180 authored Aug 19, 2019 by Jason Baron Committed by David S. Miller Aug 20, 2019

net/smc: make sure EPOLLOUT is raised



Currently, we are only explicitly setting SOCK_NOSPACE on a write timeout
for non-blocking sockets. Epoll() edge-trigger mode relies on SOCK_NOSPACE
being set when -EAGAIN is returned to ensure that EPOLLOUT is raised.
Expand the setting of SOCK_NOSPACE to non-blocking sockets as well that can
use SO_SNDTIMEO to adjust their write timeout. This mirrors the behavior
that Eric Dumazet introduced for tcp sockets.

Signed-off-by: Jason Baron <jbaron@akamai.com>
Cc: Eric Dumazet <edumazet@google.com>
Cc: Ursula Braun <ubraun@linux.ibm.com>
Cc: Karsten Graul <kgraul@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 1edfb8ed

net/smc/smc_tx.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -76,13 +76,11 @@ static int smc_tx_wait(struct smc_sock *smc, int flags)
		DEFINE_WAIT_FUNC(wait, woken_wake_function);
		struct smc_connection *conn = &smc->conn;
		struct sock *sk = &smc->sk;
		bool noblock;
		long timeo;
		int rc = 0;

		/* similar to sk_stream_wait_memory */
		timeo = sock_sndtimeo(sk, flags & MSG_DONTWAIT);
		noblock = timeo ? false : true;
		add_wait_queue(sk_sleep(sk), &wait);
		while (1) {
		sk_set_bit(SOCKWQ_ASYNC_NOSPACE, sk);
		@@ -97,7 +95,7 @@ static int smc_tx_wait(struct smc_sock *smc, int flags)
		break;
		}
		if (!timeo) {
		if (noblock)
		/* ensure EPOLLOUT is subsequently generated */
		set_bit(SOCK_NOSPACE, &sk->sk_socket->flags);
		rc = -EAGAIN;
		break;

Admin message