Please update test case to not expect failure when setting a non-present range as non-present .
> -----Original Message----- > From: Tan, Dun <dun....@intel.com> > Sent: Wednesday, March 8, 2023 6:08 PM > To: devel@edk2.groups.io > Cc: Dong, Eric <eric.d...@intel.com>; Ni, Ray <ray...@intel.com>; Kumar, > Rahul R <rahul.r.ku...@intel.com>; Gerd Hoffmann <kra...@redhat.com> > Subject: [Patch V2 06/14] UefiCpuPkg/CpuPageTableLib: Add manual test to > check Mask and Attr > > Add manual test case to check input Mask and Attribute. When > creating new page table or mapping not-present range in existing > page table, all the non-reserved fields of Mask and Present bit of > Attribute should not be 0. > > Signed-off-by: Dun Tan <dun....@intel.com> > Cc: Eric Dong <eric.d...@intel.com> > Cc: Ray Ni <ray...@intel.com> > Cc: Rahul Kumar <rahul1.ku...@intel.com> > Cc: Gerd Hoffmann <kra...@redhat.com> > --- > > UefiCpuPkg/Library/CpuPageTableLib/UnitTest/CpuPageTableLibUnitTestHo > st.c | 110 > ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ > +++++++++++++++++++++++++++++++++++++++++++++++++++- > 1 file changed, 109 insertions(+), 1 deletion(-) > > diff --git > a/UefiCpuPkg/Library/CpuPageTableLib/UnitTest/CpuPageTableLibUnitTest > Host.c > b/UefiCpuPkg/Library/CpuPageTableLib/UnitTest/CpuPageTableLibUnitTest > Host.c > index 3014a03243..fe00a7f632 100644 > --- > a/UefiCpuPkg/Library/CpuPageTableLib/UnitTest/CpuPageTableLibUnitTest > Host.c > +++ > b/UefiCpuPkg/Library/CpuPageTableLib/UnitTest/CpuPageTableLibUnitTest > Host.c > @@ -697,6 +697,114 @@ TestCaseManualChangeNx ( > return UNIT_TEST_PASSED; > } > > +/** > + Check if the input Mask and Attribute is expected when creating new page > table or > + map not-present range in existing page table. > + > + @param[in] Context [Optional] An optional parameter that enables: > + 1) test-case reuse with varied parameters and > + 2) test-case re-entry for Target tests that need a > + reboot. This parameter is a VOID* and it is the > + responsibility of the test author to ensure that the > + contents are well understood by all test cases that > may > + consume it. > + > + @retval UNIT_TEST_PASSED The Unit test has completed and the > test > + case was successful. > + @retval UNIT_TEST_ERROR_TEST_FAILED A test case assertion has failed. > +**/ > +UNIT_TEST_STATUS > +EFIAPI > +TestCaseToCheckMapMaskAndAttr ( > + IN UNIT_TEST_CONTEXT Context > + ) > +{ > + UINTN PageTable; > + PAGING_MODE PagingMode; > + VOID *Buffer; > + UINTN PageTableBufferSize; > + IA32_MAP_ATTRIBUTE MapAttribute; > + IA32_MAP_ATTRIBUTE ExpectedMapAttribute; > + IA32_MAP_ATTRIBUTE MapMask; > + RETURN_STATUS Status; > + IA32_MAP_ENTRY *Map; > + UINTN MapCount; > + > + PagingMode = Paging4Level; > + PageTableBufferSize = 0; > + PageTable = 0; > + Buffer = NULL; > + MapAttribute.Uint64 = 0; > + MapAttribute.Bits.Present = 1; > + MapMask.Uint64 = 0; > + MapMask.Bits.Present = 1; > + // > + // Create Page table to cover [0, 1G]. All fields of MapMask should be set. > + // > + Status = PageTableMap (&PageTable, PagingMode, Buffer, > &PageTableBufferSize, 0, SIZE_1GB, &MapAttribute, &MapMask); > + UT_ASSERT_EQUAL (Status, RETURN_INVALID_PARAMETER); > + MapMask.Uint64 = MAX_UINT64; > + Status = PageTableMap (&PageTable, PagingMode, Buffer, > &PageTableBufferSize, 0, SIZE_1GB, &MapAttribute, &MapMask); > + UT_ASSERT_EQUAL (Status, RETURN_BUFFER_TOO_SMALL); > + Buffer = AllocatePages (EFI_SIZE_TO_PAGES (PageTableBufferSize)); > + Status = PageTableMap (&PageTable, PagingMode, Buffer, > &PageTableBufferSize, 0, SIZE_1GB, &MapAttribute, &MapMask); > + UT_ASSERT_EQUAL (Status, RETURN_SUCCESS); > + > + // > + // Update Page table to cover [1G, 2G - 8K]. All fields of MapMask should > be set and Present bit of MapAttribute should be 1. > + // > + PageTableBufferSize = 0; > + MapAttribute.Uint64 = SIZE_1GB; > + MapAttribute.Bits.Present = 1; > + MapMask.Uint64 = 0; > + MapMask.Bits.Present = 1; > + Status = PageTableMap (&PageTable, PagingMode, Buffer, > &PageTableBufferSize, SIZE_1GB, SIZE_1GB - SIZE_8KB, &MapAttribute, > &MapMask); > + UT_ASSERT_EQUAL (Status, RETURN_INVALID_PARAMETER); > + MapMask.Uint64 = MAX_UINT64; > + Status = PageTableMap (&PageTable, PagingMode, Buffer, > &PageTableBufferSize, SIZE_1GB, SIZE_1GB - SIZE_8KB, &MapAttribute, > &MapMask); > + UT_ASSERT_EQUAL (Status, RETURN_BUFFER_TOO_SMALL); > + Buffer = AllocatePages (EFI_SIZE_TO_PAGES (PageTableBufferSize)); > + Status = PageTableMap (&PageTable, PagingMode, Buffer, > &PageTableBufferSize, SIZE_1GB, SIZE_1GB - SIZE_8KB, &MapAttribute, > &MapMask); > + UT_ASSERT_EQUAL (Status, RETURN_SUCCESS); > + > + // > + // Update Page table to cover [2G - 8K, 2G] and set [2G - 8K, 2G] as RW. > All > fields of MapMask should be set and Present bit of MapAttribute should be 1. > + // > + PageTableBufferSize = 0; > + MapAttribute.Uint64 = SIZE_2GB - SIZE_8KB; > + MapAttribute.Bits.ReadWrite = 1; > + MapMask.Uint64 = MAX_UINT64; > + Status = PageTableMap (&PageTable, PagingMode, Buffer, > &PageTableBufferSize, SIZE_2GB - SIZE_8KB, SIZE_8KB, &MapAttribute, > &MapMask); > + UT_ASSERT_EQUAL (Status, RETURN_INVALID_PARAMETER); > + MapAttribute.Bits.Present = 1; > + Status = PageTableMap (&PageTable, PagingMode, Buffer, > &PageTableBufferSize, SIZE_2GB - SIZE_8KB, SIZE_8KB, &MapAttribute, > &MapMask); > + UT_ASSERT_EQUAL (Status, RETURN_SUCCESS); > + > + MapCount = 0; > + Status = PageTableParse (PageTable, PagingMode, NULL, &MapCount); > + UT_ASSERT_EQUAL (Status, RETURN_BUFFER_TOO_SMALL); > + Map = AllocatePages (EFI_SIZE_TO_PAGES (MapCount* sizeof > (IA32_MAP_ENTRY))); > + Status = PageTableParse (PageTable, PagingMode, Map, &MapCount); > + UT_ASSERT_EQUAL (Status, RETURN_SUCCESS); > + > + // > + // There should be two ranges [0, 2G-8k] with RW = 0 and [2G-8k, 2G] with > RW = 1 > + // > + UT_ASSERT_EQUAL (MapCount, 2); > + UT_ASSERT_EQUAL (Map[0].LinearAddress, 0); > + UT_ASSERT_EQUAL (Map[0].Length, SIZE_2GB - SIZE_8KB); > + ExpectedMapAttribute.Uint64 = 0; > + ExpectedMapAttribute.Bits.Present = 1; > + UT_ASSERT_EQUAL (Map[0].Attribute.Uint64, > ExpectedMapAttribute.Uint64); > + UT_ASSERT_EQUAL (Map[1].LinearAddress, SIZE_2GB - SIZE_8KB); > + UT_ASSERT_EQUAL (Map[1].Length, SIZE_8KB); > + ExpectedMapAttribute.Uint64 = SIZE_2GB - SIZE_8KB; > + ExpectedMapAttribute.Bits.Present = 1; > + ExpectedMapAttribute.Bits.ReadWrite = 1; > + UT_ASSERT_EQUAL (Map[1].Attribute.Uint64, > ExpectedMapAttribute.Uint64); > + return UNIT_TEST_PASSED; > +} > + > /** > Initialize the unit test framework, suite, and unit tests for the > sample unit tests and run the unit tests. > @@ -746,7 +854,7 @@ UefiTestMain ( > AddTestCase (ManualTestCase, "Check if the parent entry has different > ReadWrite attribute", "Manual Test Case5", > TestCaseManualChangeReadWrite, NULL, NULL, NULL); > AddTestCase (ManualTestCase, "Check if the parent entry has different Nx > attribute", "Manual Test Case6", TestCaseManualChangeNx, NULL, NULL, > NULL); > AddTestCase (ManualTestCase, "Check if the needed size is expected", > "Manual Test Case7", TestCaseManualSizeNotMatch, NULL, NULL, NULL); > - > + AddTestCase (ManualTestCase, "Check MapMask when creating new page > table or mapping not-present range", "Manual Test Case8", > TestCaseToCheckMapMaskAndAttr, NULL, NULL, NULL); > // > // Populate the Random Test Cases. > // > -- > 2.31.1.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#101195): https://edk2.groups.io/g/devel/message/101195 Mute This Topic: https://groups.io/mt/97469478/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/leave/9847357/21656/1706620634/xyzzy [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-