From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 33819820D6 for ; Wed, 8 Feb 2017 10:13:09 -0800 (PST) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga101.fm.intel.com with ESMTP; 08 Feb 2017 10:13:08 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.35,348,1484035200"; d="scan'208,217";a="931614963" Received: from fmsmsx108.amr.corp.intel.com ([10.18.124.206]) by orsmga003.jf.intel.com with ESMTP; 08 Feb 2017 10:13:07 -0800 Received: from fmsmsx112.amr.corp.intel.com (10.18.116.6) by FMSMSX108.amr.corp.intel.com (10.18.124.206) with Microsoft SMTP Server (TLS) id 14.3.248.2; Wed, 8 Feb 2017 10:13:07 -0800 Received: from shsmsx101.ccr.corp.intel.com (10.239.4.153) by FMSMSX112.amr.corp.intel.com (10.18.116.6) with Microsoft SMTP Server (TLS) id 14.3.248.2; Wed, 8 Feb 2017 10:13:06 -0800 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.88]) by SHSMSX101.ccr.corp.intel.com ([169.254.1.177]) with mapi id 14.03.0248.002; Thu, 9 Feb 2017 02:13:04 +0800 From: "Yao, Jiewen" To: Laszlo Ersek , "Duran, Leo" , "Zeng, Star" , "edk2-devel@ml01.01.org" CC: "Tian, Feng" , "Singh, Brijesh" , "Yao, Jiewen" Thread-Topic: [edk2] [PATCH] MdeModulePkg: Add dynamic PCD PcdPteMemoryEncryptionAddressOrMask Thread-Index: AQHSgXv4au8E8mWrIUOyXbiZF/4SjKFd3LCAgADzuwCAAIajAP//fGiAgAAFHACAAAepgIAAik+g Date: Wed, 8 Feb 2017 18:13:04 +0000 Message-ID: <74D8A39837DF1E4DA445A8C0B3885C503A8EB1F5@shsmsx102.ccr.corp.intel.com> References: <1486497223-22694-1-git-send-email-leo.duran@amd.com> <1486497223-22694-2-git-send-email-leo.duran@amd.com> <0C09AFA07DD0434D9E2A0C6AEB0483103B8215CE@shsmsx102.ccr.corp.intel.com> <74D8A39837DF1E4DA445A8C0B3885C503A8EB0DA@shsmsx102.ccr.corp.intel.com> <8ededd61-0675-2e6e-f58d-1afcdb672505@redhat.com> In-Reply-To: <8ededd61-0675-2e6e-f58d-1afcdb672505@redhat.com> Accept-Language: zh-CN, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 X-Content-Filtered-By: Mailman/MimeDel 2.1.21 Subject: Re: [PATCH] MdeModulePkg: Add dynamic PCD PcdPteMemoryEncryptionAddressOrMask X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Feb 2017 18:13:09 -0000 Content-Language: en-US Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable I think X64 DXEIPL *may* create page table for X64 DXE. It is controlled by= PcdDxeIplBuildPageTables. if (FeaturePcdGet (PcdDxeIplBuildPageTables)) { // // Create page table and save PageMapLevel4 to CR3 // PageTables =3D CreateIdentityMappingPageTables ((EFI_PHYSICAL_ADDRESS) = (UINTN) BaseOfStack, STACK_SIZE); Thank you Yao Jiewen From: Laszlo Ersek [mailto:lersek@redhat.com] Sent: Wednesday, February 8, 2017 9:56 AM To: Duran, Leo ; Yao, Jiewen ; Zen= g, Star ; edk2-devel@ml01.01.org Cc: Tian, Feng ; Singh, Brijesh Subject: Re: [edk2] [PATCH] MdeModulePkg: Add dynamic PCD PcdPteMemoryEncry= ptionAddressOrMask On 02/08/17 18:28, Duran, Leo wrote: > Lazlo, et al, > Please see reply below. > Lleo > >> -----Original Message----- >> From: Laszlo Ersek [mailto:lersek@redhat.com] >> Sent: Wednesday, February 08, 2017 11:11 AM >> To: Yao, Jiewen >; Dur= an, Leo >> >; Zeng, Star >; edk2- >> devel@ml01.01.org >> Cc: Tian, Feng >; Singh,= Brijesh >> > >> Subject: Re: [edk2] [PATCH] MdeModulePkg: Add dynamic PCD >> PcdPteMemoryEncryptionAddressOrMask >> >> On 02/08/17 18:05, Yao, Jiewen wrote: >>> HI Leo >>> >>> Thanks to clarify that. >>> >>> >>> >>> If that is the case, do you think it will be better to limit this PCD >>> to >>> X64 only in DEC file. Such as [PcdsDynamic.X64, PcdsDynamicEx.X64] >> >> Not sure if this is the best place to raise the following observation, b= ut it >> should do: >> >> please everyone remember that PcdDxeIplSwitchToLongMode is only TRUE >> if PEI is 32-bit and DXE is 64-bit. It is FALSE in *two* cases: >> - both PEI and DXE are 32-bit, and >> - both PEI and DXE are 64-bit. >> >> This doesn't necessarily invalidate anything said thus fair in the threa= d, but >> the following statement from Leo: >> >> The SEV feature requires 64-bit LongMode, so the >> PcdDxeIplSwitchtoLongMode *must* set to TRUE at build-time >> >> does not follow. The PCD is FALSE in OvmfPkgX64.dsc. > [Duran, Leo] > Good points... I should have provided more context. > 1) I had referred the "PEI is 32-bit and DXE is 64-bit." > 2) If both PEI and DXE are 64-bit, then you would be executing the X64 of= HandOffToDxe(), which does *not* call Create4GPageTables(). > > That is, Create4GPageTables() only gets called in the "PEI is 32-bit" cas= e. Right. Now that you mention the function name HandOffToDxe(), I'm pretty sure that I've looked at this several times in the past, I just couldn't / can't recall it now, without looking. My goal was to ensure that all cases would be considered. Looks like they have been. :) It would be nice if both the Ia32X64 and the X64 OVMF platforms could work under SEV. Thanks! Laszlo > >> >> Thanks, >> Laszlo >> >>> >>> >>> >>> Thank you >>> >>> Yao Jiewen >>> >>> >>> >>> *From:*Duran, Leo [mailto:leo.duran@amd.com] >>> *Sent:* Wednesday, February 8, 2017 9:00 AM >>> *To:* Zeng, Star >; edk= 2-devel@ml01.01.org >>> *Cc:* Laszlo Ersek >; Tian,= Feng >>> >; Singh, Brijesh >; Yao, >>> Jiewen > >>> *Subject:* RE: [edk2] [PATCH] MdeModulePkg: Add dynamic PCD >>> PcdPteMemoryEncryptionAddressOrMask >>> >>> >>> >>> Pease see reply below. >>> Leo >>> >>>> -----Original Message----- >>>> From: Zeng, Star [mailto:star.zeng@intel.com] >>>> Sent: Tuesday, February 07, 2017 8:27 PM >>>> To: Duran, Leo >>; >>>> edk2-devel@ml01.01.org >>> >>>> Cc: Laszlo Ersek >>> >; Tian, Feng >>> >; >>>> Singh, Brijesh >>> >; Zeng,= Star >>> >; >>>> Yao, Jiewen >> >>>> Subject: RE: [edk2] [PATCH] MdeModulePkg: Add dynamic PCD >>>> PcdPteMemoryEncryptionAddressOrMask >>>> >>>> Does Create4GPageTablesIa32Pae() also need to be updated? >>>> >>>> Thanks, >>>> Star >>> [Duran, Leo] >>> Hi Star, >>> No, I do not think Create4GPageTablesIa32Pae() is in the execution path= . >>> >>> The SEV feature requires 64-bit LongMode, so the >>> PcdDxeIplSwitchtoLongMode *must* set to TRUE at build-time, in which >> case Create4GPageTablesIa32Pae() would *not* be called by >> HandOffToDxeCore(). >>> >>>> -----Original Message----- >>>> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf >>>> Of Leo Duran >>>> Sent: Wednesday, February 8, 2017 3:54 AM >>>> To: edk2-devel@ml01.01.org >>>> Cc: Laszlo Ersek >>> >; Tian, Feng >>> >; >>>> Brijesh Singh >>> >; Zeng,= Star >>> >; >>>> Leo Duran >> >>>> Subject: [edk2] [PATCH] MdeModulePkg: Add dynamic PCD >>>> PcdPteMemoryEncryptionAddressOrMask >>>> >>>> From: Brijesh Singh >>>> > >>>> >>>> This dynamic PCD holds the address mask for page table entries when >>>> memory encryption is enabled on AMD processors supporting the Secure >>>> Encrypted Virtualization (SEV) feature. >>>> >>>> Cc: Feng Tian >> >>>> Cc: Star Zeng >> >>>> Cc: Laszlo Ersek >> >>>> Contributed-under: TianoCore Contribution Agreement 1.0 >>>> Signed-off-by: Leo Duran >>>> > >>>> --- >>>> MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf | 5 ++++- >>>> MdeModulePkg/Core/DxeIplPeim/X64/VirtualMemory.c | 18 >> ++++++++++-- >>>> ------ >>>> MdeModulePkg/MdeModulePkg.dec | 8 ++++++++ >>>> 3 files changed, 22 insertions(+), 9 deletions(-) >>>> >>>> diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf >>>> b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf >>>> index 2bc41be..d62bd9b 100644 >>>> --- a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf >>>> +++ b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf >>>> @@ -6,6 +6,8 @@ >>>> # needed to run the DXE Foundation. >>>> # >>>> # Copyright (c) 2006 - 2016, Intel Corporation. All rights >>>> reserved.
>>>> +# Copyright (c) 2017, AMD Incorporated. All rights reserved.
# >>>> # This program and the accompanying materials # are licensed and >>>> made available under the terms and conditions of the BSD License # >>>> which accompanies this distribution. The full text of the license >>>> may be found at @@ -111,7 +113,8 @@ [FeaturePcd] >>>> gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSupportUefiDecompress >> ## >>>> CONSUMES >>>> >>>> [Pcd.IA32,Pcd.X64] >>>> - gEfiMdeModulePkgTokenSpaceGuid.PcdUse1GPageTable ## >>>> SOMETIMES_CONSUMES >>>> + gEfiMdeModulePkgTokenSpaceGuid.PcdUse1GPageTable = ## >>>> SOMETIMES_CONSUMES >>>> + >>>> >> gEfiMdeModulePkgTokenSpaceGuid.PcdPteMemoryEncryptionAddressOrM >>>> ask ## CONSUMES >>>> >>>> [Pcd.IA32,Pcd.X64,Pcd.ARM,Pcd.AARCH64] >>>> gEfiMdeModulePkgTokenSpaceGuid.PcdSetNxForStack ## >>>> SOMETIMES_CONSUMES >>>> diff --git a/MdeModulePkg/Core/DxeIplPeim/X64/VirtualMemory.c >>>> b/MdeModulePkg/Core/DxeIplPeim/X64/VirtualMemory.c >>>> index 790f6ab..2c52389 100644 >>>> --- a/MdeModulePkg/Core/DxeIplPeim/X64/VirtualMemory.c >>>> +++ b/MdeModulePkg/Core/DxeIplPeim/X64/VirtualMemory.c >>>> @@ -16,6 +16,8 @@ >>>> 3) IA-32 Intel(R) Architecture Software Developer's Manual >>>> Volume 3:System Programmer's Guide, Intel >>>> >>>> Copyright (c) 2006 - 2016, Intel Corporation. All rights >>>> reserved.
>>>> +Copyright (c) 2017, AMD Incorporated. All rights reserved.
>>>> + >>>> This program and the accompanying materials are licensed and made >>>> available under the terms and conditions of the BSD License which >>>> accompanies this distribution. The full text of the license may be >>>> found at @@ -71,14 +73,14 @@ Split2MPageTo4K ( >>>> // >>>> // Fill in 2M page entry. >>>> // >>>> - *PageEntry2M =3D (UINT64) (UINTN) PageTableEntry | IA32_PG_P | >>>> IA32_PG_RW; >>>> + *PageEntry2M =3D (UINT64) (UINTN) PageTableEntry | PcdGet64 >>>> + (PcdPteMemoryEncryptionAddressOrMask) | IA32_PG_P | >> IA32_PG_RW; >>>> >>>> PhysicalAddress4K =3D PhysicalAddress; >>>> for (IndexOfPageTableEntries =3D 0; IndexOfPageTableEntries < 512; >>>> IndexOfPageTableEntries++, PageTableEntry++, PhysicalAddress4K +=3D >>>> SIZE_4KB) { >>>> // >>>> // Fill in the Page Table entries >>>> // >>>> - PageTableEntry->Uint64 =3D (UINT64) PhysicalAddress4K; >>>> + PageTableEntry->Uint64 =3D (UINT64) PhysicalAddress4K | PcdGet64 >>>> + (PcdPteMemoryEncryptionAddressOrMask); >>>> PageTableEntry->Bits.ReadWrite =3D 1; >>>> PageTableEntry->Bits.Present =3D 1; >>>> if ((PhysicalAddress4K >=3D StackBase) && (PhysicalAddress4K < >>>> StackBase + >>>> StackSize)) { @@ -116,7 +118,7 @@ Split1GPageTo2M ( >>>> // >>>> // Fill in 1G page entry. >>>> // >>>> - *PageEntry1G =3D (UINT64) (UINTN) PageDirectoryEntry | IA32_PG_P | >>>> IA32_PG_RW; >>>> + *PageEntry1G =3D (UINT64) (UINTN) PageDirectoryEntry | PcdGet64 >>>> + (PcdPteMemoryEncryptionAddressOrMask) | IA32_PG_P | >> IA32_PG_RW; >>>> >>>> PhysicalAddress2M =3D PhysicalAddress; >>>> for (IndexOfPageDirectoryEntries =3D 0; IndexOfPageDirectoryEntries >>>> < 512; >>>> IndexOfPageDirectoryEntries++, PageDirectoryEntry++, >>>> IndexOfPageDirectoryEntries++PhysicalAddress2M >>>> +=3D SIZE_2MB) { @@ -129,7 +131,7 @@ Split1GPageTo2M ( >>>> // >>>> // Fill in the Page Directory entries >>>> // >>>> - PageDirectoryEntry->Uint64 =3D (UINT64) PhysicalAddress2M; >>>> + PageDirectoryEntry->Uint64 =3D (UINT64) PhysicalAddress2M | >>>> + PcdGet64 (PcdPteMemoryEncryptionAddressOrMask); >>>> PageDirectoryEntry->Bits.ReadWrite =3D 1; >>>> PageDirectoryEntry->Bits.Present =3D 1; >>>> PageDirectoryEntry->Bits.MustBe1 =3D 1; @@ -248,7 +250,7 @@ >>>> CreateIdentityMappingPageTables ( >>>> // >>>> // Make a PML4 Entry >>>> // >>>> - PageMapLevel4Entry->Uint64 =3D >>>> (UINT64)(UINTN)PageDirectoryPointerEntry; >>>> + PageMapLevel4Entry->Uint64 =3D >>>> + (UINT64)(UINTN)PageDirectoryPointerEntry | PcdGet64 >>>> + (PcdPteMemoryEncryptionAddressOrMask); >>>> PageMapLevel4Entry->Bits.ReadWrite =3D 1; >>>> PageMapLevel4Entry->Bits.Present =3D 1; >>>> >>>> @@ -262,7 +264,7 @@ CreateIdentityMappingPageTables ( >>>> // >>>> // Fill in the Page Directory entries >>>> // >>>> - PageDirectory1GEntry->Uint64 =3D (UINT64)PageAddress; >>>> + PageDirectory1GEntry->Uint64 =3D (UINT64)PageAddress | >>>> + PcdGet64 (PcdPteMemoryEncryptionAddressOrMask); >>>> PageDirectory1GEntry->Bits.ReadWrite =3D 1; >>>> PageDirectory1GEntry->Bits.Present =3D 1; >>>> PageDirectory1GEntry->Bits.MustBe1 =3D 1; @@ -280,7 +282,7 >>>> @@ CreateIdentityMappingPageTables ( >>>> // >>>> // Fill in a Page Directory Pointer Entries >>>> // >>>> - PageDirectoryPointerEntry->Uint64 =3D >>>> (UINT64)(UINTN)PageDirectoryEntry; >>>> + PageDirectoryPointerEntry->Uint64 =3D >>>> + (UINT64)(UINTN)PageDirectoryEntry | PcdGet64 >>>> + (PcdPteMemoryEncryptionAddressOrMask); >>>> PageDirectoryPointerEntry->Bits.ReadWrite =3D 1; >>>> PageDirectoryPointerEntry->Bits.Present =3D 1; >>>> >>>> @@ -294,7 +296,7 @@ CreateIdentityMappingPageTables ( >>>> // >>>> // Fill in the Page Directory entries >>>> // >>>> - PageDirectoryEntry->Uint64 =3D (UINT64)PageAddress; >>>> + PageDirectoryEntry->Uint64 =3D (UINT64)PageAddress | >>>> + PcdGet64 (PcdPteMemoryEncryptionAddressOrMask); >>>> PageDirectoryEntry->Bits.ReadWrite =3D 1; >>>> PageDirectoryEntry->Bits.Present =3D 1; >>>> PageDirectoryEntry->Bits.MustBe1 =3D 1; diff --git >>>> a/MdeModulePkg/MdeModulePkg.dec >> b/MdeModulePkg/MdeModulePkg.dec index >>>> 273cd7e..207384f 100644 >>>> --- a/MdeModulePkg/MdeModulePkg.dec >>>> +++ b/MdeModulePkg/MdeModulePkg.dec >>>> @@ -6,6 +6,8 @@ >>>> # Copyright (c) 2007 - 2017, Intel Corporation. All rights >>>> reserved.
# Copyright (c) 2016, Linaro Ltd. All rights >>>> reserved.
# (C) Copyright 2016 Hewlett Packard Enterprise >>>> Development LP
>>>> +# Copyright (c) 2017, AMD Incorporated. All rights reserved.
# >>>> # This program and the accompanying materials are licensed and made >>>> available under # the terms and conditions of the BSD License that >>>> accompanies this distribution. >>>> # The full text of the license may be found at @@ -1738,5 +1740,11 >>>> @@ [PcdsDynamic, PcdsDynamicEx] >>>> # @Prompt If there is any test key used by the platform. >>>> >>>> >> gEfiMdeModulePkgTokenSpaceGuid.PcdTestKeyUsed|FALSE|BOOLEAN|0x0 >>>> 0030003 >>>> >>>> + ## This dynamic PCD holds the address mask for page table entries >>>> + when memory encryption is # enabled on AMD processors supporting >>>> + the >>>> Secure Encrypted Virtualization (SEV) feature. >>>> + # This mask should be applied when creating 1:1 virtual to >>>> + physical >>>> mapping tables. >>>> + # >>>> + >>>> + >>>> >> gEfiMdeModulePkgTokenSpaceGuid.PcdPteMemoryEncryptionAddressOrM >>>> ask|0x0 >>>> + |UINT64|0x00030004 >>>> + >>>> [UserExtensions.TianoCore."ExtraFiles"] >>>> MdeModulePkgExtra.uni >>>> -- >>>> 1.9.1 >>>> >>>> _______________________________________________ >>>> edk2-devel mailing list >>>> edk2-devel@lists.01.org >>>> https://lists.01.org/mailman/listinfo/edk2-devel >>> >