diff options
author | David Howells <dhowells@redhat.com> | 2016-09-23 12:39:22 +0100 |
---|---|---|
committer | David Howells <dhowells@redhat.com> | 2016-09-23 15:49:19 +0100 |
commit | 70790dbe3f6651fb66ad38da0a1e24368778bc16 (patch) | |
tree | baa3dd1cf168385d24f7b631a6a75763f6b82cd4 /virt | |
parent | 01a88f7f6bd4514de9551c3fc9a6fd9e65cbf79d (diff) | |
download | linux-70790dbe3f6651fb66ad38da0a1e24368778bc16.tar.gz linux-70790dbe3f6651fb66ad38da0a1e24368778bc16.tar.bz2 linux-70790dbe3f6651fb66ad38da0a1e24368778bc16.zip |
rxrpc: Pass the last Tx packet marker in the annotation buffer
When the last packet of data to be transmitted on a call is queued, tx_top
is set and then the RXRPC_CALL_TX_LAST flag is set. Unfortunately, this
leaves a race in the ACK processing side of things because the flag affects
the interpretation of tx_top and also allows us to start receiving reply
data before we've finished transmitting.
To fix this, make the following changes:
(1) rxrpc_queue_packet() now sets a marker in the annotation buffer
instead of setting the RXRPC_CALL_TX_LAST flag.
(2) rxrpc_rotate_tx_window() detects the marker and sets the flag in the
same context as the routines that use it.
(3) rxrpc_end_tx_phase() is simplified to just shift the call state.
The Tx window must have been rotated before calling to discard the
last packet.
(4) rxrpc_receiving_reply() is added to handle the arrival of the first
DATA packet of a reply to a client call (which is an implicit ACK of
the Tx phase).
(5) The last part of rxrpc_input_ack() is reordered to perform Tx
rotation, then soft-ACK application and then to end the phase if we've
rotated the last packet. In the event of a terminal ACK, the soft-ACK
application will be skipped as nAcks should be 0.
(6) rxrpc_input_ackall() now has to rotate as well as ending the phase.
In addition:
(7) Alter the transmit tracepoint to log the rotation of the last packet.
(8) Remove the no-longer relevant queue_reqack tracepoint note. The
ACK-REQUESTED packet header flag is now set as needed when we actually
transmit the packet and may vary by retransmission.
Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'virt')
0 files changed, 0 insertions, 0 deletions