From patchwork Fri Mar 5 04:01:41 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhu Yi X-Patchwork-Id: 46991 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 0A506B7D03 for ; Fri, 5 Mar 2010 15:00:36 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754395Ab0CEEA3 (ORCPT ); Thu, 4 Mar 2010 23:00:29 -0500 Received: from mga14.intel.com ([143.182.124.37]:27263 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752248Ab0CEEA2 (ORCPT ); Thu, 4 Mar 2010 23:00:28 -0500 Received: from azsmga001.ch.intel.com ([10.2.17.19]) by azsmga102.ch.intel.com with ESMTP; 04 Mar 2010 20:00:24 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.49,585,1262592000"; d="scan'208";a="251111185" Received: from debian.sh.intel.com (HELO localhost.localdomain) ([10.239.13.113]) by azsmga001.ch.intel.com with ESMTP; 04 Mar 2010 20:00:23 -0800 From: Zhu Yi To: davem@davemloft.net Cc: netdev@vger.kernel.org, Zhu Yi , Alexey Kuznetsov , "Pekka Savola (ipv6)" , Patrick McHardy Subject: [PATCH V3 2/8] tcp: use limited socket backlog Date: Fri, 5 Mar 2010 12:01:41 +0800 Message-Id: <1267761707-15605-2-git-send-email-yi.zhu@intel.com> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1267761707-15605-1-git-send-email-yi.zhu@intel.com> References: <1267761707-15605-1-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 tcp adapt to the limited socket backlog change. Cc: "David S. Miller" Cc: Alexey Kuznetsov Cc: "Pekka Savola (ipv6)" Cc: Patrick McHardy Signed-off-by: Zhu Yi Acked-by: Eric Dumazet --- net/ipv4/tcp_ipv4.c | 6 ++++-- net/ipv6/tcp_ipv6.c | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index c3588b4..4baf194 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c @@ -1682,8 +1682,10 @@ process: if (!tcp_prequeue(sk, skb)) ret = tcp_v4_do_rcv(sk, skb); } - } else - sk_add_backlog(sk, skb); + } else if (sk_add_backlog_limited(sk, skb)) { + bh_unlock_sock(sk); + goto discard_and_relse; + } bh_unlock_sock(sk); sock_put(sk); diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index 6963a6b..c4ea9d5 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c @@ -1740,8 +1740,10 @@ process: if (!tcp_prequeue(sk, skb)) ret = tcp_v6_do_rcv(sk, skb); } - } else - sk_add_backlog(sk, skb); + } else if (sk_add_backlog_limited(sk, skb)) { + bh_unlock_sock(sk); + goto discard_and_relse; + } bh_unlock_sock(sk); sock_put(sk);