From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 4B70B21A13493 for ; Thu, 4 May 2017 01:54:18 -0700 (PDT) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga105.jf.intel.com with ESMTP; 04 May 2017 01:54:17 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.38,287,1491289200"; d="scan'208";a="1143494929" Received: from fmsmsx103.amr.corp.intel.com ([10.18.124.201]) by fmsmga001.fm.intel.com with ESMTP; 04 May 2017 01:54:17 -0700 Received: from fmsmsx116.amr.corp.intel.com (10.18.116.20) by FMSMSX103.amr.corp.intel.com (10.18.124.201) with Microsoft SMTP Server (TLS) id 14.3.319.2; Thu, 4 May 2017 01:54:17 -0700 Received: from shsmsx104.ccr.corp.intel.com (10.239.4.70) by fmsmsx116.amr.corp.intel.com (10.18.116.20) with Microsoft SMTP Server (TLS) id 14.3.319.2; Thu, 4 May 2017 01:54:17 -0700 Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.117]) by SHSMSX104.ccr.corp.intel.com ([10.239.4.70]) with mapi id 14.03.0319.002; Thu, 4 May 2017 16:54:15 +0800 From: "Ye, Ting" To: "Fu, Siyuan" , "edk2-devel@lists.01.org" CC: "Wu, Jiaxin" , Andrey Tepin Thread-Topic: [Patch] NetworkPkg: Addressing TCP Window Retraction when window scale factor is used. Thread-Index: AQHSw+CVPLKx35/lEEeSpp7eYkfM56Hj3rEQ Date: Thu, 4 May 2017 08:54:15 +0000 Message-ID: References: <1493797202-94576-1-git-send-email-siyuan.fu@intel.com> In-Reply-To: <1493797202-94576-1-git-send-email-siyuan.fu@intel.com> Accept-Language: zh-CN, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [Patch] NetworkPkg: Addressing TCP Window Retraction when window scale factor is used. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 May 2017 08:54:18 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Hi Siyuan, Maybe we could add some notes to the check-in log to record the test cases = covered for validating this patch? And please fix RFC3723 in the log also. Best Regards, Ting -----Original Message----- From: Fu, Siyuan=20 Sent: Wednesday, May 03, 2017 3:40 PM To: edk2-devel@lists.01.org Cc: Wu, Jiaxin ; Andrey Tepin ; Ye= , Ting Subject: [Patch] NetworkPkg: Addressing TCP Window Retraction when window s= cale factor is used. The RFC1323 which defines the TCP window scale option has been obsoleted by= RFC7323. This patch is to follow the RFC3723 to address the TCP window retraction pr= oblem when a non-zero scale factor is used. Cc: Wu Jiaxin Cc: Andrey Tepin Cc: Ye Ting Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Fu Siyuan --- NetworkPkg/TcpDxe/TcpMisc.c | 3 ++- NetworkPkg/TcpDxe/TcpOutput.c | 33 ++++++++++++++++++++++++++++----- Netw= orkPkg/TcpDxe/TcpProto.h | 8 +++++++- 3 files changed, 37 insertions(+), 7 deletions(-) diff --git a/NetworkPkg/TcpDxe/TcpMisc.c b/NetworkPkg/TcpDxe/TcpMisc.c inde= x a8592c9..4435036 100644 --- a/NetworkPkg/TcpDxe/TcpMisc.c +++ b/NetworkPkg/TcpDxe/TcpMisc.c @@ -2,7 +2,7 @@ Misc support routines for TCP driver. =20 (C) Copyright 2014 Hewlett-Packard Development Company, L.P.
- Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.
+ Copyright (c) 2009 - 2017, Intel Corporation. All rights=20 + reserved.
=20 This program and the accompanying materials are licensed and made available under the terms and conditions of the BS= D License @@ -86,6 +86,7 @@ TcpInitTcbLocal ( // First window size is never scaled // Tcb->RcvWndScale =3D 0; + Tcb->RetxmitSeqMax =3D 0; =20 Tcb->ProbeTimerOn =3D FALSE; } diff --git a/NetworkPkg/TcpDxe/TcpOutput.c b/NetworkPkg/TcpDxe/TcpOutput.c = index a46cb60..f3dacf3 100644 --- a/NetworkPkg/TcpDxe/TcpOutput.c +++ b/NetworkPkg/TcpDxe/TcpOutput.c @@ -1,7 +1,7 @@ /** @file TCP output process routines. =20 - Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.
+ Copyright (c) 2009 - 2017, Intel Corporation. All rights=20 + reserved.
=20 This program and the accompanying materials are licensed and made available under the terms and conditions of the BS= D License @@ -664,7 +664,27 @@ TcpRetransmit ( // 2. Must in the current send window // 3. Will not change the boundaries of queued segments. // - if (TCP_SEQ_LT (Tcb->SndWl2 + Tcb->SndWnd, Seq)) { + =20 + if ((Tcb->SndWndScale !=3D 0) && + (TCP_SEQ_GT (Seq, Tcb->RetxmitSeqMax) || TCP_SEQ_GT (Tcb->SndWl2 + T= cb->SndWnd + (1 << Tcb->SndWndScale), Seq))) { + // + // Handle the Window Retraction if TCP window scale is enabled accordi= ng to RFC7323: + // On first retransmission, or if the sequence number is out of + // window by less than 2^Rcv.Wind.Shift, then do normal + // retransmission(s) without regard to the receiver window as long + // as the original segment was in window when it was sent. + // + Len =3D TCP_SUB_SEQ (Tcb->SndNxt, Seq); + DEBUG ( + (EFI_D_WARN, + "TcpRetransmit: retransmission without regard to the receiver window= for TCB %p\n", + Tcb) + ); + =20 + } else if (TCP_SEQ_GEQ (Tcb->SndWl2 + Tcb->SndWnd, Seq)) { + Len =3D TCP_SUB_SEQ (Tcb->SndWl2 + Tcb->SndWnd, Seq); + =20 + } else { DEBUG ( (EFI_D_WARN, "TcpRetransmit: retransmission cancelled because send window too sma= ll for TCB %p\n", @@ -674,10 +694,9 @@ TcpRetransmit ( return 0; } =20 - Len =3D TCP_SUB_SEQ (Tcb->SndWl2 + Tcb->SndWnd, Seq); - Len =3D MIN (Len, Tcb->SndMss); + Len =3D MIN (Len, Tcb->SndMss); =20 - Nbuf =3D TcpGetSegmentSndQue (Tcb, Seq, Len); + Nbuf =3D TcpGetSegmentSndQue (Tcb, Seq, Len); if (Nbuf =3D=3D NULL) { return -1; } @@ -688,6 +707,10 @@ TcpRetransmit ( goto OnError; } =20 + if (TCP_SEQ_GT (Seq, Tcb->RetxmitSeqMax)) { + Tcb->RetxmitSeqMax =3D Seq; + } + // // The retransmitted buffer may be on the SndQue, // trim TCP head because all the buffers on SndQue diff --git a/NetworkP= kg/TcpDxe/TcpProto.h b/NetworkPkg/TcpDxe/TcpProto.h index ee35134..81397d7 = 100644 --- a/NetworkPkg/TcpDxe/TcpProto.h +++ b/NetworkPkg/TcpDxe/TcpProto.h @@ -1,7 +1,7 @@ /** @file TCP protocol header file. =20 - Copyright (c) 2009 - 2012, Intel Corporation. All rights reserved.
+ Copyright (c) 2009 - 2017, Intel Corporation. All rights=20 + reserved.
=20 This program and the accompanying materials are licensed and made available under the terms and conditions of the BS= D License @@ -316,6 +316,12 @@ struct _TCP_CONTROL_BLOCK { TCP_SEQNO LossRecover; ///< Recover point for retxmit. =20 // + // RFC7323 + // Addressing Window Retraction for TCP Window Scale Option. + // + TCP_SEQNO RetxmitSeqMax; ///< Max Seq number in previous r= etransmission. + + // // configuration parameters, for EFI_TCP4_PROTOCOL specification // UINT32 KeepAliveIdle; ///< Idle time before sending first p= robe. -- 1.9.5.msysgit.1