{"id":831084,"url":"http://patchwork.ozlabs.org/api/1.2/patches/831084/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20171027045510.5827-9-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-9-edumazet@google.com>","list_archive_url":null,"date":"2017-10-27T04:55:03","name":"[v2,net-next,08/15] tcp: Namespace-ify sysctl_tcp_abort_on_overflow","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"2969942d757f9f91c4efcf55a01a01364315fbab","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-9-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/831084/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/831084/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=\"dm0k8vhB\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3yNWmY4kkZz9t34\n\tfor ;\n\tFri, 27 Oct 2017 15:56:13 +1100 (AEDT)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1752050AbdJ0E4M (ORCPT );\n\tFri, 27 Oct 2017 00:56:12 -0400","from mail-io0-f193.google.com ([209.85.223.193]:47957 \"EHLO\n\tmail-io0-f193.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1751901AbdJ0Ezc (ORCPT\n\t); Fri, 27 Oct 2017 00:55:32 -0400","by mail-io0-f193.google.com with SMTP id h70so10131813ioi.4\n\tfor ; Thu, 26 Oct 2017 21:55:32 -0700 (PDT)","from localhost ([2620:15c:2c4:201:c5be:583d:61a8:d070])\n\tby smtp.gmail.com with ESMTPSA id\n\tq191sm558541itb.1.2017.10.26.21.55.31\n\t(version=TLS1_2 cipher=AES128-SHA bits=128/128);\n\tThu, 26 Oct 2017 21:55:31 -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=3HPAPDNh6dEvIzXr6aqV8feKOz0OduJsluznb08h1Js=;\n\tb=dm0k8vhBU1gpjygTER5PvG4lcjdUOhsGDeHUTrdK+1/r74PobTUWTdFdIWK66hUfFO\n\tMZ/jOyNzPdpvZCdBixUlBiVqGhhGKprZ9rGzQ1jqA77xS15zH7IOCbQ+qcMnotk5ABOq\n\tXfL4vDHxZOtJXlENn+TqErD5ao874z39WAmiUbu+V00BeBEL49URnQZpmMSyi2lGIT1S\n\tdJ7aME6iOvnHedDa06J0DIokqObMXEEeojFpvh7HKZU00QGXv72URqFDhCXKX6ILoFnf\n\tG/vrAN6mdJYWPp5g6YdC0YLErC3yKXDU7NlCFaywKV7yO+2MsLM+0XHwgjPwZ3BgUW0t\n\t9VlA==","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=3HPAPDNh6dEvIzXr6aqV8feKOz0OduJsluznb08h1Js=;\n\tb=YUj6DolJ+K7iBL9AuiPJBJ2DxSBKc/FnLSvT1JMQykn8Gl6rBMNF/jnuXlhZXdZ7kD\n\tk0SWvIW27TRuEDY0tWH6EZ2t+f2VLg428uXfCWNGH78r+cNAhKpeWTorH8/95w0UrQoE\n\t+jw3YUM/stkGFwYADGdRVkpYXIayhfPwl9oVbgSS00BmR3iLimlFsFUGI1cCv5eQPeMQ\n\tQvILnXs9Cqlj75EQ5zx1Zv/LrnTanEoNpvTiKfOW9D84beZRXSSn/i/70OjR6W+oDUi7\n\t+1B2f5ZQRndEYLzm5zKooPlwo98X+gLc0sIAnzvHlmrsYIG2M/ExSgpP6t7Dw3FPifgW\n\t9+Hw==","X-Gm-Message-State":"AMCzsaXWsqRKyujr8070eTBmX0MP+L7a4ezqJ3RxWX1RyCcVrCNh2IOp\n\tevtUiOX9QOFe8Y3Nv/O6C4UqAW7nRpY=","X-Google-Smtp-Source":"ABhQp+S+O40ezmQ+pmScH0vSUE2THNM8g4uSUnCYAl1So5Zu7nDZLGnoeTaJatvc2jyTjMi4E3j/JQ==","X-Received":"by 10.36.245.11 with SMTP id k11mr1687782ith.0.1509080131751;\n\tThu, 26 Oct 2017 21:55:31 -0700 (PDT)","From":"Eric Dumazet ","To":"\"David S . Miller\" ","Cc":"netdev , Eric Dumazet ,\n\tEric Dumazet ","Subject":"[PATCH v2 net-next 08/15] tcp: Namespace-ify\n\tsysctl_tcp_abort_on_overflow","Date":"Thu, 26 Oct 2017 21:55:03 -0700","Message-Id":"<20171027045510.5827-9-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_minisocks.c | 4 +---\n 4 files changed, 9 insertions(+), 11 deletions(-)","diff":"diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h\nindex 968edce38eb5d3399724b3142277eab44f19f2fb..3875fdf6b18653477408beb25176eac849e65ba4 100644\n--- a/include/net/netns/ipv4.h\n+++ b/include/net/netns/ipv4.h\n@@ -135,6 +135,7 @@ struct netns_ipv4 {\n \tint sysctl_tcp_retrans_collapse;\n \tint sysctl_tcp_stdurg;\n \tint sysctl_tcp_rfc1337;\n+\tint sysctl_tcp_abort_on_overflow;\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 2aea2b3373b38dde9aabf869931448e9ecd38649..7331281a229289f130ad7b5c5ddec1eba1ea2747 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_abort_on_overflow;\n extern int sysctl_tcp_max_orphans;\n extern int sysctl_tcp_fack;\n extern int sysctl_tcp_reordering;\ndiff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c\nindex 832e554235df37770809541ad8f9f1ca2f201739..ffd1fd769bba7c3524aa6dfac734e1de0cad1506 100644\n--- a/net/ipv4/sysctl_net_ipv4.c\n+++ b/net/ipv4/sysctl_net_ipv4.c\n@@ -393,13 +393,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_abort_on_overflow\",\n-\t\t.data\t\t= &sysctl_tcp_abort_on_overflow,\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_abort_on_overflow\",\n+\t\t.data\t\t= &init_net.ipv4.sysctl_tcp_abort_on_overflow,\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_minisocks.c b/net/ipv4/tcp_minisocks.c\nindex 11836667763cf9a32c673086b6dc2d759833c856..3674d63170b293778d32abd34aa32043c001aa82 100644\n--- a/net/ipv4/tcp_minisocks.c\n+++ b/net/ipv4/tcp_minisocks.c\n@@ -29,8 +29,6 @@\n #include \n #include \n \n-int sysctl_tcp_abort_on_overflow __read_mostly;\n-\n static bool tcp_in_window(u32 seq, u32 end_seq, u32 s_win, u32 e_win)\n {\n \tif (seq == s_win)\n@@ -783,7 +781,7 @@ struct sock *tcp_check_req(struct sock *sk, struct sk_buff *skb,\n \treturn inet_csk_complete_hashdance(sk, child, req, own_req);\n \n listen_overflow:\n-\tif (!sysctl_tcp_abort_on_overflow) {\n+\tif (!sock_net(sk)->ipv4.sysctl_tcp_abort_on_overflow) {\n \t\tinet_rsk(req)->acked = 1;\n \t\treturn NULL;\n \t}\n","prefixes":["v2","net-next","08/15"]}