rxrpc: Don't try to resend the request if we're receiving the reply

[ Upstream commit 114af61f88fbe34d641b13922d098ffec4c1be1b ]

rxrpc has a timer to trigger resending of unacked data packets in a call.
This is not cancelled when a client call switches to the receive phase on
the basis that most calls don't last long enough for it to ever expire.
However, if it *does* expire after we've started to receive the reply, we
shouldn't then go into trying to retransmit or pinging the server to find
out if an ack got lost.

Fix this by skipping the resend code if we're into receiving the reply to a
client call.

Fixes: 17926a79320a ("[AF_RXRPC]: Provide secure RxRPC sockets for use by userspace and kernel both")
Signed-off-by: David Howells <dhowells@redhat.com>
cc: linux-afs@lists.infradead.org
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/net/rxrpc/call_event.c b/net/rxrpc/call_event.c
index 468efc3660c03805608d5e4f2f146f007e03f9b1..12f5c1870103331180c51019738b140c50d4fef4 100644 (file)
--- a/net/rxrpc/call_event.c
+++ b/net/rxrpc/call_event.c
@@ -429,7 +429,8 @@ recheck_state:
                goto recheck_state;
        }
 
-       if (test_and_clear_bit(RXRPC_CALL_EV_RESEND, &call->events)) {
+       if (test_and_clear_bit(RXRPC_CALL_EV_RESEND, &call->events) &&
+           call->state != RXRPC_CALL_CLIENT_RECV_REPLY) {
                rxrpc_resend(call, now);
                goto recheck_state;
        }