From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (NAM10-DM6-obe.outbound.protection.outlook.com [40.107.93.54]) by mx.groups.io with SMTP id smtpd.web10.14866.1624902229709037231 for ; Mon, 28 Jun 2021 10:43:49 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@amd.com header.s=selector1 header.b=HakV0vbN; spf=permerror, err=parse error for token &{10 18 %{i}._ip.%{h}._ehlo.%{d}._spf.vali.email}: invalid domain name (domain: amd.com, ip: 40.107.93.54, mailfrom: brijesh.singh@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kUz4txwoMQjxl2Ag3LE5iFPqPJl6+zM68iKqIIqQm6jjCfqt903J/DhUPNkQtU4V0MYruYn8kOAZxnIodI4Q7PPMxHe84PdtCzsaSmDv8sZSL6ji7AQSPt661bSLVFaCSqOiEKAgm9Axv1m6E7nQRCyxw09kZepqGMR4mThMzPxIXKUKj4tb2RbVHkLB9lt0Zq3jglrG0bWHujJdqL/iUOhJ6u4pqYmzOG2XJgCFOuNYuiceCOpqS9a+G3IPIQo8XjiuJKKRslnXZ5GV9O3Ure9w5woYbDzVjDbHooHgVLK1Tj6KH5avS4347wnXalt+uoqy4JiIMBjnc3tR8didpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=a+xem6I8wVE9lFVXOhZPkFdzZ1K5q1JQN1L3V/Xariw=; b=IrHk4QeEBoGHOdhUNHzdQVvHwlm3JLtZG1Qx/louln7vrUb4HUnpqZCcEWCl8kMFInnhdD1BmlxghoA8EUHUQlPYikcFH/40rzdXJTeAmC+hf85xQWuYtUu0kBYKRLOalqECV6fTAcjImDoeVFFnVTPCi1QZlOxzy7nLSVih39A+0OAkwh8bjBLca7UA+iupVZaKiAD+dmnB9cMd7boQcYNY9ofwLJQjX6MAaCrr3ggJAe30sG1D/+qsNgDyboto0gmTRSXUQqSu75XWW+H5Hv7ThD35pZVYeOFL0WaxZK4hw8l2dplMXGyTiN2i4E6S/iRxWm8hCawiN+SUtx5JPA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=a+xem6I8wVE9lFVXOhZPkFdzZ1K5q1JQN1L3V/Xariw=; b=HakV0vbNiso6zGq29S1q/Nz90fFeKZuxMjXVtQX1r0z7GIEwZl/OqBOeG0F1tHipmQodif0whTT2eqcdItoIExDfuAXXs2VOmWCGPleVpEVEiI/0hHu26nTeYNSWbuGZHd9tYULaA7R5sA0Zxf06+qP5xupSz9cPSljzYVKUAec= Authentication-Results: edk2.groups.io; dkim=none (message not signed) header.d=none;edk2.groups.io; dmarc=none action=none header.from=amd.com; Received: from DM6PR12MB2714.namprd12.prod.outlook.com (2603:10b6:5:42::18) by DM6PR12MB4371.namprd12.prod.outlook.com (2603:10b6:5:2a3::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4264.18; Mon, 28 Jun 2021 17:43:48 +0000 Received: from DM6PR12MB2714.namprd12.prod.outlook.com ([fe80::7df8:b0cd:fe1b:ae7b]) by DM6PR12MB2714.namprd12.prod.outlook.com ([fe80::7df8:b0cd:fe1b:ae7b%5]) with mapi id 15.20.4264.026; Mon, 28 Jun 2021 17:43:48 +0000 From: "Brijesh Singh" To: devel@edk2.groups.io CC: James Bottomley , Min Xu , Jiewen Yao , Tom Lendacky , Jordan Justen , Ard Biesheuvel , Laszlo Ersek , Erdem Aktas , Eric Dong , Ray Ni , Rahul Kumar , Michael D Kinney , Liming Gao , Zhiguang Liu , Michael Roth , Brijesh Singh Subject: [RFC PATCH v4 23/27] OvmfPkg/MemEncryptSevLib: change the page state in the RMP table Date: Mon, 28 Jun 2021 12:42:19 -0500 Message-ID: <20210628174223.1302-24-brijesh.singh@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210628174223.1302-1-brijesh.singh@amd.com> References: <20210628174223.1302-1-brijesh.singh@amd.com> X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: SN4PR0601CA0020.namprd06.prod.outlook.com (2603:10b6:803:2f::30) To DM6PR12MB2714.namprd12.prod.outlook.com (2603:10b6:5:42::18) Return-Path: brijesh.singh@amd.com MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sbrijesh-desktop.amd.com (165.204.77.1) by SN4PR0601CA0020.namprd06.prod.outlook.com (2603:10b6:803:2f::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4264.19 via Frontend Transport; Mon, 28 Jun 2021 17:43:47 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ddadd8ee-623a-476b-b036-08d93a5c48ca X-MS-TrafficTypeDiagnostic: DM6PR12MB4371: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8273; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6DC+tLC2UkYc0zbokeQwWMbQiflqUHsDhmc2BahoOlI6JAuNTNWUhcoXiWZF6eoumiK6sxo7QfVQLtsrAJiwsFR2mIT3/LntXgANoWTkXlNCpC0XlTFTiCNiqFGJJZA7E4wQVuZ8A9ImO3ePROmT6piXmrDBEocGAuTggHuda5d5cmYUrWVSL0c6X/cEJQadL68yKwK/Ft5pW/KooJj+kl53SZQZRpiMSdJonbB6kuqrcvaR2XCmyOre4V8VMNgkx6hZhmYKBES2l3VXnUIiw/CXy+A+x/d1TkYB7qW4T7+2XHpWTBiiliiAHI7kBr0QgpK0msqIde2+qHZEiMhBRulivbP/bZ2LMS+5Oy1Cd4ImcktbzQwih9Fw5XQsTbK8A4gyah4w5hYOfiKza33VrRoh9cDpafzm1SDhl3H4kWMOpVGmrMaVCdcmV44KLIYcUNVtbocntHSNxw7AoZ0GjBJNeuVPBswnlVoLZlFP4CN2AnDwDnA+VyubBOel6/OHJx7+yfj09+9RO7CVtAJMY1J0GozRwA2CAMm+tUf8EDe1kExUytvvx5gGxf8mvHl6McaomXZRH0kS5TlWinZRzdtUbt7g8/wh2EzNbDZrqa78yVRgJ1l4SWxD4gRXxZzbX8mjRCArjtC2cuH4Sl/+rJm/pxE/4X7bbaKI8c8b4EMjJQiJ2sc4tAH/3Geph1U6UlkuDBIbZsA7VsfNG4wGcNxTN413XRB6yRFV1N7xe1koKRINE7QS0C2zIlHpjv610GrbWtrPHQpmXRueEXdPPdOL2KtBhf5w4RgW45Nh4nJNZduAETz8lm5ySJrnb5KA X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR12MB2714.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(39860400002)(136003)(376002)(396003)(346002)(366004)(8676002)(8936002)(83380400001)(7416002)(66946007)(1076003)(36756003)(478600001)(7696005)(19627235002)(38100700002)(186003)(38350700002)(2906002)(26005)(44832011)(52116002)(16526019)(966005)(6666004)(6916009)(4326008)(54906003)(86362001)(5660300002)(2616005)(66556008)(956004)(66476007)(6486002)(316002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?3oSnSstHmSFy+yVeSEQ59z/e/THoftXBGODZuzlHT82KsyXvztfc1LHYd+A7?= =?us-ascii?Q?FFfvZcaadDIwQIzIOkUqpjsF80O9qr7F6bTsvsv6GPpyeKt7ojE7GzI6xfwk?= =?us-ascii?Q?W9wBidAq+MRDMejz5UXSEbW9GDuTF+DOmT46iBf/zfHSseJDSJs4TlZRE07O?= =?us-ascii?Q?uLc4IdK2pZUQdQ8vbGMNaUYx/0EyaCzIygCTtnoXNopYzEMDr8+O4lHq4zjK?= =?us-ascii?Q?yC1uetCYQM9zJteQXCPkALBXesm8bBT1hkAbqOADyJNZxrPXxpvYzquA9HFA?= =?us-ascii?Q?pxg9lxSxT+FLHuMT+pm+nWwHRS+gbBv9uk3W5Y5XmWvlmyXPkPqeIhNyB98j?= =?us-ascii?Q?LzKz3AQbnKxXi28WEYJbMMP0ZB7vmr7tipzh4+xtpEVnxNtpMiO/90f/ufTN?= =?us-ascii?Q?9kECf/vG3tnQ4zVBvdUhej8JNaxcLHx53deV1UlQhychJNCaRu95/X6+fm7Q?= =?us-ascii?Q?uK6H5dQeMvVMoc5EdLKf0vhpZPsCqjYUFep73NlyyDt3kgZ+SDQE+fWoyv5z?= =?us-ascii?Q?+e5f0R4psRE4oAIPvbNK7UE0wapHmy+7kYRTuh/51FtkriKhjnzWw3fym5JJ?= =?us-ascii?Q?ChhUMOkJRffktub7JcX/TDw685m16omS7R23Tpg3JfA3cBamK3XKdtf/dRPd?= =?us-ascii?Q?lVXdOLtOFF9wmwhGNYtyH/K3DW8Ru6y6/KcNQjl6ngaqtiqhAHqom17yyq8x?= =?us-ascii?Q?8GcAlDgiAtpVZhWb7psnqEpARkjj13LclsRQN8zW7pl7lY7WnXjm+8Ro6Fr9?= =?us-ascii?Q?sJLlYuemSRgXY7UoKqizRMpADzNN+XU+bMYLqdyataH3uMl2HHX/dRTIyblh?= =?us-ascii?Q?aiI3nFVL+f5RG97FA29va267fR2zpyhXqB+usQ+jUGj+ExmkBhSN91lWx/Fm?= =?us-ascii?Q?5eXeMLxeylI0Y6xjA14OCibliS57fVe6PWtuQ/41a4D9g7ltjJYo6ygwFNA6?= =?us-ascii?Q?eg42MB6ORN37lb1rrZUl+BLdLo0vUZ5Q/i2Pyog6C/nD+OPLLg71x0ZvkhHb?= =?us-ascii?Q?GBi69DHG/wSfi0/MCtOhTtp1P0YPPzjswfPyhBKM0bHXOgt6KN2eZRGD9o3A?= =?us-ascii?Q?T0Ryk7w1fvIfyWq6v57xaysliVXQklEDFRYBwYeZGt3F21jZvlp1BzpdEcO4?= =?us-ascii?Q?rNQvY2hFaWXaGvFbMCGuT6YXxbeCti7AUjaDqonNKgC43hfZFdJ4ltHY2PBd?= =?us-ascii?Q?e44yKRBVG7Hphy0Tw1jac7y7hpBNo6NxeQOXEHxm9SX7oYEl+4X0zqma6MCI?= =?us-ascii?Q?Lcd3nBPsYJb6Z+QpeLiUNk0tPz1QmVOUxEwqZAwlonnPpphoXhIBoqziuG0f?= =?us-ascii?Q?+HoTLTROHnlKMaRa+RCCyvy5?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: ddadd8ee-623a-476b-b036-08d93a5c48ca X-MS-Exchange-CrossTenant-AuthSource: DM6PR12MB2714.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jun 2021 17:43:48.3720 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: nO9aJKMHz90EFbWiALeG4PKKT4IFIT2BKMhUI1P7Sczk3mIgdV8KsP9KMFbxdDYP71kD13sMRr/T73uLO3Yhbg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4371 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3275 The MemEncryptSev{Set,Clear}PageEncMask() functions are used to set or clear the memory encryption attribute in the page table. When SEV-SNP is active, we also need to change the page state in the RMP table so that it is in sync with the memory encryption attribute change. Cc: James Bottomley Cc: Min Xu Cc: Jiewen Yao Cc: Tom Lendacky Cc: Jordan Justen Cc: Ard Biesheuvel Cc: Laszlo Ersek Cc: Erdem Aktas Signed-off-by: Brijesh Singh --- .../X64/PeiDxeVirtualMemory.c | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/PeiDxeVirtualMemory.c= b/OvmfPkg/Library/BaseMemEncryptSevLib/X64/PeiDxeVirtualMemory.c index f146f6d61cc5..56db1e4b6ecf 100644 --- a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/PeiDxeVirtualMemory.c +++ b/OvmfPkg/Library/BaseMemEncryptSevLib/X64/PeiDxeVirtualMemory.c @@ -17,6 +17,7 @@ #include =20 #include "VirtualMemory.h" +#include "SnpPageStateChange.h" =20 STATIC BOOLEAN mAddressEncMaskChecked =3D FALSE; STATIC UINT64 mAddressEncMask; @@ -695,10 +696,12 @@ SetMemoryEncDec ( PAGE_MAP_AND_DIRECTORY_POINTER *PageDirectoryPointerEntry; PAGE_TABLE_1G_ENTRY *PageDirectory1GEntry; PAGE_TABLE_ENTRY *PageDirectory2MEntry; + PHYSICAL_ADDRESS OrigPhysicalAddress; PAGE_TABLE_4K_ENTRY *PageTableEntry; UINT64 PgTableMask; UINT64 AddressEncMask; BOOLEAN IsWpEnabled; + UINTN OrigLength; RETURN_STATUS Status; =20 // @@ -751,6 +754,22 @@ SetMemoryEncDec ( =20 Status =3D EFI_SUCCESS; =20 + // + // To maintain the security gurantees we must set the page to shared in = the RMP + // table before clearing the memory encryption mask from the current pag= e table. + // + // The InternalSetPageState() is used for setting the page state in the = RMP table. + // + if ((Mode =3D=3D ClearCBit) && MemEncryptSevSnpIsEnabled ()) { + InternalSetPageState (PhysicalAddress, EFI_SIZE_TO_PAGES (Length), Sev= SnpPageShared, FALSE); + } + + // + // Save the specified length and physical address (we need it later). + // + OrigLength =3D Length; + OrigPhysicalAddress =3D PhysicalAddress; + while (Length !=3D 0) { // @@ -923,6 +942,21 @@ SetMemoryEncDec ( // CpuFlushTlb(); =20 + // + // SEV-SNP requires that all the private pages (i.e pages mapped encrypt= ed) must be + // added in the RMP table before the access. + // + // The InternalSetPageState() is used for setting the page state in the = RMP table. + // + if ((Mode =3D=3D SetCBit) && MemEncryptSevSnpIsEnabled ()) { + InternalSetPageState ( + OrigPhysicalAddress, + EFI_SIZE_TO_PAGES (OrigLength), + SevSnpPagePrivate, + FALSE + ); + } + Done: // // Restore page table write protection, if any. --=20 2.17.1