From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by mx.groups.io with SMTP id smtpd.web11.66779.1679557305298569223 for ; Thu, 23 Mar 2023 00:41:47 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=O2wJfzau; spf=pass (domain: intel.com, ip: 192.55.52.43, mailfrom: dun.tan@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1679557307; x=1711093307; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=MvX44xTkZ0hslaSFpjVqQIcYVZqABPT7/mOiERpVaNQ=; b=O2wJfzauURtqn2ecv98Q3yh6N1na5qxyw6l2oBCvlF/zYaJ/Lbad7lgY Ocw2qnNery8H00kifOH4a3OrTwjz9x5DOAS+pKmYbHTlPsjCryrgQhraz WoylZjm4gFx5ZF0mNYuTr5TGDSpMmd2zI1alJ+R8iYl73Z+1cgEyDHq6c B0tuouA9Zitu86CO1bMzCZq56l9mtiAv5rUOnkctrhqCP0nJPRRK4CjyN B5LdA+FR3JxpBBBlJ2XBCoJGhWy3o0a3OU1yvbdBMqLXjPA7f/vAIOba3 n6uCf9TaA8zktnLrrmDSc11WiE5aTowhzc2CM+m/+peIFTlNk836QMnoe Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10657"; a="425699764" X-IronPort-AV: E=Sophos;i="5.98,283,1673942400"; d="scan'208";a="425699764" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Mar 2023 00:41:47 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10657"; a="684616868" X-IronPort-AV: E=Sophos;i="5.98,283,1673942400"; d="scan'208";a="684616868" Received: from shwdeopenlab702.ccr.corp.intel.com ([10.239.55.92]) by fmsmga007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Mar 2023 00:41:45 -0700 From: "duntan" To: devel@edk2.groups.io Cc: Eric Dong , Ray Ni , Rahul Kumar , Gerd Hoffmann , Zhiguang Liu Subject: [Patch V4 14/21] UefiCpuPkg/CpuPageTableLib: Modify RandomTest to check IsModified Date: Thu, 23 Mar 2023 15:40:50 +0800 Message-Id: <20230323074057.549-15-dun.tan@intel.com> X-Mailer: git-send-email 2.31.1.windows.1 In-Reply-To: <20230323074057.549-1-dun.tan@intel.com> References: <20230323074057.549-1-dun.tan@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Modify RandomTest to check if parameter IsModified of PageTableMap() correctlly indicates whether input page table is modified or not. Signed-off-by: Dun Tan Cc: Eric Dong Cc: Ray Ni Cc: Rahul Kumar Cc: Gerd Hoffmann Cc: Zhiguang Liu --- 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