From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (NAM10-BN7-obe.outbound.protection.outlook.com [40.107.92.47]) by mx.groups.io with SMTP id smtpd.web08.1335.1632163606435968284 for ; Mon, 20 Sep 2021 11:46:48 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@amd.com header.s=selector1 header.b=l61mqbMa; 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.92.47, mailfrom: brijesh.singh@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LnLrgT3XAlgfSa89TBY8s4QWgIh4s+KqbUC/JH/g41RF7bK6g82MG6TeLxkGA08DK5whk2ToraSl/nHbVrRGldKAj3ZknX1BKiZFJ+z5NlSXVWAdSLB+NNqVikvds9PyG7Ci1dwUyQFykv4SbQEMTHpqahXSHPKnrhSQFiae33KeDVEuBu6tRlEKz7BZ9LkxI1pSe/4lMYk8mfDCQFsHbzWOYS+pwWV5E+mlf3znrm1sKENcygq2338CatWK7O44h4mFcrpBuMCEZwDwDbt6VXaZFbobni43HE7jKJz9Ng8jb5+MDp9hpyod+7jHtejJwaTMsoyYI0x8LIwjwKIV5w== 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; bh=X6r0nD7n4uJBJCtDmtwm4mGO8ZKKhmFquzC2PjW0W9c=; b=ioI+CmAWf9yJDmMlXq32MicfWgadonC0wW599gnhVa+Jfl645Z1+Tel2IA9dxIT9LzjdnQZA/tEc6ptMOJiaC4/IXT0Ex70gkkjElcJt12qu+tUEm/6/jJkq78buJsytm7dlyBx3nTyVMFGk4YkNC1ZVv9gwY6aDsNmkbuVNbbyDyeaQqLl8KqQSDKFWDTrZsQZtnmc1aK7Lbvs0k2lW4KG8dalxkF6MqbelUqxPIVBGZz0xwPnESSfRj/koyo738FyfrMGsYxOKaXA1l8slIa21kvojTo30qlnrmy7bvWULZiEiOkmxG6jPP2EsJJKh1mEW2tkc3rUG2tDySXfKDA== 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=X6r0nD7n4uJBJCtDmtwm4mGO8ZKKhmFquzC2PjW0W9c=; b=l61mqbMa52vRYegMOdZ7VgBGHu6psW3MmBBSoXkLTUAoKnzl0N/16CM5w95zPYywHZuGCHEdva1DPorR2qXYxr9dv5C1tiK7zcsck9A5EE85Jq1HAmUJOXzN68/MemiuAANdUnMVa9YLs3eF5f8v+cp8Bw+b2fvTHk/X1O9Uo7Y= 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 SN6PR12MB2718.namprd12.prod.outlook.com (2603:10b6:805:6f::22) by SA0PR12MB4575.namprd12.prod.outlook.com (2603:10b6:806:73::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14; Mon, 20 Sep 2021 18:46:43 +0000 Received: from SN6PR12MB2718.namprd12.prod.outlook.com ([fe80::78b7:7336:d363:9be3]) by SN6PR12MB2718.namprd12.prod.outlook.com ([fe80::78b7:7336:d363:9be3%6]) with mapi id 15.20.4523.018; Mon, 20 Sep 2021 18:46:43 +0000 From: "Brijesh Singh" To: devel@edk2.groups.io CC: James Bottomley , Min Xu , Jiewen Yao , Tom Lendacky , Jordan Justen , Ard Biesheuvel , Erdem Aktas , Michael Roth , Gerd Hoffmann , Brijesh Singh , Michael Roth , Jiewen Yao Subject: [PATCH v8 28/32] OvmfPkg/MemEncryptSevLib: change the page state in the RMP table Date: Mon, 20 Sep 2021 13:46:00 -0500 Message-ID: <20210920184604.31590-29-brijesh.singh@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210920184604.31590-1-brijesh.singh@amd.com> References: <20210920184604.31590-1-brijesh.singh@amd.com> X-ClientProxiedBy: SN4PR0201CA0034.namprd02.prod.outlook.com (2603:10b6:803:2e::20) To SN6PR12MB2718.namprd12.prod.outlook.com (2603:10b6:805:6f::22) Return-Path: brijesh.singh@amd.com MIME-Version: 1.0 Received: from sbrijesh-desktop.amd.com (165.204.77.1) by SN4PR0201CA0034.namprd02.prod.outlook.com (2603:10b6:803:2e::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14 via Frontend Transport; Mon, 20 Sep 2021 18:46:42 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9238822d-92e8-4e0f-fab7-08d97c66fd9b X-MS-TrafficTypeDiagnostic: SA0PR12MB4575: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8273; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: R6jPLvCEYQwo2TYMNtvxeNzGVLTmEE+k8lUwHvJWfO670Vbql/EDCbJ6zExVU5ptGdyBt4mNOdU+Bo8WJu1h17BME9KhhxXB0WSPbwXZCMgARa8llFTHUr14uBAIHcH4xowk0qgw5FGXTfUzmy+d8EyykzrZGRdcxkr+UJt7VX5OFe612CVe8KxI/CqPM7+qZc3HfarTfrDU7ZuImZG/o9WaQyZZu6PVG5QxoviA886HMpcKZjCwN4Ha6wZmr/K0yBJ7/eAuXaorWA2b1NrRR/bo6r+qnyCVPfT976wKPIottC/tk/iFKhd6VwSmLX0QPZSkiHV4rKpH4zU8iEn9tQefJapDSY8uWlsmjfUQczXWbW/8HzQHrznr4HqOsf3TBLePjL5ZAsdKIgGl0hm3yyiKu2P8eMmn1sSXapDpOXp9P2fhKusflupyCvLzHwwSm2KZlBRaHJZkL+M1OaeKCtYLYcoikK4G+Vj+b5GoIUSgOVfCpHFS6tkU4AxQAzbsRPtiT0qVkXSbuiWev0bI2KBdi5g3+sgcBBlYnupEnKqIV9pz/3KK4luNWIjMSUBLnB8o5nGWNIr8KhmYt4czeyNJJ9Amlge2tovSnyk8MnuQZM1zn6L6WVQrLWfym48oAeZ7T75RnDgwrVt0ZLoy2fVJUqLJ7hrUvGq0DFCEyvFYaycx0EpIeiwyE8Z5X8ZSP4G8wFVXUxlRxw/owdAebNr5QBIq+nFlwRuGmcSDyN/5bS0rlEMG3niI17OnDFT3LKfRYPkbmq50sVy8jmMEgw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SN6PR12MB2718.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(366004)(38350700002)(44832011)(5660300002)(36756003)(83380400001)(38100700002)(8936002)(66946007)(508600001)(6916009)(7696005)(52116002)(1076003)(6666004)(956004)(8676002)(186003)(54906003)(2616005)(2906002)(6486002)(26005)(19627235002)(316002)(66556008)(66476007)(966005)(86362001)(4326008);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?5lgqrmbLua4nNOr/iG15S52ReFgM+VN89AMX45mY6c/cwpt60rkPUGskTLaQ?= =?us-ascii?Q?02fOafCT3RhtPrmxv+Jn6fDO6IlKgH+EuCf8cKAbFd3abtogWgLoKGwRfApF?= =?us-ascii?Q?/CfPJmACbHjRcgl4jlLoS2yy5vBtHILw3vsD1fxrZABuzPgnjZH9MsMYk6In?= =?us-ascii?Q?hpFlmgJtkYHFSaaCjJ2zyqAry7p1lhsOw3T/aEoT19KkIvrO2tD0elsSlCV3?= =?us-ascii?Q?bwUYpgEVj8boczlrohmQgKC+K7DOxjYVOH+FIFUcVBlh9NxLsnTx63IuFOB4?= =?us-ascii?Q?h4LVtbMz7t+OcJf0NuE5IZsq9iw1Kihn2131ASh9zoAspBAQAlkwErfLc4Bf?= =?us-ascii?Q?OBlVBsLnceAI3JoHH6e5IaibYoZu4ClU+ohDmOHEEdRUlC7QGiMgeV2RP8z/?= =?us-ascii?Q?NGg0feK2G/ynz257eSWvBNTzNwIU+vWuWcWKrsP2+ESxXExeXT9EC1TMe+ZM?= =?us-ascii?Q?Zz8bNJQnZT+h0RWNF2QlZsWb6OZjXbEZgKW+/2ILNNEgDcWR7BTNySyycePS?= =?us-ascii?Q?eDK+vLJKwNYoff9bniPA46RyBBkLdC15PSuGuJG3omqFkYt40JK1//Wka2Sq?= =?us-ascii?Q?UFZQ1NpMaprBfaQVswSfK6qkl3+Z+lzE1nqu7lVPZigzcEnsyxfV46P0vM4o?= =?us-ascii?Q?4FkssP69Zx9gn1xMlwgDh5TQoAtldY5FzHoHN+lifi0LRQeL/yzUwFIoTMGk?= =?us-ascii?Q?jLRCwT1G6AN3lYgIOWhA/lmOG5gfGCF41Zf2SjCF5ZaH7FbOwOK00g5F3GyD?= =?us-ascii?Q?E2nNWFyYv3UqbEr4ZlfHu8T2VqcHQNExpewz7tA6Wy3q+HOdeYYYt1rz6DnS?= =?us-ascii?Q?rOnby+NCURtE0E49YBBqAGw16JQTKkvRI5VInXkw9BJnqjTKo453E89I+ddn?= =?us-ascii?Q?j683en9F7EufizC6kq5bLNa5kpS8XhfcjCWclWcz8tfFOXyLoEaY6YtPhFJK?= =?us-ascii?Q?6wfYydfFN6IDcrS+eYI9e7pKWFaTsna+p2QUZySMBQQNERigznO7+IOfJyu0?= =?us-ascii?Q?lCq3dvhTT+6PXYjj3/HCfYT25AMBpiI8AjPtmh2dhqNkEvzXPNequKv7EUib?= =?us-ascii?Q?jePxhx34o1u//eFODsnVc0EyjIi6TGkO/VkLZOe/G8oGpugPJwtEwTxDfAVk?= =?us-ascii?Q?FUuNqhReGmkesoWIcwPTqXDDxyr1oFnI4iXG9wEn2MSy2472HeKRyPJC1C4g?= =?us-ascii?Q?sfWAcezuGgzvAQrpxRJCYxH8Ra2dVIXjFOQlIbWkHlYNtfZoWmX9AeQUDB2r?= =?us-ascii?Q?7yAiWNG/3tfNJRdZQUqER5VBh1WbQORwXCmaH1GaS6CHD+RqoOe/oXztQt7b?= =?us-ascii?Q?4EEiJyo6RrBIshqZovJYE9Ee?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9238822d-92e8-4e0f-fab7-08d97c66fd9b X-MS-Exchange-CrossTenant-AuthSource: SN6PR12MB2718.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Sep 2021 18:46:43.4881 (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: vXnbEHe3rSKapE7LsDz9vIksDsfHD4PMkAcbhQug+FxpGIJRWKmI+u7KoqDnPJO6mnYE1aW1Y+wu/bee+6ywiQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR12MB4575 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: Michael Roth Cc: James Bottomley Cc: Min Xu Cc: Jiewen Yao Cc: Tom Lendacky Cc: Jordan Justen Cc: Ard Biesheuvel Cc: Erdem Aktas Cc: Gerd Hoffmann Acked-by: Jiewen Yao 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.25.1