{"id":830990,"url":"http://patchwork.ozlabs.org/api/1.2/patches/830990/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20171026233526.6155-12-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-12-edumazet@google.com>","list_archive_url":null,"date":"2017-10-26T23:35:22","name":"[net-next,11/15] tcp: Namespace-ify sysctl_tcp_max_reordering","commit_ref":null,"pull_url":null,"state":"changes-requested","archived":true,"hash":"2c2244b4a72c4a33696380c25d6047d5edcb041c","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-12-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/830990/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/830990/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=\"UGLZPGTL\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3yNNgF4W6yz9t2S\n\tfor ;\n\tFri, 27 Oct 2017 10:36:09 +1100 (AEDT)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S932487AbdJZXgH (ORCPT );\n\tThu, 26 Oct 2017 19:36:07 -0400","from mail-pf0-f196.google.com ([209.85.192.196]:55204 \"EHLO\n\tmail-pf0-f196.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S932442AbdJZXgA (ORCPT\n\t); Thu, 26 Oct 2017 19:36:00 -0400","by mail-pf0-f196.google.com with SMTP id n89so3597229pfk.11\n\tfor ; Thu, 26 Oct 2017 16:36:00 -0700 (PDT)","from localhost ([2620:15c:2c4:201:c5be:583d:61a8:d070])\n\tby smtp.gmail.com with ESMTPSA id\n\tq70sm14037636pfj.39.2017.10.26.16.35.57\n\t(version=TLS1_2 cipher=AES128-SHA bits=128/128);\n\tThu, 26 Oct 2017 16:35:57 -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=Wmjnc5fL09b6RAMVcFPe41hCxYitgKPRSe4g7BypnrM=;\n\tb=UGLZPGTLejMzgbrL8s+Viv09QhzuoMxfP7XU9Z/NCvOESgaXKI3Sa4NWagjReuLOj/\n\tD+Ooip84orUK+MU+dX0AXdfNt99NWBlL6qq6wrKi9yIaZHYUrDtFwF6skzElvGV49t+z\n\tBIPTLGuUc+M/7JsZjgROL7MEA9UNT9pSnh4n1W+++rezVMwLBaevTGGkjjXo+JG4XgKK\n\t39q5my1oimRNKoICCTrhvPb8Yas6CqBSYnye/XKcwQ9ELOGZW3T0SdrB30ManWCAEvwU\n\txckaxrU3FQSO5utvM4VrDAcvl0QL3TuzIKZeEouX8D498W9a5uz5ncyG1OFJ8RwU4FYK\n\t/d/Q==","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=Wmjnc5fL09b6RAMVcFPe41hCxYitgKPRSe4g7BypnrM=;\n\tb=MqlGYeBaY0oW7BWasz9vbkJOCQ9TR+ZnV1zmxWXRDNLb/84LvTkCOPAFtrH6GwMetx\n\t/9cWhHpxVF9FV38tj8eBK6V/xAl/fpTisCH8t8DIRML9cZ3lvrlOhGvUvty2ap2gUW1I\n\tvxrfQwUUW10FBWXpHVbXUpNlRM779h65Cy+SGATATA5byGfaYAOr4P9aXLOHivAeJPJA\n\tJVny8BclfzYZTFfWLqlpU5inLsiidGBGB/XI235K41Ua2Y5exBedPh1pL2lnPzrn1+3Z\n\tU17cTGLqBYcFHq7CX5HwN7sAdfZIdD7vduz+IzjvZVFpVI+L6rVgc9/wUz+r7oGSl4Jf\n\thWaw==","X-Gm-Message-State":"AMCzsaVyafQTR5PlhGoVCU2cF3Td5t0HHfmpGEnINUBkp9DADXWLNFkZ\n\tLs/0jo5p13x0jUv7Bc8UlU+nKIkkExY=","X-Google-Smtp-Source":"ABhQp+RFB3rfcXVF5TBeODzxikzBnz0td3a6hqE2OrEETG7Lvocye06pHxYEl8gdhI1LZIfoi6LL3Q==","X-Received":"by 10.99.106.71 with SMTP id f68mr6346621pgc.449.1509060958287; \n\tThu, 26 Oct 2017 16:35:58 -0700 (PDT)","From":"Eric Dumazet ","To":"\"David S . Miller\" ","Cc":"netdev , Eric Dumazet ,\n\tEric Dumazet ","Subject":"[PATCH net-next 11/15] tcp: Namespace-ify sysctl_tcp_max_reordering","Date":"Thu, 26 Oct 2017 16:35:22 -0700","Message-Id":"<20171026233526.6155-12-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 | 1 -\n net/ipv4/sysctl_net_ipv4.c | 14 +++++++-------\n net/ipv4/tcp_input.c | 3 +--\n net/ipv4/tcp_ipv4.c | 2 ++\n 5 files changed, 11 insertions(+), 10 deletions(-)","diff":"diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h\nindex f0e792beeea974b0850090d7624a3d7490124067..3f6844665a2fbe66fc0c91bd13e057ac2e03007a 100644\n--- a/include/net/netns/ipv4.h\n+++ b/include/net/netns/ipv4.h\n@@ -137,6 +137,7 @@ struct netns_ipv4 {\n \tint sysctl_tcp_rfc1337;\n \tint sysctl_tcp_abort_on_overflow;\n \tint sysctl_tcp_fack;\n+\tint sysctl_tcp_max_reordering;\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 c912d63839e7cd4b6ad009344e8017de4c0b1483..2b559c7bf16c70864e77a34c78479d01f538d6cd 100644\n--- a/include/net/tcp.h\n+++ b/include/net/tcp.h\n@@ -241,7 +241,6 @@ void tcp_time_wait(struct sock *sk, int state, int timeo);\n \n /* sysctl variables for tcp */\n extern int sysctl_tcp_max_orphans;\n-extern int sysctl_tcp_max_reordering;\n extern int sysctl_tcp_dsack;\n extern long sysctl_tcp_mem[3];\n extern int sysctl_tcp_wmem[3];\ndiff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c\nindex 1f23be13ce7be8b2a12b82aada36c6351fdfb70a..18cd228a20690541936dd6b3d9bb02cb283a9740 100644\n--- a/net/ipv4/sysctl_net_ipv4.c\n+++ b/net/ipv4/sysctl_net_ipv4.c\n@@ -414,13 +414,6 @@ static struct ctl_table ipv4_table[] = {\n \t\t.mode\t\t= 0644,\n \t\t.proc_handler\t= proc_dointvec_jiffies,\n \t},\n-\t{\n-\t\t.procname\t= \"tcp_max_reordering\",\n-\t\t.data\t\t= &sysctl_tcp_max_reordering,\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_dsack\",\n \t\t.data\t\t= &sysctl_tcp_dsack,\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_max_reordering\",\n+\t\t.data\t\t= &init_net.ipv4.sysctl_tcp_max_reordering,\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 8941fc32072b69fedcb01afbe837f4d7791dd28d..bd6abf9a6d5a0f7a85384a259d61a34c4170eb50 100644\n--- a/net/ipv4/tcp_input.c\n+++ b/net/ipv4/tcp_input.c\n@@ -77,7 +77,6 @@\n #include \n #include \n \n-int sysctl_tcp_max_reordering __read_mostly = 300;\n int sysctl_tcp_dsack __read_mostly = 1;\n int sysctl_tcp_app_win __read_mostly = 31;\n int sysctl_tcp_adv_win_scale __read_mostly = 1;\n@@ -887,7 +886,7 @@ static void tcp_update_reordering(struct sock *sk, const int metric,\n \t\treturn;\n \n \tif (metric > tp->reordering) {\n-\t\ttp->reordering = min(sysctl_tcp_max_reordering, metric);\n+\t\ttp->reordering = min(sock_net(sk)->ipv4.sysctl_tcp_max_reordering, metric);\n \n #if FASTRETRANS_DEBUG > 1\n \t\tpr_debug(\"Disorder%d %d %u f%u s%u rr%d\\n\",\ndiff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c\nindex 2bc6ba2059d32aa848dbc415b4b0e194b61b0268..c379a242abb3546044da9a3ef032f6f68acafe88 100644\n--- a/net/ipv4/tcp_ipv4.c\n+++ b/net/ipv4/tcp_ipv4.c\n@@ -2488,6 +2488,8 @@ static int __net_init tcp_sk_init(struct net *net)\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 \tnet->ipv4.sysctl_tcp_retrans_collapse = 1;\n+\tnet->ipv4.sysctl_tcp_max_reordering = 300;\n+\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;\n","prefixes":["net-next","11/15"]}