Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 01a88f7f authored by David Howells's avatar David Howells
Browse files

rxrpc: Fix call timer 



Fix the call timer in the following ways:

 (1) If call->resend_at or call->ack_at are before or equal to the current
     time, then ignore that timeout.

 (2) If call->expire_at is before or equal to the current time, then don't
     set the timer at all (possibly we should queue the call).

 (3) Don't skip modifying the timer if timer_pending() is true.  This
     indicates that the timer is working, not that it has expired and is
     running/waiting to run its expiry handler.

Also call rxrpc_set_timer() to start the call timer going rather than
calling add_timer().

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

net/rxrpc/call_event.c

+14 −11
Original line number Diff line number Diff line
@@ -28,24 +28,27 @@ void rxrpc_set_timer(struct rxrpc_call *call) 
{

	unsigned long t, now = jiffies;



	_enter("{%ld,%ld,%ld:%ld}",

	       call->ack_at - now, call->resend_at - now, call->expire_at - now,

	       call->timer.expires - now);



	read_lock_bh(&call->state_lock);



	if (call->state < RXRPC_CALL_COMPLETE) {

		t = call->ack_at;

		if (time_before(call->resend_at, t))

			t = call->resend_at;

		if (time_before(call->expire_at, t))

		t = call->expire_at;

		if (!timer_pending(&call->timer) ||

		    time_before(t, call->timer.expires)) {

			_debug("set timer %ld", t - now);

		if (time_before_eq(t, now))

			goto out;



		if (time_after(call->resend_at, now) &&

		    time_before(call->resend_at, t))

			t = call->resend_at;



		if (time_after(call->ack_at, now) &&

		    time_before(call->ack_at, t))

			t = call->ack_at;



		if (call->timer.expires != t || !timer_pending(&call->timer)) {

			mod_timer(&call->timer, t);

		}

	}



out:

	read_unlock_bh(&call->state_lock);

}

net/rxrpc/call_object.c

+2 −2
Original line number Diff line number Diff line
@@ -199,8 +199,8 @@ static void rxrpc_start_call_timer(struct rxrpc_call *call) 
	call->expire_at = expire_at;

	call->ack_at = expire_at;

	call->resend_at = expire_at;

	call->timer.expires = expire_at;

	add_timer(&call->timer);

	call->timer.expires = expire_at + 1;

	rxrpc_set_timer(call);

}



/*