MdeModulePkg/Variable: Parameterize VARIABLE_INFO_ENTRY buffer

UpdateVariableInfo () currently accepts parameters regarding updates
to be made to a global variable of type VARIABLE_INFO_ENTRY. This
change passes the structure by pointer to UpdateVariableInfo ()
so structures other than the fixed global variable can be updated.

Cc: Dandan Bi <dandan.bi@intel.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Eric Dong <eric.dong@intel.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Hao A Wu <hao.a.wu@intel.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Signed-off-by: Michael Kubacki <michael.a.kubacki@intel.com>
Reviewed-by: Jian J Wang <jian.j.wang@intel.com>
Reviewed-by: Hao A Wu <hao.a.wu@intel.com>

3 files changed, 40 insertions, 35 deletions

diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
index 70af86db24..5cc12c2ae0 100644
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
+++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
@@ -1641,7 +1641,7 @@ UpdateVariable (
         // go to delete this variable in variable HOB and

         // try to flush other variables from HOB to flash.

         //

-        UpdateVariableInfo (VariableName, VendorGuid, FALSE, FALSE, FALSE, TRUE, FALSE);

+        UpdateVariableInfo (VariableName, VendorGuid, FALSE, FALSE, FALSE, TRUE, FALSE, &gVariableInfo);

         FlushHobVariableToFlash (VariableName, VendorGuid);

         return EFI_SUCCESS;

       }

@@ -1758,7 +1758,7 @@ UpdateVariable (
                  &State

                  );

       if (!EFI_ERROR (Status)) {

-        UpdateVariableInfo (VariableName, VendorGuid, Variable->Volatile, FALSE, FALSE, TRUE, FALSE);

+        UpdateVariableInfo (VariableName, VendorGuid, Variable->Volatile, FALSE, FALSE, TRUE, FALSE, &gVariableInfo);

         if (!Variable->Volatile) {

           CacheVariable->CurrPtr->State = State;

           FlushHobVariableToFlash (VariableName, VendorGuid);

@@ -1777,7 +1777,7 @@ UpdateVariable (
       //

       // Variable content unchanged and no need to update timestamp, just return.

       //

-      UpdateVariableInfo (VariableName, VendorGuid, Variable->Volatile, FALSE, TRUE, FALSE, FALSE);

+      UpdateVariableInfo (VariableName, VendorGuid, Variable->Volatile, FALSE, TRUE, FALSE, FALSE, &gVariableInfo);

       Status = EFI_SUCCESS;

       goto Done;

     } else if ((CacheVariable->CurrPtr->State == VAR_ADDED) ||

@@ -2006,7 +2006,7 @@ UpdateVariable (
           CacheVariable->CurrPtr = (VARIABLE_HEADER *)((UINTN) CacheVariable->StartPtr + ((UINTN) Variable->CurrPtr - (UINTN) Variable->StartPtr));

           CacheVariable->InDeletedTransitionPtr = NULL;

         }

-        UpdateVariableInfo (VariableName, VendorGuid, FALSE, FALSE, TRUE, FALSE, FALSE);

+        UpdateVariableInfo (VariableName, VendorGuid, FALSE, FALSE, TRUE, FALSE, FALSE, &gVariableInfo);

         FlushHobVariableToFlash (VariableName, VendorGuid);

       } else {

         if (IsCommonUserVariable && ((VarSize + mVariableModuleGlobal->CommonUserVariableTotalSize) > mVariableModuleGlobal->CommonMaxUserVariableSpace)) {

@@ -2156,7 +2156,7 @@ UpdateVariable (
           CacheVariable->CurrPtr = (VARIABLE_HEADER *)((UINTN) CacheVariable->StartPtr + ((UINTN) Variable->CurrPtr - (UINTN) Variable->StartPtr));

           CacheVariable->InDeletedTransitionPtr = NULL;

         }

-        UpdateVariableInfo (VariableName, VendorGuid, TRUE, FALSE, TRUE, FALSE, FALSE);

+        UpdateVariableInfo (VariableName, VendorGuid, TRUE, FALSE, TRUE, FALSE, FALSE, &gVariableInfo);

       }

       goto Done;

     }

@@ -2227,7 +2227,7 @@ UpdateVariable (
   }

 

   if (!EFI_ERROR (Status)) {

-    UpdateVariableInfo (VariableName, VendorGuid, Volatile, FALSE, TRUE, FALSE, FALSE);

+    UpdateVariableInfo (VariableName, VendorGuid, Volatile, FALSE, TRUE, FALSE, FALSE, &gVariableInfo);

     if (!Volatile) {

       FlushHobVariableToFlash (VariableName, VendorGuid);

     }

@@ -2306,7 +2306,7 @@ VariableServiceGetVariable (
     }

 

     *DataSize = VarDataSize;

-    UpdateVariableInfo (VariableName, VendorGuid, Variable.Volatile, TRUE, FALSE, FALSE, FALSE);

+    UpdateVariableInfo (VariableName, VendorGuid, Variable.Volatile, TRUE, FALSE, FALSE, FALSE, &gVariableInfo);

 

     Status = EFI_SUCCESS;

     goto Done;

diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableParsing.c b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableParsing.c
index d6bb916e68..870c9e3742 100644
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableParsing.c
+++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableParsing.c
@@ -660,13 +660,14 @@ Done:
   the transaction. Data is allocated by this routine, but never

   freed.

 

-  @param[in] VariableName   Name of the Variable to track.

-  @param[in] VendorGuid     Guid of the Variable to track.

-  @param[in] Volatile       TRUE if volatile FALSE if non-volatile.

-  @param[in] Read           TRUE if GetVariable() was called.

-  @param[in] Write          TRUE if SetVariable() was called.

-  @param[in] Delete         TRUE if deleted via SetVariable().

-  @param[in] Cache          TRUE for a cache hit.

+  @param[in]      VariableName   Name of the Variable to track.

+  @param[in]      VendorGuid     Guid of the Variable to track.

+  @param[in]      Volatile       TRUE if volatile FALSE if non-volatile.

+  @param[in]      Read           TRUE if GetVariable() was called.

+  @param[in]      Write          TRUE if SetVariable() was called.

+  @param[in]      Delete         TRUE if deleted via SetVariable().

+  @param[in]      Cache          TRUE for a cache hit.

+  @param[in,out]  VariableInfo   Pointer to a pointer of VARIABLE_INFO_ENTRY structures.

 

 **/

 VOID

@@ -677,35 +678,38 @@ UpdateVariableInfo (
   IN  BOOLEAN                 Read,

   IN  BOOLEAN                 Write,

   IN  BOOLEAN                 Delete,

-  IN  BOOLEAN                 Cache

+  IN  BOOLEAN                 Cache,

+  IN OUT VARIABLE_INFO_ENTRY  **VariableInfo

   )

 {

   VARIABLE_INFO_ENTRY   *Entry;

 

   if (FeaturePcdGet (PcdVariableCollectStatistics)) {

-

+    if (VariableName == NULL || VendorGuid == NULL || VariableInfo == NULL) {

+      return;

+    }

     if (AtRuntime ()) {

       // Don't collect statistics at runtime.

       return;

     }

 

-    if (gVariableInfo == NULL) {

+    if (*VariableInfo == NULL) {

       //

       // On the first call allocate a entry and place a pointer to it in

       // the EFI System Table.

       //

-      gVariableInfo = AllocateZeroPool (sizeof (VARIABLE_INFO_ENTRY));

-      ASSERT (gVariableInfo != NULL);

-

-      CopyGuid (&gVariableInfo->VendorGuid, VendorGuid);

-      gVariableInfo->Name = AllocateZeroPool (StrSize (VariableName));

-      ASSERT (gVariableInfo->Name != NULL);

-      StrCpyS (gVariableInfo->Name, StrSize(VariableName)/sizeof(CHAR16), VariableName);

-      gVariableInfo->Volatile = Volatile;

+      *VariableInfo = AllocateZeroPool (sizeof (VARIABLE_INFO_ENTRY));

+      ASSERT (*VariableInfo != NULL);

+

+      CopyGuid (&(*VariableInfo)->VendorGuid, VendorGuid);

+      (*VariableInfo)->Name = AllocateZeroPool (StrSize (VariableName));

+      ASSERT ((*VariableInfo)->Name != NULL);

+      StrCpyS ((*VariableInfo)->Name, StrSize(VariableName)/sizeof(CHAR16), VariableName);

+      (*VariableInfo)->Volatile = Volatile;

     }

 

 

-    for (Entry = gVariableInfo; Entry != NULL; Entry = Entry->Next) {

+    for (Entry = (*VariableInfo); Entry != NULL; Entry = Entry->Next) {

       if (CompareGuid (VendorGuid, &Entry->VendorGuid)) {

         if (StrCmp (VariableName, Entry->Name) == 0) {

           if (Read) {

@@ -739,7 +743,6 @@ UpdateVariableInfo (
         StrCpyS (Entry->Next->Name, StrSize(VariableName)/sizeof(CHAR16), VariableName);

         Entry->Next->Volatile = Volatile;

       }

-

     }

   }

 }

diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableParsing.h b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableParsing.h
index 6555316f52..1777ce0e69 100644
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableParsing.h
+++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableParsing.h
@@ -286,13 +286,14 @@ VariableServiceGetNextVariableInternal (
   the transaction. Data is allocated by this routine, but never

   freed.

 

-  @param[in] VariableName   Name of the Variable to track.

-  @param[in] VendorGuid     Guid of the Variable to track.

-  @param[in] Volatile       TRUE if volatile FALSE if non-volatile.

-  @param[in] Read           TRUE if GetVariable() was called.

-  @param[in] Write          TRUE if SetVariable() was called.

-  @param[in] Delete         TRUE if deleted via SetVariable().

-  @param[in] Cache          TRUE for a cache hit.

+  @param[in]      VariableName   Name of the Variable to track.

+  @param[in]      VendorGuid     Guid of the Variable to track.

+  @param[in]      Volatile       TRUE if volatile FALSE if non-volatile.

+  @param[in]      Read           TRUE if GetVariable() was called.

+  @param[in]      Write          TRUE if SetVariable() was called.

+  @param[in]      Delete         TRUE if deleted via SetVariable().

+  @param[in]      Cache          TRUE for a cache hit.

+  @param[in,out]  VariableInfo   Pointer to a pointer of VARIABLE_INFO_ENTRY structures.

 

 **/

 VOID

@@ -303,7 +304,8 @@ UpdateVariableInfo (
   IN  BOOLEAN                 Read,

   IN  BOOLEAN                 Write,

   IN  BOOLEAN                 Delete,

-  IN  BOOLEAN                 Cache

+  IN  BOOLEAN                 Cache,

+  IN OUT VARIABLE_INFO_ENTRY  **VariableInfo

   );

 

 #endif