From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eric Dumazet Subject: [PATCH] tcp: restore correct limit Date: Tue, 10 Apr 2012 12:03:14 +0200 Message-ID: <1334052194.3126.66.camel@edumazet-glaptop> References: <4F83EB0E.4020104@monstr.eu> <1334046444.3126.12.camel@edumazet-glaptop> <1334046746.3126.13.camel@edumazet-glaptop> <4F83F166.4010208@monstr.eu> <1334047544.3126.14.camel@edumazet-glaptop> <4F83F959.3070302@monstr.eu> <1334049896.3126.23.camel@edumazet-glaptop> <4F83FD7A.5010602@monstr.eu> <1334050698.3126.30.camel@edumazet-glaptop> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Cc: netdev@vger.kernel.org, John Williams , David Miller , Jason Wang , Glauber Costa To: monstr@monstr.eu Return-path: Received: from mail-bk0-f46.google.com ([209.85.214.46]:33108 "EHLO mail-bk0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752245Ab2DJKDT (ORCPT ); Tue, 10 Apr 2012 06:03:19 -0400 Received: by bkcik5 with SMTP id ik5so4036238bkc.19 for ; Tue, 10 Apr 2012 03:03:18 -0700 (PDT) In-Reply-To: <1334050698.3126.30.camel@edumazet-glaptop> Sender: netdev-owner@vger.kernel.org List-ID: Commit c43b874d5d714f (tcp: properly initialize tcp memory limits) added a regression on machines with low amount of memory, since sockets cant use 1/128 of memory but 1/1024 Fix this to match comment and previous behavior. Signed-off-by: Eric Dumazet Cc: Jason Wang Cc: Glauber Costa --- net/ipv4/tcp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 5d54ed3..67d726e 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -3302,7 +3302,7 @@ void __init tcp_init(void) tcp_init_mem(&init_net); /* Set per-socket limits to no more than 1/128 the pressure threshold */ - limit = nr_free_buffer_pages() << (PAGE_SHIFT - 10); + limit = nr_free_buffer_pages() << (PAGE_SHIFT - 7); limit = max(limit, 128UL); max_share = min(4UL*1024*1024, limit);