Skip to content

Commit

Permalink
net: sctp: migrate most recently used transport to ktime
Browse files Browse the repository at this point in the history
Be more precise in transport path selection and use ktime
helpers instead of jiffies to compare and pick the better
primary and secondary recently used transports. This also
avoids any side-effects during a possible roll-over, and
could lead to better path decision-making.

Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Daniel Borkmann authored and David S. Miller committed Jun 11, 2014
1 parent b82e8f3 commit e575235
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 8 deletions.
6 changes: 3 additions & 3 deletions include/net/sctp/structs.h
Original file line number Diff line number Diff line change
Expand Up @@ -838,10 +838,10 @@ struct sctp_transport {
unsigned long sackdelay;
__u32 sackfreq;

/* When was the last time (in jiffies) that we heard from this
* transport? We use this to pick new active and retran paths.
/* When was the last time that we heard from this transport? We use
* this to pick new active and retran paths.
*/
unsigned long last_time_heard;
ktime_t last_time_heard;

/* Last time(in jiffies) when cwnd is reduced due to the congestion
* indication based on ECNE chunk.
Expand Down
8 changes: 5 additions & 3 deletions net/sctp/associola.c
Original file line number Diff line number Diff line change
Expand Up @@ -1036,7 +1036,7 @@ static void sctp_assoc_bh_rcv(struct work_struct *work)
}

if (chunk->transport)
chunk->transport->last_time_heard = jiffies;
chunk->transport->last_time_heard = ktime_get();

/* Run through the state machine. */
error = sctp_do_sm(net, SCTP_EVENT_T_CHUNK, subtype,
Expand Down Expand Up @@ -1283,11 +1283,13 @@ static void sctp_select_active_and_retran_path(struct sctp_association *asoc)
trans->state == SCTP_PF)
continue;
if (trans_pri == NULL ||
trans->last_time_heard > trans_pri->last_time_heard) {
ktime_after(trans->last_time_heard,
trans_pri->last_time_heard)) {
trans_sec = trans_pri;
trans_pri = trans;
} else if (trans_sec == NULL ||
trans->last_time_heard > trans_sec->last_time_heard) {
ktime_after(trans->last_time_heard,
trans_sec->last_time_heard)) {
trans_sec = trans;
}
}
Expand Down
2 changes: 1 addition & 1 deletion net/sctp/endpointola.c
Original file line number Diff line number Diff line change
Expand Up @@ -481,7 +481,7 @@ static void sctp_endpoint_bh_rcv(struct work_struct *work)
}

if (chunk->transport)
chunk->transport->last_time_heard = jiffies;
chunk->transport->last_time_heard = ktime_get();

error = sctp_do_sm(net, SCTP_EVENT_T_CHUNK, subtype, state,
ep, asoc, chunk, GFP_ATOMIC);
Expand Down
2 changes: 1 addition & 1 deletion net/sctp/transport.c
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ static struct sctp_transport *sctp_transport_init(struct net *net,
*/
peer->rto = msecs_to_jiffies(net->sctp.rto_initial);

peer->last_time_heard = jiffies;
peer->last_time_heard = ktime_get();
peer->last_time_ecne_reduced = jiffies;

peer->param_flags = SPP_HB_DISABLE |
Expand Down

0 comments on commit e575235

Please sign in to comment.