{"id":831085,"url":"http://patchwork.ozlabs.org/api/1.2/patches/831085/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20171027045510.5827-6-edumazet@google.com/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/1.2/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20171027045510.5827-6-edumazet@google.com>","list_archive_url":null,"date":"2017-10-27T04:55:00","name":"[v2,net-next,05/15] tcp: Namespace-ify sysctl_tcp_retrans_collapse","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"829b7eacab837dfdad8a8505c5c4aef0a0e08f3c","submitter":{"id":13357,"url":"http://patchwork.ozlabs.org/api/1.2/people/13357/?format=json","name":"Eric Dumazet","email":"edumazet@google.com"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/1.2/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/20171027045510.5827-6-edumazet@google.com/mbox/","series":[{"id":10492,"url":"http://patchwork.ozlabs.org/api/1.2/series/10492/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=10492","date":"2017-10-27T04:54:55","name":"tcp: move 14 sysctls to namespaces","version":2,"mbox":"http://patchwork.ozlabs.org/series/10492/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/831085/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/831085/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=)","ozlabs.org; dkim=pass (2048-bit key;\n\tunprotected) header.d=google.com header.i=@google.com\n\theader.b=\"jqWwyaBT\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3yNWmm1gwgz9t30\n\tfor ;\n\tFri, 27 Oct 2017 15:56:24 +1100 (AEDT)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1752071AbdJ0E4X (ORCPT );\n\tFri, 27 Oct 2017 00:56:23 -0400","from mail-io0-f194.google.com ([209.85.223.194]:56411 \"EHLO\n\tmail-io0-f194.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1751908AbdJ0Ez0 (ORCPT\n\t); Fri, 27 Oct 2017 00:55:26 -0400","by mail-io0-f194.google.com with SMTP id m81so10103956ioi.13\n\tfor ; Thu, 26 Oct 2017 21:55:26 -0700 (PDT)","from localhost ([2620:15c:2c4:201:c5be:583d:61a8:d070])\n\tby smtp.gmail.com with ESMTPSA id\n\ta139sm472311ita.24.2017.10.26.21.55.25\n\t(version=TLS1_2 cipher=AES128-SHA bits=128/128);\n\tThu, 26 Oct 2017 21:55:25 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=google.com; s=20161025;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=xIpXv7e+PhnhLVGeFi52ZlfMZ7lx6djJjDiueJobZX8=;\n\tb=jqWwyaBTcFgcfGS6vyPKeM5WpwlnK4ln5Vpcbt6w5KN6bGTqi8J2rjO9dYL8XzFVJd\n\tVzORHoMxca+Z8gnuB/V7J+MsouOOger7Om83g4gx0aizF2S8vE8UQo5mVU2qUEfNu7GB\n\tvV0YhkYMllFrsbB7FSENER2vbnMJgbvh2T1gF5DuPMACpTL+L2zhtTa6pgYkFCR2S3xE\n\t693TmfDHG29XnmO18VBFU7Qw8qXm9LysU63e8wVPF4rEz1lhFz7wKKYFvfUQUtiE+rQy\n\t+WSO+rvUOtIijpqqGen526YIoo9bVnfcpe7RjCmpospTevm22vIq6/o89oP8dElC9XmY\n\tAEsw==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=xIpXv7e+PhnhLVGeFi52ZlfMZ7lx6djJjDiueJobZX8=;\n\tb=cvsv+hKuptpfFfKyNfs6wAgs4GPhpVsPpWCoOHG39pVgArhns8mtbeleP3/G+PiUaW\n\tyQP3mxAnodkdpr7znN3CNPFyJ4pfp87kdtD6LcyLvy5HB5pvBy3g/bAl0DfsK4vKyZcw\n\tNHmyFLdVlT6pzIg2HZ9iDI+gQhbgMmggiBxq35TyfrvUQ8TpyRfATIG9EjFfjFeyR/V4\n\t4mRwlnbxo76HMLTyQuQJYGlxLFemZAdRTv/frCV2+SMhyiwBkTAJNkK+DqOyiAo18tXg\n\tqk9w5/Yr9XW01X6it78t97ocg+i9EvRbkEJizUwIrUSoHy+Z8EpyMzMN5BlwkGMtKkwD\n\tcMIA==","X-Gm-Message-State":"AMCzsaU1CPAgnN6uJaoXFt7KRzJzLgb1Sax7SbVU8CdKjkFvM8ohRxxF\n\tAVsuSUe5NM7lT3Dn/dRyScig9kiIhlg=","X-Google-Smtp-Source":"ABhQp+Qdu4pDMR2HBMXJRyOW6SYaCPs6Xz4iQFAnUsfN2XR1muwevfLEiaTmSNxF2h3CyaHm8R7nBQ==","X-Received":"by 10.107.185.6 with SMTP id j6mr34607247iof.221.1509080125730; \n\tThu, 26 Oct 2017 21:55:25 -0700 (PDT)","From":"Eric Dumazet ","To":"\"David S . Miller\" ","Cc":"netdev , Eric Dumazet ,\n\tEric Dumazet ","Subject":"[PATCH v2 net-next 05/15] tcp: Namespace-ify\n\tsysctl_tcp_retrans_collapse","Date":"Thu, 26 Oct 2017 21:55:00 -0700","Message-Id":"<20171027045510.5827-6-edumazet@google.com>","X-Mailer":"git-send-email 2.15.0.rc2.357.g7e34df9404-goog","In-Reply-To":"<20171027045510.5827-1-edumazet@google.com>","References":"<20171027045510.5827-1-edumazet@google.com>","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"Signed-off-by: Eric Dumazet \n---\n include/net/netns/ipv4.h | 1 +\n include/net/tcp.h | 1 -\n net/ipv4/sysctl_net_ipv4.c | 14 +++++++-------\n net/ipv4/tcp_ipv4.c | 2 +-\n net/ipv4/tcp_output.c | 5 +----\n 5 files changed, 10 insertions(+), 13 deletions(-)","diff":"diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h\nindex 8662692686b3af98a94a176230b9ed147881d87a..b28c172b10e497f235b51aae0fc2d3bbf7cc51f3 100644\n--- a/include/net/netns/ipv4.h\n+++ b/include/net/netns/ipv4.h\n@@ -132,6 +132,7 @@ struct netns_ipv4 {\n \tint sysctl_tcp_recovery;\n \tint sysctl_tcp_thin_linear_timeouts;\n \tint sysctl_tcp_slow_start_after_idle;\n+\tint sysctl_tcp_retrans_collapse;\n \tstruct inet_timewait_death_row tcp_death_row;\n \tint sysctl_max_syn_backlog;\n \tint sysctl_tcp_fastopen;\ndiff --git a/include/net/tcp.h b/include/net/tcp.h\nindex cc2ab522eb5cf7cb08b6918cdfd5c5500cfbf057..33cc86355b8ff9b506d21ad46cfc01b3916f5b61 100644\n--- a/include/net/tcp.h\n+++ b/include/net/tcp.h\n@@ -243,7 +243,6 @@ void tcp_time_wait(struct sock *sk, int state, int timeo);\n \n \n /* sysctl variables for tcp */\n-extern int sysctl_tcp_retrans_collapse;\n extern int sysctl_tcp_stdurg;\n extern int sysctl_tcp_rfc1337;\n extern int sysctl_tcp_abort_on_overflow;\ndiff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c\nindex 40d69af8b363bc236e23879973872d8f9346d85e..533b92ad39dd0cada542028fe2f276d9eebcd2c8 100644\n--- a/net/ipv4/sysctl_net_ipv4.c\n+++ b/net/ipv4/sysctl_net_ipv4.c\n@@ -386,13 +386,6 @@ static int proc_tcp_available_ulp(struct ctl_table *ctl,\n }\n \n static struct ctl_table ipv4_table[] = {\n-\t{\n-\t\t.procname\t= \"tcp_retrans_collapse\",\n-\t\t.data\t\t= &sysctl_tcp_retrans_collapse,\n-\t\t.maxlen\t\t= sizeof(int),\n-\t\t.mode\t\t= 0644,\n-\t\t.proc_handler\t= proc_dointvec\n-\t},\n \t{\n \t\t.procname\t= \"tcp_max_orphans\",\n \t\t.data\t\t= &sysctl_tcp_max_orphans,\n@@ -1145,6 +1138,13 @@ static struct ctl_table ipv4_net_table[] = {\n \t\t.mode\t\t= 0644,\n \t\t.proc_handler\t= proc_dointvec\n \t},\n+\t{\n+\t\t.procname\t= \"tcp_retrans_collapse\",\n+\t\t.data\t\t= &init_net.ipv4.sysctl_tcp_retrans_collapse,\n+\t\t.maxlen\t\t= sizeof(int),\n+\t\t.mode\t\t= 0644,\n+\t\t.proc_handler\t= proc_dointvec\n+\t},\n \t{ }\n };\n \ndiff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c\nindex cea63a4b59655823def7a423d27191003c7f084c..2bc6ba2059d32aa848dbc415b4b0e194b61b0268 100644\n--- a/net/ipv4/tcp_ipv4.c\n+++ b/net/ipv4/tcp_ipv4.c\n@@ -2487,7 +2487,7 @@ static int __net_init tcp_sk_init(struct net *net)\n \tnet->ipv4.sysctl_tcp_early_retrans = 3;\n \tnet->ipv4.sysctl_tcp_recovery = TCP_RACK_LOSS_DETECTION;\n \tnet->ipv4.sysctl_tcp_slow_start_after_idle = 1; /* By default, RFC2861 behavior. */\n-\n+\tnet->ipv4.sysctl_tcp_retrans_collapse = 1;\n \tnet->ipv4.sysctl_tcp_fastopen = TFO_CLIENT_ENABLE;\n \tspin_lock_init(&net->ipv4.tcp_fastopen_ctx_lock);\n \tnet->ipv4.sysctl_tcp_fastopen_blackhole_timeout = 60 * 60;\ndiff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c\nindex bdc288a06f941add38a5cde434081c63ee94ed42..55a0aa4b96dfc7cd8f703ad42b932bae23ea5660 100644\n--- a/net/ipv4/tcp_output.c\n+++ b/net/ipv4/tcp_output.c\n@@ -45,9 +45,6 @@\n \n #include \n \n-/* People can turn this off for buggy TCP's found in printers etc. */\n-int sysctl_tcp_retrans_collapse __read_mostly = 1;\n-\n /* People can turn this on to work with those rare, broken TCPs that\n * interpret the window field as a signed quantity.\n */\n@@ -2804,7 +2801,7 @@ static void tcp_retrans_try_collapse(struct sock *sk, struct sk_buff *to,\n \tstruct sk_buff *skb = to, *tmp;\n \tbool first = true;\n \n-\tif (!sysctl_tcp_retrans_collapse)\n+\tif (!sock_net(sk)->ipv4.sysctl_tcp_retrans_collapse)\n \t\treturn;\n \tif (TCP_SKB_CB(skb)->tcp_flags & TCPHDR_SYN)\n \t\treturn;\n","prefixes":["v2","net-next","05/15"]}