tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MdeModulePkg: Addressing TCP Window Retraction when window scale factor is used. 

The RFC1323 which defines the TCP window scale option has been obsoleted by RFC7323.
This patch is to follow the RFC7323 to address the TCP window retraction problem
when a non-zero scale factor is used.
The changes has been test in high packet loss rate network by using HTTP boot and
iSCSI file read/write.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Fu Siyuan <siyuan.fu@intel.com>
Reviewed-by: Wu Jiaxin <jiaxin.wu@intel.com>
Reviewed-by: Ye Ting <ting.ye@intel.com>
This commit is contained in:
Fu Siyuan 2017-05-03 15:22:08 +08:00
parent 3696ceaecb
commit ca12a0c83b
3 changed files with 44 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Misc.c
View File

@ -1,7 +1,7 @@
/** @file /** @file
Misc support routines for tcp. Misc support routines for tcp.
Copyright (c) 2005 - 2016, Intel Corporation. All rights reserved.<BR> Copyright (c) 2005 - 2017, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -78,6 +78,7 @@ TcpInitTcbLocal (
// First window size is never scaled // First window size is never scaled
// //
Tcb->RcvWndScale = 0; Tcb->RcvWndScale = 0;
Tcb->RetxmitSeqMax = 0;
Tcb->ProbeTimerOn = FALSE; Tcb->ProbeTimerOn = FALSE;
} }

36
MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Output.c
View File

@ -1,7 +1,7 @@
/** @file /** @file
TCP output process routines. TCP output process routines.
Copyright (c) 2005 - 2016, Intel Corporation. All rights reserved.<BR> Copyright (c) 2005 - 2017, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -671,14 +671,36 @@ TcpRetransmit (
// 2. must in the current send window // 2. must in the current send window
// 3. will not change the boundaries of queued segments. // 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; return 0;
} }
Len = TCP_SUB_SEQ (Tcb->SndWl2 + Tcb->SndWnd, Seq);
Len = MIN (Len, Tcb->SndMss); Len = MIN (Len, Tcb->SndMss);
Nbuf = TcpGetSegmentSndQue (Tcb, Seq, Len); Nbuf = TcpGetSegmentSndQue (Tcb, Seq, Len);
@ -692,6 +714,10 @@ TcpRetransmit (
goto OnError; goto OnError;
} }
if (TCP_SEQ_GT (Seq, Tcb->RetxmitSeqMax)) {
Tcb->RetxmitSeqMax = Seq;
}
// //
// The retransmitted buffer may be on the SndQue, // The retransmitted buffer may be on the SndQue,
// trim TCP head because all the buffer on SndQue // trim TCP head because all the buffer on SndQue

8
MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Proto.h
View File

@ -1,7 +1,7 @@
/** @file /** @file
Tcp Protocol header file. Tcp Protocol header file.
Copyright (c) 2005 - 2010, Intel Corporation. All rights reserved.<BR> Copyright (c) 2005 - 2017, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -250,6 +250,12 @@ struct _TCP_CB {
UINT32 TimeWaitTimeout; ///< The TIME_WAIT time out UINT32 TimeWaitTimeout; ///< The TIME_WAIT time out
UINT32 ConnectTimeout; ///< The connect establishment time out 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 // configuration for tcp provided by user
// //