From: "Ni, Ray" <ray.ni@intel.com>
To: "Tan, Dun" <dun.tan@intel.com>,
"devel@edk2.groups.io" <devel@edk2.groups.io>
Cc: "Dong, Eric" <eric.dong@intel.com>,
"Kumar, Rahul R" <rahul.r.kumar@intel.com>,
Gerd Hoffmann <kraxel@redhat.com>,
"Liu, Zhiguang" <zhiguang.liu@intel.com>
Subject: Re: [Patch V4 14/21] UefiCpuPkg/CpuPageTableLib: Modify RandomTest to check IsModified
Date: Thu, 23 Mar 2023 13:23:04 +0000 [thread overview]
Message-ID: <MN6PR11MB8244B84EE5A06D754E75093D8C879@MN6PR11MB8244.namprd11.prod.outlook.com> (raw)
In-Reply-To: <20230323074057.549-15-dun.tan@intel.com>
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
next prev parent reply other threads:[~2023-03-23 13:23 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-23 7:40 [Patch V4 00/21] Fix issues in CpuPageTableLib duntan
2023-03-23 7:40 ` [Patch V4 01/21] UefiCpuPkg/CpuPageTableLib: Remove unneeded 'if' condition duntan
2023-03-23 7:40 ` [Patch V4 02/21] UefiCpuPkg/CpuPageTableLib: Add check for input Length duntan
2023-03-23 12:20 ` Ni, Ray
2023-03-23 7:40 ` [Patch V4 03/21] UefiCpuPkg/CpuPageTableLib:Initialize some LocalVariable at beginning duntan
2023-03-23 12:26 ` Ni, Ray
2023-03-23 7:40 ` [Patch V4 04/21] UefiCpuPkg/CpuPageTableLib: Fix the non-1:1 mapping issue duntan
2023-03-23 12:29 ` Ni, Ray
2023-03-23 7:40 ` [Patch V4 05/21] UefiCpuPkg/CpuPageTableLib:Clear PageSize bit(Bit7) for non-leaf duntan
2023-03-23 12:29 ` Ni, Ray
2023-03-23 7:40 ` [Patch V4 06/21] UefiCpuPkg/CpuPageTableLib: Fix issue when splitting leaf entry duntan
2023-03-23 12:35 ` Ni, Ray
[not found] ` <174F0C7EF4E09C53.19937@groups.io>
2023-03-24 2:19 ` [edk2-devel] " Ni, Ray
2023-03-23 7:40 ` [Patch V4 07/21] UefiCpuPkg/MpInitLib: Add code to initialize MapMask duntan
2023-03-23 12:37 ` Ni, Ray
2023-03-23 7:40 ` [Patch V4 08/21] UefiCpuPkg/CpuPageTableLib:Add check for Mask and Attr duntan
2023-03-23 12:52 ` Ni, Ray
2023-03-24 1:55 ` duntan
2023-03-23 7:40 ` [Patch V4 09/21] UefiCpuPkg/CpuPageTableLib: Add manual test to check " duntan
2023-03-23 12:57 ` Ni, Ray
2023-03-23 7:40 ` [Patch V4 10/21] UefiCpuPkg/CpuPageTableLib:Modify RandomBoolean() in RandomTest duntan
2023-03-23 12:59 ` Ni, Ray
2023-03-23 7:40 ` [Patch V4 11/21] UefiCpuPkg/CpuPageTableLib:Modify RandomTest to check Mask/Attr duntan
2023-03-23 13:11 ` Ni, Ray
2023-03-23 7:40 ` [Patch V4 12/21] UefiCpuPkg/CpuPageTableLib: Enable non-1:1 mapping in random test duntan
2023-03-23 7:40 ` [Patch V4 13/21] UefiCpuPkg/CpuPageTableLib: Add OUTPUT IsModified parameter duntan
2023-03-23 13:20 ` Ni, Ray
2023-03-23 7:40 ` [Patch V4 14/21] UefiCpuPkg/CpuPageTableLib: Modify RandomTest to check IsModified duntan
2023-03-23 13:23 ` Ni, Ray [this message]
2023-03-23 7:40 ` [Patch V4 15/21] UefiCpuPkg: Fix IA32 build failure in CpuPageTableLib.inf duntan
2023-03-23 13:25 ` Ni, Ray
2023-03-23 7:40 ` [Patch V4 16/21] UefiCpuPkg: Modify UnitTest code since tested API is changed duntan
2023-03-23 7:40 ` [Patch V4 17/21] UefiCpuPkg/CpuPageTableLib: Add check for page table creation duntan
2023-03-23 13:29 ` Ni, Ray
2023-03-23 7:40 ` [Patch V4 18/21] UefiCpuPkg: Combine branch for non-present and leaf ParentEntry duntan
2023-03-23 13:32 ` Ni, Ray
2023-03-23 7:40 ` [Patch V4 19/21] UefiCpuPkg/CpuPageTableLib: Enable PAE paging duntan
2023-03-23 13:38 ` Ni, Ray
2023-03-23 7:40 ` [Patch V4 20/21] UefiCpuPkg/CpuPageTableLib: Add RandomTest for " duntan
2023-03-23 13:40 ` Ni, Ray
2023-03-23 7:40 ` [Patch V4 21/21] UefiCpuPkg/CpuPageTableLib: Reduce the number of random tests duntan
2023-03-23 13:40 ` Ni, Ray
2023-03-23 9:13 ` [edk2-devel] [Patch V4 00/21] Fix issues in CpuPageTableLib Gerd Hoffmann
2023-03-23 9:16 ` duntan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=MN6PR11MB8244B84EE5A06D754E75093D8C879@MN6PR11MB8244.namprd11.prod.outlook.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox