From: Eric Dumazet <edumazet@google.com>
To: "David S . Miller" <davem@davemloft.net>
Cc: netdev <netdev@vger.kernel.org>,
Eric Dumazet <edumazet@google.com>,
Eric Dumazet <eric.dumazet@gmail.com>
Subject: [PATCH net-next 05/12] tcp: Namespace-ify sysctl_tcp_limit_output_bytes
Date: Fri, 27 Oct 2017 07:47:25 -0700 [thread overview]
Message-ID: <20171027144732.23885-6-edumazet@google.com> (raw)
In-Reply-To: <20171027144732.23885-1-edumazet@google.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
---
include/net/netns/ipv4.h | 1 +
include/net/tcp.h | 1 -
net/ipv4/sysctl_net_ipv4.c | 14 +++++++-------
net/ipv4/tcp_ipv4.c | 2 ++
net/ipv4/tcp_output.c | 6 ++----
5 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
index e74c7c1b0d18e68a4b6caeeb65f6ec09148a6549..e98f473bab13cd9b8ff5cc3a62a75134dd84371a 100644
--- a/include/net/netns/ipv4.h
+++ b/include/net/netns/ipv4.h
@@ -146,6 +146,7 @@ struct netns_ipv4 {
int sysctl_tcp_moderate_rcvbuf;
int sysctl_tcp_tso_win_divisor;
int sysctl_tcp_workaround_signed_windows;
+ int sysctl_tcp_limit_output_bytes;
struct inet_timewait_death_row tcp_death_row;
int sysctl_max_syn_backlog;
int sysctl_tcp_fastopen;
diff --git a/include/net/tcp.h b/include/net/tcp.h
index e338e16178dd8c46a96e81ff4d4aa1ccaaf9c937..33f9d30a69050e4d3eaf4e1f4869d148442902fc 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -250,7 +250,6 @@ extern int sysctl_tcp_rmem[3];
#define TCP_RACK_LOSS_DETECTION 0x1 /* Use RACK to detect losses */
-extern int sysctl_tcp_limit_output_bytes;
extern int sysctl_tcp_challenge_ack_limit;
extern int sysctl_tcp_min_tso_segs;
extern int sysctl_tcp_min_rtt_wlen;
diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
index 3ae9012a497997f542fa1d743ba78a6c61beaf95..6caf5c40730fa10f14a35e1f3219a69f5365a2ce 100644
--- a/net/ipv4/sysctl_net_ipv4.c
+++ b/net/ipv4/sysctl_net_ipv4.c
@@ -457,13 +457,6 @@ static struct ctl_table ipv4_table[] = {
.maxlen = TCP_CA_NAME_MAX,
.proc_handler = proc_tcp_congestion_control,
},
- {
- .procname = "tcp_limit_output_bytes",
- .data = &sysctl_tcp_limit_output_bytes,
- .maxlen = sizeof(int),
- .mode = 0644,
- .proc_handler = proc_dointvec
- },
{
.procname = "tcp_challenge_ack_limit",
.data = &sysctl_tcp_challenge_ack_limit,
@@ -1145,6 +1138,13 @@ static struct ctl_table ipv4_net_table[] = {
.mode = 0644,
.proc_handler = proc_dointvec
},
+ {
+ .procname = "tcp_limit_output_bytes",
+ .data = &init_net.ipv4.sysctl_tcp_limit_output_bytes,
+ .maxlen = sizeof(int),
+ .mode = 0644,
+ .proc_handler = proc_dointvec
+ },
{ }
};
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index 284ff16148df908b8fdb0a0ec70e6c18513d35fc..713b80261e4fdbafa9031a7e3bfc06f0700c2279 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -2499,6 +2499,8 @@ static int __net_init tcp_sk_init(struct net *net)
* which are too large can cause TCP streams to be bursty.
*/
net->ipv4.sysctl_tcp_tso_win_divisor = 3;
+ /* Default TSQ limit of four TSO segments */
+ net->ipv4.sysctl_tcp_limit_output_bytes = 262144;
net->ipv4.sysctl_tcp_fastopen = TFO_CLIENT_ENABLE;
spin_lock_init(&net->ipv4.tcp_fastopen_ctx_lock);
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index 5bbed67c27e9c163ede3065e57ceb0d04a4925d2..f018892c6a98ca7b806570995474bd394d9ab427 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -45,9 +45,6 @@
#include <trace/events/tcp.h>
-/* Default TSQ limit of four TSO segments */
-int sysctl_tcp_limit_output_bytes __read_mostly = 262144;
-
static bool tcp_write_xmit(struct sock *sk, unsigned int mss_now, int nonagle,
int push_one, gfp_t gfp);
@@ -2215,7 +2212,8 @@ static bool tcp_small_queue_check(struct sock *sk, const struct sk_buff *skb,
unsigned int limit;
limit = max(2 * skb->truesize, sk->sk_pacing_rate >> 10);
- limit = min_t(u32, limit, sysctl_tcp_limit_output_bytes);
+ limit = min_t(u32, limit,
+ sock_net(sk)->ipv4.sysctl_tcp_limit_output_bytes);
limit <<= factor;
if (refcount_read(&sk->sk_wmem_alloc) > limit) {
--
2.15.0.rc2.357.g7e34df9404-goog
next prev parent reply other threads:[~2017-10-27 14:47 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-27 14:47 [PATCH net-next 00/12] tcp: move 12 sysctls to namespaces Eric Dumazet
2017-10-27 14:47 ` [PATCH net-next 01/12] tcp: Namespace-ify sysctl_tcp_nometrics_save Eric Dumazet
2017-10-27 14:47 ` [PATCH net-next 02/12] tcp: Namespace-ify sysctl_tcp_moderate_rcvbuf Eric Dumazet
2017-10-27 14:47 ` [PATCH net-next 03/12] tcp: Namespace-ify sysctl_tcp_tso_win_divisor Eric Dumazet
2017-10-27 14:47 ` [PATCH net-next 04/12] tcp: Namespace-ify sysctl_tcp_workaround_signed_windows Eric Dumazet
2017-10-27 14:47 ` Eric Dumazet [this message]
2017-10-27 14:47 ` [PATCH net-next 06/12] tcp: Namespace-ify sysctl_tcp_challenge_ack_limit Eric Dumazet
2017-10-27 14:47 ` [PATCH net-next 07/12] tcp: Namespace-ify sysctl_tcp_min_tso_segs Eric Dumazet
2017-10-27 14:47 ` [PATCH net-next 08/12] tcp: Namespace-ify sysctl_tcp_min_rtt_wlen Eric Dumazet
2017-10-27 14:47 ` [PATCH net-next 09/12] tcp: Namespace-ify sysctl_tcp_autocorking Eric Dumazet
2017-10-27 14:47 ` [PATCH net-next 10/12] tcp: Namespace-ify sysctl_tcp_invalid_ratelimit Eric Dumazet
2017-10-27 14:47 ` [PATCH net-next 11/12] tcp: Namespace-ify sysctl_tcp_pacing_ss_ratio Eric Dumazet
2017-10-27 14:47 ` [PATCH net-next 12/12] tcp: Namespace-ify sysctl_tcp_pacing_ca_ratio Eric Dumazet
2017-10-28 10:25 ` [PATCH net-next 00/12] tcp: move 12 sysctls to namespaces David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171027144732.23885-6-edumazet@google.com \
--to=edumazet@google.com \
--cc=davem@davemloft.net \
--cc=eric.dumazet@gmail.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).