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 20AF321A070BD for ; Thu, 4 May 2017 22:51:19 -0700 (PDT) Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga105.jf.intel.com with ESMTP; 04 May 2017 22:51:19 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.38,291,1491289200"; d="scan'208";a="97542562" Received: from sfu5-mobl3.ccr.corp.intel.com ([10.239.194.96]) by fmsmga005.fm.intel.com with ESMTP; 04 May 2017 22:51:18 -0700 From: Fu Siyuan To: edk2-devel@lists.01.org Cc: Wu Jiaxin , Ye Ting Date: Fri, 5 May 2017 13:51:11 +0800 Message-Id: <1493963471-110360-3-git-send-email-siyuan.fu@intel.com> X-Mailer: git-send-email 2.7.4.windows.1 In-Reply-To: <1493963471-110360-1-git-send-email-siyuan.fu@intel.com> References: <1493963471-110360-1-git-send-email-siyuan.fu@intel.com> Subject: [Patch 2/2] MdeModulePkg V3: 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: Fri, 05 May 2017 05:51:19 -0000 Change compare with V2 patch: TcpRetransmit(): Use TCP_SEQ_BETWEEN instead of TCP_SEQ_GT to guarantee Tcb->SndWl2 + Tcb->SndWnd <= Seq <= Tcb->SndWl2 + Tcb->SndWnd + 2^Rcv.Wind.Shift 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 problem when a non-zero scale factor is used. Cc: Wu Jiaxin Cc: Ye Ting Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Fu Siyuan --- MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Misc.c | 5 +-- .../Universal/Network/Tcp4Dxe/Tcp4Output.c | 42 +++++++++++++++++----- MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Proto.h | 8 ++++- 3 files changed, 44 insertions(+), 11 deletions(-) diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Misc.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Misc.c index 1a7c41a..892d19b 100644 --- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Misc.c +++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Misc.c @@ -1,7 +1,7 @@ /** @file Misc support routines for tcp. -Copyright (c) 2005 - 2016, Intel Corporation. All rights reserved.
+Copyright (c) 2005 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -78,7 +78,8 @@ TcpInitTcbLocal ( // First window size is never scaled // Tcb->RcvWndScale = 0; - + Tcb->RetxmitSeqMax = 0; + Tcb->ProbeTimerOn = FALSE; } diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Output.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Output.c index 0eec8f0..5a3d837 100644 --- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Output.c +++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Output.c @@ -1,7 +1,7 @@ /** @file TCP output process routines. -Copyright (c) 2005 - 2016, Intel Corporation. All rights reserved.
+Copyright (c) 2005 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -671,17 +671,39 @@ 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)) { - DEBUG ((EFI_D_WARN, "TcpRetransmit: retransmission cancelled " - "because send window too small for TCB %p\n", Tcb)); + + // + // Handle the Window Retraction if TCP window scale is enabled according 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. + // + if ((Tcb->SndWndScale != 0) && + (TCP_SEQ_GT (Seq, Tcb->RetxmitSeqMax) || TCP_SEQ_BETWEEN (Tcb->SndWl2 + Tcb->SndWnd, Seq, Tcb->SndWl2 + Tcb->SndWnd + (1 << Tcb->SndWndScale)))) { + Len = TCP_SUB_SEQ (Tcb->SndNxt, Seq); + DEBUG ( + (EFI_D_WARN, + "TcpRetransmit: retransmission without regard to the receiver window for TCB %p\n", + Tcb) + ); + + } else if (TCP_SEQ_GEQ (Tcb->SndWl2 + Tcb->SndWnd, Seq)) { + Len = TCP_SUB_SEQ (Tcb->SndWl2 + Tcb->SndWnd, Seq); + + } else { + DEBUG ( + (EFI_D_WARN, + "TcpRetransmit: retransmission cancelled because send window too small for TCB %p\n", + Tcb) + ); return 0; } + + Len = MIN (Len, Tcb->SndMss); - Len = TCP_SUB_SEQ (Tcb->SndWl2 + Tcb->SndWnd, Seq); - Len = MIN (Len, Tcb->SndMss); - - Nbuf = TcpGetSegmentSndQue (Tcb, Seq, Len); + Nbuf = TcpGetSegmentSndQue (Tcb, Seq, Len); if (Nbuf == NULL) { return -1; } @@ -691,6 +713,10 @@ TcpRetransmit ( if (TcpTransmitSegment (Tcb, Nbuf) != 0) { goto OnError; } + + if (TCP_SEQ_GT (Seq, Tcb->RetxmitSeqMax)) { + Tcb->RetxmitSeqMax = Seq; + } // // The retransmitted buffer may be on the SndQue, diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Proto.h b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Proto.h index 01d6034..49d8a1d 100644 --- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Proto.h +++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Proto.h @@ -1,7 +1,7 @@ /** @file Tcp Protocol header file. -Copyright (c) 2005 - 2010, Intel Corporation. All rights reserved.
+Copyright (c) 2005 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -251,6 +251,12 @@ struct _TCP_CB { UINT32 ConnectTimeout; ///< The connect establishment time out // + // RFC7323 + // Addressing Window Retraction for TCP Window Scale Option. + // + TCP_SEQNO RetxmitSeqMax; ///< Max Seq number in previous retransmission. + + // // configuration for tcp provided by user // BOOLEAN UseDefaultAddr; -- 1.9.5.msysgit.1