Commit dcbefc30 authored by David Howells's avatar David Howells
Browse files

rxrpc: Fix call expiry handling 



Fix call expiry handling in the following ways

 (1) If all the request data from a client call is acked, don't send a
     follow up IDLE ACK with firstPacket == 1 and previousPacket == 0 as
     this appears to fool some servers into thinking everything has been
     accepted.

 (2) Never send an abort back to the server once it has ACK'd all the
     request packets; rather just try to reuse the channel for the next
     call.  The first request DATA packet of the next call on the same
     channel will implicitly ACK the entire reply of the dead call - even
     if we haven't transmitted it yet.

 (3) Don't send RX_CALL_TIMEOUT in an ABORT packet, librx uses abort codes
     to pass local errors to the caller in addition to remote errors, and
     this is meant to be local only.

The following also need to be addressed in future patches:

 (4) Service calls should send PING ACKs as 'keep alives' if the server is
     still processing the call.

 (5) VERSION REPLY packets should be sent to the peers of service
     connections to act as keep-alives.  This is used to keep firewall
     routes in place.  The AFS CM should enable this.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
parent 1457cc4c

net/rxrpc/call_event.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -386,7 +386,7 @@ recheck_state: 




	now = ktime_get_real();

	now = ktime_get_real();

	if (ktime_before(call->expire_at, now)) {

	if (ktime_before(call->expire_at, now)) {

		rxrpc_abort_call("EXP", call, 0, RX_CALL_TIMEOUT, -ETIME);

		rxrpc_abort_call("EXP", call, 0, RX_USER_ABORT, -ETIME);

		set_bit(RXRPC_CALL_EV_ABORT, &call->events);

		set_bit(RXRPC_CALL_EV_ABORT, &call->events);

		goto recheck_state;

		goto recheck_state;

	}

	}

net/rxrpc/input.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -298,8 +298,6 @@ static bool rxrpc_end_tx_phase(struct rxrpc_call *call, bool reply_begun, 




	write_unlock(&call->state_lock);

	write_unlock(&call->state_lock);

	if (call->state == RXRPC_CALL_CLIENT_AWAIT_REPLY) {

	if (call->state == RXRPC_CALL_CLIENT_AWAIT_REPLY) {

		rxrpc_propose_ACK(call, RXRPC_ACK_IDLE, 0, 0, false, true,

				  rxrpc_propose_ack_client_tx_end);

		trace_rxrpc_transmit(call, rxrpc_transmit_await_reply);

		trace_rxrpc_transmit(call, rxrpc_transmit_await_reply);

	} else {

	} else {

		trace_rxrpc_transmit(call, rxrpc_transmit_end);

		trace_rxrpc_transmit(call, rxrpc_transmit_end);

net/rxrpc/output.c

+10 −0
Original line number Original line Diff line number Diff line
@@ -222,6 +222,16 @@ int rxrpc_send_abort_packet(struct rxrpc_call *call) 
	rxrpc_serial_t serial;

	rxrpc_serial_t serial;

	int ret;

	int ret;





	/* Don't bother sending aborts for a client call once the server has

	 * hard-ACK'd all of its request data.  After that point, we're not

	 * going to stop the operation proceeding, and whilst we might limit

	 * the reply, it's not worth it if we can send a new call on the same

	 * channel instead, thereby closing off this call.

	 */

	if (rxrpc_is_client_call(call) &&

	    test_bit(RXRPC_CALL_TX_LAST, &call->flags))

		return 0;



	spin_lock_bh(&call->lock);

	spin_lock_bh(&call->lock);

	if (call->conn)

	if (call->conn)

		conn = rxrpc_get_connection_maybe(call->conn);

		conn = rxrpc_get_connection_maybe(call->conn);

CRA Git | Maintained and supported by SUSTech CRA and CCSE