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.48]) by mx.groups.io with SMTP id smtpd.web09.2445.1636582534360325236 for ; Wed, 10 Nov 2021 14:15:34 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@amd.com header.s=selector1 header.b=lx10htFw; 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.48, mailfrom: brijesh.singh@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IPNHc/6m7vnRth3aWfPNFuQuJ5HaW7jkm0YWIcqZFLxcOBmuCqdn11ol9YD7eTvstd/XTW2qkhTx1QulCdK5TSV6UxLcW8wXaycgyDgqa2jwQYHUiayByVvjh5qHCkRYhJniObaP2/y6pv/gkNFwzrLom6WusVK6bnSWV5k672bxUjzagVO4TDnio4uuBLNFLUho3dNea6n9WuYEHavA89k2By4gNEtS1VNn1RrQ4Ckpi72FyPVn++XcVOeBkY/rXCapvcCG2vZRzpwD/dvfBG7qdshUsn2T4xzdqr7fBZLvgVKuOhkebhbgHGpKc8iJAjK611I/f8fLIqqMyMwCJw== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=AAcfYlxvUwlQEaM0iBzjpB3n0oarjVEg++IMGJfyqoo=; b=dzlqZWu2+fctnWBUxwuuZdg80HZXJO3KC4e0OHBrC2XTYX5Jr3JmYHq4UOxUHM3f1N0Z2jAp6tNWY07plpszAziRLA5fhL3IE3pz0ACeOUPJbDVHeJmqRTlpF9/kjfcZlX6DMsNVURnJJLZ+nlfFcEadnMNQWLy9TgA2QBBEXBPRAfzFd38+YHEqVofWWl2W8mRRdJW2Die5gNHDm6V6DrjcXjXQgtNX8DDsnhRVFw13NJukjPQ/1+wH+ZiwZkxfbEwYgwNe1kKh4Pg6HmezK2aCqUO65wcQJXvOjMhBjS8ACh+4eYM1Qoa0s1YGtqdwsWZukzW91QJmv84aWlZPjA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=edk2.groups.io smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); 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=AAcfYlxvUwlQEaM0iBzjpB3n0oarjVEg++IMGJfyqoo=; b=lx10htFwbKGrOnEHaY+sL1dLU3zN47CnZ+I0/OBGyCUktrQrsTdDy7SJv5ZRzoeEik7Lnwx6G7bRU1H+8KOia/1UaRTtztswImMA9ibFJr6vglJjZ5wBwFCb3hJEQfJzuiGw6Vk6dUOEBwgO2sFHVTHvvTst65ZCWgSCDKU5Uoo= Received: from BN6PR2001CA0015.namprd20.prod.outlook.com (2603:10b6:404:b4::25) by DM4PR12MB5183.namprd12.prod.outlook.com (2603:10b6:5:396::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.11; Wed, 10 Nov 2021 22:15:32 +0000 Received: from BN8NAM11FT066.eop-nam11.prod.protection.outlook.com (2603:10b6:404:b4:cafe::ab) by BN6PR2001CA0015.outlook.office365.com (2603:10b6:404:b4::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.16 via Frontend Transport; Wed, 10 Nov 2021 22:15:32 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; edk2.groups.io; dkim=none (message not signed) header.d=none;edk2.groups.io; dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; Received: from SATLEXMB04.amd.com (165.204.84.17) by BN8NAM11FT066.mail.protection.outlook.com (10.13.177.138) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4690.15 via Frontend Transport; Wed, 10 Nov 2021 22:15:31 +0000 Received: from sbrijesh-desktop.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.17; Wed, 10 Nov 2021 16:15:30 -0600 From: "Brijesh Singh" To: CC: James Bottomley , Min Xu , "Jiewen Yao" , Tom Lendacky , "Jordan Justen" , Ard Biesheuvel , Erdem Aktas , "Michael Roth" , Gerd Hoffmann , "Michael D Kinney" , Liming Gao , Zhiguang Liu , Ray Ni , Rahul Kumar , Eric Dong , Brijesh Singh , Michael Roth , Jiewen Yao Subject: [PATCH v12 28/32] OvmfPkg/MemEncryptSevLib: change the page state in the RMP table Date: Wed, 10 Nov 2021 16:14:53 -0600 Message-ID: <20211110221457.2397234-29-brijesh.singh@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211110221457.2397234-1-brijesh.singh@amd.com> References: <20211110221457.2397234-1-brijesh.singh@amd.com> MIME-Version: 1.0 Return-Path: brijesh.singh@amd.com X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 615b1f1f-95ea-4954-207e-08d9a4979c53 X-MS-TrafficTypeDiagnostic: DM4PR12MB5183: 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: 5D3vlgw5scL2jwj4iwADJvQS2u3El5y98JbwyJOc63YYYyScIdw1Xrtbpv75CI6ja8nEMuKdVcw0nU0Eu33PyMkANJ++Jsp4d15Km7IReWEXNaWSrEefmHfUcjH215Li3yxjRuf5tskscCkUVcDywMw0gsuYdWsn9YsYprO0XYZA6R8rrNa6ttr1z2ntFN65bdqpKL0SuaFozTDKnnlbasYnDB20ln3MIOQZfPLoL/obkGkegf7OTpAx8eX4ZagU6lkIWvxGFGqlOuumDqxcfhOr3H8FWDUCNiLaukWa89zp7de3qjSI4yoDhnm7sknp+87NtkKKGYeq0ATlF2773P6Vxn1SCsqrs7cyFgYgeCyW0pclp7JiRSUQ9ChC/gZ3nUWpvs6tS7humem8WkaopZsGwSX33QB5CFAS9GAXR10/yt5r4qLrFhGGjsnRCXSAbA/+IJsTIC+twK8vq+j/tJTSBN+oyiQCfN0kzpcqe5deScXxiF4cSW/g/7qC8K1taGygy5BE5oBhZDjpnMChWL6tWxdNqZF64YDUsSytjB3SFrJevhYAsj9jkQaTLbpC+5hhO4rLAs8rTRIQcyWZLgzyniYj56vjP1RImogqV9rrF7YB7LBTHZ622GW5mFt+iJXql6Jt00Ucg4YpRx4w/Y839IQGnbKl2wVGHrOeMa6uVK6Miy7wbDf2+v8LLBd9qsBP8pJkYiQs1mFiAsKb0Uh5gqDnAqngtJHeDAvOfbsS1YME5tXng/kANbKCE06b3lXRycCybEGmDWxLKiX6NyIBdkrttGyxpVqRylhWkurTFEyc+91x0PLs8dOJe5Ym X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(4636009)(46966006)(36840700001)(356005)(83380400001)(426003)(6666004)(5660300002)(54906003)(81166007)(7416002)(6916009)(19627235002)(26005)(336012)(316002)(8676002)(2616005)(508600001)(966005)(70206006)(86362001)(36756003)(70586007)(186003)(2906002)(1076003)(16526019)(4326008)(47076005)(36860700001)(8936002)(44832011)(82310400003)(7696005)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Nov 2021 22:15:31.8916 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 615b1f1f-95ea-4954-207e-08d9a4979c53 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT066.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB5183 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 Acked-by: Gerd Hoffmann 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