From patchwork Fri Jan 27 14:35:32 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Glauber Costa X-Patchwork-Id: 138236 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 45C171007D2 for ; Sat, 28 Jan 2012 01:36:45 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755879Ab2A0Og2 (ORCPT ); Fri, 27 Jan 2012 09:36:28 -0500 Received: from mx2.parallels.com ([64.131.90.16]:50921 "EHLO mx2.parallels.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755808Ab2A0Og0 (ORCPT ); Fri, 27 Jan 2012 09:36:26 -0500 Received: from [96.31.168.206] (helo=mail.parallels.com) by mx2.parallels.com with esmtps (TLSv1:AES128-SHA:128) (Exim 4.74) (envelope-from ) id 1Rqmuf-0001Yl-Fj; Fri, 27 Jan 2012 09:36:25 -0500 Received: from straightjacket.localdomain (195.214.232.10) by mail.parallels.com (10.255.249.32) with Microsoft SMTP Server (TLS) id 14.1.218.12; Fri, 27 Jan 2012 06:36:24 -0800 Message-ID: <4F22B634.2020007@parallels.com> Date: Fri, 27 Jan 2012 18:35:32 +0400 From: Glauber Costa User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:9.0) Gecko/20111222 Thunderbird/9.0 MIME-Version: 1.0 To: Ingo Molnar CC: , "David S. Miller" , Subject: Re: [v3.3-rc1 regression] TCP: too many of orphaned sockets References: <20120127124641.GA30819@elte.hu> <4F229D5C.4040300@parallels.com> <20120127125645.GA28131@elte.hu> <20120127141754.GA30202@elte.hu> <20120127142246.GA22318@elte.hu> In-Reply-To: <20120127142246.GA22318@elte.hu> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On 01/27/2012 06:22 PM, Ingo Molnar wrote: > > * Ingo Molnar wrote: > >> ok, i've bisected it, and the bad commit is: >> >> 3dc43e3e4d0b52197d3205214fe8f162f9e0c334 is the first bad commit >> commit 3dc43e3e4d0b52197d3205214fe8f162f9e0c334 >> Author: Glauber Costa >> Date: Sun Dec 11 21:47:05 2011 +0000 >> >> per-netns ipv4 sysctl_tcp_mem > > Might be related to this detail in the .config: > > # CONFIG_PROC_SYSCTL is not set > > So former tcp_init() code does not get run? > > Thanks, > > Ingo Can you tell me if the following patch fixes your problem? diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 9bcdec3..366834b 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -3276,9 +3276,23 @@ void __init tcp_init(void) sysctl_tcp_max_orphans = cnt / 2; sysctl_max_syn_backlog = max(128, cnt / 256); + /* + * Despite the sysctl name, those values are always used in the code. + * CONFIG_PROC_SYSCTL only exposes it as a sysctl, allowing the admin + * to tweak them. If this is not configured, we need to provide + * a default value here + */ +#ifdef CONFIG_PROC_SYSCTL /* Set per-socket limits to no more than 1/128 the pressure threshold */ limit = ((unsigned long)init_net.ipv4.sysctl_tcp_mem[1]) << (PAGE_SHIFT - 7); +#else + limit = nr_free_buffer_pages() / 8; + limit = max(limit, 128UL); + init_net.ipv4.sysctl_tcp_mem[0] = limit / 4 * 3; + init_net.ipv4.sysctl_tcp_mem[1] = limit; + init_net.ipv4.sysctl_tcp_mem[2] = sysctl_tcp_mem[0] * 2; +#endif max_share = min(4UL*1024*1024, limit); sysctl_tcp_wmem[0] = SK_MEM_QUANTUM;