From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM02-CY1-obe.outbound.protection.outlook.com (mail-cys01nam02on0602.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe45::602]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 5D98381FF5 for ; Wed, 8 Feb 2017 09:55:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector1-amd-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=y/EEXLBlkmUdtVhAZ0RYyQxmxOF34Bz670Ap7Zh3Brw=; b=5Jp64bbfWRqrdvPheHUUbXNUHDxM8AOwsLXOsZwTdxh0e5yOXeZsspVxaYuF2SqGn3rvFIhIwhCz0OmZGYyBklir1dGeHCi+o/AWsAkNWwML6bvcAH4PWMb//5A+pjy9yoW2+PvpquTyQdsfaywvB7SZqJZ4A+YrUkvCIR2yqe0= Received: from DM5PR12MB1243.namprd12.prod.outlook.com (10.168.237.22) by DM5PR12MB1610.namprd12.prod.outlook.com (10.172.40.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.888.16; Wed, 8 Feb 2017 17:55:25 +0000 Received: from DM5PR12MB1243.namprd12.prod.outlook.com ([10.168.237.22]) by DM5PR12MB1243.namprd12.prod.outlook.com ([10.168.237.22]) with mapi id 15.01.0888.026; Wed, 8 Feb 2017 17:55:24 +0000 From: "Duran, Leo" To: "'Yao, Jiewen'" , Laszlo Ersek , "Zeng, Star" , "edk2-devel@ml01.01.org" CC: "Tian, Feng" , "Singh, Brijesh" Thread-Topic: [edk2] [PATCH] MdeModulePkg: Add dynamic PCD PcdPteMemoryEncryptionAddressOrMask Thread-Index: AQHSgXvpPu5JgE3+Q0eFw1PUQsHrO6FeYs2AgADyPgCAAAL8gIAAAYuAgAAB+oCAAApgcA== Date: Wed, 8 Feb 2017 17:55:24 +0000 Message-ID: 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> <74D8A39837DF1E4DA445A8C0B3885C503A8EB10D@shsmsx102.ccr.corp.intel.com> In-Reply-To: <74D8A39837DF1E4DA445A8C0B3885C503A8EB10D@shsmsx102.ccr.corp.intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: spf=none (sender IP is ) smtp.mailfrom=leo.duran@amd.com; x-originating-ip: [165.204.77.1] x-microsoft-exchange-diagnostics: 1; DM5PR12MB1610; 7:hlvpABsoA7+9zldVonT6QcGXfCNl21njNj+v/ZfoUExwrUP/UXjMIL9frfDPKEcIvKCOOmmquoQiCnEEPiY2M6NlKwEm6WoEvV9HHovjROgA1A/npGOhjViIrloU91UvEqo5fxn9WubEOG6nY41i4HDePQWN/sZ78J0wK9GdwQucU+RKCBxl1yO+lJD76W8xx9tjg5NHdGVtjBngrq8gMxL0Hw5rCiDy+MmH7zUog8qEWFBv1mqOAqVoKqai1nZOv62leY8Fv1kFqWNaCqEPcauV18XJXMx0d5BsJ6Dch1cJNixaQ7sM+1bbKfXkR0Y2tM12ubrYEZC74tVCbOm0pFAsifpZL/baUwZwIjmDcQqE/mNa7/An04a7q53dzQ/xTxX4cF7DUicrHKyTwJpvpo02o5szr5FVArk0RvEhDO0ykbdNByfzVjKK54vmSXQqKUK6GINsxtoGJRmHO/5ixSuWT1i0IOsY192YC2NSqB7EI9PsLRx2k5qM/8JU+Jl9gfzU7vGL+JXk4JYIPlElEA==; 20:eoTfNmUawECDcP2k1RwL/wV/TfeeM4gbCve8zPpTwHTX+TEpAMHLnu3ico2wRJMQ9ln9TRxbyi/EsmQj/wjFBzkq+Nmi8zDaaRL4gPJcaJ3drlIUlZJMgvZrOL3os1IFnOBViRDCmkB+3gO7jpXxChTiOYV6KzYckaE8uymnllyD/iuBhlG2KjNXnte7+C6mQrnZGZAmHlNylUmBCqnAuacxfcLp+rr7oVNKaVqIqJfFgQKJ+r51ZQ5Wvo1otsBt x-forefront-antispam-report: SFV:SKI; SCL:-1SFV:NSPM; SFS:(10009020)(6029001)(7916002)(39450400003)(39410400002)(39850400002)(39840400002)(39860400002)(13464003)(189002)(377454003)(199003)(24454002)(101416001)(38730400002)(6246003)(53546003)(790700001)(74316002)(7906003)(66066001)(5660300001)(97736004)(2950100002)(2900100001)(54356999)(7736002)(68736007)(50986999)(3846002)(6116002)(102836003)(76176999)(86362001)(106116001)(122556002)(105586002)(92566002)(106356001)(7696004)(8676002)(2501003)(25786008)(55016002)(99286003)(3280700002)(229853002)(8936002)(606005)(81156014)(81166006)(9686003)(189998001)(93886004)(2906002)(33656002)(6506006)(53946003)(54906002)(4326007)(6306002)(77096006)(3660700001)(54896002)(236005)(6436002)(53936002)(213903007); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR12MB1610; H:DM5PR12MB1243.namprd12.prod.outlook.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; x-ms-office365-filtering-correlation-id: 17f116bd-9f7b-451c-8019-08d4504ba8a4 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(48565401081); SRVR:DM5PR12MB1610; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(767451399110)(162533806227266)(21748063052155)(228905959029699); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(2017020702029)(20170203043)(8121501046)(5005006)(3002001)(10201501046)(6055026)(6041248)(20161123564025)(20161123555025)(20161123562025)(20161123560025)(20161123558025)(6072148); SRVR:DM5PR12MB1610; BCL:0; PCL:0; RULEID:; SRVR:DM5PR12MB1610; x-forefront-prvs: 0212BDE3BE received-spf: None (protection.outlook.com: amd.com does not designate permitted sender hosts) spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Feb 2017 17:55:24.7254 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB1610 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 17:55:28 -0000 Content-Language: en-US Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Agreed. Leo From: Yao, Jiewen [mailto:jiewen.yao@intel.com] Sent: Wednesday, February 08, 2017 11:18 AM To: Laszlo Ersek ; Duran, Leo ; Zeng,= Star ; edk2-devel@ml01.01.org Cc: Tian, Feng ; Singh, Brijesh Subject: RE: [edk2] [PATCH] MdeModulePkg: Add dynamic PCD PcdPteMemoryEncry= ptionAddressOrMask Good reminder. I take back my word. In this case, we need consume PcdPteMemoryEncryptionAddressOrMask in IA32 = mode to build X64 paging. We need [Duran, Leo] Agreed :). From: Laszlo Ersek [mailto:lersek@redhat.com] Sent: Wednesday, February 8, 2017 9:11 AM To: Yao, Jiewen >; Duran,= Leo >; Zeng, Star >; edk2-devel@ml01.01.org Cc: Tian, Feng >; Singh, Br= ijesh > Subject: Re: [edk2] [PATCH] MdeModulePkg: Add dynamic PCD PcdPteMemoryEncry= ptionAddressOrMask 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, but 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 thread, 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. 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 >; edk2-= devel@ml01.01.org > *Cc:* Laszlo Ersek >; Tian, F= eng > >; 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, S= tar > >; >> 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 PcdDxeIplSwitchtoLongMod= e *must* set to TRUE at build-time, > in which case Create4GPageTablesIa32Pae() would *not* be called by HandOf= fToDxeCore(). > >> -----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, S= tar > >; >> 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 mad= e >> available under the terms and conditions of the BSD License # which >> accompanies this distribution. The full text of the license may be foun= d 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 foun= d 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 < Stac= kBase + >> 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++, 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 | PcdGet= 64 >> + (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 | PcdGet= 64 >> + (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) Copyrigh= t 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 >