From 2e4c2a049be0cfebb2caa79884f22e80ee96eca7 Mon Sep 17 00:00:00 2001
From: hhuan13 <hhuan13@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Thu, 9 Sep 2010 09:30:19 +0000
Subject: [PATCH] Improve PXE Over IPv4 performance: 1. Stop UdpWrite instance
 upon return from EfiPxeBcUdpWrite() to avoid mass pkgs enqueue to this
 useless instance in Udp layer. 2. Enhance Udp timeout logic to prevent the
 worst case happen, and set PxeUdp instance to 50ms to avoid enqueue mass pkgs
 in background.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10861 6f19259b-4bc3-4df7-8a09-765794883524
---
 .../Universal/Network/Udp4Dxe/Udp4Impl.c      |  2 +-
 .../Network/UefiPxeBcDxe/PxeBcImpl.c          | 28 +++++++++++--------
 .../Network/UefiPxeBcDxe/PxeBcImpl.h          |  2 +-
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.c b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.c
index bc07c185d9..ffcbfed2c5 100644
--- a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.c
+++ b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.c
@@ -431,7 +431,7 @@ Udp4CheckTimeout (
       //
       // TimeoutTick unit is microsecond, MNP_TIMEOUT_CHECK_INTERVAL unit is 100ns.
       //
-      if (Wrap->TimeoutTick <= (UDP4_TIMEOUT_INTERVAL / 10)) {
+      if (Wrap->TimeoutTick < (UDP4_TIMEOUT_INTERVAL / 10)) {
         //
         // Remove this RxData if it timeouts.
         //
diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c
index ba8fe5c429..50736a9731 100644
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c
+++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c
@@ -1407,20 +1407,20 @@ EfiPxeBcUdpWrite (
     if (SrcPort != NULL) {
       Private->CurrentUdpSrcPort = *SrcPort;
     }
-
-    Status = PxeBcConfigureUdpWriteInstance (
-               Udp4,
-               &Private->StationIp.v4,
-               &Private->SubnetMask.v4,
-               &Private->GatewayIp.v4,
-               &Private->CurrentUdpSrcPort
-               );
-    if (EFI_ERROR (Status)) {
-      Private->CurrentUdpSrcPort = 0;
-      return EFI_INVALID_PARAMETER;
-    }
   }
 
+  Status = PxeBcConfigureUdpWriteInstance (
+             Udp4,
+             &Private->StationIp.v4,
+             &Private->SubnetMask.v4,
+             &Private->GatewayIp.v4,
+             &Private->CurrentUdpSrcPort
+             );
+  if (EFI_ERROR (Status)) {
+    Private->CurrentUdpSrcPort = 0;
+    return EFI_INVALID_PARAMETER;
+  }
+  
   ZeroMem (&Token, sizeof (EFI_UDP4_COMPLETION_TOKEN));
   ZeroMem (&Udp4Session, sizeof (EFI_UDP4_SESSION_DATA));
 
@@ -1492,6 +1492,10 @@ ON_EXIT:
 
   FreePool (Udp4TxData);
 
+  //
+  // Reset the instance.
+  //
+  Udp4->Configure (Udp4, NULL);
   return Status;
 }
 
diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.h b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.h
index ddc1eba034..cc771bc5d4 100644
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.h
+++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.h
@@ -53,7 +53,7 @@ typedef struct _PXEBC_PRIVATE_DATA  PXEBC_PRIVATE_DATA;
 #define PXEBC_DEFAULT_UDP_OVERHEAD_SIZE    8
 #define PXEBC_DEFAULT_TFTP_OVERHEAD_SIZE   4
 #define PXEBC_DEFAULT_PACKET_SIZE          1480
-#define PXEBC_DEFAULT_LIFETIME             2000000  // 2 seconds, unit is microsecond
+#define PXEBC_DEFAULT_LIFETIME             50000  // 50ms, unit is microsecond
 
 struct _PXEBC_PRIVATE_DATA {
   UINT32                                    Signature;