]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
rxrpc: Requeue call for recvmsg if more data
authorDavid Howells <dhowells@redhat.com>
Tue, 13 Sep 2016 21:36:21 +0000 (22:36 +0100)
committerDavid Howells <dhowells@redhat.com>
Tue, 13 Sep 2016 21:36:21 +0000 (22:36 +0100)
rxrpc_recvmsg() needs to make sure that the call it has just been
processing gets requeued for further attention if the buffer has been
filled and there's more data to be consumed.  The softirq producer only
queues the call and wakes the socket if it fills the first slot in the
window, so userspace might end up sleeping forever otherwise, despite there
being data available.

This is not a problem provided the userspace buffer is big enough or it
empties the buffer completely before more data comes in.

Signed-off-by: David Howells <dhowells@redhat.com>
net/rxrpc/recvmsg.c

index 20d0b5c6f81b64247ca2fbd344c3575bbf435a71..16ff56f6925636a538b145cacfd7bc8974a0f5ea 100644 (file)
@@ -463,6 +463,10 @@ int rxrpc_recvmsg(struct socket *sock, struct msghdr *msg, size_t len,
                                         flags, &copied);
                if (ret == -EAGAIN)
                        ret = 0;
+
+               if (after(call->rx_top, call->rx_hard_ack) &&
+                   call->rxtx_buffer[(call->rx_hard_ack + 1) & RXRPC_RXTX_BUFF_MASK])
+                       rxrpc_notify_socket(call);
                break;
        default:
                ret = 0;