aboutsummaryrefslogtreecommitdiffstats
path: root/net/sctp/ulpqueue.c
diff options
context:
space:
mode:
authorMarcelo Ricardo Leitner <marcelo.leitner@gmail.com>2016-04-08 15:41:28 -0400
committerDavid S. Miller <davem@davemloft.net>2016-04-13 23:04:44 -0400
commitfb586f25300f4587c7ebd097a604bf269b25bfa7 (patch)
treec9cd81d9f5ddf626822d059e55f4c4691668de50 /net/sctp/ulpqueue.c
parent250eb1f8815303f71c94a5680f8e4f2dcfa25cf5 (diff)
sctp: delay calls to sk_data_ready() as much as possible
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>
Diffstat (limited to 'net/sctp/ulpqueue.c')
-rw-r--r--net/sctp/ulpqueue.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sctp/ulpqueue.c b/net/sctp/ulpqueue.c
index ce469d648ffb..72e5b3e41cdd 100644
--- a/net/sctp/ulpqueue.c
+++ b/net/sctp/ulpqueue.c
@@ -264,7 +264,7 @@ int sctp_ulpq_tail_event(struct sctp_ulpq *ulpq, struct sctp_ulpevent *event)
264 sctp_ulpq_clear_pd(ulpq); 264 sctp_ulpq_clear_pd(ulpq);
265 265
266 if (queue == &sk->sk_receive_queue) 266 if (queue == &sk->sk_receive_queue)
267 sk->sk_data_ready(sk); 267 sctp_sk(sk)->pending_data_ready = 1;
268 return 1; 268 return 1;
269 269
270out_free: 270out_free:
@@ -1140,5 +1140,5 @@ void sctp_ulpq_abort_pd(struct sctp_ulpq *ulpq, gfp_t gfp)
1140 1140
1141 /* If there is data waiting, send it up the socket now. */ 1141 /* If there is data waiting, send it up the socket now. */
1142 if (sctp_ulpq_clear_pd(ulpq) || ev) 1142 if (sctp_ulpq_clear_pd(ulpq) || ev)
1143 sk->sk_data_ready(sk); 1143 sctp_sk(sk)->pending_data_ready = 1;
1144} 1144}