From patchwork Wed Mar 3 08:36:27 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhu Yi X-Patchwork-Id: 46780 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 5CE65B7D06 for ; Wed, 3 Mar 2010 19:35:17 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752013Ab0CCIfB (ORCPT ); Wed, 3 Mar 2010 03:35:01 -0500 Received: from mga01.intel.com ([192.55.52.88]:60230 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751872Ab0CCIet (ORCPT ); Wed, 3 Mar 2010 03:34:49 -0500 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP; 03 Mar 2010 00:31:38 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.49,573,1262592000"; d="scan'208";a="545595698" Received: from debian.sh.intel.com (HELO localhost.localdomain) ([10.239.13.113]) by fmsmga002.fm.intel.com with ESMTP; 03 Mar 2010 00:33:54 -0800 From: Zhu Yi To: netdev@vger.kernel.org Cc: Zhu Yi , Vlad Yasevich , Sridhar Samudrala Subject: [PATCH V2 5/7] sctp: use limited socket backlog Date: Wed, 3 Mar 2010 16:36:27 +0800 Message-Id: <1267605389-7369-5-git-send-email-yi.zhu@intel.com> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1267605389-7369-4-git-send-email-yi.zhu@intel.com> References: <1267605389-7369-1-git-send-email-yi.zhu@intel.com> <1267605389-7369-2-git-send-email-yi.zhu@intel.com> <1267605389-7369-3-git-send-email-yi.zhu@intel.com> <1267605389-7369-4-git-send-email-yi.zhu@intel.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Make sctp adapt to the limited socket backlog change. Cc: Vlad Yasevich Cc: Sridhar Samudrala Signed-off-by: Zhu Yi --- net/sctp/input.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/net/sctp/input.c b/net/sctp/input.c index c0c973e..20e69c3 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); @@ -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_limited(sk, skb); } /* Handle icmp frag needed error. */