From patchwork Wed Oct 22 10:00:01 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ilpo_J=C3=A4rvinen?= X-Patchwork-Id: 5329 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id BF44ADDE06 for ; Wed, 22 Oct 2008 21:02:11 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755925AbYJVKBb (ORCPT ); Wed, 22 Oct 2008 06:01:31 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755738AbYJVKBa (ORCPT ); Wed, 22 Oct 2008 06:01:30 -0400 Received: from courier.cs.helsinki.fi ([128.214.9.1]:50450 "EHLO mail.cs.helsinki.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755877AbYJVKB2 (ORCPT ); Wed, 22 Oct 2008 06:01:28 -0400 Received: from wrl-59.cs.helsinki.fi (wrl-59.cs.helsinki.fi [128.214.166.179]) (AUTH: PLAIN cs-relay, TLS: TLSv1/SSLv3,256bits,AES256-SHA) by mail.cs.helsinki.fi with esmtp; Wed, 22 Oct 2008 13:00:27 +0300 id 0005BF17.48FEF9BB.00005E79 Received: by wrl-59.cs.helsinki.fi (Postfix, from userid 50795) id 588F8A009F; Wed, 22 Oct 2008 13:00:01 +0300 (EEST) Received: from localhost (localhost [127.0.0.1]) by wrl-59.cs.helsinki.fi (Postfix) with ESMTP id 471D7A0098; Wed, 22 Oct 2008 13:00:01 +0300 (EEST) Date: Wed, 22 Oct 2008 13:00:01 +0300 (EEST) From: "=?ISO-8859-1?Q?Ilpo_J=E4rvinen?=" X-X-Sender: ijjarvin@wrl-59.cs.helsinki.fi To: David Miller cc: jarkao2@gmail.com, sentiniate@tiscali.it, Netdev , bugme-daemon@bugzilla.kernel.org, olon@verizon.net Subject: Re: two other cases Re: [Bug 11721] after upgrade to 2.6.27 i cannot navigate In-Reply-To: <20081021.163207.157978465.davem@davemloft.net> Message-ID: References: <20081021201857.08faf0a7@topolino> <20081021184539.GA3320@ami.dom.local> <20081021.163207.157978465.davem@davemloft.net> MIME-Version: 1.0 Content-ID: Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Tue, 21 Oct 2008, David Miller wrote: > From: Jarek Poplawski > Date: Tue, 21 Oct 2008 20:45:39 +0200 > > > On Tue, Oct 21, 2008 at 08:18:57PM +0200, Aldo Maggi wrote: > > ... > > > i've compiled 2.6.27.2 source after having patched it with your today's > > > patch. > > > > > > it works! i.e. i can navigate (w3m kernel.org) and update (apt-get > > > update) > > > > Ilpo, I should say you're incredible! ...But, since I've promised to > > myself not to disturb you anymore (again), I can't do this, sorry :-( > > Indeed, excellent work Ilpo. > > Ilpo, now that we know this fixes things for sure, could you submit > this formally with a proper signoff? > > I'll queue it up for -stable too. > > Thanks! Sure, here below is one with a warning (it's the first patch + comment). Olon, can you please check this as well if it affect to your case too (though the symptoms were not that clear in your case). It would be nice for Aldo to check what the result will be with my second patch (only) using sack=1,ts=0,wscale=0. I guess it does but it's a bit unclear if nop's in front help or not (having the patch below should anyway help also in that case as the mss option gets moved before it anyway). --- [PATCH] tcp: Restore ordering of TCP options for the sake of inter-operability This is not our bug! Sadly some devices cannot cope with the change of TCP option ordering which was a result of the recent rewrite of the option code (not that there was some particular reason steming from the rewrite for the reordering) though any ordering of TCP options is perfectly legal. Thus we restore the original ordering to allow interoperability with/through such broken devices and add some warning about this trap. Since the reordering just happened without any particular reason, this change shouldn't cost us anything. There are already couple of known failure reports (within close proximity of the last release), so the problem might be more wide-spread than a single device. And other reports which may be due to the same problem though the symptoms were less obvious. Analysis of one of the case revealed (with very high probability) that sack capability cannot be negotiated as the first option (SYN never got a response). Signed-off-by: Ilpo Järvinen Reported-by: Aldo Maggi Tested-by: Aldo Maggi --- net/ipv4/tcp_output.c | 23 +++++++++++++++++------ 1 files changed, 17 insertions(+), 6 deletions(-) diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index de54f02..e4c5ac9 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -362,6 +362,17 @@ struct tcp_out_options { __u32 tsval, tsecr; /* need to include OPTION_TS */ }; +/* Beware: Something in the Internet is very sensitive to the ordering of + * TCP options, we learned this through the hard way, so be careful here. + * Luckily we can at least blame others for their non-compliance but from + * inter-operatibility perspective it seems that we're somewhat stuck with + * the ordering which we have been using if we want to keep working with + * those broken things (not that it currently hurts anybody as there isn't + * particular reason why the ordering would need to be changed). + * + * At least SACK_PERM as the first option is known to lead to a disaster + * (but it may well be that other scenarios fail similarly). + */ static void tcp_options_write(__be32 *ptr, struct tcp_sock *tp, const struct tcp_out_options *opts, __u8 **md5_hash) { @@ -376,6 +387,12 @@ static void tcp_options_write(__be32 *ptr, struct tcp_sock *tp, *md5_hash = NULL; } + if (unlikely(opts->mss)) { + *ptr++ = htonl((TCPOPT_MSS << 24) | + (TCPOLEN_MSS << 16) | + opts->mss); + } + if (likely(OPTION_TS & opts->options)) { if (unlikely(OPTION_SACK_ADVERTISE & opts->options)) { *ptr++ = htonl((TCPOPT_SACK_PERM << 24) | @@ -392,12 +409,6 @@ static void tcp_options_write(__be32 *ptr, struct tcp_sock *tp, *ptr++ = htonl(opts->tsecr); } - if (unlikely(opts->mss)) { - *ptr++ = htonl((TCPOPT_MSS << 24) | - (TCPOLEN_MSS << 16) | - opts->mss); - } - if (unlikely(OPTION_SACK_ADVERTISE & opts->options && !(OPTION_TS & opts->options))) { *ptr++ = htonl((TCPOPT_NOP << 24) |