From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mx.groups.io with SMTP id smtpd.web11.379.1686191316401101708 for ; Wed, 07 Jun 2023 19:28:38 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=XmB4CvvY; spf=pass (domain: intel.com, ip: 192.55.52.115, 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=1686191318; x=1717727318; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=fMA3Fz6aG++nh76eduJcmscKSWMocBVN41VDl+8yhu8=; b=XmB4CvvYAul/5WnpKWzo48elHFylafjuF3fZawWEG+D0f3gJXYaM3NTi 09EkTnZbPbJH8IJnx7abfgvSv1HrihYvNgkTRKs1sibIEequGH4o8xqNg H6R8mazBfxCr6kyZXnE727fiOjgyHdb/89kU5BSN+KIcZ9nFFpMAuQXyI U0k5vBkEkG1o81EQcLAa6m0yN5CTZdDRXRYPANAyZoea4fvbJM/4Ou+gv Ig7Ff9ldvXrHSt3T0EI2wtvlwPN0xQRiRuwwcx41d8VqnJBINvMWZ04r/ ia56sT2ZCywo+PuxIaP0Gyt9e5kddqxb0smlD7U9GM2PUeQpVlpqQhGCG g==; X-IronPort-AV: E=McAfee;i="6600,9927,10734"; a="357184249" X-IronPort-AV: E=Sophos;i="6.00,225,1681196400"; d="scan'208";a="357184249" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Jun 2023 19:28:38 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10734"; a="774877758" X-IronPort-AV: E=Sophos;i="6.00,225,1681196400"; d="scan'208";a="774877758" Received: from shwdeopenlab702.ccr.corp.intel.com ([10.239.55.158]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Jun 2023 19:28:37 -0700 From: "duntan" To: devel@edk2.groups.io Cc: Eric Dong , Ray Ni , Rahul Kumar , Gerd Hoffmann Subject: [Patch V5 05/14] UefiCpuPkg/PiSmmCpuDxeSmm: Avoid setting non-present range to RO/NX Date: Thu, 8 Jun 2023 10:27:33 +0800 Message-Id: <20230608022742.1292-6-dun.tan@intel.com> X-Mailer: git-send-email 2.31.1.windows.1 In-Reply-To: <20230608022742.1292-1-dun.tan@intel.com> References: <20230608022742.1292-1-dun.tan@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit In PiSmmCpuDxeSmm code, SetMemMapAttributes() marks memory ranges in SmmMemoryAttributesTable to RO/NX. There may exist non-present range in these memory ranges. Set other attributes for a non-present range is not permitted in CpuPageTableMapLib. So add code to handle this case. Only map the present ranges in SmmMemoryAttributesTable to RO or NX. Signed-off-by: Dun Tan Cc: Eric Dong Cc: Ray Ni Cc: Rahul Kumar Cc: Gerd Hoffmann --- UefiCpuPkg/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c | 129 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------- 1 file changed, 107 insertions(+), 22 deletions(-) diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c b/UefiCpuPkg/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c index 862b3e9720..3c79927c7b 100644 --- a/UefiCpuPkg/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c @@ -918,6 +918,70 @@ PatchGdtIdtMap ( ); } +/** + This function set [Base, Limit] to the input MemoryAttribute. + + @param Base Start address of range. + @param Limit Limit address of range. + @param Attribute The bit mask of attributes to modify for the memory region. + @param Map Pointer to the array of Cr3 IA32_MAP_ENTRY. + @param Count Count of IA32_MAP_ENTRY in Map. +**/ +VOID +SetMemMapWithNonPresentRange ( + UINT64 Base, + UINT64 Limit, + UINT64 Attribute, + IA32_MAP_ENTRY *Map, + UINTN Count + ) +{ + UINTN Index; + UINT64 NonPresentRangeStart; + + NonPresentRangeStart = 0; + for (Index = 0; Index < Count; Index++) { + if ((Map[Index].LinearAddress > NonPresentRangeStart) && + (Base < Map[Index].LinearAddress) && (Limit > NonPresentRangeStart)) + { + // + // We should NOT set attributes for non-present ragne. + // + // + // There is a non-present ( [NonPresentStart, Map[Index].LinearAddress] ) range before current Map[Index] + // and it is overlapped with [Base, Limit]. + // + if (Base < NonPresentRangeStart) { + SmmSetMemoryAttributes ( + Base, + NonPresentRangeStart - Base, + Attribute + ); + } + + Base = Map[Index].LinearAddress; + } + + NonPresentRangeStart = Map[Index].LinearAddress + Map[Index].Length; + if (NonPresentRangeStart >= Limit) { + break; + } + } + + Limit = MIN (NonPresentRangeStart, Limit); + + if (Base < Limit) { + // + // There is no non-present range in current [Base, Limit] anymore. + // + SmmSetMemoryAttributes ( + Base, + Limit - Base, + Attribute + ); + } +} + /** This function sets memory attribute according to MemoryAttributesTable. **/ @@ -932,6 +996,11 @@ SetMemMapAttributes ( UINTN DescriptorSize; UINTN Index; EDKII_PI_SMM_MEMORY_ATTRIBUTES_TABLE *MemoryAttributesTable; + UINTN PageTable; + EFI_STATUS Status; + IA32_MAP_ENTRY *Map; + UINTN Count; + UINT64 MemoryAttribute; SmmGetSystemConfigurationTable (&gEdkiiPiSmmMemoryAttributesTableGuid, (VOID **)&MemoryAttributesTable); if (MemoryAttributesTable == NULL) { @@ -958,36 +1027,52 @@ SetMemMapAttributes ( MemoryMap = NEXT_MEMORY_DESCRIPTOR (MemoryMap, DescriptorSize); } + Count = 0; + Map = NULL; + PageTable = AsmReadCr3 (); + Status = PageTableParse (PageTable, mPagingMode, NULL, &Count); + while (Status == RETURN_BUFFER_TOO_SMALL) { + if (Map != NULL) { + FreePool (Map); + } + + Map = AllocatePool (Count * sizeof (IA32_MAP_ENTRY)); + ASSERT (Map != NULL); + Status = PageTableParse (PageTable, mPagingMode, Map, &Count); + } + + ASSERT_RETURN_ERROR (Status); + MemoryMap = MemoryMapStart; for (Index = 0; Index < MemoryMapEntryCount; Index++) { DEBUG ((DEBUG_VERBOSE, "SetAttribute: Memory Entry - 0x%lx, 0x%x\n", MemoryMap->PhysicalStart, MemoryMap->NumberOfPages)); - switch (MemoryMap->Type) { - case EfiRuntimeServicesCode: - SmmSetMemoryAttributes ( - MemoryMap->PhysicalStart, - EFI_PAGES_TO_SIZE ((UINTN)MemoryMap->NumberOfPages), - EFI_MEMORY_RO - ); - break; - case EfiRuntimeServicesData: - SmmSetMemoryAttributes ( - MemoryMap->PhysicalStart, - EFI_PAGES_TO_SIZE ((UINTN)MemoryMap->NumberOfPages), - EFI_MEMORY_XP - ); - break; - default: - SmmSetMemoryAttributes ( - MemoryMap->PhysicalStart, - EFI_PAGES_TO_SIZE ((UINTN)MemoryMap->NumberOfPages), - EFI_MEMORY_XP - ); - break; + if (MemoryMap->Type == EfiRuntimeServicesCode) { + MemoryAttribute = EFI_MEMORY_RO; + } else { + ASSERT ((MemoryMap->Type == EfiRuntimeServicesData) || (MemoryMap->Type == EfiConventionalMemory)); + // + // Set other type memory as NX. + // + MemoryAttribute = EFI_MEMORY_XP; } + // + // There may exist non-present range overlaps with the MemoryMap range. + // Do not change other attributes of non-present range while still remaining it as non-present + // + SetMemMapWithNonPresentRange ( + MemoryMap->PhysicalStart, + MemoryMap->PhysicalStart + EFI_PAGES_TO_SIZE ((UINTN)MemoryMap->NumberOfPages), + MemoryAttribute, + Map, + Count + ); + MemoryMap = NEXT_MEMORY_DESCRIPTOR (MemoryMap, DescriptorSize); } + FreePool (Map); + PatchSmmSaveStateMap (); PatchGdtIdtMap (); -- 2.31.1.windows.1