From: Gilad Ben-Yossef <gilad@codefidence.com>
To: netdev@vger.kernel.org
Cc: ori@comsleep.com, Gilad Ben-Yossef <gilad@codefidence.com>
Subject: [PATCH RFC] Allow to turn off TCP window scale opt per route
Date: Tue, 20 Oct 2009 17:22:39 +0200 [thread overview]
Message-ID: <1256052161-14156-7-git-send-email-gilad@codefidence.com> (raw)
In-Reply-To: <1256052161-14156-6-git-send-email-gilad@codefidence.com>
Add and use no window scale bit in the features field.
Signed-off-by: Gilad Ben-Yossef <gilad@codefidence.com>
Sigend-off-by: Ori Finkelman <ori@comsleep.com>
Sigend-off-by: Yony Amit <yony@comsleep.com>
---
include/linux/rtnetlink.h | 1 +
net/ipv4/tcp_input.c | 3 ++-
net/ipv4/tcp_output.c | 6 ++++--
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h
index 2ab8c75..6784b34 100644
--- a/include/linux/rtnetlink.h
+++ b/include/linux/rtnetlink.h
@@ -380,6 +380,7 @@ enum
#define RTAX_FEATURE_NO_SACK 0x00000002
#define RTAX_FEATURE_NO_TSTAMP 0x00000004
#define RTAX_FEATURE_ALLFRAG 0x00000008
+#define RTAX_FEATURE_NO_WSCALE 0x00000010
struct rta_session
{
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index d2f9742..4f5e914 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -3739,7 +3739,8 @@ void tcp_parse_options(struct sk_buff *skb, struct tcp_options_received *opt_rx,
break;
case TCPOPT_WINDOW:
if (opsize == TCPOLEN_WINDOW && th->syn &&
- !estab && sysctl_tcp_window_scaling) {
+ !estab && sysctl_tcp_window_scaling &&
+ !dst_feature(dst, RTAX_FEATURE_NO_WSCALE)) {
__u8 snd_wscale = *(__u8 *)ptr;
opt_rx->wscale_ok = 1;
if (snd_wscale > 14) {
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index 8f30c18..ff60a21 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -496,7 +496,8 @@ static unsigned tcp_syn_options(struct sock *sk, struct sk_buff *skb,
opts->tsecr = tp->rx_opt.ts_recent;
size += TCPOLEN_TSTAMP_ALIGNED;
}
- if (likely(sysctl_tcp_window_scaling)) {
+ if (likely(sysctl_tcp_window_scaling &&
+ !dst_feature(dst, RTAX_FEATURE_NO_WSCALE))) {
opts->ws = tp->rx_opt.rcv_wscale;
opts->options |= OPTION_WSCALE;
size += TCPOLEN_WSCALE_ALIGNED;
@@ -2347,7 +2348,8 @@ static void tcp_connect_init(struct sock *sk)
tp->advmss - (tp->rx_opt.ts_recent_stamp ? tp->tcp_header_len - sizeof(struct tcphdr) : 0),
&tp->rcv_wnd,
&tp->window_clamp,
- sysctl_tcp_window_scaling,
+ (sysctl_tcp_window_scaling &&
+ !dst_feature(dst, RTAX_FEATURE_NO_WSCALE)),
&rcv_wscale);
tp->rx_opt.rcv_wscale = rcv_wscale;
--
1.5.6.3
next prev parent reply other threads:[~2009-10-20 15:22 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-10-20 15:22 [PATCH RFC] Per route TCP options Gilad Ben-Yossef
2009-10-20 15:22 ` [PATCH RFC] Only parse time stamp TCP option in time wait sock Gilad Ben-Yossef
2009-10-20 15:22 ` [PATCH RFC] Allow tcp_parse_options to consult dst entry Gilad Ben-Yossef
2009-10-20 15:22 ` [PATCH RFC] Add dst_feature to query route entry features Gilad Ben-Yossef
2009-10-20 15:22 ` [PATCH RFC] Add the no SACK route option feature Gilad Ben-Yossef
2009-10-20 15:22 ` [PATCH RFC] Allow disabling TCP timestamp options per route Gilad Ben-Yossef
2009-10-20 15:22 ` Gilad Ben-Yossef [this message]
2009-10-20 15:22 ` [PATCH RFC] Allow disabling of DSACK TCP option " Gilad Ben-Yossef
2009-10-20 15:22 ` [PATCH RFC] Document future removal of sysctl_tcp_* options Gilad Ben-Yossef
2009-10-21 1:40 ` [PATCH RFC] Allow to turn off TCP window scale opt per route Stephen Hemminger
2009-10-21 8:18 ` Gilad Ben-Yossef
2009-10-20 15:44 ` [PATCH RFC] Per route TCP options Eric Dumazet
2009-10-20 16:11 ` Gilad Ben-Yossef
2009-10-20 18:53 ` Ilpo Järvinen
2009-10-21 8:15 ` Gilad Ben-Yossef
2009-10-20 16:26 ` Rick Jones
2009-10-21 8:04 ` Gilad Ben-Yossef
2009-10-21 8:21 ` Florian Westphal
2009-10-21 8:40 ` Gilad Ben-Yossef
2009-10-21 0:36 ` David Miller
2009-10-21 8:10 ` Gilad Ben-Yossef
2009-10-21 2:13 ` Bill Fink
2009-10-21 8:27 ` Gilad Ben-Yossef
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=1256052161-14156-7-git-send-email-gilad@codefidence.com \
--to=gilad@codefidence.com \
--cc=netdev@vger.kernel.org \
--cc=ori@comsleep.com \
/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).