{"id":830983,"url":"http://patchwork.ozlabs.org/api/1.2/patches/830983/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20171026233526.6155-3-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-3-edumazet@google.com>","list_archive_url":null,"date":"2017-10-26T23:35:13","name":"[net-next,02/15] tcp: Namespace-ify sysctl_tcp_recovery","commit_ref":null,"pull_url":null,"state":"changes-requested","archived":true,"hash":"42a17e13bc59fc8053d818e778f97416408d665b","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-3-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/830983/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/830983/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=\"AT1awWNg\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3yNNfp1XLpz9sxR\n\tfor ;\n\tFri, 27 Oct 2017 10:35:46 +1100 (AEDT)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S932416AbdJZXfl (ORCPT );\n\tThu, 26 Oct 2017 19:35:41 -0400","from mail-pg0-f67.google.com ([74.125.83.67]:46133 \"EHLO\n\tmail-pg0-f67.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S932396AbdJZXfh (ORCPT\n\t); Thu, 26 Oct 2017 19:35:37 -0400","by mail-pg0-f67.google.com with SMTP id k7so3893425pga.3\n\tfor ; Thu, 26 Oct 2017 16:35:36 -0700 (PDT)","from localhost ([2620:15c:2c4:201:c5be:583d:61a8:d070])\n\tby smtp.gmail.com with ESMTPSA id\n\tq16sm10358968pgq.79.2017.10.26.16.35.35\n\t(version=TLS1_2 cipher=AES128-SHA bits=128/128);\n\tThu, 26 Oct 2017 16:35:35 -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=a+ZGirJ4ATxBlYyDViCj7/WirHkyNfRIeb3NP5G5/Sg=;\n\tb=AT1awWNgROr6vGuErZVG9b8ea9ptMCYmwJL01mFTaiWcRKlYRT12no1A1GdyI9RgnS\n\tBUP2udH92hD+Dwk8S6MeT8WrmlB25lQE0s/UbvNp5VS4FwNkCiRFSWDbs+CMKa/u0k9s\n\t2Xvu4NF8SNvvTrqq5BrAYEjh0yBEYkUYsN/WMjVzjie2wKe31fbOBuqPHdcx86Ut8F5k\n\tuemdiGl/Cxu1QMjBuqMTS3GVL5RzYzFbWpbPw/Lfv9fvRAlMCojvcbI6rSSHdcD+aauT\n\tezsWAefBeyFHi9GDAhhPtU+10pKqI5OpqtYa+4YnB287YwXWGbBktt2wtcAKgrGI9a+A\n\tv3Lw==","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=a+ZGirJ4ATxBlYyDViCj7/WirHkyNfRIeb3NP5G5/Sg=;\n\tb=FR6vdIV1jQOTD/duZUxDjhFPxLwXSYeaqjWEyNjgOkE3auKwL5Tk0axADtiF4GSMBG\n\tI2say8A/FUcTU2/R/4c+5K/EFDP/hTuuDRTS3tLIrus0Lw5ixmYm3H5899PQqYhiexHT\n\tfFTIpBtvkx6e+uN+iYVVDFMHF3xVts0m5+YpgBVCg8pivBlOMNfMpFJs8OR5FMQg2SRm\n\tJVqLfDFhBBAjSGNO4j8k5LLhRJvw9d9aa0n+C7BDA7XMgoCBjqWdS5zpdXe+83+RF2X6\n\t+7WH2auHHHjDl87RmmCeipOJzCSvcLqpJ7yLhumqAc0QIZR6Eznk2OpgUYdQmx65aq7D\n\te8+Q==","X-Gm-Message-State":"AMCzsaU2VwKi6t4VRxU8QLiqoxhH5GAxWVcxzxVL7jRqmCTZv/ahJyB9\n\tlo3q+0oBmdXudsa4POQGG7zVoQ==","X-Google-Smtp-Source":"ABhQp+TFFCSHAJs1IvAqGwvLZxenitaaiUqWKxlS/4BZv841QswjRTV1Dyoiu3mDOQEU50wAark5XA==","X-Received":"by 10.101.66.197 with SMTP id l5mr6393596pgp.240.1509060936204; \n\tThu, 26 Oct 2017 16:35:36 -0700 (PDT)","From":"Eric Dumazet ","To":"\"David S . Miller\" ","Cc":"netdev , Eric Dumazet ,\n\tEric Dumazet ","Subject":"[PATCH net-next 02/15] tcp: Namespace-ify sysctl_tcp_recovery","Date":"Thu, 26 Oct 2017 16:35:13 -0700","Message-Id":"<20171026233526.6155-3-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 | 2 +-\n net/ipv4/sysctl_net_ipv4.c | 14 +++++++-------\n net/ipv4/tcp_input.c | 2 +-\n net/ipv4/tcp_ipv4.c | 1 +\n net/ipv4/tcp_recovery.c | 2 --\n 6 files changed, 11 insertions(+), 11 deletions(-)","diff":"diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h\nindex a7f39e3ea666a835b6042e4008c86ccaadd14b46..d6ed718075d44cfc0e60995c1e938d588ad261a8 100644\n--- a/include/net/netns/ipv4.h\n+++ b/include/net/netns/ipv4.h\n@@ -129,6 +129,7 @@ struct netns_ipv4 {\n \tint sysctl_tcp_window_scaling;\n \tint sysctl_tcp_timestamps;\n \tint sysctl_tcp_early_retrans;\n+\tint sysctl_tcp_recovery;\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 862cecd9424b30e637cfb717db519e2fe95d2c8e..469b4954beee8571ba8d930e852db8b1fef5eed3 100644\n--- a/include/net/tcp.h\n+++ b/include/net/tcp.h\n@@ -262,7 +262,7 @@ extern int sysctl_tcp_workaround_signed_windows;\n extern int sysctl_tcp_slow_start_after_idle;\n extern int sysctl_tcp_thin_linear_timeouts;\n extern int sysctl_tcp_thin_dupack;\n-extern int sysctl_tcp_recovery;\n+\n #define TCP_RACK_LOSS_DETECTION 0x1 /* Use RACK to detect losses */\n \n extern int sysctl_tcp_limit_output_bytes;\ndiff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c\nindex f0f650f020afd535f41943c6c9fb1483be7cfb8d..78019adcae875a438264ee47723670f6b54cacf9 100644\n--- a/net/ipv4/sysctl_net_ipv4.c\n+++ b/net/ipv4/sysctl_net_ipv4.c\n@@ -449,13 +449,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_recovery\",\n-\t\t.data\t\t= &sysctl_tcp_recovery,\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_max_reordering\",\n \t\t.data\t\t= &sysctl_tcp_max_reordering,\n@@ -1145,6 +1138,13 @@ static struct ctl_table ipv4_net_table[] = {\n \t\t.extra1\t\t= &zero,\n \t\t.extra2\t\t= &four,\n \t},\n+\t{\n+\t\t.procname\t= \"tcp_recovery\",\n+\t\t.data\t\t= &init_net.ipv4.sysctl_tcp_recovery,\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 91b4f14f71fb6c63c97dde8ba6a5af61c5a1fc82..2cc56fd57b751dd6b457c15067aa9309683a04a8 100644\n--- a/net/ipv4/tcp_input.c\n+++ b/net/ipv4/tcp_input.c\n@@ -2786,7 +2786,7 @@ static void tcp_rack_identify_loss(struct sock *sk, int *ack_flag)\n \tstruct tcp_sock *tp = tcp_sk(sk);\n \n \t/* Use RACK to detect loss */\n-\tif (sysctl_tcp_recovery & TCP_RACK_LOSS_DETECTION) {\n+\tif (sock_net(sk)->ipv4.sysctl_tcp_recovery & TCP_RACK_LOSS_DETECTION) {\n \t\tu32 prior_retrans = tp->retrans_out;\n \n \t\ttcp_rack_mark_lost(sk);\ndiff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c\nindex 7ab313f6768e234173d78f17cfb1f664b230e958..517ff1948a71287b06ea0859e1f25a15119a3dd9 100644\n--- a/net/ipv4/tcp_ipv4.c\n+++ b/net/ipv4/tcp_ipv4.c\n@@ -2485,6 +2485,7 @@ static int __net_init tcp_sk_init(struct net *net)\n \tnet->ipv4.sysctl_tcp_window_scaling = 1;\n \tnet->ipv4.sysctl_tcp_timestamps = 1;\n \tnet->ipv4.sysctl_tcp_early_retrans = 3;\n+\tnet->ipv4.sysctl_tcp_recovery = TCP_RACK_LOSS_DETECTION;\n \n \tnet->ipv4.sysctl_tcp_fastopen = TFO_CLIENT_ENABLE;\n \tspin_lock_init(&net->ipv4.tcp_fastopen_ctx_lock);\ndiff --git a/net/ipv4/tcp_recovery.c b/net/ipv4/tcp_recovery.c\nindex cda6074a429a24b7be600065d95600f4f9810ee4..d3603a9e24eae8649edd12d3f0678015b09b2037 100644\n--- a/net/ipv4/tcp_recovery.c\n+++ b/net/ipv4/tcp_recovery.c\n@@ -1,8 +1,6 @@\n #include \n #include \n \n-int sysctl_tcp_recovery __read_mostly = TCP_RACK_LOSS_DETECTION;\n-\n static void tcp_rack_mark_skb_lost(struct sock *sk, struct sk_buff *skb)\n {\n \tstruct tcp_sock *tp = tcp_sk(sk);\n","prefixes":["net-next","02/15"]}