{"id":830987,"url":"http://patchwork.ozlabs.org/api/1.2/patches/830987/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20171026233526.6155-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":"<20171026233526.6155-9-edumazet@google.com>","list_archive_url":null,"date":"2017-10-26T23:35:19","name":"[net-next,08/15] tcp: Namespace-ify sysctl_tcp_abort_on_overflow","commit_ref":null,"pull_url":null,"state":"changes-requested","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/20171026233526.6155-9-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/830987/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/830987/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=\"V11WQSbK\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3yNNg26Bt8z9sxR\n\tfor ;\n\tFri, 27 Oct 2017 10:35:58 +1100 (AEDT)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S932465AbdJZXf4 (ORCPT );\n\tThu, 26 Oct 2017 19:35:56 -0400","from mail-pg0-f66.google.com ([74.125.83.66]:57155 \"EHLO\n\tmail-pg0-f66.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S932442AbdJZXfw (ORCPT\n\t); Thu, 26 Oct 2017 19:35:52 -0400","by mail-pg0-f66.google.com with SMTP id m18so3876262pgd.13\n\tfor ; Thu, 26 Oct 2017 16:35:52 -0700 (PDT)","from localhost ([2620:15c:2c4:201:c5be:583d:61a8:d070])\n\tby smtp.gmail.com with ESMTPSA id\n\tm195sm12198596pga.13.2017.10.26.16.35.50\n\t(version=TLS1_2 cipher=AES128-SHA bits=128/128);\n\tThu, 26 Oct 2017 16:35:50 -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=x0ivg02Q+GU0HiD6QeuVQBwKo/16/Q3cqIG4tnm2SJ4=;\n\tb=V11WQSbKJ5V6/O7CQNi0KKbCsfdBgL81ZJaw85m88KXyAjsJAP79ku3SMUn0WH4QdY\n\txBjt//2xWzrDrJv3haJFlj3E9FKkYRoYEFkRY0zo+WkyO2xNtWrGMzvB1plv9dw4FwTe\n\tOWyZ8fUI+u2a9dXDjwdyCWQ1YMS1ljSlLxTR8uXI4FsMD2S8hSiY+Ydx5QhT/wLwJFHg\n\tHR/pHR0HVTjIHTxoQTMFXQsaiVOjcUlMcQgbikwIjY8kLEDcC2TdPUeckwfXs98rc0vT\n\t8e6A0rTybhGJyq70PaE3OAs5w4YdIKWofuWF1Hbq8lpRjHdX9A2ZF4FpcTZ579floe6Y\n\teoNA==","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=x0ivg02Q+GU0HiD6QeuVQBwKo/16/Q3cqIG4tnm2SJ4=;\n\tb=iqNaPnM8gVkb3XvVwNCfQW0AA/p0FxQb6wrzXRLU1pJqrIGRSse8Jw1bvvMnw8q6FU\n\tdGP6LIG+rZVMLyX0Ps3xZpBe9+wWFDINo5FXqaE+kycJuI5WyvpW0/eMSJpkb+Vt5OIU\n\taO0vcZH8NFHD/ajTYKvx178uyqOOzxhXUEgF4sl1b+qbGjHTvqjQC8NNmtqIFqX+78y2\n\tydY9PvVr2Eya6+HFKh/GgQEgxMjFxmsVPRbPX123ymmW4gL0FcsUmA14eSnn+wEdadWd\n\tE73FPxL2KN8/vlSx7mspo+jBBROifWKMjpQicDgeUMQKPP++aBivyvb5oTPcOZHMSxBL\n\tAPRQ==","X-Gm-Message-State":"AMCzsaVZAycehlCoZPkAl5/jkVIY00Q5RXkLs37iK+ueCtRJJyDEhrDt\n\tylv46s7NwVd9Dx+oDGC1AJpC/w==","X-Google-Smtp-Source":"ABhQp+TBGFDi3Tgvx1x4YhEH/t8Yj3sY7WFYEs8DdHQGa4pO3I3ENGqw7E46UqtEo4Of/nm8hbzftQ==","X-Received":"by 10.99.179.74 with SMTP id x10mr6228109pgt.336.1509060951212; \n\tThu, 26 Oct 2017 16:35:51 -0700 (PDT)","From":"Eric Dumazet ","To":"\"David S . Miller\" ","Cc":"netdev , Eric Dumazet ,\n\tEric Dumazet ","Subject":"[PATCH net-next 08/15] tcp: Namespace-ify\n\tsysctl_tcp_abort_on_overflow","Date":"Thu, 26 Oct 2017 16:35:19 -0700","Message-Id":"<20171026233526.6155-9-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_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 7f88987bc62dd76206c15eb91f2990d4469e5421..e28471ce52bd815346676931075588d59306a441 100644\n--- a/include/net/tcp.h\n+++ b/include/net/tcp.h\n@@ -240,7 +240,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 2abaa4c1fe0108f2645d8e783ae6b48e87a82fb3..a79a89fdb558a5d66ec5241fdb8bfcab196c744d 100644\n--- a/net/ipv4/tcp_minisocks.c\n+++ b/net/ipv4/tcp_minisocks.c\n@@ -28,8 +28,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@@ -764,7 +762,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":["net-next","08/15"]}