{"id":831076,"url":"http://patchwork.ozlabs.org/api/1.2/patches/831076/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20171027045510.5827-8-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-8-edumazet@google.com>","list_archive_url":null,"date":"2017-10-27T04:55:02","name":"[v2,net-next,07/15] tcp: Namespace-ify sysctl_tcp_rfc1337","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"3ad1b15398f5b27cd764fae01e3f0c8ac646f54a","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-8-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/831076/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/831076/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=\"SaUrEjgW\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3yNWlt3hb8z9t30\n\tfor ;\n\tFri, 27 Oct 2017 15:55:38 +1100 (AEDT)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751990AbdJ0Ezg (ORCPT );\n\tFri, 27 Oct 2017 00:55:36 -0400","from mail-io0-f194.google.com ([209.85.223.194]:44541 \"EHLO\n\tmail-io0-f194.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1750930AbdJ0Eza (ORCPT\n\t); Fri, 27 Oct 2017 00:55:30 -0400","by mail-io0-f194.google.com with SMTP id m16so10138229iod.1\n\tfor ; Thu, 26 Oct 2017 21:55:30 -0700 (PDT)","from localhost ([2620:15c:2c4:201:c5be:583d:61a8:d070])\n\tby smtp.gmail.com with ESMTPSA id\n\te77sm471743itc.25.2017.10.26.21.55.29\n\t(version=TLS1_2 cipher=AES128-SHA bits=128/128);\n\tThu, 26 Oct 2017 21:55:29 -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=vqeuXdyG5xsdmztbBa/OTB0zQWiTJgHaIpZ/M3oK41M=;\n\tb=SaUrEjgWgMlUt4YTxxskLZ9A1IXZcVL+LOYvZPWnU3Jk+ixWTzUH+woyvCILL0kcx0\n\t9pvSfVpIPdN3encfophOJaQSBO59IxePU41dfD1CTs70HOw1rnMZbLuVY2+gnCLv0mtd\n\t1eD26wewGBoZybbVKGEMThC39XFLIRmSANFJbJZyDH/WMHWyxhIV9LaiHZwGGhbRozzg\n\t24QeM4NHjUi7RMuePYmJeElkt1w1Q52QvP8qAKZG41pyoZWjlG5JqoED7WOD35Q5RE9N\n\t7njdf1bS5iNGbSVHWfXKOh31Y7irl4u2wXt5PLCbrDGh+bLBjMBFv+/lUoXrJa3Y9gTv\n\tCj3w==","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=vqeuXdyG5xsdmztbBa/OTB0zQWiTJgHaIpZ/M3oK41M=;\n\tb=iFW7pRXwGeJCOljyfRpOfe4+7XOK3YGMqytqq83gZz475jhziznjYH3aitoP5J1KVO\n\thbp4FRhUrazAurz99rj73xmeT2GcCpWF89i5JCosn3ju+7MMmMHRUPulJoG5ooBSIcZ5\n\taoI8rxWQD3Fsk7L2ROUpmpFQbYc45sXQSX16IoOj/2IHff0XBVHyH0MaL+ge3p3dXGfL\n\t6rkFY9nb/quQdYii+uxGJHM+sfZnnfP5OsBbr/XDc0jVBcQDxbA5XAa6/XqvlRppnIqW\n\tjejIxWnAlXJtJzL8+/NJqqCYSCFja6oyXIZSY+go2Xhi658Oq2tLGqWOP/Fn6M3BnU6j\n\tg1Zw==","X-Gm-Message-State":"AMCzsaV8xo4hcWQfv+pohAxV1gJPLEdnSGtxOCStYnoqy8AF9rMbYkeh\n\tyxMkDY9Hx3CMb+NFrwdq5Qur8A==","X-Google-Smtp-Source":"ABhQp+QDdbDcQWibSiz8dr/vEUBEswkVVy+qc11+qLgC6q30PT7JNZKRKr55cX06nNioiixJWQfNbQ==","X-Received":"by 10.36.68.146 with SMTP id o140mr1645750ita.74.1509080129690; \n\tThu, 26 Oct 2017 21:55:29 -0700 (PDT)","From":"Eric Dumazet ","To":"\"David S . Miller\" ","Cc":"netdev , Eric Dumazet ,\n\tEric Dumazet ","Subject":"[PATCH v2 net-next 07/15] tcp: Namespace-ify sysctl_tcp_rfc1337","Date":"Thu, 26 Oct 2017 21:55:02 -0700","Message-Id":"<20171027045510.5827-8-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 | 1 -\n net/ipv4/tcp_minisocks.c | 2 +-\n 5 files changed, 9 insertions(+), 10 deletions(-)","diff":"diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h\nindex ffa2cf3dc747ca9443df3927dc7928c18357f872..968edce38eb5d3399724b3142277eab44f19f2fb 100644\n--- a/include/net/netns/ipv4.h\n+++ b/include/net/netns/ipv4.h\n@@ -134,6 +134,7 @@ struct netns_ipv4 {\n \tint sysctl_tcp_slow_start_after_idle;\n \tint sysctl_tcp_retrans_collapse;\n \tint sysctl_tcp_stdurg;\n+\tint sysctl_tcp_rfc1337;\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 cf3fac7008d791f2a01e4df9178164769a861c60..2aea2b3373b38dde9aabf869931448e9ecd38649 100644\n--- a/include/net/tcp.h\n+++ b/include/net/tcp.h\n@@ -243,7 +243,6 @@ void tcp_time_wait(struct sock *sk, int state, int timeo);\n \n \n /* sysctl variables for tcp */\n-extern int sysctl_tcp_rfc1337;\n extern int sysctl_tcp_abort_on_overflow;\n extern int sysctl_tcp_max_orphans;\n extern int sysctl_tcp_fack;\ndiff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c\nindex a34bb75815c15afc077ba7ff36939b5abc9229f6..832e554235df37770809541ad8f9f1ca2f201739 100644\n--- a/net/ipv4/sysctl_net_ipv4.c\n+++ b/net/ipv4/sysctl_net_ipv4.c\n@@ -400,13 +400,6 @@ static struct ctl_table ipv4_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_rfc1337\",\n-\t\t.data\t\t= &sysctl_tcp_rfc1337,\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= \"inet_peer_threshold\",\n \t\t.data\t\t= &inet_peer_threshold,\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_rfc1337\",\n+\t\t.data\t\t= &init_net.ipv4.sysctl_tcp_rfc1337,\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 14b06963c102dc8c747050448e504fc2e75a4eb4..64fde81b0eb70feccffd18a703e2b604e306ea65 100644\n--- a/net/ipv4/tcp_input.c\n+++ b/net/ipv4/tcp_input.c\n@@ -89,7 +89,6 @@ EXPORT_SYMBOL(sysctl_tcp_adv_win_scale);\n /* rfc5961 challenge ack rate limiting */\n int sysctl_tcp_challenge_ack_limit = 1000;\n \n-int sysctl_tcp_rfc1337 __read_mostly;\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;\ndiff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c\nindex 056009f1c14f13ac4af987d0a7451f32dbde0023..11836667763cf9a32c673086b6dc2d759833c856 100644\n--- a/net/ipv4/tcp_minisocks.c\n+++ b/net/ipv4/tcp_minisocks.c\n@@ -181,7 +181,7 @@ tcp_timewait_state_process(struct inet_timewait_sock *tw, struct sk_buff *skb,\n \t\t\t * Oh well... nobody has a sufficient solution to this\n \t\t\t * protocol bug yet.\n \t\t\t */\n-\t\t\tif (sysctl_tcp_rfc1337 == 0) {\n+\t\t\tif (twsk_net(tw)->ipv4.sysctl_tcp_rfc1337 == 0) {\n kill:\n \t\t\t\tinet_twsk_deschedule_put(tw);\n \t\t\t\treturn TCP_TW_SUCCESS;\n","prefixes":["v2","net-next","07/15"]}