| Message ID | 147464377267.5090.12222734463447533990.stgit@warthog.procyon.org.uk |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On 09/23/2016 06:16 PM, David Howells wrote: > 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: David Howells <dhowells@redhat.com> > --- > > net/rxrpc/call_event.c | 25 ++++++++++++++----------- > net/rxrpc/call_object.c | 4 ++-- > 2 files changed, 16 insertions(+), 13 deletions(-) > > diff --git a/net/rxrpc/call_event.c b/net/rxrpc/call_event.c > index 3a7f90a2659c..8bc5c8e37ab4 100644 > --- a/net/rxrpc/call_event.c > +++ b/net/rxrpc/call_event.c > @@ -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->expire_at; > + 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_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_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); > } CodingStyle: {} not needed now. [...] MBR, Sergei
Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> wrote: > > + if (call->timer.expires != t || !timer_pending(&call->timer)) { > > mod_timer(&call->timer, t); > > } > > CodingStyle: {} not needed now. See patch 11. David
diff --git a/net/rxrpc/call_event.c b/net/rxrpc/call_event.c index 3a7f90a2659c..8bc5c8e37ab4 100644 --- a/net/rxrpc/call_event.c +++ b/net/rxrpc/call_event.c @@ -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->expire_at; + 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_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_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); } diff --git a/net/rxrpc/call_object.c b/net/rxrpc/call_object.c index f50a6094e198..f2fadf667e19 100644 --- a/net/rxrpc/call_object.c +++ b/net/rxrpc/call_object.c @@ -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); } /*
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: David Howells <dhowells@redhat.com> --- net/rxrpc/call_event.c | 25 ++++++++++++++----------- net/rxrpc/call_object.c | 4 ++-- 2 files changed, 16 insertions(+), 13 deletions(-)