Skip to content

Commit

Permalink
sctp: delay calls to sk_data_ready() as much as possible
Browse files Browse the repository at this point in the history
Currently processing of multiple chunks in a single SCTP packet leads to
multiple calls to sk_data_ready, causing multiple wake up signals which
are costy and doesn't make it wake up any faster.

With this patch it will note that the wake up is pending and will do it
before leaving the state machine interpreter, latest place possible to
do it realiably and cleanly.

Note that sk_data_ready events are not dependent on asocs, unlike waking
up writers.

v2: series re-checked
v3: use local vars to cleanup the code, suggested by Jakub Sitnicki
Signed-off-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Marcelo Ricardo Leitner authored and David S. Miller committed Apr 14, 2016
1 parent 250eb1f commit fb586f2
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 3 deletions.
3 changes: 2 additions & 1 deletion include/net/sctp/structs.h
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,8 @@ struct sctp_sock {
v4mapped:1,
frag_interleave:1,
recvrcvinfo:1,
recvnxtinfo:1;
recvnxtinfo:1,
pending_data_ready:1;

atomic_t pd_mode;
/* Receive to here while partial delivery is in effect. */
Expand Down
7 changes: 7 additions & 0 deletions net/sctp/sm_sideeffect.c
Original file line number Diff line number Diff line change
Expand Up @@ -1222,6 +1222,8 @@ static int sctp_cmd_interpreter(sctp_event_t event_type,
sctp_cmd_seq_t *commands,
gfp_t gfp)
{
struct sock *sk = ep->base.sk;
struct sctp_sock *sp = sctp_sk(sk);
int error = 0;
int force;
sctp_cmd_t *cmd;
Expand Down Expand Up @@ -1742,6 +1744,11 @@ static int sctp_cmd_interpreter(sctp_event_t event_type,
error = sctp_outq_uncork(&asoc->outqueue, gfp);
} else if (local_cork)
error = sctp_outq_uncork(&asoc->outqueue, gfp);

if (sp->pending_data_ready) {
sk->sk_data_ready(sk);
sp->pending_data_ready = 0;
}
return error;
nomem:
error = -ENOMEM;
Expand Down
4 changes: 2 additions & 2 deletions net/sctp/ulpqueue.c
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ int sctp_ulpq_tail_event(struct sctp_ulpq *ulpq, struct sctp_ulpevent *event)
sctp_ulpq_clear_pd(ulpq);

if (queue == &sk->sk_receive_queue)
sk->sk_data_ready(sk);
sctp_sk(sk)->pending_data_ready = 1;
return 1;

out_free:
Expand Down Expand Up @@ -1140,5 +1140,5 @@ void sctp_ulpq_abort_pd(struct sctp_ulpq *ulpq, gfp_t gfp)

/* If there is data waiting, send it up the socket now. */
if (sctp_ulpq_clear_pd(ulpq) || ev)
sk->sk_data_ready(sk);
sctp_sk(sk)->pending_data_ready = 1;
}

0 comments on commit fb586f2

Please sign in to comment.