Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3e79bd1e authored by Jason Baron's avatar Jason Baron Committed by Greg Kroah-Hartman
Browse files

net/smc: make sure EPOLLOUT is raised 



[ Upstream commit 4651d1802f7063e4d8c0bcad957f46ece0c04024 ]

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: default avatarJason 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: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ff129837

net/smc/smc_tx.c

+2 −4
Original line number Diff line number Diff line
@@ -75,13 +75,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);
@@ -96,7 +94,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;