{"id":831078,"url":"http://patchwork.ozlabs.org/api/1.2/patches/831078/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20171027045510.5827-13-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-13-edumazet@google.com>","list_archive_url":null,"date":"2017-10-27T04:55:07","name":"[v2,net-next,12/15] tcp: Namespace-ify sysctl_tcp_dsack","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"192aef34284740ca72f09c9426214988df5df45c","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-13-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/831078/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/831078/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=\"Roy+EUbS\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3yNWm40byYz9t30\n\tfor ;\n\tFri, 27 Oct 2017 15:55:48 +1100 (AEDT)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1752026AbdJ0Ezq (ORCPT );\n\tFri, 27 Oct 2017 00:55:46 -0400","from mail-io0-f193.google.com ([209.85.223.193]:53475 \"EHLO\n\tmail-io0-f193.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1751997AbdJ0Ezk (ORCPT\n\t); Fri, 27 Oct 2017 00:55:40 -0400","by mail-io0-f193.google.com with SMTP id 189so10116363iow.10\n\tfor ; Thu, 26 Oct 2017 21:55:40 -0700 (PDT)","from localhost ([2620:15c:2c4:201:c5be:583d:61a8:d070])\n\tby smtp.gmail.com with ESMTPSA id\n\td16sm3039753iod.38.2017.10.26.21.55.39\n\t(version=TLS1_2 cipher=AES128-SHA bits=128/128);\n\tThu, 26 Oct 2017 21:55:39 -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=rWYTl0OCNObO+4/pA2vP+ioEY6tXb2rKyg7M3TAFkTk=;\n\tb=Roy+EUbSyScGYCQ2JZYV1dIZIznfrNR1lt9AFPWLrdhgaGhG92xEdkqLAsLmbZlaRb\n\t8KK6gnNgZSd4bfoM0y36UOy3Q8dnlSGzHEkgegjEqHuHTeKIfWvBimcfctqEb0ZcxsQE\n\tLhhefcy5YWVZF1rKcKhQQrN+8v975GxWihgTzL7H4gwpC44LzSd9wLRwyYYSJnQk0lBz\n\tcUvEjjD42PFhxcgEC0VrW3ZvpMrubBDRfSLyhoja1dO47ZDmWjyfZO5K3dTdJzLS9WHx\n\teKbgql4vglE+X3ieSCieUwjVOZzsWz3X6LUBC75pkWlKKoWMx3VExmjQ5E6wExZYtg43\n\tIKXw==","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=rWYTl0OCNObO+4/pA2vP+ioEY6tXb2rKyg7M3TAFkTk=;\n\tb=bila2hlKN1kap7UTk5lwKx5ptSh/KiX2Untq6XcZquxLMb3MaBOYhVAYa9kzJ9rty9\n\tphn024HfF2y/J0MDZroZv9/BK0FR7Y36mGSjdI8LYnaWK8/8idues8bWaMnjy6UjDFN/\n\tQ4Nj/L2XZgPTr0HktlayoLe2P07TAPh8SYcOYgMOk/VrKGOccKG+EAr2WH29SknVbQ/7\n\t5G8Ge1/sS/+cHMyfNdBAWmdy1ckVbIyRtLReqRqGEo9uwaWiC62yn8/+jrgWgUfVQI1G\n\t3i1UeoT8BBEsPBQguu2949Tx7gvj2hzjm+PuSCVPSwnBhiPaWAZNhFziPdTNsh1mx6Qn\n\ttzpw==","X-Gm-Message-State":"AMCzsaWQ4hf+C9I7a3+zRJ/jn2wmosEM9rdDHS+e0vi+O7NON1GysLMB\n\ts6K3qhQXN1OUIpfS7VqRVcl7BIrv4Xg=","X-Google-Smtp-Source":"ABhQp+RnOeFHWZGLLq4sUcbbNsWbGwHGcVqcIT8qhfKIq0GjeFI8rEHqRWUSOFAUd1IxxzadcQOqpQ==","X-Received":"by 10.107.11.27 with SMTP id v27mr33580202ioi.179.1509080140040; \n\tThu, 26 Oct 2017 21:55:40 -0700 (PDT)","From":"Eric Dumazet ","To":"\"David S . Miller\" ","Cc":"netdev , Eric Dumazet ,\n\tEric Dumazet ","Subject":"[PATCH v2 net-next 12/15] tcp: Namespace-ify sysctl_tcp_dsack","Date":"Thu, 26 Oct 2017 21:55:07 -0700","Message-Id":"<20171027045510.5827-13-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 | 5 ++---\n net/ipv4/tcp_ipv4.c | 1 +\n 5 files changed, 11 insertions(+), 11 deletions(-)","diff":"diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h\nindex 3f6844665a2fbe66fc0c91bd13e057ac2e03007a..956957a77db96ad3d231cc018c13503d615d8d2e 100644\n--- a/include/net/netns/ipv4.h\n+++ b/include/net/netns/ipv4.h\n@@ -138,6 +138,7 @@ struct netns_ipv4 {\n \tint sysctl_tcp_abort_on_overflow;\n \tint sysctl_tcp_fack;\n \tint sysctl_tcp_max_reordering;\n+\tint sysctl_tcp_dsack;\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 8cd286226a1eca27d97b9f182d1a951b072e4575..8b2ae3e8d79f223d4637226fc7278fe751d0b5d7 100644\n--- a/include/net/tcp.h\n+++ b/include/net/tcp.h\n@@ -244,7 +244,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_dsack;\n extern long sysctl_tcp_mem[3];\n extern int sysctl_tcp_wmem[3];\n extern int sysctl_tcp_rmem[3];\ndiff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c\nindex 18cd228a20690541936dd6b3d9bb02cb283a9740..7652a9c2a65d3f1cfa0a75d1198e1d9d56761c35 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_dsack\",\n-\t\t.data\t\t= &sysctl_tcp_dsack,\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_mem\",\n \t\t.maxlen\t\t= sizeof(sysctl_tcp_mem),\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_dsack\",\n+\t\t.data\t\t= &init_net.ipv4.sysctl_tcp_dsack,\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 c118657f06ee390053e38c35f03bea5b82845513..fd77037ac800a1153ec0ef904fcf00b93c061fa1 100644\n--- a/net/ipv4/tcp_input.c\n+++ b/net/ipv4/tcp_input.c\n@@ -79,7 +79,6 @@\n #include \n #include \n \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 EXPORT_SYMBOL(sysctl_tcp_adv_win_scale);\n@@ -4150,7 +4149,7 @@ static void tcp_dsack_set(struct sock *sk, u32 seq, u32 end_seq)\n {\n \tstruct tcp_sock *tp = tcp_sk(sk);\n \n-\tif (tcp_is_sack(tp) && sysctl_tcp_dsack) {\n+\tif (tcp_is_sack(tp) && sock_net(sk)->ipv4.sysctl_tcp_dsack) {\n \t\tint mib_idx;\n \n \t\tif (before(seq, tp->rcv_nxt))\n@@ -4185,7 +4184,7 @@ static void tcp_send_dupack(struct sock *sk, const struct sk_buff *skb)\n \t\tNET_INC_STATS(sock_net(sk), LINUX_MIB_DELAYEDACKLOST);\n \t\ttcp_enter_quickack_mode(sk);\n \n-\t\tif (tcp_is_sack(tp) && sysctl_tcp_dsack) {\n+\t\tif (tcp_is_sack(tp) && sock_net(sk)->ipv4.sysctl_tcp_dsack) {\n \t\t\tu32 end_seq = TCP_SKB_CB(skb)->end_seq;\n \n \t\t\tif (after(TCP_SKB_CB(skb)->end_seq, tp->rcv_nxt))\ndiff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c\nindex c379a242abb3546044da9a3ef032f6f68acafe88..d9d4d191e8f3c962a6ee68015ffe5a6e7fb8e9c1 100644\n--- a/net/ipv4/tcp_ipv4.c\n+++ b/net/ipv4/tcp_ipv4.c\n@@ -2489,6 +2489,7 @@ static int __net_init tcp_sk_init(struct net *net)\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+\tnet->ipv4.sysctl_tcp_dsack = 1;\n \n \tnet->ipv4.sysctl_tcp_fastopen = TFO_CLIENT_ENABLE;\n \tspin_lock_init(&net->ipv4.tcp_fastopen_ctx_lock);\n","prefixes":["v2","net-next","12/15"]}