Re: [edk2] [Patch] NetworkPkg: Recycle the ICMP error message in PXE driver.

2017-12-21 Thread Wu, Jiaxin 
Reviewed-by: Jiaxin Wu <jiaxin...@intel.com>


> -Original Message-
> From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of Fu,
> Siyuan
> Sent: Thursday, December 21, 2017 3:46 PM
> To: edk2-devel@lists.01.org
> Cc: Ye, Ting <ting...@intel.com>; Wang, Fan <fan.w...@intel.com>; Wu,
> Jiaxin <jiaxin...@intel.com>
> Subject: [edk2] [Patch] NetworkPkg: Recycle the ICMP error message in PXE
> driver.
> 
> This patch updates PxeBcIcmpErrorDpcHandle() and
> PxeBcIcmp6ErrorDpcHandle() to
> recycle the ICMP packet after copy it to PXE mode data.
> 
> Cc: Ye Ting <ting...@intel.com>
> Cc: Wu Jiaxin <jiaxin...@intel.com>
> Cc: Wang Fan <fan.w...@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Fu Siyuan <siyuan...@intel.com>
> ---
>  NetworkPkg/UefiPxeBcDxe/PxeBcSupport.c | 36 +++-
> --
>  1 file changed, 16 insertions(+), 20 deletions(-)
> 
> diff --git a/NetworkPkg/UefiPxeBcDxe/PxeBcSupport.c
> b/NetworkPkg/UefiPxeBcDxe/PxeBcSupport.c
> index dfc79a067b..1e77929364 100644
> --- a/NetworkPkg/UefiPxeBcDxe/PxeBcSupport.c
> +++ b/NetworkPkg/UefiPxeBcDxe/PxeBcSupport.c
> @@ -257,8 +257,7 @@ PxeBcIcmpErrorDpcHandle (
>  //
>  // The return status should be recognized as EFI_ICMP_ERROR.
>  //
> -gBS->SignalEvent (RxData->RecycleSignal);
> -goto ON_EXIT;
> +goto ON_RECYCLE;
>}
> 
>if (EFI_IP4 (RxData->Header->SourceAddress) != 0 &&
> @@ -268,24 +267,21 @@ PxeBcIcmpErrorDpcHandle (
>  //
>  // The source address of the received packet should be a valid unicast
> address.
>  //
> -gBS->SignalEvent (RxData->RecycleSignal);
> -goto ON_EXIT;
> +goto ON_RECYCLE;
>}
> 
>if (!EFI_IP4_EQUAL (>Header->DestinationAddress, 
> >StationIp.v4)) {
>  //
>  // The destination address of the received packet should be equal to the
> host address.
>  //
> -gBS->SignalEvent (RxData->RecycleSignal);
> -goto ON_EXIT;
> +goto ON_RECYCLE;
>}
> 
>if (RxData->Header->Protocol != EFI_IP_PROTO_ICMP) {
>  //
>  // The protocol value in the header of the receveid packet should be
> EFI_IP_PROTO_ICMP.
>  //
> -gBS->SignalEvent (RxData->RecycleSignal);
> -goto ON_EXIT;
> +goto ON_RECYCLE;
>}
> 
>Type = *((UINT8 *) RxData->FragmentTable[0].FragmentBuffer);
> @@ -298,8 +294,7 @@ PxeBcIcmpErrorDpcHandle (
>  //
>  // The type of the receveid ICMP message should be
> ICMP_ERROR_MESSAGE.
>  //
> -gBS->SignalEvent (RxData->RecycleSignal);
> -goto ON_EXIT;
> +goto ON_RECYCLE;
>}
> 
>//
> @@ -326,6 +321,9 @@ PxeBcIcmpErrorDpcHandle (
>  IcmpError += CopiedLen;
>}
> 
> +ON_RECYCLE:
> +  gBS->SignalEvent (RxData->RecycleSignal);
> +
>  ON_EXIT:
>Private->IcmpToken.Status = EFI_NOT_READY;
>Ip4->Receive (Ip4, >IcmpToken);
> @@ -395,16 +393,14 @@ PxeBcIcmp6ErrorDpcHandle (
>  //
>  // The return status should be recognized as EFI_ICMP_ERROR.
>  //
> -gBS->SignalEvent (RxData->RecycleSignal);
> -goto ON_EXIT;
> +goto ON_RECYCLE;
>}
> 
>if (!NetIp6IsValidUnicast (>Header->SourceAddress)) {
>  //
>  // The source address of the received packet should be a valid unicast
> address.
>  //
> -gBS->SignalEvent (RxData->RecycleSignal);
> -goto ON_EXIT;
> +goto ON_RECYCLE;
>}
> 
>if (!NetIp6IsUnspecifiedAddr (>StationIp.v6) &&
> @@ -412,16 +408,14 @@ PxeBcIcmp6ErrorDpcHandle (
>  //
>  // The destination address of the received packet should be equal to the
> host address.
>  //
> -gBS->SignalEvent (RxData->RecycleSignal);
> -goto ON_EXIT;
> +goto ON_RECYCLE;
>}
> 
>if (RxData->Header->NextHeader != IP6_ICMP) {
>  //
>  // The nextheader in the header of the receveid packet should be
> IP6_ICMP.
>  //
> -gBS->SignalEvent (RxData->RecycleSignal);
> -goto ON_EXIT;
> +goto ON_RECYCLE;
>}
> 
>Type = *((UINT8 *) RxData->FragmentTable[0].FragmentBuffer);
> @@ -433,8 +427,7 @@ PxeBcIcmp6ErrorDpcHandle (
>  //
>  // The type of the receveid packet should be an ICMP6 error message.
>  //
> -gBS->SignalEvent (RxData->RecycleSignal);
> -goto ON_EXIT;
> +goto ON_RECYCLE;
>}
> 
>//
> @@ -461,6 +454,9 @@ PxeBcIcmp6ErrorDpcHandle (
>  Icmp6Error += CopiedLen;
>}
> 
> +ON_RECYCLE:
> +  gBS->SignalEvent (RxData->RecycleSignal);
> +
>  ON_EXIT:
>Private->Icmp6Token.Status = EFI_NOT_READY;
>Ip6->Receive (Ip6, >Icmp6Token);
> --
> 2.13.0.windows.1
> 
> ___
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel
___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

[edk2] [Patch] NetworkPkg: Recycle the ICMP error message in PXE driver.

2017-12-20 Thread Fu Siyuan 
This patch updates PxeBcIcmpErrorDpcHandle() and PxeBcIcmp6ErrorDpcHandle() to
recycle the ICMP packet after copy it to PXE mode data.

Cc: Ye Ting 
Cc: Wu Jiaxin 
Cc: Wang Fan 
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Fu Siyuan 
---
 NetworkPkg/UefiPxeBcDxe/PxeBcSupport.c | 36 +++---
 1 file changed, 16 insertions(+), 20 deletions(-)

diff --git a/NetworkPkg/UefiPxeBcDxe/PxeBcSupport.c 
b/NetworkPkg/UefiPxeBcDxe/PxeBcSupport.c
index dfc79a067b..1e77929364 100644
--- a/NetworkPkg/UefiPxeBcDxe/PxeBcSupport.c
+++ b/NetworkPkg/UefiPxeBcDxe/PxeBcSupport.c
@@ -257,8 +257,7 @@ PxeBcIcmpErrorDpcHandle (
 //
 // The return status should be recognized as EFI_ICMP_ERROR.
 //
-gBS->SignalEvent (RxData->RecycleSignal);
-goto ON_EXIT;
+goto ON_RECYCLE;
   }
 
   if (EFI_IP4 (RxData->Header->SourceAddress) != 0 &&
@@ -268,24 +267,21 @@ PxeBcIcmpErrorDpcHandle (
 //
 // The source address of the received packet should be a valid unicast 
address.
 //
-gBS->SignalEvent (RxData->RecycleSignal);
-goto ON_EXIT;
+goto ON_RECYCLE;
   }
 
   if (!EFI_IP4_EQUAL (>Header->DestinationAddress, 
>StationIp.v4)) {
 //
 // The destination address of the received packet should be equal to the 
host address.
 //
-gBS->SignalEvent (RxData->RecycleSignal);
-goto ON_EXIT;
+goto ON_RECYCLE;
   }
 
   if (RxData->Header->Protocol != EFI_IP_PROTO_ICMP) {
 //
 // The protocol value in the header of the receveid packet should be 
EFI_IP_PROTO_ICMP.
 //
-gBS->SignalEvent (RxData->RecycleSignal);
-goto ON_EXIT;
+goto ON_RECYCLE;
   }
 
   Type = *((UINT8 *) RxData->FragmentTable[0].FragmentBuffer);
@@ -298,8 +294,7 @@ PxeBcIcmpErrorDpcHandle (
 //
 // The type of the receveid ICMP message should be ICMP_ERROR_MESSAGE.
 //
-gBS->SignalEvent (RxData->RecycleSignal);
-goto ON_EXIT;
+goto ON_RECYCLE;
   }
 
   //
@@ -326,6 +321,9 @@ PxeBcIcmpErrorDpcHandle (
 IcmpError += CopiedLen;
   }
 
+ON_RECYCLE:
+  gBS->SignalEvent (RxData->RecycleSignal);
+
 ON_EXIT:
   Private->IcmpToken.Status = EFI_NOT_READY;
   Ip4->Receive (Ip4, >IcmpToken);
@@ -395,16 +393,14 @@ PxeBcIcmp6ErrorDpcHandle (
 //
 // The return status should be recognized as EFI_ICMP_ERROR.
 //
-gBS->SignalEvent (RxData->RecycleSignal);
-goto ON_EXIT;
+goto ON_RECYCLE;
   }
 
   if (!NetIp6IsValidUnicast (>Header->SourceAddress)) {
 //
 // The source address of the received packet should be a valid unicast 
address.
 //
-gBS->SignalEvent (RxData->RecycleSignal);
-goto ON_EXIT;
+goto ON_RECYCLE;
   }
 
   if (!NetIp6IsUnspecifiedAddr (>StationIp.v6) &&
@@ -412,16 +408,14 @@ PxeBcIcmp6ErrorDpcHandle (
 //
 // The destination address of the received packet should be equal to the 
host address.
 //
-gBS->SignalEvent (RxData->RecycleSignal);
-goto ON_EXIT;
+goto ON_RECYCLE;
   }
 
   if (RxData->Header->NextHeader != IP6_ICMP) {
 //
 // The nextheader in the header of the receveid packet should be IP6_ICMP.
 //
-gBS->SignalEvent (RxData->RecycleSignal);
-goto ON_EXIT;
+goto ON_RECYCLE;
   }
 
   Type = *((UINT8 *) RxData->FragmentTable[0].FragmentBuffer);
@@ -433,8 +427,7 @@ PxeBcIcmp6ErrorDpcHandle (
 //
 // The type of the receveid packet should be an ICMP6 error message.
 //
-gBS->SignalEvent (RxData->RecycleSignal);
-goto ON_EXIT;
+goto ON_RECYCLE;
   }
 
   //
@@ -461,6 +454,9 @@ PxeBcIcmp6ErrorDpcHandle (
 Icmp6Error += CopiedLen;
   }
 
+ON_RECYCLE:
+  gBS->SignalEvent (RxData->RecycleSignal);
+  
 ON_EXIT:
   Private->Icmp6Token.Status = EFI_NOT_READY;
   Ip6->Receive (Ip6, >Icmp6Token);
-- 
2.13.0.windows.1

___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel