{"id":830996,"url":"http://patchwork.ozlabs.org/api/1.2/patches/830996/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20171026233526.6155-10-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-10-edumazet@google.com>","list_archive_url":null,"date":"2017-10-26T23:35:20","name":"[net-next,09/15] tcp: Namespace-ify sysctl_tcp_fack","commit_ref":null,"pull_url":null,"state":"changes-requested","archived":true,"hash":"c264aceefcb58a31b8e08824c76774bb6a3bd4b3","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-10-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/830996/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/830996/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=\"M1SAxB9R\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3yNNgj0G4Nz9t2d\n\tfor ;\n\tFri, 27 Oct 2017 10:36:33 +1100 (AEDT)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S932506AbdJZXgb (ORCPT );\n\tThu, 26 Oct 2017 19:36:31 -0400","from mail-pf0-f194.google.com ([209.85.192.194]:49693 \"EHLO\n\tmail-pf0-f194.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S932396AbdJZXfy (ORCPT\n\t); Thu, 26 Oct 2017 19:35:54 -0400","by mail-pf0-f194.google.com with SMTP id i5so3609372pfe.6\n\tfor ; Thu, 26 Oct 2017 16:35:54 -0700 (PDT)","from localhost ([2620:15c:2c4:201:c5be:583d:61a8:d070])\n\tby smtp.gmail.com with ESMTPSA id\n\tj12sm12528072pfe.160.2017.10.26.16.35.53\n\t(version=TLS1_2 cipher=AES128-SHA bits=128/128);\n\tThu, 26 Oct 2017 16:35:53 -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=p5ZxuojtBhddt/ocdY1aULmoEzEw/TglqtcQcGoU2aY=;\n\tb=M1SAxB9RCrWYhQZFSTORholoD2WQWYPLBiw2MTGtXvHuCEXXOQMUiPqG2y+NWwn2io\n\tg28EycrBse+qG9GgU3z13m1pavc8FMcQoJrE1/YjquSL8e9kYp2izDEAaV2K4NbsUlZM\n\tKVab76BFPSpT81rT3Sq9S4+9QqxIh8DzzDMqWfJYOed5V/o6gK6iHzPTXsEqr83C+nUu\n\tuTi9hHa2029zolfEk/hdIp4bO1cvnvXYvp565XWOJcuqs96ahawq1WfgG6SJ+9JiLfsg\n\tuUN3crHbqPZjY/gCKAeQ1iaESX+/nWSUbmdi+2bN/jCICXv8J6MZsA5bHV3S0hsb4mIz\n\tiyUg==","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=p5ZxuojtBhddt/ocdY1aULmoEzEw/TglqtcQcGoU2aY=;\n\tb=kYA75b4fwo9jjlW/qOCTqa66FIoUdk6FdAuNsJ6HXu4hR8KZRyzLQba35snvtjzdEG\n\t0cEkarudTRFxxxCCyG2pp1e/LYme5KG2aIVwPJBSx8S+sAuxWDIBfONJAupcxzbjrVR5\n\tD9BQnfvLPhkbvvi3DRxwveUJfbHS8LDp14A0L1U2drEBqyH2ckyvLDYJ4A32YakYirMR\n\tcM8ELYLXJGt/0fyqzVm3UUG61E30SJHsukSQQgfKo6vMrcvMPBkI7bg7GH/n1Fzb06RN\n\tUhZ9LFDYFWrOehKWobOHVsjmNl9BVVigi0Tor3KWGnKzd3BkHq2Rti/wenMXpH4vN2Mu\n\tyIFQ==","X-Gm-Message-State":"AMCzsaXwlIX5jtquBDrp9Kom7vpw6a8trFRamGDKe5eacmkPjA5hOzR4\n\tpifzlwRWyxLALZqB8SpD1+1fh+JW9FQ=","X-Google-Smtp-Source":"ABhQp+TWTf/Mx9g09ekdKBNrTvr9NOj7rCbJQC4dfOC5YnVeec2S/SwFluLJKXoLn+TErgqXQBQk8g==","X-Received":"by 10.84.247.129 with SMTP id o1mr5410568pll.6.1509060953885;\n\tThu, 26 Oct 2017 16:35:53 -0700 (PDT)","From":"Eric Dumazet ","To":"\"David S . Miller\" ","Cc":"netdev , Eric Dumazet ,\n\tEric Dumazet ","Subject":"[PATCH net-next 09/15] tcp: Namespace-ify sysctl_tcp_fack","Date":"Thu, 26 Oct 2017 16:35:20 -0700","Message-Id":"<20171026233526.6155-10-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.c | 2 +-\n net/ipv4/tcp_input.c | 3 +--\n net/ipv4/tcp_minisocks.c | 2 +-\n 6 files changed, 11 insertions(+), 12 deletions(-)","diff":"diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h\nindex 3875fdf6b18653477408beb25176eac849e65ba4..f0e792beeea974b0850090d7624a3d7490124067 100644\n--- a/include/net/netns/ipv4.h\n+++ b/include/net/netns/ipv4.h\n@@ -136,6 +136,7 @@ struct netns_ipv4 {\n \tint sysctl_tcp_stdurg;\n \tint sysctl_tcp_rfc1337;\n \tint sysctl_tcp_abort_on_overflow;\n+\tint sysctl_tcp_fack;\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 e28471ce52bd815346676931075588d59306a441..38504d5ab109454219ac9570c3b11e02733384c1 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_fack;\n extern int sysctl_tcp_reordering;\n extern int sysctl_tcp_max_reordering;\n extern int sysctl_tcp_dsack;\ndiff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c\nindex ffd1fd769bba7c3524aa6dfac734e1de0cad1506..1f23be13ce7be8b2a12b82aada36c6351fdfb70a 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_fack\",\n-\t\t.data\t\t= &sysctl_tcp_fack,\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_max_reordering\",\n \t\t.data\t\t= &sysctl_tcp_max_reordering,\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_fack\",\n+\t\t.data\t\t= &init_net.ipv4.sysctl_tcp_fack,\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.c b/net/ipv4/tcp.c\nindex 8f36277e82e9dbea750ce66b73018a81b30b5156..4a777ba113b9afe118e3020da65878d85848e1cb 100644\n--- a/net/ipv4/tcp.c\n+++ b/net/ipv4/tcp.c\n@@ -2511,7 +2511,7 @@ static int tcp_repair_options_est(struct sock *sk,\n \t\t\t\treturn -EINVAL;\n \n \t\t\ttp->rx_opt.sack_ok |= TCP_SACK_SEEN;\n-\t\t\tif (sysctl_tcp_fack)\n+\t\t\tif (sock_net(sk)->ipv4.sysctl_tcp_fack)\n \t\t\t\ttcp_enable_fack(tp);\n \t\t\tbreak;\n \t\tcase TCPOPT_TIMESTAMP:\ndiff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c\nindex d2d3f62387a98d7f955f8c9e27320b9722035b2a..8941fc32072b69fedcb01afbe837f4d7791dd28d 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_fack __read_mostly;\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@@ -5690,7 +5689,7 @@ static int tcp_rcv_synsent_state_process(struct sock *sk, struct sk_buff *skb,\n \t\t\ttp->tcp_header_len = sizeof(struct tcphdr);\n \t\t}\n \n-\t\tif (tcp_is_sack(tp) && sysctl_tcp_fack)\n+\t\tif (tcp_is_sack(tp) && sock_net(sk)->ipv4.sysctl_tcp_fack)\n \t\t\ttcp_enable_fack(tp);\n \n \t\ttcp_sync_mss(sk, icsk->icsk_pmtu_cookie);\ndiff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c\nindex a79a89fdb558a5d66ec5241fdb8bfcab196c744d..eba61f77bc36e4f49580d15840c15af565b8b479 100644\n--- a/net/ipv4/tcp_minisocks.c\n+++ b/net/ipv4/tcp_minisocks.c\n@@ -491,7 +491,7 @@ struct sock *tcp_create_openreq_child(const struct sock *sk,\n \n \t\tnewtp->rx_opt.tstamp_ok = ireq->tstamp_ok;\n \t\tif ((newtp->rx_opt.sack_ok = ireq->sack_ok) != 0) {\n-\t\t\tif (sysctl_tcp_fack)\n+\t\t\tif (sock_net(sk)->ipv4.sysctl_tcp_fack)\n \t\t\t\ttcp_enable_fack(newtp);\n \t\t}\n \t\tnewtp->window_clamp = req->rsk_window_clamp;\n","prefixes":["net-next","09/15"]}