{"id":830985,"url":"http://patchwork.ozlabs.org/api/1.2/patches/830985/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20171026233526.6155-4-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-4-edumazet@google.com>","list_archive_url":null,"date":"2017-10-26T23:35:14","name":"[net-next,03/15] tcp: Namespace-ify sysctl_tcp_thin_linear_timeouts","commit_ref":null,"pull_url":null,"state":"changes-requested","archived":true,"hash":"25a9792f244995111701986521036945f65368a9","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-4-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/830985/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/830985/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=\"noFzWhtG\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3yNNfy0MZcz9t2S\n\tfor ;\n\tFri, 27 Oct 2017 10:35:54 +1100 (AEDT)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S932438AbdJZXfr (ORCPT );\n\tThu, 26 Oct 2017 19:35:47 -0400","from mail-pf0-f194.google.com ([209.85.192.194]:56672 \"EHLO\n\tmail-pf0-f194.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S932381AbdJZXfj (ORCPT\n\t); Thu, 26 Oct 2017 19:35:39 -0400","by mail-pf0-f194.google.com with SMTP id b85so3596882pfj.13\n\tfor ; Thu, 26 Oct 2017 16:35:39 -0700 (PDT)","from localhost ([2620:15c:2c4:201:c5be:583d:61a8:d070])\n\tby smtp.gmail.com with ESMTPSA id\n\tm1sm11801246pfk.54.2017.10.26.16.35.38\n\t(version=TLS1_2 cipher=AES128-SHA bits=128/128);\n\tThu, 26 Oct 2017 16:35:38 -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=C2EKTai6IpcsioIU07XDqTC5aJz//I2m1lEawOgKHy8=;\n\tb=noFzWhtGhfPzV7Q3AfL7DUIsv/iq4I7TJ/yTPQdt0CPQZagWBDACzxaOev1O1s+q8h\n\tNoFtr1fyqKipfSvw9gS8QOFea/VM317LSmcqbj3UVI1gXGCvK8nl26Uylh8WuUxxD01Z\n\txHmyUJdPcoLnINOeWE/nUx+tlwQt5GYItniqg21rBW8M7XG2v2pRAN2og9YAXIFmb/Y1\n\t1WjgOcVd3h7Ss7/sD4dK45KemXQoIEYeg9BkGlVboXtKHmSP9Nrx68GRepeJ1mhCCI0e\n\tjvW/INdxmXHBDp0/faK7XECMR+Af0A1VvFkuJYVQJ0vfstTy4iS2UIMgkQ8+NHeFXQc5\n\thw5A==","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=C2EKTai6IpcsioIU07XDqTC5aJz//I2m1lEawOgKHy8=;\n\tb=SCI9dEvu8W7q1Eeiw1Cy3R4wqhH9cWrcbwU3mR3t3odpWAdzV12u+9gqzyNXFrxypq\n\teh3U3PwibNz7Jo+uJcpYeET6grzgI5zva1f2zAUbfYSAcLyHzhygTOosMvwHAk4J6hfd\n\tE8k36NV2rg9AfQh0KCfX06lLaU6Az0WDgrMU9bHVwhhlo9PQhC0vHRjZZNWROSO8JyxW\n\tIv9RXHvtZLDWvLRzp2h0bHAXCJaQYyeidTDiZ11Q8VcBajuL0PW9UdYhoRITaNO8gJBv\n\ttQxry48assW1HU8RXL60KflwpPJbMoZjKQurpDo1AeSdCF8Guy8yP8YqhiNctZtnT/E9\n\tMA6g==","X-Gm-Message-State":"AMCzsaUfHBlU4jKpR+HKBWc8PW3RmDTvNLYyO7BhZqPBqr1zd9qVy8I8\n\t4rL0hzAI1aKX/AWdAvkO/un88Q==","X-Google-Smtp-Source":"ABhQp+QSGSSN9elNKb0lSPZaik/4BHqh2OC0EkMkDeTFhLeA14lCT17Nk6csLwyUTn0BofSItlJCKg==","X-Received":"by 10.101.72.199 with SMTP id o7mr6496175pgs.450.1509060938993; \n\tThu, 26 Oct 2017 16:35:38 -0700 (PDT)","From":"Eric Dumazet ","To":"\"David S . Miller\" ","Cc":"netdev , Eric Dumazet ,\n\tEric Dumazet ","Subject":"[PATCH net-next 03/15] tcp: Namespace-ify\n\tsysctl_tcp_thin_linear_timeouts","Date":"Thu, 26 Oct 2017 16:35:14 -0700","Message-Id":"<20171026233526.6155-4-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":"Note that sysctl_tcp_thin_dupack was not used, I deleted it.\n\nSigned-off-by: Eric Dumazet \n---\n include/net/netns/ipv4.h | 1 +\n include/net/tcp.h | 2 --\n net/ipv4/sysctl_net_ipv4.c | 14 +++++++-------\n net/ipv4/tcp_timer.c | 4 +---\n 4 files changed, 9 insertions(+), 12 deletions(-)","diff":"diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h\nindex d6ed718075d44cfc0e60995c1e938d588ad261a8..2a9f37b39c45fe451e45025790a4e5c45ece5cbc 100644\n--- a/include/net/netns/ipv4.h\n+++ b/include/net/netns/ipv4.h\n@@ -130,6 +130,7 @@ struct netns_ipv4 {\n \tint sysctl_tcp_timestamps;\n \tint sysctl_tcp_early_retrans;\n \tint sysctl_tcp_recovery;\n+\tint sysctl_tcp_thin_linear_timeouts;\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 469b4954beee8571ba8d930e852db8b1fef5eed3..8ef12bfe1a3a7083f1bbc924bc43a022a4057768 100644\n--- a/include/net/tcp.h\n+++ b/include/net/tcp.h\n@@ -260,8 +260,6 @@ 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-extern int sysctl_tcp_thin_linear_timeouts;\n-extern int sysctl_tcp_thin_dupack;\n \n #define TCP_RACK_LOSS_DETECTION 0x1 /* Use RACK to detect losses */\n \ndiff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c\nindex 78019adcae875a438264ee47723670f6b54cacf9..12003214f4d80b38d5f754ddd91be8a990168ade 100644\n--- a/net/ipv4/sysctl_net_ipv4.c\n+++ b/net/ipv4/sysctl_net_ipv4.c\n@@ -620,13 +620,6 @@ static struct ctl_table ipv4_table[] = {\n \t\t.mode\t\t= 0644,\n \t\t.proc_handler = proc_allowed_congestion_control,\n \t},\n-\t{\n-\t\t.procname = \"tcp_thin_linear_timeouts\",\n-\t\t.data = &sysctl_tcp_thin_linear_timeouts,\n-\t\t.maxlen = sizeof(int),\n-\t\t.mode = 0644,\n-\t\t.proc_handler = proc_dointvec\n-\t},\n \t{\n \t\t.procname\t= \"tcp_min_tso_segs\",\n \t\t.data\t\t= &sysctl_tcp_min_tso_segs,\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 = \"tcp_thin_linear_timeouts\",\n+\t\t.data = &init_net.ipv4.sysctl_tcp_thin_linear_timeouts,\n+\t\t.maxlen = sizeof(int),\n+\t\t.mode = 0644,\n+\t\t.proc_handler = proc_dointvec\n+\t},\n \t{ }\n };\n \ndiff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c\nindex 804a8d34ce86cc17472c918c00c25de88b85184f..035a1ef1f2d8462c1d19f364b599ffac538ef688 100644\n--- a/net/ipv4/tcp_timer.c\n+++ b/net/ipv4/tcp_timer.c\n@@ -22,8 +22,6 @@\n #include \n #include \n \n-int sysctl_tcp_thin_linear_timeouts __read_mostly;\n-\n /**\n * tcp_write_err() - close socket and save error info\n * @sk: The socket the error has appeared on.\n@@ -522,7 +520,7 @@ void tcp_retransmit_timer(struct sock *sk)\n \t * linear-timeout retransmissions into a black hole\n \t */\n \tif (sk->sk_state == TCP_ESTABLISHED &&\n-\t (tp->thin_lto || sysctl_tcp_thin_linear_timeouts) &&\n+\t (tp->thin_lto || net->ipv4.sysctl_tcp_thin_linear_timeouts) &&\n \t tcp_stream_is_thin(tp) &&\n \t icsk->icsk_retransmits <= TCP_THIN_LINEAR_RETRIES) {\n \t\ticsk->icsk_backoff = 0;\n","prefixes":["net-next","03/15"]}