From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM02-BN1-obe.outbound.protection.outlook.com (NAM02-BN1-obe.outbound.protection.outlook.com []) by mx.groups.io with SMTP id smtpd.web09.45.1622070715669955813 for ; Wed, 26 May 2021 16:11:56 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@amd.com header.s=selector1 header.b=qZzVnsoU; spf=permerror, err=parse error for token &{10 18 %{i}._ip.%{h}._ehlo.%{d}._spf.vali.email}: invalid domain name (domain: amd.com, ip: , mailfrom: brijesh.singh@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BaqyeLhr/aIfJwVyLDnMu6FGvRhlDO7bvmVln0iysxrSVZn2ty/HxeIsuCiCfrveglZhTurZpM0KZ2b6df6pLFeat+xFhYHUZjzAlPIkua8sqYR51a+50FJd98C9Nk4rBB6RcxGJVzDnobsq5vvjw25Uv8vD6pDZYtpmKbyFszOVab2sELqfBBWxrKEcCmSpYFBusDpUJW5fAFhiR9rTkYKhNARO2SLWtFO4vAMRbub2jxNKCMqPQLk9fPBid44y3sQc5/bRDZP5lRFlc7aUXhSH6e1IvOcUUwISKhcwLOqv0CUj/ubCSt0j0cPJUIvoKM3oX9nH4jcdaFcL7TpASg== 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=MkHWnNAMyyV4No+fJWEsy8+jRAZyRQpgxGQ9Q2bkwvy2qZIVElReCeJUiB/X0EZmklM8xLHWVBH6bBCN3wqKWDpeefHYSxdYbr4QtEX7Yj11P1JDzM6Z8wOTRLWsxSxmW4oxJb/ci/e0P/HLsBQu3i8gZ+F03oUUHyQXB9OpfPVqw0ydXrpEzqUv2dlKd4yPAmF0XGA1s7+WlSw3kafIFJNZIGJIEa8IBQIjTWq8GcRCThwMtYO7uWtDNpeLnWXk8xNZGlXQ8au5DMAsYd/bFxkHLkVtqCRjQf/bdf/DqATQIMjZVoLELXFnaNx0q6jatx0S2QVYDaiLgy6/rmScmQ== 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=qZzVnsoUjhtPaFHFr2yQ1nW/MWX9DmdNQ42JJ1ar8kJVlTjRanO/1IYL2zxWrJQjFIFPxCykOISdiL46/jFwG0GjiyPhng+pr7ZWzQm25kDrvd9mXHqJ6Yz2qQ5Ns7cfiOnJxEyZfSvtp0KQnWAtFHrY2dkmWOiXM8S3FRnYPqY= Authentication-Results: linux.ibm.com; dkim=none (message not signed) header.d=none;linux.ibm.com; dmarc=none action=none header.from=amd.com; Received: from SN6PR12MB2718.namprd12.prod.outlook.com (2603:10b6:805:6f::22) by SN6PR12MB2782.namprd12.prod.outlook.com (2603:10b6:805:73::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4129.28; Wed, 26 May 2021 23:11:53 +0000 Received: from SN6PR12MB2718.namprd12.prod.outlook.com ([fe80::9898:5b48:a062:db94]) by SN6PR12MB2718.namprd12.prod.outlook.com ([fe80::9898:5b48:a062:db94%6]) with mapi id 15.20.4150.023; Wed, 26 May 2021 23:11:53 +0000 From: "Brijesh Singh" To: James Bottomley , Min Xu , Jiewen Yao , Tom Lendacky , Jordan Justen , Laszlo Ersek , Erdem Aktas , Eric Dong , Ray Ni , Rahul Kumar , devel@edk2.groups.io CC: Brijesh Singh , Ard Biesheuvel Subject: [PATCH RFC v3 18/22] OvmfPkg/MemEncryptSevLib: Change the page state in the RMP table Date: Wed, 26 May 2021 18:11:14 -0500 Message-ID: <20210526231118.12946-19-brijesh.singh@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210526231118.12946-1-brijesh.singh@amd.com> References: <20210526231118.12946-1-brijesh.singh@amd.com> X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: SA0PR11CA0202.namprd11.prod.outlook.com (2603:10b6:806:1bc::27) To SN6PR12MB2718.namprd12.prod.outlook.com (2603:10b6:805:6f::22) 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 SA0PR11CA0202.namprd11.prod.outlook.com (2603:10b6:806:1bc::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4173.21 via Frontend Transport; Wed, 26 May 2021 23:11:52 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4c8cfde0-5589-496d-5745-08d9209ba5f4 X-MS-TrafficTypeDiagnostic: SN6PR12MB2782: 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: IZ86xQp34yXhV1RUX+KZ73IqvE06nb6Qjok0m6XRuDtvmIgEeiO3VSZZC3nw5ZjomUAUpXRjpyNw5R2EGXsG1nIjWHCtjrbykKfDYXbNIkjOpXHI15PalqI8zCfIkuBg6BhBmkvRPOnBqbAVABKrm4rC4tWuy5ZfpddJH0ZOHNvgDP67Z4P8eydpdnlnLJ0do8vCf20FzNh1HBUECLUs0pO4KH6wOLC/5oWPZuBPyoXSGfXtitC6hguzFeeEPk0p5F/oBqjvXL1X8KsFQ2iGlZ5FOyKFh57LSPl4oA82EZM7IhurKbP4u/OsMBUSy6KoJnT/xewJOAPd5ySfkyLZ0ZWH5kJZLoNXk6bAiK/Lkwc9rU/ciMpuOjbVMydWmPm9o4toN0+Rc0/IiwMp/0OgC5+/mHsTXMUYrknILWcm+L64kpSSRleQ3SWPCcUor5dxBbODW7/qaWlC8AsG7VQHAAoUMfNkaNQPYhcdoeQXugm4W7qupQYQp8EFTv6Fnxzfwb9nRD5C/612g+9K/pPEs5m4nH38m0EQis3/uU6x+MefuHpOP0iMgpImz0G/vQdR6Oe7Ji3uTYlrnMNFegxnqK49ZK2ta3YQV4BKpYNqfbo7Dnh8sA7DIDLX7eszWTyBMxq8JSvt4h/Yedi7KZFGotllUBZzPw/cnjqDvhIxum8XXQNVa6bDYi8+ryAd0Ck+wi4TWuUoBuLJ0zDsit0dwGTSNnRvWiXmIff95Meg2//HzrNC4EyO+zLYk/Mkz0pOxZgwMOXfGN1VKNmsvGiuNdzlu8DxKfBxT+aYE/QIY08= 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)(39860400002)(346002)(396003)(376002)(136003)(26005)(316002)(5660300002)(8676002)(83380400001)(186003)(38350700002)(16526019)(478600001)(54906003)(36756003)(4326008)(86362001)(6666004)(7416002)(2616005)(110136005)(44832011)(2906002)(52116002)(66476007)(66556008)(7696005)(921005)(19627235002)(6486002)(8936002)(38100700002)(66946007)(1076003)(956004)(966005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?vNlFY/AxLCglctPqXgtg//Co+g6zRCUejRco2NE8IkLyzkVcZGDmVGoLm6tw?= =?us-ascii?Q?G/RvBLyCFFsdhHzk0lDL6i1uGo/Mj92uYDBeoZflcuY1tLpSn3x1mJ1Kyst0?= =?us-ascii?Q?FIFQ0jWFfG1cgyYtZBy51YwUjixQroBbz4uzALfP8EVzqX1DE2PDZ54u6N9I?= =?us-ascii?Q?sluz8LhPh2kchIOOj7sgbXRNdS3yz/PkXXjhFzwl5HeZAvqGkAiWmVZ8eGY7?= =?us-ascii?Q?isYIq70O17WAK5VlFe14hvHpRKNwW+z1YvEFOviZMvBO7V8bKN80fLOW2o9q?= =?us-ascii?Q?/2fccEyQyKPjnfrpnAWlCf5unbX9Qd6HlYJd4Yi5+a5LMW304aKkPT16vHlk?= =?us-ascii?Q?VJzxQpgXZpmjLVjGk/CZOR3GFMMfdFquIlti2VOycFcQ9NQ1Lw71ladWldK7?= =?us-ascii?Q?9MN/twiCl/snXkeMzK7dEF+EeKgWlxZ4YRONeTbHMrutGQRyfg8/79YlXCYq?= =?us-ascii?Q?kyWrIH1taXyPU47lNoV6owGTTSoQhZ1wqUfY9TiQh4pdHiPyBjJytst0njoD?= =?us-ascii?Q?VSAACRvoorShhT2eP1zYS0NIDGQESO7j0Go7oBZoYkLYLWr7y6J1dOpYSkS/?= =?us-ascii?Q?EFp4joahQdJcx3MzWvLMCfXqynylaVtLf/5Evx9IkYnXvuVcwYFaRfNZ3GoZ?= =?us-ascii?Q?/7vVSI94O9/5trHiaGX6xVNfZbHVde+dxiF/kVHW7cGGkr96ANYcwQuVNhce?= =?us-ascii?Q?8+zKKB8tqp42N7DH/GXt2oeqGPmnpY0jbfmGrfs1+nIpc3nvzMFxGa9jvBbD?= =?us-ascii?Q?8ULBEeFGpn2rk0xpOimozCnCN64Fn5RxBPGpVoMkIRmMd/bJpg+2fVsjwaHg?= =?us-ascii?Q?x+gnzRJaKKNr+Pk99sfYW+FzrJ3WCQk+13PedbEm+uZKQEcXuiefe2JJHg8W?= =?us-ascii?Q?ytTaxo6mQHpNrC3sYqKLz45D2IBQ+/uoyaMeOZMG0Li7VlUFSX1SiJqyaReQ?= =?us-ascii?Q?nZ67C9/flngufX9O0b583NPijWECUd49rV50FE6s5YuEfCf4gXRfdCYRh0qP?= =?us-ascii?Q?sQg96u7EuOjohwpdUBMgLXQ8Ve5MptLKaVLdrXbEcPQzQ+12UuDf4VF4VWG9?= =?us-ascii?Q?BU3iE4UI6mx9+Gn5S+F/ykJEbDdMf0U1PuFbccB3/TaAI/BFfAOoCqKc9Nh5?= =?us-ascii?Q?9rqVG5X31bk8LznAG5/4o7DOfRqW0KVJnyk7AsNzEQxxWgNHjc2X8AEIKSb7?= =?us-ascii?Q?/RYjPiArU1t+4WHizd/NpJu96GPjpZu8c3+ZLMNl825DUMZIzIbZYiZPLRUv?= =?us-ascii?Q?iVkq1hCNx4EwznemZyOjRpFbC9rPzcU+hpLw6MHhYwKU+LXA3q45dBbCS9+W?= =?us-ascii?Q?9oWvw6yUaxyYRj46OJ+PJV5v?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4c8cfde0-5589-496d-5745-08d9209ba5f4 X-MS-Exchange-CrossTenant-AuthSource: SN6PR12MB2718.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 May 2021 23:11:53.0126 (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: lxnRydz/obI0hcysLMa9Yp97A69x92sbfc0uWTfQ57B9sMFbATsN01ooNeYhG8lhTeC/U9hD3A6dRyrIXWM0TA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR12MB2782 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