{"id":831071,"url":"http://patchwork.ozlabs.org/api/1.2/patches/831071/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20171027045510.5827-2-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-2-edumazet@google.com>","list_archive_url":null,"date":"2017-10-27T04:54:56","name":"[v2,net-next,01/15] tcp: Namespace-ify sysctl_tcp_early_retrans","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"c92ea0e4bf9a251fa2733b67a2e1abe778aa07d7","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-2-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/831071/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/831071/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=\"QKi5brZ3\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3yNWlb1LTNz9t30\n\tfor ;\n\tFri, 27 Oct 2017 15:55:23 +1100 (AEDT)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751705AbdJ0EzU (ORCPT );\n\tFri, 27 Oct 2017 00:55:20 -0400","from mail-io0-f193.google.com ([209.85.223.193]:50682 \"EHLO\n\tmail-io0-f193.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1751283AbdJ0EzS (ORCPT\n\t); Fri, 27 Oct 2017 00:55:18 -0400","by mail-io0-f193.google.com with SMTP id 97so10123290iok.7\n\tfor ; Thu, 26 Oct 2017 21:55:18 -0700 (PDT)","from localhost ([2620:15c:2c4:201:c5be:583d:61a8:d070])\n\tby smtp.gmail.com with ESMTPSA id\n\tn132sm477504itn.25.2017.10.26.21.55.16\n\t(version=TLS1_2 cipher=AES128-SHA bits=128/128);\n\tThu, 26 Oct 2017 21:55:16 -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=ExiUgjzMuWPHjgSA9DgF9bPrUMquEYjgNjswy3NJHrw=;\n\tb=QKi5brZ3AOs8ekXSiQbFPOb1ttUO6OHOSgSlbXFJNmTPoWzpozbI3juydZlCqdGhH9\n\tfqw3HHj1MphrpaOuVUz5hVQ5GiXJ6DsFGfoenWQHXKwIaHG9s8PjTnP4lJ8qdDzlKqa4\n\t45Xry+ZuDnz1CgA327TYarkTL4xiCXkj8SYuKXlX64G7bE6SMPOhkCRnnxV0G0Ri46VI\n\tt8cw/DdrIUQ+rI4QlPakjS2LBC5/CRL5qwvs2xSWfMmkMAcCIBVfqAdZBeNaHavtbMb+\n\tn90cCByo8n1ytZ9AB7SNU7gOW28xRm0erhJQeLPdjBzmTOjXi5zuWYG/kTDryDWT4BHA\n\txzOg==","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=ExiUgjzMuWPHjgSA9DgF9bPrUMquEYjgNjswy3NJHrw=;\n\tb=ounGrx3oAGw3NSEXnMLz//LIayFjQ74iz8JPmfUxhsSxQui84rZD/3fmME2eFSRX4f\n\txn3S48sYLzNeaYSan/T4kf93OMAp+v1M7eD5C7thX/rN8ygfw4Prg8K6Iwc1djU+xyju\n\tpSPm7BbCsXO4tFrCRN6aQeQQHRdya/djx2qRSFqjX1KeZzgT+TGEOcLhlVDmFpXs2NQS\n\tgjKJaC1vPZUo5g7Ag+mCPIrIuFRhin5HOjSi3FkvU3tMixNphr0BgVyiMWCmIqGZtUh0\n\tpY7U0jrdD4YQFAl+YfsAAtJeUFobrXsGVYkbEo278/muYvDqGx/+Rm9gJyx7OcJymeAs\n\ttOMw==","X-Gm-Message-State":"AMCzsaVFNpcaYDhXKYHB2W79txLpuHFyH5GLT80EV6imBI8el5xsJIbx\n\teu8kwk41d+kkALeXCkJ9hDLu3A==","X-Google-Smtp-Source":"ABhQp+TZ3hQK9+sXRHJiUhEm9On4p0VEJY6+kWPyYIloQq3kUcaB+41YyWPeKUrqTvg+v9e08FZMWw==","X-Received":"by 10.36.204.70 with SMTP id x67mr1442794itf.133.1509080117333; \n\tThu, 26 Oct 2017 21:55:17 -0700 (PDT)","From":"Eric Dumazet ","To":"\"David S . Miller\" ","Cc":"netdev , Eric Dumazet ,\n\tEric Dumazet ","Subject":"[PATCH v2 net-next 01/15] tcp: Namespace-ify\n\tsysctl_tcp_early_retrans","Date":"Thu, 26 Oct 2017 21:54:56 -0700","Message-Id":"<20171027045510.5827-2-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 | 18 +++++++++---------\n net/ipv4/tcp_input.c | 1 -\n net/ipv4/tcp_ipv4.c | 1 +\n net/ipv4/tcp_output.c | 4 +++-\n 6 files changed, 14 insertions(+), 12 deletions(-)","diff":"diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h\nindex 2c4222a5d1025f5928665e10edb70fad65352dba..a7f39e3ea666a835b6042e4008c86ccaadd14b46 100644\n--- a/include/net/netns/ipv4.h\n+++ b/include/net/netns/ipv4.h\n@@ -128,6 +128,7 @@ struct netns_ipv4 {\n \tint sysctl_tcp_sack;\n \tint sysctl_tcp_window_scaling;\n \tint sysctl_tcp_timestamps;\n+\tint sysctl_tcp_early_retrans;\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 285bc82dea410b22ac585ee65daff5cbac7c3fc7..a12b71d4118baa6b939bdeba7380cb3830d46ff0 100644\n--- a/include/net/tcp.h\n+++ b/include/net/tcp.h\n@@ -265,7 +265,6 @@ 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-extern int sysctl_tcp_early_retrans;\n extern int sysctl_tcp_recovery;\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 81d218346cf7a0f340f964c434a21cace5c41fa0..f0f650f020afd535f41943c6c9fb1483be7cfb8d 100644\n--- a/net/ipv4/sysctl_net_ipv4.c\n+++ b/net/ipv4/sysctl_net_ipv4.c\n@@ -634,15 +634,6 @@ static struct ctl_table ipv4_table[] = {\n \t\t.mode = 0644,\n \t\t.proc_handler = proc_dointvec\n \t},\n-\t{\n-\t\t.procname\t= \"tcp_early_retrans\",\n-\t\t.data\t\t= &sysctl_tcp_early_retrans,\n-\t\t.maxlen\t\t= sizeof(int),\n-\t\t.mode\t\t= 0644,\n-\t\t.proc_handler\t= proc_dointvec_minmax,\n-\t\t.extra1\t\t= &zero,\n-\t\t.extra2\t\t= &four,\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 +1136,15 @@ 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_early_retrans\",\n+\t\t.data\t\t= &init_net.ipv4.sysctl_tcp_early_retrans,\n+\t\t.maxlen\t\t= sizeof(int),\n+\t\t.mode\t\t= 0644,\n+\t\t.proc_handler\t= proc_dointvec_minmax,\n+\t\t.extra1\t\t= &zero,\n+\t\t.extra2\t\t= &four,\n+\t},\n \t{ }\n };\n \ndiff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c\nindex 337f6011528a7d4c3ab7fdcc0623496cfefafc71..7656b1e6d5046297b4c5e6cf5591266b9be40095 100644\n--- a/net/ipv4/tcp_input.c\n+++ b/net/ipv4/tcp_input.c\n@@ -95,7 +95,6 @@ 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_early_retrans __read_mostly = 3;\n int sysctl_tcp_invalid_ratelimit __read_mostly = HZ/2;\n \n #define FLAG_DATA\t\t0x01 /* Incoming frame contained data.\t\t*/\ndiff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c\nindex 23a8100af5ad399d4fa2568f4cac19192a008055..7ab313f6768e234173d78f17cfb1f664b230e958 100644\n--- a/net/ipv4/tcp_ipv4.c\n+++ b/net/ipv4/tcp_ipv4.c\n@@ -2484,6 +2484,7 @@ static int __net_init tcp_sk_init(struct net *net)\n \tnet->ipv4.sysctl_tcp_sack = 1;\n \tnet->ipv4.sysctl_tcp_window_scaling = 1;\n \tnet->ipv4.sysctl_tcp_timestamps = 1;\n+\tnet->ipv4.sysctl_tcp_early_retrans = 3;\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 c8fc512e0bbb48f7d36e159e8aae56ec70a24498..21713836d46af9d48de10e8ec0e7410572ed7eeb 100644\n--- a/net/ipv4/tcp_output.c\n+++ b/net/ipv4/tcp_output.c\n@@ -2435,6 +2435,7 @@ bool tcp_schedule_loss_probe(struct sock *sk)\n \tstruct inet_connection_sock *icsk = inet_csk(sk);\n \tstruct tcp_sock *tp = tcp_sk(sk);\n \tu32 timeout, rto_delta_us;\n+\tint early_retrans;\n \n \t/* Don't do any loss probe on a Fast Open connection before 3WHS\n \t * finishes.\n@@ -2442,10 +2443,11 @@ bool tcp_schedule_loss_probe(struct sock *sk)\n \tif (tp->fastopen_rsk)\n \t\treturn false;\n \n+\tearly_retrans = sock_net(sk)->ipv4.sysctl_tcp_early_retrans;\n \t/* Schedule a loss probe in 2*RTT for SACK capable connections\n \t * in Open state, that are either limited by cwnd or application.\n \t */\n-\tif ((sysctl_tcp_early_retrans != 3 && sysctl_tcp_early_retrans != 4) ||\n+\tif ((early_retrans != 3 && early_retrans != 4) ||\n \t !tp->packets_out || !tcp_is_sack(tp) ||\n \t icsk->icsk_ca_state != TCP_CA_Open)\n \t\treturn false;\n","prefixes":["v2","net-next","01/15"]}