From mboxrd@z Thu Jan 1 00:00:00 1970 From: Zhu Yi Subject: [PATCH 6/8] sctp: use limited socket backlog Date: Wed, 3 Mar 2010 14:35:09 +0800 Message-ID: <1267598111-12503-6-git-send-email-yi.zhu@intel.com> References: <1267598111-12503-1-git-send-email-yi.zhu@intel.com> <1267598111-12503-2-git-send-email-yi.zhu@intel.com> <1267598111-12503-3-git-send-email-yi.zhu@intel.com> <1267598111-12503-4-git-send-email-yi.zhu@intel.com> <1267598111-12503-5-git-send-email-yi.zhu@intel.com> Cc: Zhu Yi , Vlad Yasevich , Sridhar Samudrala To: netdev@vger.kernel.org Return-path: Received: from mga01.intel.com ([192.55.52.88]:65441 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754451Ab0CCGdj (ORCPT ); Wed, 3 Mar 2010 01:33:39 -0500 In-Reply-To: <1267598111-12503-5-git-send-email-yi.zhu@intel.com> Sender: netdev-owner@vger.kernel.org List-ID: Make sctp adapt to the limited socket backlog change. Cc: Vlad Yasevich Cc: Sridhar Samudrala Signed-off-by: Zhu Yi --- net/sctp/input.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/net/sctp/input.c b/net/sctp/input.c index c0c973e..ca42181 100644 --- a/net/sctp/input.c +++ b/net/sctp/input.c @@ -75,7 +75,7 @@ static struct sctp_association *__sctp_lookup_association( const union sctp_addr *peer, struct sctp_transport **pt); -static void sctp_add_backlog(struct sock *sk, struct sk_buff *skb); +static int sctp_add_backlog(struct sock *sk, struct sk_buff *skb); /* Calculate the SCTP checksum of an SCTP packet. */ @@ -265,8 +265,12 @@ int sctp_rcv(struct sk_buff *skb) } if (sock_owned_by_user(sk)) { + if (sctp_add_backlog(sk, skb)) { + sctp_bh_unlock_sock(sk); + sctp_chunk_free(chunk); + goto discard_release; + } SCTP_INC_STATS_BH(SCTP_MIB_IN_PKT_BACKLOG); - sctp_add_backlog(sk, skb); } else { SCTP_INC_STATS_BH(SCTP_MIB_IN_PKT_SOFTIRQ); sctp_inq_push(&chunk->rcvr->inqueue, chunk); @@ -336,7 +340,7 @@ int sctp_backlog_rcv(struct sock *sk, struct sk_buff *skb) sctp_bh_lock_sock(sk); if (sock_owned_by_user(sk)) { - sk_add_backlog(sk, skb); + __sk_add_backlog(sk, skb); backloged = 1; } else sctp_inq_push(inqueue, chunk); @@ -362,7 +366,7 @@ done: return 0; } -static void sctp_add_backlog(struct sock *sk, struct sk_buff *skb) +static int sctp_add_backlog(struct sock *sk, struct sk_buff *skb) { struct sctp_chunk *chunk = SCTP_INPUT_CB(skb)->chunk; struct sctp_ep_common *rcvr = chunk->rcvr; @@ -377,7 +381,7 @@ static void sctp_add_backlog(struct sock *sk, struct sk_buff *skb) else BUG(); - sk_add_backlog(sk, skb); + return sk_add_backlog(sk, skb); } /* Handle icmp frag needed error. */ -- 1.6.3.3