diff options
| author | David Howells <dhowells@redhat.com> | 2016-09-13 22:36:21 +0100 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2016-09-13 22:36:21 +0100 |
| commit | 33b603fda815faf12f66156a49b510126fac984b (patch) | |
| tree | 4ca28cac584fc743b04740fcaf07a1b992b7bb9c /net/rxrpc/recvmsg.c | |
| parent | 91c2c7b656a80984362dbcb3d326e4a7274d0607 (diff) | |
| download | linux-stable-33b603fda815faf12f66156a49b510126fac984b.tar.gz linux-stable-33b603fda815faf12f66156a49b510126fac984b.tar.bz2 linux-stable-33b603fda815faf12f66156a49b510126fac984b.zip | |
rxrpc: Requeue call for recvmsg if more data
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>
Diffstat (limited to 'net/rxrpc/recvmsg.c')
| -rw-r--r-- | net/rxrpc/recvmsg.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/rxrpc/recvmsg.c b/net/rxrpc/recvmsg.c index 20d0b5c6f81b..16ff56f69256 100644 --- a/net/rxrpc/recvmsg.c +++ b/net/rxrpc/recvmsg.c @@ -463,6 +463,10 @@ try_again: 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; |