{"id":830984,"url":"http://patchwork.ozlabs.org/api/1.2/patches/830984/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20171026233526.6155-5-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":"<20171026233526.6155-5-edumazet@google.com>","list_archive_url":null,"date":"2017-10-26T23:35:15","name":"[net-next,04/15] tcp: Namespace-ify sysctl_tcp_slow_start_after_idle","commit_ref":null,"pull_url":null,"state":"changes-requested","archived":true,"hash":"6ad235297989ab2cc0c80af120b868c720a15050","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/20171026233526.6155-5-edumazet@google.com/mbox/","series":[{"id":10461,"url":"http://patchwork.ozlabs.org/api/1.2/series/10461/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=10461","date":"2017-10-26T23:35:11","name":"tcp: move 14 sysctls to namespaces","version":1,"mbox":"http://patchwork.ozlabs.org/series/10461/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/830984/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/830984/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=\"e2pANPnL\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3yNNfr1h3vz9sxR\n\tfor ;\n\tFri, 27 Oct 2017 10:35:48 +1100 (AEDT)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S932430AbdJZXfp (ORCPT );\n\tThu, 26 Oct 2017 19:35:45 -0400","from mail-pg0-f65.google.com ([74.125.83.65]:43859 \"EHLO\n\tmail-pg0-f65.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S932396AbdJZXfm (ORCPT\n\t); Thu, 26 Oct 2017 19:35:42 -0400","by mail-pg0-f65.google.com with SMTP id s75so3903424pgs.0\n\tfor ; Thu, 26 Oct 2017 16:35:42 -0700 (PDT)","from localhost ([2620:15c:2c4:201:c5be:583d:61a8:d070])\n\tby smtp.gmail.com with ESMTPSA id\n\tb68sm11543706pfg.171.2017.10.26.16.35.40\n\t(version=TLS1_2 cipher=AES128-SHA bits=128/128);\n\tThu, 26 Oct 2017 16:35:40 -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=bVZhIMJHHLeI5acxkSxLIjAh/Iaut8GTyxM+biMyL6Q=;\n\tb=e2pANPnLmuTK2MsteO8VjlCUXYgZLRLjAXZfhC0ezpOSnrnJs1PhIxQ2vdWZbIWFL2\n\tzVbLyOJwyIjEQeuRryj6P3qFwqznuTLOtwlAZk3BEyoGa/KHDIcOoDo20RAJxEbGJTYJ\n\tnsZWn4eI5J2w3Xu8bsULX/x/YOsIwUfHNoxDjuJtNvR66GaKHKxpGm8EP//VV3KX2Gtp\n\ttdEDUnqBZRL75Dj5+CB8gjOw6GUJrr99Bcyk6O+E14wVzkDYVXs0bNFb5is3D4Wwvpw4\n\t0HUviCB4yr4ZOd1kOzA9k45GkOVYQUtTytsGN4xZkO0LhbghmA5OG6VOEFV+x2zv1v/i\n\tOLaw==","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=bVZhIMJHHLeI5acxkSxLIjAh/Iaut8GTyxM+biMyL6Q=;\n\tb=fw1zpj108KGehSnEzhIPTKzO8AWIbyYx/t914Usi1AYTp3vV/8tP5JXJUCHWlo9zT7\n\tDKNuDjPawpe9ZaoawM8M+9tdV2kD1txshAh6vzblP60tGQ7RJtvHNvf/KcV9sWM8laWS\n\t0nGiafdsypRX3996fzgdXD1L0GhUQJgQT83O6yS9hWkKztrgo/x/D6swJm9gGQJ7Xubm\n\tKIjYgD4WXrnmn3MbEINvVfCh9CNsPAHeWADyC0N1jwNCZDzOdQfnnNsLjANKVaa1e94J\n\t5EU+TGgFuJCnbZP2x/tdYhg+t+US6/uorMUmeB5lq28h9hQPwWGe1tVdBlUjt9bcYAJw\n\tX/kw==","X-Gm-Message-State":"AMCzsaXtA9OqzjFUw1GeRxt8MgYTJUWWJEfbPr8WfTC77D0oNZIvm3kl\n\tlq6XmYvM6XwtOiNDzTGPSxNGvA==","X-Google-Smtp-Source":"ABhQp+TJaUFLP63KYd4Oz6Fa4bleW/Q7ZuIycxgBSdra2daDpB0Ejr8PiAhvsX0k0/ApaPVcucAQfQ==","X-Received":"by 10.98.68.144 with SMTP id m16mr6825649pfi.343.1509060941238; \n\tThu, 26 Oct 2017 16:35:41 -0700 (PDT)","From":"Eric Dumazet ","To":"\"David S . Miller\" ","Cc":"netdev , Eric Dumazet ,\n\tEric Dumazet ","Subject":"[PATCH net-next 04/15] tcp: Namespace-ify\n\tsysctl_tcp_slow_start_after_idle","Date":"Thu, 26 Oct 2017 16:35:15 -0700","Message-Id":"<20171026233526.6155-5-edumazet@google.com>","X-Mailer":"git-send-email 2.15.0.rc2.357.g7e34df9404-goog","In-Reply-To":"<20171026233526.6155-1-edumazet@google.com>","References":"<20171026233526.6155-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 | 3 +--\n net/ipv4/sysctl_net_ipv4.c | 14 +++++++-------\n net/ipv4/tcp_ipv4.c | 1 +\n net/ipv4/tcp_output.c | 5 +----\n 5 files changed, 11 insertions(+), 13 deletions(-)","diff":"diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h\nindex 2a9f37b39c45fe451e45025790a4e5c45ece5cbc..8662692686b3af98a94a176230b9ed147881d87a 100644\n--- a/include/net/netns/ipv4.h\n+++ b/include/net/netns/ipv4.h\n@@ -131,6 +131,7 @@ struct netns_ipv4 {\n \tint sysctl_tcp_early_retrans;\n \tint sysctl_tcp_recovery;\n \tint sysctl_tcp_thin_linear_timeouts;\n+\tint sysctl_tcp_slow_start_after_idle;\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 8ef12bfe1a3a7083f1bbc924bc43a022a4057768..09c79705a0742aa8c22b3b7795d01b6c685d32e2 100644\n--- a/include/net/tcp.h\n+++ b/include/net/tcp.h\n@@ -259,7 +259,6 @@ extern int sysctl_tcp_nometrics_save;\n extern int sysctl_tcp_moderate_rcvbuf;\n extern int sysctl_tcp_tso_win_divisor;\n extern int sysctl_tcp_workaround_signed_windows;\n-extern int sysctl_tcp_slow_start_after_idle;\n \n #define TCP_RACK_LOSS_DETECTION 0x1 /* Use RACK to detect losses */\n \n@@ -1305,7 +1304,7 @@ static inline void tcp_slow_start_after_idle_check(struct sock *sk)\n \tstruct tcp_sock *tp = tcp_sk(sk);\n \ts32 delta;\n \n-\tif (!sysctl_tcp_slow_start_after_idle || tp->packets_out ||\n+\tif (!sock_net(sk)->ipv4.sysctl_tcp_slow_start_after_idle || tp->packets_out ||\n \t ca_ops->cong_control)\n \t\treturn;\n \tdelta = tcp_jiffies32 - tp->lsndtime;\ndiff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c\nindex 12003214f4d80b38d5f754ddd91be8a990168ade..40d69af8b363bc236e23879973872d8f9346d85e 100644\n--- a/net/ipv4/sysctl_net_ipv4.c\n+++ b/net/ipv4/sysctl_net_ipv4.c\n@@ -571,13 +571,6 @@ static struct ctl_table ipv4_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_slow_start_after_idle\",\n-\t\t.data\t\t= &sysctl_tcp_slow_start_after_idle,\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 #ifdef CONFIG_NETLABEL\n \t{\n \t\t.procname\t= \"cipso_cache_enable\",\n@@ -1145,6 +1138,13 @@ static struct ctl_table ipv4_net_table[] = {\n \t\t.mode = 0644,\n \t\t.proc_handler = proc_dointvec\n \t},\n+\t{\n+\t\t.procname\t= \"tcp_slow_start_after_idle\",\n+\t\t.data\t\t= &init_net.ipv4.sysctl_tcp_slow_start_after_idle,\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 517ff1948a71287b06ea0859e1f25a15119a3dd9..cea63a4b59655823def7a423d27191003c7f084c 100644\n--- a/net/ipv4/tcp_ipv4.c\n+++ b/net/ipv4/tcp_ipv4.c\n@@ -2486,6 +2486,7 @@ static int __net_init tcp_sk_init(struct net *net)\n \tnet->ipv4.sysctl_tcp_timestamps = 1;\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_fastopen = TFO_CLIENT_ENABLE;\n \tspin_lock_init(&net->ipv4.tcp_fastopen_ctx_lock);\ndiff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c\nindex dd7c22b7d23b016b1da83138d6e8047abdef97e6..bc93a346e6e91289c2aeb2f2d2522b809da12dd6 100644\n--- a/net/ipv4/tcp_output.c\n+++ b/net/ipv4/tcp_output.c\n@@ -61,9 +61,6 @@ int sysctl_tcp_limit_output_bytes __read_mostly = 262144;\n */\n int sysctl_tcp_tso_win_divisor __read_mostly = 3;\n \n-/* By default, RFC2861 behavior. */\n-int sysctl_tcp_slow_start_after_idle __read_mostly = 1;\n-\n static bool tcp_write_xmit(struct sock *sk, unsigned int mss_now, int nonagle,\n \t\t\t int push_one, gfp_t gfp);\n \n@@ -1633,7 +1630,7 @@ static void tcp_cwnd_validate(struct sock *sk, bool is_cwnd_limited)\n \t\tif (tp->packets_out > tp->snd_cwnd_used)\n \t\t\ttp->snd_cwnd_used = tp->packets_out;\n \n-\t\tif (sysctl_tcp_slow_start_after_idle &&\n+\t\tif (sock_net(sk)->ipv4.sysctl_tcp_slow_start_after_idle &&\n \t\t (s32)(tcp_jiffies32 - tp->snd_cwnd_stamp) >= inet_csk(sk)->icsk_rto &&\n \t\t !ca_ops->cong_control)\n \t\t\ttcp_cwnd_application_limited(sk);\n","prefixes":["net-next","04/15"]}