{"id":831082,"url":"http://patchwork.ozlabs.org/api/1.2/patches/831082/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20171027045510.5827-16-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-16-edumazet@google.com>","list_archive_url":null,"date":"2017-10-27T04:55:10","name":"[v2,net-next,15/15] tcp: Namespace-ify sysctl_tcp_frto","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"0d347fdef1730646644f8b3cf19424500b9fd531","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-16-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/831082/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/831082/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=\"XZC5YFlI\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3yNWmK0M77z9t30\n\tfor ;\n\tFri, 27 Oct 2017 15:56:01 +1100 (AEDT)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1752062AbdJ0Ez6 (ORCPT );\n\tFri, 27 Oct 2017 00:55:58 -0400","from mail-io0-f193.google.com ([209.85.223.193]:54979 \"EHLO\n\tmail-io0-f193.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1751997AbdJ0Ezr (ORCPT\n\t); Fri, 27 Oct 2017 00:55:47 -0400","by mail-io0-f193.google.com with SMTP id e89so10105913ioi.11\n\tfor ; Thu, 26 Oct 2017 21:55:46 -0700 (PDT)","from localhost ([2620:15c:2c4:201:c5be:583d:61a8:d070])\n\tby smtp.gmail.com with ESMTPSA id\n\ti201sm481706ita.32.2017.10.26.21.55.45\n\t(version=TLS1_2 cipher=AES128-SHA bits=128/128);\n\tThu, 26 Oct 2017 21:55:45 -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=o0hZ9F7dKHWlwE5oZ1U6dVNq6O6j3qGlmQ4Nq+CxtHw=;\n\tb=XZC5YFlIQnCzq/GYgq5QN2+uG/R7ojb90cD66NjheWIw1tcvazdsN+ndZ1eghaySV/\n\teVoZER28nE/R+8AGXa2R8zabij2xBROoyrSUh/DK+j2i8LaltQHAY7tET5iHi8MvUVij\n\tLZv15vCd8BOPKh+Vz/eH6MmntxKk8ovnzAO4kZyHDjwOMjtjk8J4ImPPktHLyICfsoR8\n\taMWS9yxUo9n4BkmZsZoL+HS/UkObyf/CCZhEnR5OakKlDgvNKf48aXNK6MNvo3rMJeI3\n\tgWCGPIWD8teLJNxgPtke6COisQ8W5dTkzbb75qnRbY3q89UdqFcgswHJvlzgUm4nJy55\n\tEd6g==","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=o0hZ9F7dKHWlwE5oZ1U6dVNq6O6j3qGlmQ4Nq+CxtHw=;\n\tb=tMGOtpNJoUyps2NRHEv/oF3QcYGIZz2PH7u+9PDGHxvdNLqsRgDGE6n4T2PxzhU/7V\n\tjoD+wmvY3GagYG/LXZRoyDhpcEdxDOt0G3WwpGZ9EgTzYJFIxJALsW9OUq6KbAwW57aJ\n\tGLo2BlNg4bR77x/oNErmqELNvZB5FH3WV1FQo/6qob4TSXeDljZ1Ua0d/pwsoPwyQChQ\n\tsci4PguOZXEDe/LZlDbYPASEHgb7FqQUIKKKWQE4o38iklmW3VwvY0Ga2xXgyKJ8CbjI\n\tRhX8McpDIu8A8c0Ut/QuDzGGlhQG76s2g/llLmfFx5M2rJrdcO2DkCTTo1TA7j1Ir9VR\n\tJ9wA==","X-Gm-Message-State":"AMCzsaUDliR8xr1lPbMXM4dLnybygcdp0m1mURevtBjCEvKrwfCPfG2Z\n\tjQRHy0GRnj6FgKwbdeL1ElHX/Q==","X-Google-Smtp-Source":"ABhQp+SFc5CSzPfnvRHIJlPmadu13QBhHydiHra+EkPxzh3VsjSLoFQWqRiAkMZV6VQ4zrZDRgboFg==","X-Received":"by 10.107.159.5 with SMTP id i5mr31262515ioe.300.1509080146259; \n\tThu, 26 Oct 2017 21:55:46 -0700 (PDT)","From":"Eric Dumazet ","To":"\"David S . Miller\" ","Cc":"netdev , Eric Dumazet ,\n\tEric Dumazet ","Subject":"[PATCH v2 net-next 15/15] tcp: Namespace-ify sysctl_tcp_frto","Date":"Thu, 26 Oct 2017 21:55:10 -0700","Message-Id":"<20171027045510.5827-16-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_input.c | 3 +--\n net/ipv4/tcp_ipv4.c | 1 +\n 5 files changed, 10 insertions(+), 10 deletions(-)","diff":"diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h\nindex 9dbb07d4eff465428817831e55c6a4922b7208fb..f4622e28db3a1484553f51709b144ee769766a28 100644\n--- a/include/net/netns/ipv4.h\n+++ b/include/net/netns/ipv4.h\n@@ -141,6 +141,7 @@ struct netns_ipv4 {\n \tint sysctl_tcp_dsack;\n \tint sysctl_tcp_app_win;\n \tint sysctl_tcp_adv_win_scale;\n+\tint sysctl_tcp_frto;\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 0dc27cd248997bf6a0463477db38db483c312fb0..18f047501f53be3780bd41a5c8234adf9683cebf 100644\n--- a/include/net/tcp.h\n+++ b/include/net/tcp.h\n@@ -247,7 +247,6 @@ extern int sysctl_tcp_max_orphans;\n extern long sysctl_tcp_mem[3];\n extern int sysctl_tcp_wmem[3];\n extern int sysctl_tcp_rmem[3];\n-extern int sysctl_tcp_frto;\n extern int sysctl_tcp_nometrics_save;\n extern int sysctl_tcp_moderate_rcvbuf;\n extern int sysctl_tcp_tso_win_divisor;\ndiff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c\nindex a95123e1e7da706c88bf5553b7d8ef6c2653ab50..f1bcb9b7e082c6688fad12e15be9b872ebed8151 100644\n--- a/net/ipv4/sysctl_net_ipv4.c\n+++ b/net/ipv4/sysctl_net_ipv4.c\n@@ -437,13 +437,6 @@ static struct ctl_table ipv4_table[] = {\n \t\t.proc_handler\t= proc_dointvec_minmax,\n \t\t.extra1\t\t= &one,\n \t},\n-\t{\n-\t\t.procname\t= \"tcp_frto\",\n-\t\t.data\t\t= &sysctl_tcp_frto,\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_min_rtt_wlen\",\n \t\t.data\t\t= &sysctl_tcp_min_rtt_wlen,\n@@ -1145,6 +1138,13 @@ static struct ctl_table ipv4_net_table[] = {\n \t\t.extra1\t\t= &tcp_adv_win_scale_min,\n \t\t.extra2\t\t= &tcp_adv_win_scale_max,\n \t},\n+\t{\n+\t\t.procname\t= \"tcp_frto\",\n+\t\t.data\t\t= &init_net.ipv4.sysctl_tcp_frto,\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_input.c b/net/ipv4/tcp_input.c\nindex 8ee2c84b0bc67f943dbaea95d9433e82b9a7d082..90d76f1c8f96bc89618ddc59ae237a34cd25db7c 100644\n--- a/net/ipv4/tcp_input.c\n+++ b/net/ipv4/tcp_input.c\n@@ -83,7 +83,6 @@\n int sysctl_tcp_challenge_ack_limit = 1000;\n \n int sysctl_tcp_max_orphans __read_mostly = NR_FILE;\n-int sysctl_tcp_frto __read_mostly = 2;\n int sysctl_tcp_min_rtt_wlen __read_mostly = 300;\n int sysctl_tcp_moderate_rcvbuf __read_mostly = 1;\n int sysctl_tcp_invalid_ratelimit __read_mostly = HZ/2;\n@@ -2026,7 +2025,7 @@ void tcp_enter_loss(struct sock *sk)\n \t * falsely raise the receive window, which results in repeated\n \t * timeouts and stop-and-go behavior.\n \t */\n-\ttp->frto = sysctl_tcp_frto &&\n+\ttp->frto = net->ipv4.sysctl_tcp_frto &&\n \t\t (new_recovery || icsk->icsk_retransmits) &&\n \t\t !inet_csk(sk)->icsk_mtup.probe_size;\n }\ndiff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c\nindex 1fe30fb99308b3e3fd07509b509b0e3727cc5d44..49757c75821111c6d2cf413415be2c1b58482659 100644\n--- a/net/ipv4/tcp_ipv4.c\n+++ b/net/ipv4/tcp_ipv4.c\n@@ -2492,6 +2492,7 @@ static int __net_init tcp_sk_init(struct net *net)\n \tnet->ipv4.sysctl_tcp_dsack = 1;\n \tnet->ipv4.sysctl_tcp_app_win = 31;\n \tnet->ipv4.sysctl_tcp_adv_win_scale = 1;\n+\tnet->ipv4.sysctl_tcp_frto = 2;\n \n \tnet->ipv4.sysctl_tcp_fastopen = TFO_CLIENT_ENABLE;\n \tspin_lock_init(&net->ipv4.tcp_fastopen_ctx_lock);\n","prefixes":["v2","net-next","15/15"]}