Skip to content

Commit 17e9e23

Browse files
dhowellsdavem330
authored andcommitted
rxrpc: Fix received abort handling
AF_RXRPC is incorrectly sending back to the server any abort it receives for a client connection. This is due to the final-ACK offload to the connection event processor patch. The abort code is copied into the last-call information on the connection channel and then the event processor is set. Instead, the following should be done: (1) In the case of a final-ACK for a successful call, the ACK should be scheduled as before. (2) In the case of a locally generated ABORT, the ABORT details should be cached for sending in response to further packets related to that call and no further action scheduled at call disconnect time. (3) In the case of an ACK received from the peer, the call should be considered dead, no ABORT should be transmitted at this time. In response to further non-ABORT packets from the peer relating to this call, an RX_USER_ABORT ABORT should be transmitted. (4) In the case of a call killed due to network error, an RX_USER_ABORT ABORT should be cached for transmission in response to further packets, but no ABORT should be sent at this time. Fixes: 3136ef4 ("rxrpc: Delay terminal ACK transmission on a client call") Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent e729452 commit 17e9e23

File tree

2 files changed

+14
-5
lines changed

2 files changed

+14
-5
lines changed

net/rxrpc/conn_client.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -834,7 +834,8 @@ void rxrpc_disconnect_client_call(struct rxrpc_call *call)
834834
* can be skipped if we find a follow-on call. The first DATA packet
835835
* of the follow on call will implicitly ACK this call.
836836
*/
837-
if (test_bit(RXRPC_CALL_EXPOSED, &call->flags)) {
837+
if (call->completion == RXRPC_CALL_SUCCEEDED &&
838+
test_bit(RXRPC_CALL_EXPOSED, &call->flags)) {
838839
unsigned long final_ack_at = jiffies + 2;
839840

840841
WRITE_ONCE(chan->final_ack_at, final_ack_at);

net/rxrpc/conn_object.c

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -177,13 +177,21 @@ void __rxrpc_disconnect_call(struct rxrpc_connection *conn,
177177
* through the channel, whilst disposing of the actual call record.
178178
*/
179179
trace_rxrpc_disconnect_call(call);
180-
if (call->abort_code) {
181-
chan->last_abort = call->abort_code;
182-
chan->last_type = RXRPC_PACKET_TYPE_ABORT;
183-
} else {
180+
switch (call->completion) {
181+
case RXRPC_CALL_SUCCEEDED:
184182
chan->last_seq = call->rx_hard_ack;
185183
chan->last_type = RXRPC_PACKET_TYPE_ACK;
184+
break;
185+
case RXRPC_CALL_LOCALLY_ABORTED:
186+
chan->last_abort = call->abort_code;
187+
chan->last_type = RXRPC_PACKET_TYPE_ABORT;
188+
break;
189+
default:
190+
chan->last_abort = RX_USER_ABORT;
191+
chan->last_type = RXRPC_PACKET_TYPE_ABORT;
192+
break;
186193
}
194+
187195
/* Sync with rxrpc_conn_retransmit(). */
188196
smp_wmb();
189197
chan->last_call = chan->call_id;

0 commit comments

Comments
 (0)