Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/1.2/patches/830997/?format=api
{ "id": 830997, "url": "http://patchwork.ozlabs.org/api/1.2/patches/830997/?format=api", "web_url": "http://patchwork.ozlabs.org/project/netdev/patch/20171026233526.6155-6-edumazet@google.com/", "project": { "id": 7, "url": "http://patchwork.ozlabs.org/api/1.2/projects/7/?format=api", "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-6-edumazet@google.com>", "list_archive_url": null, "date": "2017-10-26T23:35:16", "name": "[net-next,05/15] tcp: Namespace-ify sysctl_tcp_retrans_collapse", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": true, "hash": "829b7eacab837dfdad8a8505c5c4aef0a0e08f3c", "submitter": { "id": 13357, "url": "http://patchwork.ozlabs.org/api/1.2/people/13357/?format=api", "name": "Eric Dumazet", "email": "edumazet@google.com" }, "delegate": { "id": 34, "url": "http://patchwork.ozlabs.org/api/1.2/users/34/?format=api", "username": "davem", "first_name": "David", "last_name": "Miller", "email": "davem@davemloft.net" }, "mbox": "http://patchwork.ozlabs.org/project/netdev/patch/20171026233526.6155-6-edumazet@google.com/mbox/", "series": [ { "id": 10461, "url": "http://patchwork.ozlabs.org/api/1.2/series/10461/?format=api", "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/830997/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/830997/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<netdev-owner@vger.kernel.org>", "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=<UNKNOWN>)", "ozlabs.org; dkim=pass (2048-bit key;\n\tunprotected) header.d=google.com header.i=@google.com\n\theader.b=\"a3FUjxj7\"; dkim-atps=neutral" ], "Received": [ "from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3yNNgs2Lr0z9s1h\n\tfor <patchwork-incoming@ozlabs.org>;\n\tFri, 27 Oct 2017 10:36:41 +1100 (AEDT)", "(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S932510AbdJZXgj (ORCPT <rfc822;patchwork-incoming@ozlabs.org>);\n\tThu, 26 Oct 2017 19:36:39 -0400", "from mail-pf0-f193.google.com ([209.85.192.193]:44811 \"EHLO\n\tmail-pf0-f193.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S932417AbdJZXfo (ORCPT\n\t<rfc822;netdev@vger.kernel.org>); Thu, 26 Oct 2017 19:35:44 -0400", "by mail-pf0-f193.google.com with SMTP id x7so3619326pfa.1\n\tfor <netdev@vger.kernel.org>; Thu, 26 Oct 2017 16:35:44 -0700 (PDT)", "from localhost ([2620:15c:2c4:201:c5be:583d:61a8:d070])\n\tby smtp.gmail.com with ESMTPSA id\n\tq2sm5901500pgf.92.2017.10.26.16.35.42\n\t(version=TLS1_2 cipher=AES128-SHA bits=128/128);\n\tThu, 26 Oct 2017 16:35:43 -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=HMfUH6f61knnyg8Y7gvrcbA9rhmYLe1pM28PXgszANg=;\n\tb=a3FUjxj7x83fHy1wRSR+M5+BIqmqrQ3ttYiE/f+82Hdp3VXnRGyA19Nf491J4InQYq\n\the5paDoJVuC/6YqpP5ax37D5ic9aX0fpEV5nbcPxhu4yrI0ujLcwVLmH57thdTnEuTQQ\n\thmZa1/m9inR/MBeVJnIchgD+F2Q9xBdlQZaGU/INS5rcuEej//DrB0+aqg1TReH3Bc/u\n\tUZeVGcI3dI+YIzJFGCVEfsqUqfRe2uAPUqVNyshdEdE8xRUc6LfUwexVVUPkJS5Dto/t\n\ti/GGyMpp/MQRfCE7QrckgUxagsDUKDgGkMrzGLUxe2QwNBxpS6dSdK8zpP8P0o7bRSfn\n\t6wsw==", "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=HMfUH6f61knnyg8Y7gvrcbA9rhmYLe1pM28PXgszANg=;\n\tb=XgxOODKK7SJrQhnGnUEbBE6Y7eU4jalpowVWC6iSAITyYxB02Ap+ybYFGNy7qIVB8F\n\ti683ZmNG1P/htJpibuMwSb3NUjE/YU/mOlO4Vn15SPiL2QZLCooz8MK6DeCUQVjV4dR7\n\tspiek9PByQMmAqqEDzSvKk67Tqq97rqazsMyD+J1kNs0C/SbbOK2J6ynzVNztq1F2mVH\n\tKMyPZhiHvKA/JoWLWwAyPCOTWKGvejEnTdCRMJCQkiq0rlSWSoheOinzEG48l4fFNiGA\n\tEApVVIkxhqqVXgI1usS0kRzbhNlBUh9FyI3LqOJPuumqJheyqWwdaBLpwpIDlfC3xRly\n\t8jOg==", "X-Gm-Message-State": "AMCzsaW0/Q189T9EBCn6cb1ZAs7jlXr92MNjjMAOCdOlmqnMzfDIAPsC\n\t3/IZ2sPGWcEd8T2ZEefBDKc/s51gFCg=", "X-Google-Smtp-Source": "ABhQp+SWk6PabppTZynOh98d07s6+iVx0ZVoGPHSAiJN7ka3YIKZ8gzTwkQoh6s1P2Y3B9qAXB3HsQ==", "X-Received": "by 10.99.95.14 with SMTP id t14mr6356679pgb.70.1509060943599;\n\tThu, 26 Oct 2017 16:35:43 -0700 (PDT)", "From": "Eric Dumazet <edumazet@google.com>", "To": "\"David S . Miller\" <davem@davemloft.net>", "Cc": "netdev <netdev@vger.kernel.org>, Eric Dumazet <edumazet@google.com>,\n\tEric Dumazet <eric.dumazet@gmail.com>", "Subject": "[PATCH net-next 05/15] tcp: Namespace-ify\n\tsysctl_tcp_retrans_collapse", "Date": "Thu, 26 Oct 2017 16:35:16 -0700", "Message-Id": "<20171026233526.6155-6-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": "<netdev.vger.kernel.org>", "X-Mailing-List": "netdev@vger.kernel.org" }, "content": "Signed-off-by: Eric Dumazet <edumazet@google.com>\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_ipv4.c | 2 +-\n net/ipv4/tcp_output.c | 5 +----\n 5 files changed, 10 insertions(+), 13 deletions(-)", "diff": "diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h\nindex 8662692686b3af98a94a176230b9ed147881d87a..b28c172b10e497f235b51aae0fc2d3bbf7cc51f3 100644\n--- a/include/net/netns/ipv4.h\n+++ b/include/net/netns/ipv4.h\n@@ -132,6 +132,7 @@ struct netns_ipv4 {\n \tint sysctl_tcp_recovery;\n \tint sysctl_tcp_thin_linear_timeouts;\n \tint sysctl_tcp_slow_start_after_idle;\n+\tint sysctl_tcp_retrans_collapse;\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 09c79705a0742aa8c22b3b7795d01b6c685d32e2..085848e4de38058bb09f025387c713ade32b263e 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_retrans_collapse;\n extern int sysctl_tcp_stdurg;\n extern int sysctl_tcp_rfc1337;\n extern int sysctl_tcp_abort_on_overflow;\ndiff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c\nindex 40d69af8b363bc236e23879973872d8f9346d85e..533b92ad39dd0cada542028fe2f276d9eebcd2c8 100644\n--- a/net/ipv4/sysctl_net_ipv4.c\n+++ b/net/ipv4/sysctl_net_ipv4.c\n@@ -386,13 +386,6 @@ static int proc_tcp_available_ulp(struct ctl_table *ctl,\n }\n \n static struct ctl_table ipv4_table[] = {\n-\t{\n-\t\t.procname\t= \"tcp_retrans_collapse\",\n-\t\t.data\t\t= &sysctl_tcp_retrans_collapse,\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_orphans\",\n \t\t.data\t\t= &sysctl_tcp_max_orphans,\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_retrans_collapse\",\n+\t\t.data\t\t= &init_net.ipv4.sysctl_tcp_retrans_collapse,\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_ipv4.c b/net/ipv4/tcp_ipv4.c\nindex cea63a4b59655823def7a423d27191003c7f084c..2bc6ba2059d32aa848dbc415b4b0e194b61b0268 100644\n--- a/net/ipv4/tcp_ipv4.c\n+++ b/net/ipv4/tcp_ipv4.c\n@@ -2487,7 +2487,7 @@ static int __net_init tcp_sk_init(struct net *net)\n \tnet->ipv4.sysctl_tcp_early_retrans = 3;\n \tnet->ipv4.sysctl_tcp_recovery = TCP_RACK_LOSS_DETECTION;\n \tnet->ipv4.sysctl_tcp_slow_start_after_idle = 1; /* By default, RFC2861 behavior. */\n-\n+\tnet->ipv4.sysctl_tcp_retrans_collapse = 1;\n \tnet->ipv4.sysctl_tcp_fastopen = TFO_CLIENT_ENABLE;\n \tspin_lock_init(&net->ipv4.tcp_fastopen_ctx_lock);\n \tnet->ipv4.sysctl_tcp_fastopen_blackhole_timeout = 60 * 60;\ndiff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c\nindex bc93a346e6e91289c2aeb2f2d2522b809da12dd6..735fff44aaca3d5afbb0ac55ebdb9898b6c44ae6 100644\n--- a/net/ipv4/tcp_output.c\n+++ b/net/ipv4/tcp_output.c\n@@ -44,9 +44,6 @@\n \n #include <trace/events/tcp.h>\n \n-/* People can turn this off for buggy TCP's found in printers etc. */\n-int sysctl_tcp_retrans_collapse __read_mostly = 1;\n-\n /* People can turn this on to work with those rare, broken TCPs that\n * interpret the window field as a signed quantity.\n */\n@@ -2747,7 +2744,7 @@ static void tcp_retrans_try_collapse(struct sock *sk, struct sk_buff *to,\n \tstruct sk_buff *skb = to, *tmp;\n \tbool first = true;\n \n-\tif (!sysctl_tcp_retrans_collapse)\n+\tif (!sock_net(sk)->ipv4.sysctl_tcp_retrans_collapse)\n \t\treturn;\n \tif (TCP_SKB_CB(skb)->tcp_flags & TCPHDR_SYN)\n \t\treturn;\n", "prefixes": [ "net-next", "05/15" ] }