Reviewed-by: Ray Ni <ray.ni@intel.com>
> -----Original Message-----
> From: Tan, Dun <dun.tan@intel.com>
> Sent: Thursday, March 23, 2023 3:41 PM
> To: devel@edk2.groups.io
> Cc: Dong, Eric <eric.dong@intel.com>; Ni, Ray <ray.ni@intel.com>; Kumar,
> Rahul R <rahul.r.kumar@intel.com>; Gerd Hoffmann <kraxel@redhat.com>;
> Liu, Zhiguang <zhiguang.liu@intel.com>
> Subject: [Patch V4 14/21] UefiCpuPkg/CpuPageTableLib: Modify RandomTest
> to check IsModified
>
> Modify RandomTest to check if parameter IsModified of
> PageTableMap() correctlly indicates whether input page table
> is modified or not.
>
> Signed-off-by: Dun Tan <dun.tan@intel.com>
> Cc: Eric Dong <eric.dong@intel.com>
> Cc: Ray Ni <ray.ni@intel.com>
> Cc: Rahul Kumar <rahul1.kumar@intel.com>
> Cc: Gerd Hoffmann <kraxel@redhat.com>
> Cc: Zhiguang Liu <zhiguang.liu@intel.com>
> ---
> UefiCpuPkg/Library/CpuPageTableLib/UnitTest/RandomTest.c | 45
> +++++++++++++++++++++++++++++++++------------
> 1 file changed, 33 insertions(+), 12 deletions(-)
>
> diff --git a/UefiCpuPkg/Library/CpuPageTableLib/UnitTest/RandomTest.c
> b/UefiCpuPkg/Library/CpuPageTableLib/UnitTest/RandomTest.c
> index 816fd7b446..6f1485976a 100644
> --- a/UefiCpuPkg/Library/CpuPageTableLib/UnitTest/RandomTest.c
> +++ b/UefiCpuPkg/Library/CpuPageTableLib/UnitTest/RandomTest.c
> @@ -636,6 +636,8 @@ SingleMapEntryTest (
> VOID *Buffer;
> IA32_MAP_ENTRY *Map;
> UINTN MapCount;
> + IA32_MAP_ENTRY *Map2;
> + UINTN MapCount2;
> UINTN Index;
> UINTN KeyPointCount;
> UINTN NewKeyPointCount;
> @@ -648,11 +650,13 @@ SingleMapEntryTest (
> UINT64 PreviousAddress;
> UINT64 RangeLimit;
> BOOLEAN IsNotPresent;
> + BOOLEAN IsModified;
>
> MapsIndex = MapEntrys->Count;
> MapCount = 0;
> PreviousAddress = 0;
> IsNotPresent = FALSE;
> + IsModified = FALSE;
>
> GenerateSingleRandomMapEntry (MaxAddress, MapEntrys);
> RangeLimit = MapEntrys->Maps[MapsIndex].LinearAddress + MapEntrys-
> >Maps[MapsIndex].Length;
> @@ -697,7 +701,7 @@ SingleMapEntryTest (
> MapEntrys->Maps[MapsIndex].Length,
> &MapEntrys->Maps[MapsIndex].Attribute,
> &MapEntrys->Maps[MapsIndex].Mask,
> - NULL
> + &IsModified
> );
>
> Attribute = &MapEntrys->Maps[MapsIndex].Attribute;
> @@ -758,7 +762,7 @@ SingleMapEntryTest (
> MapEntrys->Maps[MapsIndex].Length,
> &MapEntrys->Maps[MapsIndex].Attribute,
> &MapEntrys->Maps[MapsIndex].Mask,
> - NULL
> + &IsModified
> );
> }
>
> @@ -772,18 +776,31 @@ SingleMapEntryTest (
> return TestStatus;
> }
>
> - MapCount = 0;
> - Status = PageTableParse (*PageTable, PagingMode, NULL, &MapCount);
> - if (MapCount != 0) {
> + MapCount2 = 0;
> + Status = PageTableParse (*PageTable, PagingMode, NULL, &MapCount2);
> + if (MapCount2 != 0) {
> UT_ASSERT_EQUAL (Status, RETURN_BUFFER_TOO_SMALL);
>
> //
> - // Allocate memory for Maps
> + // Allocate memory for Map2
> // Note the memory is only used in this one Single MapEntry Test
> //
> - Map = AllocatePages (EFI_SIZE_TO_PAGES (MapCount * sizeof
> (IA32_MAP_ENTRY)));
> - ASSERT (Map != NULL);
> - Status = PageTableParse (*PageTable, PagingMode, Map, &MapCount);
> + Map2 = AllocatePages (EFI_SIZE_TO_PAGES (MapCount2 * sizeof
> (IA32_MAP_ENTRY)));
> + ASSERT (Map2 != NULL);
> + Status = PageTableParse (*PageTable, PagingMode, Map2, &MapCount2);
> + }
> +
> + //
> + // Check if PageTable has been modified.
> + //
> + if (MapCount2 != MapCount) {
> + UT_ASSERT_EQUAL (IsModified, TRUE);
> + } else {
> + if (CompareMem (Map, Map2, MapCount2 * sizeof
> (IA32_MAP_ENTRY)) != 0) {
> + UT_ASSERT_EQUAL (IsModified, TRUE);
> + } else {
> + UT_ASSERT_EQUAL (IsModified, FALSE);
> + }
> }
>
> UT_ASSERT_EQUAL (Status, RETURN_SUCCESS);
> @@ -793,17 +810,17 @@ SingleMapEntryTest (
> // Note the memory is only used in this one Single MapEntry Test
> //
> KeyPointCount = 0;
> - GetKeyPointList (MapEntrys, Map, MapCount, NULL, &KeyPointCount);
> + GetKeyPointList (MapEntrys, Map2, MapCount2, NULL, &KeyPointCount);
> KeyPointBuffer = AllocatePages (EFI_SIZE_TO_PAGES (KeyPointCount *
> sizeof (UINT64)));
> ASSERT (KeyPointBuffer != NULL);
> NewKeyPointCount = 0;
> - GetKeyPointList (MapEntrys, Map, MapCount, KeyPointBuffer,
> &NewKeyPointCount);
> + GetKeyPointList (MapEntrys, Map2, MapCount2, KeyPointBuffer,
> &NewKeyPointCount);
>
> //
> // Compare all key point's attribute
> //
> for (Index = 0; Index < NewKeyPointCount; Index++) {
> - if (!CompareEntrysforOnePoint (KeyPointBuffer[Index], MapEntrys, Map,
> MapCount, InitMap, InitMapCount)) {
> + if (!CompareEntrysforOnePoint (KeyPointBuffer[Index], MapEntrys,
> Map2, MapCount2, InitMap, InitMapCount)) {
> DEBUG ((DEBUG_INFO, "Error happens at below key point\n"));
> DEBUG ((DEBUG_INFO, "Index = %d KeyPointBuffer[Index] = 0x%lx\n",
> Index, KeyPointBuffer[Index]));
> Value = GetEntryFromPageTable (*PageTable, PagingMode,
> KeyPointBuffer[Index], &Level);
> @@ -817,6 +834,10 @@ SingleMapEntryTest (
> FreePages (Map, EFI_SIZE_TO_PAGES (MapCount * sizeof
> (IA32_MAP_ENTRY)));
> }
>
> + if (MapCount2 != 0) {
> + FreePages (Map2, EFI_SIZE_TO_PAGES (MapCount2 * sizeof
> (IA32_MAP_ENTRY)));
> + }
> +
> return UNIT_TEST_PASSED;
> }
>
> --
> 2.31.1.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#101683): https://edk2.groups.io/g/devel/message/101683
Mute This Topic: https://groups.io/mt/97796391/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/leave/3901457/1787277/102458076/xyzzy [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-