{"id":831075,"url":"http://patchwork.ozlabs.org/api/1.2/patches/831075/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20171027045510.5827-7-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-7-edumazet@google.com>","list_archive_url":null,"date":"2017-10-27T04:55:01","name":"[v2,net-next,06/15] tcp: Namespace-ify sysctl_tcp_stdurg","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"97907cc3db629ef6bb2eee7d02642b7babf114e7","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-7-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/831075/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/831075/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=\"fzTxjJQX\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3yNWlq5099z9t30\n\tfor ;\n\tFri, 27 Oct 2017 15:55:35 +1100 (AEDT)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751980AbdJ0Ezd (ORCPT );\n\tFri, 27 Oct 2017 00:55:33 -0400","from mail-io0-f193.google.com ([209.85.223.193]:46670 \"EHLO\n\tmail-io0-f193.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1751932AbdJ0Ez2 (ORCPT\n\t); Fri, 27 Oct 2017 00:55:28 -0400","by mail-io0-f193.google.com with SMTP id 101so10132041ioj.3\n\tfor ; Thu, 26 Oct 2017 21:55:28 -0700 (PDT)","from localhost ([2620:15c:2c4:201:c5be:583d:61a8:d070])\n\tby smtp.gmail.com with ESMTPSA id\n\te142sm474063ite.28.2017.10.26.21.55.27\n\t(version=TLS1_2 cipher=AES128-SHA bits=128/128);\n\tThu, 26 Oct 2017 21:55:27 -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=OaE2WPDTHp2Plib4PtOPlB15GFirnp/VzZoIbERFHx4=;\n\tb=fzTxjJQXwGjywMW7iSTZVK9z7RyhcPHyKugCCbXSNnWO/fOgXtJtdJl/G0BRKKc/id\n\tQYV5lrtjex8QeHiCERzBjRx7pGsGewUDNwMcxePSjtCSF5PfZ+O2UL5ch/vk0EIs5HUG\n\tR+Ghkcfz7xxc1Ut7OKRuFOKeQQHZVsOBR7mwYOFIag4HkabSWkjl3gFnyVHy8u1Hw/zX\n\tSSeQjzIqCr99Hmr3ghUCn8UNdrQWWGw24aqPSCUN+sqN8D63Xt3mcngVcoerjv1evYte\n\tx5HLLFXg21Pj4xb5So/fKAM9G2wMSy3RGr//h6Lzj/W5VEoU3K72U7vNJwq6s6aIIvzF\n\txAsw==","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=OaE2WPDTHp2Plib4PtOPlB15GFirnp/VzZoIbERFHx4=;\n\tb=IMii5pArNJnB5eLoC2hR/3VtTLzkkwmgJ7IFuUXre97jenc9e2X0HgeyP67rBNrkfm\n\tny0ZLZwCvGV+8Bpj2ziYrndwKpotye3hqrUoQDfNBct0Fs7dvyqc4l9xxrXRhQWiR+My\n\te29qIM7/wXgiINuT6ST76awYNhrORbJzsb8s+08HijaUNs/SjrgJSLwj4ptHMqQqraTU\n\tVuRR8OhL9sKwHDvHZmMG50SPto3pO2m7yKH5u3cK1hNEZYkwFOEsLREL20yvaXM/nUmD\n\ttNTal6l0k7C3PHQywrrATEigYFbeJk8q4waplElxOvbU/Lh+fa6miJsQyrD/L37yrSJY\n\tW8aA==","X-Gm-Message-State":"AMCzsaVMRdG9BmY0Z7bFScqJfGe6a2w1aJfmNIMDQOOqZGPmlpzHQuPN\n\tMRL9mNCBMOGzNwwvm4rXj0CdRQ==","X-Google-Smtp-Source":"ABhQp+TGYjZMPalrPd/1C11GtJfO+Lh+rIK4qBEkg8zywCDDgLV9fbRTZ4Lsh9EeDyQRhRfZ5/qSBw==","X-Received":"by 10.107.3.193 with SMTP id e62mr34469352ioi.88.1509080127771; \n\tThu, 26 Oct 2017 21:55:27 -0700 (PDT)","From":"Eric Dumazet ","To":"\"David S . Miller\" ","Cc":"netdev , Eric Dumazet ,\n\tEric Dumazet ","Subject":"[PATCH v2 net-next 06/15] tcp: Namespace-ify sysctl_tcp_stdurg","Date":"Thu, 26 Oct 2017 21:55:01 -0700","Message-Id":"<20171027045510.5827-7-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 | 3 +--\n 4 files changed, 9 insertions(+), 10 deletions(-)","diff":"diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h\nindex b28c172b10e497f235b51aae0fc2d3bbf7cc51f3..ffa2cf3dc747ca9443df3927dc7928c18357f872 100644\n--- a/include/net/netns/ipv4.h\n+++ b/include/net/netns/ipv4.h\n@@ -133,6 +133,7 @@ struct netns_ipv4 {\n \tint sysctl_tcp_thin_linear_timeouts;\n \tint sysctl_tcp_slow_start_after_idle;\n \tint sysctl_tcp_retrans_collapse;\n+\tint sysctl_tcp_stdurg;\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 33cc86355b8ff9b506d21ad46cfc01b3916f5b61..cf3fac7008d791f2a01e4df9178164769a861c60 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_stdurg;\n extern int sysctl_tcp_rfc1337;\n extern int sysctl_tcp_abort_on_overflow;\n extern int sysctl_tcp_max_orphans;\ndiff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c\nindex 533b92ad39dd0cada542028fe2f276d9eebcd2c8..a34bb75815c15afc077ba7ff36939b5abc9229f6 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_stdurg\",\n-\t\t.data\t\t= &sysctl_tcp_stdurg,\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_rfc1337\",\n \t\t.data\t\t= &sysctl_tcp_rfc1337,\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_stdurg\",\n+\t\t.data\t\t= &init_net.ipv4.sysctl_tcp_stdurg,\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 5b2272dbf6a9a507d62d8ee594fab53284b22a6d..14b06963c102dc8c747050448e504fc2e75a4eb4 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_stdurg __read_mostly;\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@@ -5123,7 +5122,7 @@ static void tcp_check_urg(struct sock *sk, const struct tcphdr *th)\n \tstruct tcp_sock *tp = tcp_sk(sk);\n \tu32 ptr = ntohs(th->urg_ptr);\n \n-\tif (ptr && !sysctl_tcp_stdurg)\n+\tif (ptr && !sock_net(sk)->ipv4.sysctl_tcp_stdurg)\n \t\tptr--;\n \tptr += ntohl(th->seq);\n \n","prefixes":["v2","net-next","06/15"]}