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

rxrpc: Fix missing start of call timeout 



The expect_rx_by call timeout is supposed to be set when a call is started
to indicate that we need to receive a packet by that point.  This is
currently put back every time we receive a packet, but it isn't started
when we first send a packet.  Without this, the call may wait forever if
the server doesn't deign to reply.

Fix this by setting the timeout upon a successful UDP sendmsg call for the
first DATA packet.  The timeout is initiated only for initial transmission
and not for subsequent retries as we don't want the retry mechanism to
extend the timeout indefinitely.

Fixes: a158bdd3 ("rxrpc: Fix call timeouts")
Reported-by: default avatarMarc Dionne <marc.dionne@auristor.com>
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
parent 4a026da9

net/rxrpc/ar-internal.h

+1 −0
Original line number Diff line number Diff line
@@ -476,6 +476,7 @@ enum rxrpc_call_flag { 
	RXRPC_CALL_SEND_PING,		/* A ping will need to be sent */

	RXRPC_CALL_PINGING,		/* Ping in process */

	RXRPC_CALL_RETRANS_TIMEOUT,	/* Retransmission due to timeout occurred */

	RXRPC_CALL_BEGAN_RX_TIMER,	/* We began the expect_rx_by timer */

};



/*

net/rxrpc/input.c

+1 −1
Original line number Diff line number Diff line
@@ -971,7 +971,7 @@ static void rxrpc_input_call_packet(struct rxrpc_call *call, 
	if (timo) {

		unsigned long now = jiffies, expect_rx_by;



		expect_rx_by = jiffies + timo;

		expect_rx_by = now + timo;

		WRITE_ONCE(call->expect_rx_by, expect_rx_by);

		rxrpc_reduce_call_timer(call, expect_rx_by, now,

					rxrpc_timer_set_for_normal);

net/rxrpc/output.c

+11 −0
Original line number Diff line number Diff line
@@ -414,6 +414,17 @@ done: 
							rxrpc_timer_set_for_lost_ack);

			}

		}



		if (sp->hdr.seq == 1 &&

		    !test_and_set_bit(RXRPC_CALL_BEGAN_RX_TIMER,

				      &call->flags)) {

			unsigned long nowj = jiffies, expect_rx_by;



			expect_rx_by = nowj + call->next_rx_timo;

			WRITE_ONCE(call->expect_rx_by, expect_rx_by);

			rxrpc_reduce_call_timer(call, expect_rx_by, nowj,

						rxrpc_timer_set_for_normal);

		}

	}



	rxrpc_set_keepalive(call);

net/rxrpc/sendmsg.c

+10 −0
Original line number Diff line number Diff line
@@ -223,6 +223,15 @@ static void rxrpc_queue_packet(struct rxrpc_sock *rx, struct rxrpc_call *call, 


	ret = rxrpc_send_data_packet(call, skb, false);

	if (ret < 0) {

		switch (ret) {

		case -ENETUNREACH:

		case -EHOSTUNREACH:

		case -ECONNREFUSED:

			rxrpc_set_call_completion(call,

						  RXRPC_CALL_LOCAL_ERROR,

						  0, ret);

			goto out;

		}

		_debug("need instant resend %d", ret);

		rxrpc_instant_resend(call, ix);

	} else {
@@ -241,6 +250,7 @@ static void rxrpc_queue_packet(struct rxrpc_sock *rx, struct rxrpc_call *call, 
					rxrpc_timer_set_for_send);

	}



out:

	rxrpc_free_skb(skb, rxrpc_skb_tx_freed);

	_leave("");

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE