From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mx.groups.io with SMTP id smtpd.web11.17915.1684231210780691710 for ; Tue, 16 May 2023 03:00:42 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=jYPv5lQd; spf=pass (domain: intel.com, ip: 134.134.136.100, 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=1684231242; x=1715767242; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=dqgbpX1avgsnifocFUkpbtc7e+oPwYBeEXIKjjOtiiE=; b=jYPv5lQdCcCTv/Y1wKo0cMRDJTCVq6tAK+luYCtjyEUgKaCIQuz9ISXz 6vCoZUV3dQ6KnTaJdvBSYIZgV2nQF0WknFsgTrKECtgjpBhlGQCnzl9h9 qPI0vXVOycSYQdi+BDXjJ93TTVnS17zTPHNSEwToRzKv0uWdP5UJg6Ep9 B7JVRgAo1jdMki7UV9SXk3MKUBMzFXqjOvfajzIr9gTqbiKESzOe0oASt ubbnhGXQj3jAQv1v3zTUMXByGJb6XBxEqVaN8tK2uoCMK9CWxfifSsjGM +3ODv/Ol2xXkyO4sfBnYIkm0Qsl4wpXqX5frCURBQ7921PayWVmrlMOJx g==; X-IronPort-AV: E=McAfee;i="6600,9927,10711"; a="417093400" X-IronPort-AV: E=Sophos;i="5.99,278,1677571200"; d="scan'208";a="417093400" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 May 2023 03:00:42 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10711"; a="791019735" X-IronPort-AV: E=Sophos;i="5.99,278,1677571200"; d="scan'208";a="791019735" Received: from shwdeopenlab702.ccr.corp.intel.com ([10.239.55.158]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 May 2023 03:00:40 -0700 From: "duntan" To: devel@edk2.groups.io Cc: Eric Dong , Ray Ni , Rahul Kumar , Gerd Hoffmann Subject: [Patch V4 13/15] UefiCpuPkg: Sort mProtectionMemRange when ReadyToLock Date: Tue, 16 May 2023 17:59:30 +0800 Message-Id: <20230516095932.1525-14-dun.tan@intel.com> X-Mailer: git-send-email 2.31.1.windows.1 In-Reply-To: <20230516095932.1525-1-dun.tan@intel.com> References: <20230516095932.1525-1-dun.tan@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sort mProtectionMemRange in InitProtectedMemRange() when ReadyToLock. Signed-off-by: Dun Tan Cc: Eric Dong Cc: Ray Ni Cc: Rahul Kumar Cc: Gerd Hoffmann --- UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfile.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfile.c b/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfile.c index 5625ba0cac..b298e2fb99 100644 --- a/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfile.c +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfile.c @@ -375,6 +375,32 @@ IsAddressSplit ( return FALSE; } +/** + Function to compare 2 MEMORY_PROTECTION_RANGE based on range base. + + @param[in] Buffer1 pointer to Device Path poiner to compare + @param[in] Buffer2 pointer to second DevicePath pointer to compare + + @retval 0 Buffer1 equal to Buffer2 + @retval <0 Buffer1 is less than Buffer2 + @retval >0 Buffer1 is greater than Buffer2 +**/ +INTN +EFIAPI +ProtectionRangeCompare ( + IN CONST VOID *Buffer1, + IN CONST VOID *Buffer2 + ) +{ + if (((MEMORY_PROTECTION_RANGE *)Buffer1)->Range.Base > ((MEMORY_PROTECTION_RANGE *)Buffer2)->Range.Base) { + return 1; + } else if (((MEMORY_PROTECTION_RANGE *)Buffer1)->Range.Base < ((MEMORY_PROTECTION_RANGE *)Buffer2)->Range.Base) { + return -1; + } + + return 0; +} + /** Initialize the protected memory ranges and the 4KB-page mapped memory ranges. @@ -397,6 +423,7 @@ InitProtectedMemRange ( EFI_PHYSICAL_ADDRESS Base2MBAlignedAddress; UINT64 High4KBPageSize; UINT64 Low4KBPageSize; + VOID *Buffer; NumberOfDescriptors = 0; NumberOfAddedDescriptors = mSmmCpuSmramRangeCount; @@ -533,6 +560,14 @@ InitProtectedMemRange ( mSplitMemRangeCount = NumberOfSpliteRange; + // + // Sort the mProtectionMemRange + // + Buffer = AllocateZeroPool (sizeof (MEMORY_PROTECTION_RANGE)); + ASSERT (Buffer != NULL); + QuickSort (mProtectionMemRange, mProtectionMemRangeCount, sizeof (MEMORY_PROTECTION_RANGE), (BASE_SORT_COMPARE)ProtectionRangeCompare, Buffer); + FreePool (Buffer); + DEBUG ((DEBUG_INFO, "SMM Profile Memory Ranges:\n")); for (Index = 0; Index < mProtectionMemRangeCount; Index++) { DEBUG ((DEBUG_INFO, "mProtectionMemRange[%d].Base = %lx\n", Index, mProtectionMemRange[Index].Range.Base)); -- 2.31.1.windows.1