Commit 9749fd2b authored by David Howells's avatar David Howells
Browse files

rxrpc: Need to produce an ACK for service op if op takes a long time 



We need to generate a DELAY ACK from the service end of an operation if we
start doing the actual operation work and it takes longer than expected.
This will hard-ACK the request data and allow the client to release its
resources.

To make this work:

 (1) We have to set the ack timer and propose an ACK when the call moves to
     the RXRPC_CALL_SERVER_ACK_REQUEST and clear the pending ACK and cancel
     the timer when we start transmitting the reply (the first DATA packet
     of the reply implicitly ACKs the request phase).

 (2) It must be possible to set the timer when the caller is holding
     call->state_lock, so split the lock-getting part of the timer function
     out.

 (3) Add trace notes for the ACK we're requesting and the timer we clear.

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

net/rxrpc/ar-internal.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -733,6 +733,7 @@ extern const char rxrpc_rtt_rx_traces[rxrpc_rtt_rx__nr_trace][5]; 
enum rxrpc_timer_trace {

enum rxrpc_timer_trace {

	rxrpc_timer_begin,

	rxrpc_timer_begin,

	rxrpc_timer_init_for_reply,

	rxrpc_timer_init_for_reply,

	rxrpc_timer_init_for_send_reply,

	rxrpc_timer_expired,

	rxrpc_timer_expired,

	rxrpc_timer_set_for_ack,

	rxrpc_timer_set_for_ack,

	rxrpc_timer_set_for_ping,

	rxrpc_timer_set_for_ping,
@@ -749,6 +750,7 @@ enum rxrpc_propose_ack_trace { 
	rxrpc_propose_ack_ping_for_lost_ack,

	rxrpc_propose_ack_ping_for_lost_ack,

	rxrpc_propose_ack_ping_for_lost_reply,

	rxrpc_propose_ack_ping_for_lost_reply,

	rxrpc_propose_ack_ping_for_params,

	rxrpc_propose_ack_ping_for_params,

	rxrpc_propose_ack_processing_op,

	rxrpc_propose_ack_respond_to_ack,

	rxrpc_propose_ack_respond_to_ack,

	rxrpc_propose_ack_respond_to_ping,

	rxrpc_propose_ack_respond_to_ping,

	rxrpc_propose_ack_retry_tx,

	rxrpc_propose_ack_retry_tx,
@@ -811,6 +813,7 @@ int rxrpc_reject_call(struct rxrpc_sock *); 
/*

/*

 * call_event.c

 * call_event.c

 */

 */

void __rxrpc_set_timer(struct rxrpc_call *, enum rxrpc_timer_trace, ktime_t);

void rxrpc_set_timer(struct rxrpc_call *, enum rxrpc_timer_trace, ktime_t);

void rxrpc_set_timer(struct rxrpc_call *, enum rxrpc_timer_trace, ktime_t);

void rxrpc_propose_ACK(struct rxrpc_call *, u8, u16, u32, bool, bool,

void rxrpc_propose_ACK(struct rxrpc_call *, u8, u16, u32, bool, bool,

		       enum rxrpc_propose_ack_trace);

		       enum rxrpc_propose_ack_trace);

net/rxrpc/call_event.c

+12 −4
Original line number Original line Diff line number Diff line
@@ -24,15 +24,13 @@ 
/*

/*

 * Set the timer

 * Set the timer

 */

 */

void rxrpc_set_timer(struct rxrpc_call *call, enum rxrpc_timer_trace why,

void __rxrpc_set_timer(struct rxrpc_call *call, enum rxrpc_timer_trace why,

		       ktime_t now)

		       ktime_t now)

{

{

	unsigned long t_j, now_j = jiffies;

	unsigned long t_j, now_j = jiffies;

	ktime_t t;

	ktime_t t;

	bool queue = false;

	bool queue = false;





	read_lock_bh(&call->state_lock);



	if (call->state < RXRPC_CALL_COMPLETE) {

	if (call->state < RXRPC_CALL_COMPLETE) {

		t = call->expire_at;

		t = call->expire_at;

		if (!ktime_after(t, now)) {

		if (!ktime_after(t, now)) {
@@ -84,6 +82,16 @@ void rxrpc_set_timer(struct rxrpc_call *call, enum rxrpc_timer_trace why, 
out:

out:

	if (queue)

	if (queue)

		rxrpc_queue_call(call);

		rxrpc_queue_call(call);

}



/*

 * Set the timer

 */

void rxrpc_set_timer(struct rxrpc_call *call, enum rxrpc_timer_trace why,

		     ktime_t now)

{

	read_lock_bh(&call->state_lock);

	__rxrpc_set_timer(call, why, now);

	read_unlock_bh(&call->state_lock);

	read_unlock_bh(&call->state_lock);

}

}

net/rxrpc/misc.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -195,6 +195,7 @@ const char rxrpc_timer_traces[rxrpc_timer__nr_trace][8] = { 
	[rxrpc_timer_begin]			= "Begin ",

	[rxrpc_timer_begin]			= "Begin ",

	[rxrpc_timer_expired]			= "*EXPR*",

	[rxrpc_timer_expired]			= "*EXPR*",

	[rxrpc_timer_init_for_reply]		= "IniRpl",

	[rxrpc_timer_init_for_reply]		= "IniRpl",

	[rxrpc_timer_init_for_send_reply]	= "SndRpl",

	[rxrpc_timer_set_for_ack]		= "SetAck",

	[rxrpc_timer_set_for_ack]		= "SetAck",

	[rxrpc_timer_set_for_ping]		= "SetPng",

	[rxrpc_timer_set_for_ping]		= "SetPng",

	[rxrpc_timer_set_for_send]		= "SetTx ",

	[rxrpc_timer_set_for_send]		= "SetTx ",
@@ -207,6 +208,7 @@ const char rxrpc_propose_ack_traces[rxrpc_propose_ack__nr_trace][8] = { 
	[rxrpc_propose_ack_ping_for_lost_ack]	= "LostAck",

	[rxrpc_propose_ack_ping_for_lost_ack]	= "LostAck",

	[rxrpc_propose_ack_ping_for_lost_reply]	= "LostRpl",

	[rxrpc_propose_ack_ping_for_lost_reply]	= "LostRpl",

	[rxrpc_propose_ack_ping_for_params]	= "Params ",

	[rxrpc_propose_ack_ping_for_params]	= "Params ",

	[rxrpc_propose_ack_processing_op]	= "ProcOp ",

	[rxrpc_propose_ack_respond_to_ack]	= "Rsp2Ack",

	[rxrpc_propose_ack_respond_to_ack]	= "Rsp2Ack",

	[rxrpc_propose_ack_respond_to_ping]	= "Rsp2Png",

	[rxrpc_propose_ack_respond_to_ping]	= "Rsp2Png",

	[rxrpc_propose_ack_retry_tx]		= "RetryTx",

	[rxrpc_propose_ack_retry_tx]		= "RetryTx",

net/rxrpc/recvmsg.c

+6 −2
Original line number Original line Diff line number Diff line
@@ -151,17 +151,21 @@ static void rxrpc_end_rx_phase(struct rxrpc_call *call, rxrpc_serial_t serial) 
	switch (call->state) {

	switch (call->state) {

	case RXRPC_CALL_CLIENT_RECV_REPLY:

	case RXRPC_CALL_CLIENT_RECV_REPLY:

		__rxrpc_call_completed(call);

		__rxrpc_call_completed(call);

		write_unlock_bh(&call->state_lock);

		break;

		break;





	case RXRPC_CALL_SERVER_RECV_REQUEST:

	case RXRPC_CALL_SERVER_RECV_REQUEST:

		call->tx_phase = true;

		call->tx_phase = true;

		call->state = RXRPC_CALL_SERVER_ACK_REQUEST;

		call->state = RXRPC_CALL_SERVER_ACK_REQUEST;

		call->ack_at = call->expire_at;

		write_unlock_bh(&call->state_lock);

		rxrpc_propose_ACK(call, RXRPC_ACK_DELAY, 0, serial, false, true,

				  rxrpc_propose_ack_processing_op);

		break;

		break;

	default:

	default:

		write_unlock_bh(&call->state_lock);

		break;

		break;

	}

	}



	write_unlock_bh(&call->state_lock);

}

}





/*

/*

net/rxrpc/sendmsg.c

+5 −0
Original line number Original line Diff line number Diff line
@@ -130,6 +130,11 @@ static void rxrpc_queue_packet(struct rxrpc_call *call, struct sk_buff *skb, 
			break;

			break;

		case RXRPC_CALL_SERVER_ACK_REQUEST:

		case RXRPC_CALL_SERVER_ACK_REQUEST:

			call->state = RXRPC_CALL_SERVER_SEND_REPLY;

			call->state = RXRPC_CALL_SERVER_SEND_REPLY;

			call->ack_at = call->expire_at;

			if (call->ackr_reason == RXRPC_ACK_DELAY)

				call->ackr_reason = 0;

			__rxrpc_set_timer(call, rxrpc_timer_init_for_send_reply,

					  ktime_get_real());

			if (!last)

			if (!last)

				break;

				break;

		case RXRPC_CALL_SERVER_SEND_REPLY:

		case RXRPC_CALL_SERVER_SEND_REPLY:

CRA Git | Maintained and supported by SUSTech CRA and CCSE