Commit 02c28dff authored by David Howells's avatar David Howells

rxrpc: Fix afs large storage transmission performance drop

Commit 2ad6691d, which moved the modification of the status annotation
for a packet in the Tx buffer prior to the retransmission moved the state
clearance, but managed to lose the bit that set it to UNACK.

Consequently, if a retransmission occurs, the packet is accidentally
changed to the ACK state (ie. 0) by masking it off, which means that the
packet isn't counted towards the tally of newly-ACK'd packets if it gets
hard-ACK'd.  This then prevents the congestion control algorithm from
recovering properly.

Fix by reinstating the change of state to UNACK.

Spotted by the generic/460 xfstest.

Fixes: 2ad6691d ("rxrpc: Fix race between incoming ACK parser and retransmitter")
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
parent a2ad7c21
...@@ -253,7 +253,7 @@ static void rxrpc_resend(struct rxrpc_call *call, unsigned long now_j) ...@@ -253,7 +253,7 @@ static void rxrpc_resend(struct rxrpc_call *call, unsigned long now_j)
* confuse things * confuse things
*/ */
annotation &= ~RXRPC_TX_ANNO_MASK; annotation &= ~RXRPC_TX_ANNO_MASK;
annotation |= RXRPC_TX_ANNO_RESENT; annotation |= RXRPC_TX_ANNO_UNACK | RXRPC_TX_ANNO_RESENT;
call->rxtx_annotations[ix] = annotation; call->rxtx_annotations[ix] = annotation;
skb = call->rxtx_buffer[ix]; skb = call->rxtx_buffer[ix];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment