ShellPkg: update ping to use timer service instead of timer arch protocol .

The ping command uses PI CPU arch protocol to calculate the RTT time, which is
not allowed to use in UEFI shell. This patch updates it to use the UEFI timer
event and Stall service to estimate the system timer period.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Fu Siyuan <siyuan.fu@intel.com>
Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Hegde, Nagaraj P <nagaraj-p.hegde@hpe.com>

diff --git a/ShellPkg/Library/UefiShellNetwork1CommandsLib/Ping.c b/ShellPkg/Library/UefiShellNetwork1CommandsLib/Ping.c
index 38625fef93e62c2025e3b890e851ad47cef74c1d..b7d08d51e62ce9b43a515fd3745fedd1756a4dbb 100644 (file)
--- a/ShellPkg/Library/UefiShellNetwork1CommandsLib/Ping.c
+++ b/ShellPkg/Library/UefiShellNetwork1CommandsLib/Ping.c
@@ -86,7 +86,7 @@ typedef struct _ICMPX_ECHO_REQUEST_REPLY {
   UINT16                      Checksum;\r
   UINT16                      Identifier;\r
   UINT16                      SequenceNum;\r
-  UINT64                      TimeStamp;\r
+  UINT32                      TimeStamp;\r
   UINT8                       Data[1];\r
 } ICMPX_ECHO_REQUEST_REPLY;\r
 #pragma pack()\r
@@ -94,7 +94,7 @@ typedef struct _ICMPX_ECHO_REQUEST_REPLY {
 typedef struct _PING_ICMP_TX_INFO {\r
   LIST_ENTRY                Link;\r
   UINT16                    SequenceNum;\r
-  UINT64                    TimeStamp;\r
+  UINT32                    TimeStamp;\r
   PING_IPX_COMPLETION_TOKEN *Token;\r
 } PING_ICMPX_TX_INFO;\r
 \r
@@ -109,6 +109,7 @@ typedef struct _PING_ICMP_TX_INFO {
 #define DEFAULT_BUFFER_SIZE   16\r
 #define ICMP_V4_ECHO_REQUEST  0x8\r
 #define ICMP_V4_ECHO_REPLY    0x0\r
+#define STALL_1_MILLI_SECOND  1000\r
 \r
 #define PING_PRIVATE_DATA_SIGNATURE  SIGNATURE_32 ('P', 'i', 'n', 'g')\r
 typedef struct _PING_PRIVATE_DATA {\r
@@ -117,6 +118,10 @@ typedef struct _PING_PRIVATE_DATA {
   EFI_HANDLE                  IpChildHandle;\r
   EFI_EVENT                   Timer;\r
 \r
+  UINT32                      TimerPeriod;\r
+  UINT32                      RttTimerTick;   \r
+  EFI_EVENT                   RttTimer;\r
+\r
   EFI_STATUS                  Status;\r
   LIST_ENTRY                  TxList;\r
   UINT16                      RxCount;\r
@@ -221,93 +226,185 @@ STATIC CONST SHELL_PARAM_ITEM    PingParamList[] = {
 //\r
 STATIC CONST CHAR16      *mDstString;\r
 STATIC CONST CHAR16      *mSrcString;\r
-STATIC UINT64            mFrequency = 0;\r
-EFI_CPU_ARCH_PROTOCOL    *gCpu = NULL;\r
 \r
 /**\r
-  Read the current time.\r
+  RTT timer tick routine.\r
+\r
+  @param[in]    Event    A EFI_EVENT type event.\r
+  @param[in]    Context  The pointer to Context.\r
 \r
-  @retval the current tick value.\r
 **/\r
-UINT64\r
-ReadTime (\r
+VOID\r
+EFIAPI\r
+RttTimerTickRoutine (\r
+  IN EFI_EVENT    Event,\r
+  IN VOID         *Context\r
+  )\r
+{\r
+  UINT32     *RttTimerTick;\r
+\r
+  RttTimerTick = (UINT32*) Context;\r
+  (*RttTimerTick)++;\r
+}\r
+\r
+/**\r
+  Get the timer period of the system.\r
+\r
+  This function tries to get the system timer period by creating\r
+  an 1ms period timer.\r
+\r
+  @return     System timer period in MS, or 0 if operation failed.\r
+\r
+**/\r
+UINT32\r
+GetTimerPeriod(\r
   VOID\r
   )\r
 {\r
-  UINT64                 TimerPeriod;\r
-  EFI_STATUS             Status;\r
+  EFI_STATUS                 Status;\r
+  UINT32                     RttTimerTick;\r
+  EFI_EVENT                  TimerEvent;\r
+  UINT32                     StallCounter;\r
+  EFI_TPL                    OldTpl;\r
 \r
-  ASSERT (gCpu != NULL);\r
+  RttTimerTick = 0;\r
+  StallCounter   = 0;\r
 \r
-  Status = gCpu->GetTimerValue (gCpu, 0, &mCurrentTick, &TimerPeriod);\r
+  Status = gBS->CreateEvent (\r
+                  EVT_TIMER | EVT_NOTIFY_SIGNAL,\r
+                  TPL_NOTIFY,\r
+                  RttTimerTickRoutine,\r
+                  &RttTimerTick,\r
+                  &TimerEvent\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
-    //\r
-    // The WinntGetTimerValue will return EFI_UNSUPPORTED. Set the\r
-    // TimerPeriod by ourselves.\r
-    //\r
-    mCurrentTick += 1000000;\r
+    return 0;\r
+  }\r
+\r
+  OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
+  Status = gBS->SetTimer (\r
+                  TimerEvent,\r
+                  TimerPeriodic,\r
+                  TICKS_PER_MS\r
+                  );\r
+  if (EFI_ERROR (Status)) {\r
+    gBS->CloseEvent (TimerEvent);\r
+    return 0;\r
+  }\r
+\r
+  while (RttTimerTick < 10) {\r
+    gBS->Stall (STALL_1_MILLI_SECOND);\r
+    ++StallCounter;\r
   }\r
-  \r
-  return mCurrentTick;\r
-}\r
 \r
+  gBS->RestoreTPL (OldTpl);\r
+\r
+  gBS->SetTimer (TimerEvent, TimerCancel, 0);\r
+  gBS->CloseEvent (TimerEvent);\r
+\r
+  return StallCounter / RttTimerTick;\r
+}\r
 \r
 /**\r
-  Get and calculate the frequency in ticks/ms.\r
-  The result is saved in the global variable mFrequency\r
+  Initialize the timer event for RTT (round trip time).\r
 \r
-  @retval EFI_SUCCESS    Calculated the frequency successfully.\r
-  @retval Others         Failed to calculate the frequency.\r
+  @param[in]    Private    The pointer to PING_PRIVATE_DATA.\r
+\r
+  @retval EFI_SUCCESS      RTT timer is started.\r
+  @retval Others           Failed to start the RTT timer.\r
 \r
 **/\r
 EFI_STATUS\r
-GetFrequency (\r
-  VOID\r
+PingInitRttTimer (\r
+  PING_PRIVATE_DATA      *Private\r
   )\r
 {\r
-  EFI_STATUS               Status;\r
-  UINT64                   CurrentTick;\r
-  UINT64                   TimerPeriod;\r
+  EFI_STATUS                 Status;\r
+\r
+  Private->TimerPeriod = GetTimerPeriod ();\r
+  if (Private->TimerPeriod == 0) {\r
+    return EFI_ABORTED;\r
+  }\r
+  \r
+  Private->RttTimerTick = 0;\r
+  Status = gBS->CreateEvent (\r
+                  EVT_TIMER | EVT_NOTIFY_SIGNAL,\r
+                  TPL_NOTIFY,\r
+                  RttTimerTickRoutine,\r
+                  &Private->RttTimerTick,\r
+                  &Private->RttTimer\r
+                  );\r
+  if (EFI_ERROR (Status)) {\r
+    return Status;\r
+  }\r
 \r
-  Status = gBS->LocateProtocol (&gEfiCpuArchProtocolGuid, NULL, (VOID **) &gCpu);\r
+  Status = gBS->SetTimer (\r
+                  Private->RttTimer,\r
+                  TimerPeriodic,\r
+                  TICKS_PER_MS\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
+    gBS->CloseEvent (Private->RttTimer);\r
     return Status;\r
   }\r
 \r
-  Status = gCpu->GetTimerValue (gCpu, 0, &CurrentTick, &TimerPeriod);\r
+  return EFI_SUCCESS;\r
+}\r
 \r
-  if (EFI_ERROR (Status)) {\r
-    TimerPeriod = DEFAULT_TIMER_PERIOD;\r
+/**\r
+  Free RTT timer event resource.\r
+\r
+  @param[in]    Private    The pointer to PING_PRIVATE_DATA.\r
+\r
+**/\r
+VOID\r
+PingFreeRttTimer (\r
+  PING_PRIVATE_DATA      *Private\r
+  )\r
+{\r
+  if (Private->RttTimer != NULL) {\r
+    gBS->SetTimer (Private->RttTimer, TimerCancel, 0);\r
+    gBS->CloseEvent (Private->RttTimer);\r
   }\r
+}\r
 \r
-  //\r
-  // The timer period is in femtosecond (1 femtosecond is 1e-15 second).\r
-  // So 1e+12 is divided by timer period to produce the freq in ticks/ms.\r
-  //\r
-  mFrequency = DivU64x64Remainder (1000000000000ULL, TimerPeriod, NULL);\r
+/**\r
+  Read the current time.\r
+  \r
+  @param[in]    Private    The pointer to PING_PRIVATE_DATA.\r
 \r
-  return EFI_SUCCESS;\r
+  @retval the current tick value.\r
+**/\r
+UINT32\r
+ReadTime (\r
+  PING_PRIVATE_DATA      *Private\r
+  )\r
+{\r
+  return Private->RttTimerTick;\r
 }\r
 \r
 /**\r
   Calculate a duration in ms.\r
 \r
-  @param[in]  Begin     The start point of time.\r
-  @param[in]  End       The end point of time.\r
+  @param[in]    Private   The pointer to PING_PRIVATE_DATA.\r
+  @param[in]    Begin     The start point of time.\r
+  @param[in]    End       The end point of time.\r
 \r
   @return               The duration in ms.\r
   @retval 0             The parameters were not valid.\r
 **/\r
-UINT64\r
+UINT32\r
 CalculateTick (\r
-  IN UINT64    Begin,\r
-  IN UINT64    End\r
+  PING_PRIVATE_DATA      *Private,\r
+  IN UINT32              Begin,\r
+  IN UINT32              End\r
   )\r
 {\r
-  if (End <= Begin) {\r
+  if (End < Begin) {\r
     return (0);\r
   }\r
-  return DivU64x64Remainder (End - Begin, mFrequency, NULL);\r
+\r
+  return (End - Begin) * Private->TimerPeriod;\r
 }\r
 \r
 /**\r
@@ -448,8 +545,7 @@ Ping6OnEchoReplyReceived (
   PING_PRIVATE_DATA           *Private;\r
   ICMPX_ECHO_REQUEST_REPLY    *Reply;\r
   UINT32                      PayLoad;\r
-  UINT64                      Rtt;\r
-  CHAR8                       Near;\r
+  UINT32                      Rtt;\r
 \r
   Private = (PING_PRIVATE_DATA *) Context;\r
 \r
@@ -502,12 +598,7 @@ Ping6OnEchoReplyReceived (
   //\r
   // Display statistics on this icmp6 echo reply packet.\r
   //\r
-  Rtt  = CalculateTick (Reply->TimeStamp, ReadTime ());\r
-  if (Rtt != 0) {\r
-    Near = (CHAR8) '=';\r
-  } else {\r
-    Near = (CHAR8) '<';\r
-  }\r
+  Rtt  = CalculateTick (Private, Reply->TimeStamp, ReadTime (Private));\r
 \r
   Private->RttSum += Rtt;\r
   Private->RttMin  = Private->RttMin > Rtt ? Rtt : Private->RttMin;\r
@@ -523,8 +614,8 @@ Ping6OnEchoReplyReceived (
     mDstString,\r
     Reply->SequenceNum,\r
     Private->IpChoice == PING_IP_CHOICE_IP6?((EFI_IP6_RECEIVE_DATA*)Private->RxToken.Packet.RxData)->Header->HopLimit:0,\r
-    Near,\r
-    Rtt\r
+    Rtt,\r
+    Rtt + Private->TimerPeriod\r
     );\r
 \r
 ON_EXIT:\r
@@ -565,7 +656,7 @@ ON_EXIT:
 PING_IPX_COMPLETION_TOKEN *\r
 PingGenerateToken (\r
   IN PING_PRIVATE_DATA    *Private,\r
-  IN UINT64                TimeStamp,\r
+  IN UINT32                TimeStamp,\r
   IN UINT16                SequenceNum\r
   )\r
 {\r
@@ -678,7 +769,7 @@ PingSendEchoRequest (
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-  TxInfo->TimeStamp   = ReadTime ();\r
+  TxInfo->TimeStamp   = ReadTime (Private);\r
   TxInfo->SequenceNum = (UINT16) (Private->TxCount + 1);\r
   TxInfo->Token       = PingGenerateToken (\r
                           Private,\r
@@ -784,7 +875,7 @@ Ping6OnTimerRoutine (
   //\r
   NET_LIST_FOR_EACH_SAFE (Entry, NextEntry, &Private->TxList) {\r
     TxInfo = BASE_CR (Entry, PING_ICMPX_TX_INFO, Link);\r
-    Time   = CalculateTick (TxInfo->TimeStamp, ReadTime ());\r
+    Time   = CalculateTick (Private, TxInfo->TimeStamp, ReadTime (Private));\r
 \r
     //\r
     // Remove the timeout echo request from txlist.\r
@@ -1239,6 +1330,7 @@ Ping6DestroyIp6Instance (
   }\r
 }\r
 \r
+\r
 /**\r
   The Ping Process.\r
 \r
@@ -1323,6 +1415,16 @@ ShellPing (
     ShellStatus = SHELL_ACCESS_DENIED;\r
     goto ON_EXIT;\r
   }\r
+\r
+  //\r
+  // Start a timer to calculate the RTT.\r
+  //\r
+  Status = PingInitRttTimer (Private);\r
+  if (EFI_ERROR (Status)) {\r
+    ShellStatus = SHELL_ACCESS_DENIED;\r
+    goto ON_EXIT;\r
+  }\r
+  \r
   //\r
   // Create a ipv6 token to send the first icmp6 echo request packet.\r
   //\r
@@ -1397,8 +1499,11 @@ ON_STAT:
       STRING_TOKEN (STR_PING_RTT),\r
       gShellNetwork1HiiHandle,\r
       Private->RttMin,\r
+      Private->RttMin + Private->TimerPeriod,\r
       Private->RttMax,\r
-      DivU64x64Remainder (Private->RttSum, (Private->RxCount - Private->FailedCount), NULL)\r
+      Private->RttMax + Private->TimerPeriod,\r
+      DivU64x64Remainder (Private->RttSum, (Private->RxCount - Private->FailedCount), NULL),\r
+      DivU64x64Remainder (Private->RttSum, (Private->RxCount - Private->FailedCount), NULL) + Private->TimerPeriod\r
       );\r
   }\r
 \r
@@ -1417,6 +1522,8 @@ ON_EXIT:
       PingDestroyTxInfo (TxInfo, Private->IpChoice);\r
     }\r
 \r
+    PingFreeRttTimer (Private);\r
+\r
     if (Private->Timer != NULL) {\r
       gBS->CloseEvent (Private->Timer);\r
     }\r
@@ -1580,14 +1687,7 @@ ShellCommandRunPing (
       goto ON_EXIT;\r
     }\r
   }\r
-  //\r
-  // Get frequency to calculate the time from ticks.\r
-  //\r
-  Status = GetFrequency ();\r
 \r
-  if (EFI_ERROR(Status)) {\r
-    goto ON_EXIT;\r
-  }\r
   //\r
   // Enter into ping process.\r
   //\r

diff --git a/ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf b/ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf
index 92d47d114f6bc59ccd69b51ad435a9afe5423930..25b2e14b36ddef1127b026047bc795bccb22534e 100644 (file)
--- a/ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf
+++ b/ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf
@@ -1,7 +1,7 @@
 ##  @file\r
 # Provides shell network1 functions\r
 #\r
-# Copyright (c) 2010 - 2015, Intel Corporation. All rights reserved. <BR>\r
+# Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved. <BR>\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
@@ -55,6 +55,7 @@
 \r
 [Protocols]\r
   gEfiCpuArchProtocolGuid                       ## CONSUMES\r
+  gEfiTimerArchProtocolGuid\r
   gEfiIp6ProtocolGuid                           ## SOMETIMES_CONSUMES\r
   gEfiIp6ServiceBindingProtocolGuid             ## SOMETIMES_CONSUMES\r
   gEfiIp6ConfigProtocolGuid                     ## SOMETIMES_CONSUMES\r

diff --git a/ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.uni b/ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.uni
index c8ab64fc55f44cad1d2077336495758b6e73eae6..76b61882b1cf012f4f731f137a61b9f97105b8f5 100644 (file)
--- a/ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.uni
+++ b/ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.uni
@@ -56,9 +56,9 @@
 #string STR_PING_NOROUTE_FOUND       #language en-US "There is no route to the destination '%B%s%N' from the source '%B%s%N' was found.\r\n"\r
 #string STR_PING_START               #language en-US "Ping %s %d data bytes.\r\n"\r
 #string STR_PING_TIMEOUT             #language en-US "Echo request sequence %d timeout.\r\n"\r
-#string STR_PING_REPLY_INFO          #language en-US "%d bytes from %s : icmp_seq=%d ttl=%d time%c%dms\r\n"\r
+#string STR_PING_REPLY_INFO          #language en-US "%d bytes from %s : icmp_seq=%d ttl=%d time%d~%dms\r\n"\r
 #string STR_PING_STAT                #language en-US "\n%d packets transmitted, %d received, %d%% packet loss, time %dms\r\n"\r
-#string STR_PING_RTT                 #language en-US "\nRtt(round trip time) min=%dms max=%dms avg=%dms\r\n"\r
+#string STR_PING_RTT                 #language en-US "\nRtt(round trip time) min=%d~%dms max=%d~%dms avg=%d~%dms\r\n"\r
 \r
 #string STR_IFCONFIG_UNSUPPORTED_OPTION       #language en-US    "The option '%H%s%N' is unsupported now.\n"\r
 #string STR_IFCONFIG_LACK_OPTION              #language en-US    "Flags lack.\n"\r