From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (NAM10-MW2-obe.outbound.protection.outlook.com [40.107.94.77]) by mx.groups.io with SMTP id smtpd.web12.6771.1639020567515130768 for ; Wed, 08 Dec 2021 19:29:27 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@amd.com header.s=selector1 header.b=LVfkVlyU; 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.94.77, mailfrom: brijesh.singh@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HYB2p3DDhvwVUDyRE8GPVsnDPin9KfAfc1Tj2dMgPmmLzjYDRrsMTigXroLQob5sfZZ6J04MMPASE2pbNOwRvgaDpjQkGRjffhjoL7qFt2BLGqzD3WGyGwsmFU4vMSjB8favFtu/rp+/kQcb4d6tHNdd2Mi6536G318CTDs+ehQwEl9xU5Fz1FTrCmd3yhtwJY5Z/FjNCQfAQGqX0/q7iGmAO00ijP0Eb7oDsak9tZMfq/WVyCMhBzSNE5TFYgBvsstMwmhNM7kUx7xFq1mipkLdmYRBvwagRVohWOkxtStxrQw2aMKXd9IhX+J8PSBJfPlBsLM2G3ck75qk0qg69A== 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=D7OmvnCDjUXJ0j5+hDzugV0b85XsbMqd8TbKHrtBYI8=; b=U6zdtk0k9Q8V3nCOZQ1ngO+0jLQQCLzMmMXkIzPe1EmwXxFxiQZngIZHBMttLKphywh5mzyMkg1A8q35cE4d8KyxK16Mhp4l66zrc56EfbNVmaS3tcJO1DRzEGmxpgOCWntdOOi5JSI1aRWeIT9wAc1nEdW17bGrIBTDIruH240iggQ0fi373IXPwAVX2ykG7G05BgmHr3oPECUZDNVyc9N1XgoM9JQMNMX01JGxw7hzWpmA4DhbP6W0AOu1pt/Wv/dwQrikn+NVYM6ALkapx2ZqHP68LBT6V1EarH6WLqfBSRwh2MiKjQ8ei2sfzYK6A31KYzyAkuDmimU2oxyCyQ== 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=D7OmvnCDjUXJ0j5+hDzugV0b85XsbMqd8TbKHrtBYI8=; b=LVfkVlyU0/u77SSToU0yWfjRGIkbURCN7s1OKENdr4WQxS64sqBUOoafofuBPCxwwQkV7bawUndT+FXM8v3Wru/92w//89GWUn8UDg6N6Dk3MblHWCPnpyBPEXWBHi8wh3YwBAJmSlCCSvntkzIdpGuKC3rY9v1Q7dQHG4fUgpw= Received: from MWHPR22CA0070.namprd22.prod.outlook.com (2603:10b6:300:12a::32) by CY4PR12MB1272.namprd12.prod.outlook.com (2603:10b6:903:3e::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.20; Thu, 9 Dec 2021 03:29:23 +0000 Received: from CO1NAM11FT024.eop-nam11.prod.protection.outlook.com (2603:10b6:300:12a:cafe::d6) by MWHPR22CA0070.outlook.office365.com (2603:10b6:300:12a::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4778.12 via Frontend Transport; Thu, 9 Dec 2021 03:29:23 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;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=SATLEXMB03.amd.com; Received: from SATLEXMB03.amd.com (165.204.84.17) by CO1NAM11FT024.mail.protection.outlook.com (10.13.174.162) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4755.13 via Frontend Transport; Thu, 9 Dec 2021 03:29:23 +0000 Received: from sbrijesh-desktop.amd.com (10.180.168.240) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.17; Wed, 8 Dec 2021 21:29:21 -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 v14 29/32] OvmfPkg/MemEncryptSevLib: skip page state change for Mmio address Date: Wed, 8 Dec 2021 21:27:57 -0600 Message-ID: <20211209032800.3802995-30-brijesh.singh@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211209032800.3802995-1-brijesh.singh@amd.com> References: <20211209032800.3802995-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 SATLEXMB03.amd.com (10.181.40.144) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9978035c-46d6-43d0-b52c-08d9bac41890 X-MS-TrafficTypeDiagnostic: CY4PR12MB1272:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4502; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fI8zCKcKEG8EhKgvE0t4FX88y+Llw3Yn7b7JrFgZEoJwf5luJf0yo9vOPSylxNg9IS7K6LbHDn6ZgbO7ni0cs9E41T6yGcxiQi8wE9efZNTAm0GZwS9riOVhR4lxCaKdw8YKTdIk+X3QPr4RrEPcQedr2Xodx+BuejZKf3rU1CAZj2ErZg3mskG4JO/AdmoX7BA7zlS2AM8rzvL4coPUNgVNi+TX2XL3JiGCFUneNWZDQ5p/XGUB5aGbW0eTcivnh4TbYQJuWucPultwdsldozzqjA+rELG8EVg6kOStVyeEAjPq/yhvNvXClhhtWRTw2MYybag+t0dlv9h4R46ysodQBXdvI0DKd0NAUR2w4G+sSHVgzLyfV210iBjvK7+m2DYSUe03ggfKzX41YnudxhkTKpYh5eYPd35JpM8QIJpf6kegvYtB1L3tblL0FwcSrb/bP2NGfGYtsx1biNyQZlXwNLC0jxMioOn+OvkMZ4fdcqvrxMD2HVOoobGGuPWbyd6RVWgB7pM6ApPFma2W75L12grdYCm2EQidE/d7NdMrHOnA6wlijZkETAYDaQo87OgeCr4tpkgg4W7OZEgZB/9x5v42hpl59ID3PuTQedOYBjBJdAEZ88f/Kl467mIBDuuj6I3FFMDgxFGa+SEUkz5R9QEJdK7+7usffFRdha94zPkxmZJviytx94CXyZSIylYXrlT5gDq31nsNtZQ7d7AQD0tpUYhKCT9zIzPOYrVjsl4MKsQjtHqZ//Q4YElh/ANZYhMBdsUSaLAfBBcDjs96XNxVCQ0Rt7SoGT+Xi80= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB03.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(4636009)(46966006)(36840700001)(40470700001)(70206006)(5660300002)(54906003)(4326008)(70586007)(6666004)(83380400001)(7416002)(81166007)(47076005)(1076003)(7696005)(2616005)(44832011)(508600001)(36860700001)(356005)(86362001)(6916009)(19627235002)(2906002)(186003)(426003)(40460700001)(8936002)(16526019)(36756003)(82310400004)(8676002)(316002)(336012)(26005)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Dec 2021 03:29:23.6566 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9978035c-46d6-43d0-b52c-08d9bac41890 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=[SATLEXMB03.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT024.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR12MB1272 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain The SetMemoryEncDec() is used by the higher level routines to set or clear the page encryption mask for system RAM and Mmio address. When SEV-SNP is active, in addition to set/clear page mask it also updates the RMP table. The RMP table updates are required for the system RAM address and not the Mmio address. Add a new parameter in SetMemoryEncDec() to tell whether the specified address is Mmio. If its Mmio then skip the page state change in the RMP table. 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: Gerd Hoffmann Acked-by: Jiewen Yao Signed-off-by: Brijesh Singh --- .../X64/PeiDxeVirtualMemory.c | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/PeiDxeVirtualMemory.c= b/OvmfPkg/Library/BaseMemEncryptSevLib/X64/PeiDxeVirtualMemory.c index 814f814035fa..b9c0a5b25ac0 100644 --- a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/PeiDxeVirtualMemory.c +++ b/OvmfPkg/Library/BaseMemEncryptSevLib/X64/PeiDxeVirtualMemory.c @@ -671,6 +671,7 @@ InternalMemEncryptSevCreateIdentityMap1G ( @param[in] Mode Set or Clear mode @param[in] CacheFlush Flush the caches before applying the encryption mask + @param[in] Mmio The physical address specified is Mm= io =20 @retval RETURN_SUCCESS The attributes were cleared for the memory region. @@ -686,7 +687,8 @@ SetMemoryEncDec ( IN PHYSICAL_ADDRESS PhysicalAddress, IN UINTN Length, IN MAP_RANGE_MODE Mode, - IN BOOLEAN CacheFlush + IN BOOLEAN CacheFlush, + IN BOOLEAN Mmio ) { PAGE_MAP_AND_DIRECTORY_POINTER *PageMapLevel4Entry; @@ -709,14 +711,15 @@ SetMemoryEncDec ( =20 DEBUG (( DEBUG_VERBOSE, - "%a:%a: Cr3Base=3D0x%Lx Physical=3D0x%Lx Length=3D0x%Lx Mode=3D%a Cach= eFlush=3D%u\n", + "%a:%a: Cr3Base=3D0x%Lx Physical=3D0x%Lx Length=3D0x%Lx Mode=3D%a Cach= eFlush=3D%u Mmio=3D%u\n", gEfiCallerBaseName, __FUNCTION__, Cr3BaseAddress, PhysicalAddress, (UINT64)Length, (Mode =3D=3D SetCBit) ? "Encrypt" : "Decrypt", - (UINT32)CacheFlush + (UINT32)CacheFlush, + (UINT32)Mmio )); =20 // @@ -758,7 +761,7 @@ SetMemoryEncDec ( // // The InternalSetPageState() is used for setting the page state in the = RMP table. // - if ((Mode =3D=3D ClearCBit) && MemEncryptSevSnpIsEnabled ()) { + if (!Mmio && (Mode =3D=3D ClearCBit) && MemEncryptSevSnpIsEnabled ()) { InternalSetPageState (PhysicalAddress, EFI_SIZE_TO_PAGES (Length), Sev= SnpPageShared, FALSE); } =20 @@ -996,7 +999,8 @@ InternalMemEncryptSevSetMemoryDecrypted ( PhysicalAddress, Length, ClearCBit, - TRUE + TRUE, + FALSE ); } =20 @@ -1029,7 +1033,8 @@ InternalMemEncryptSevSetMemoryEncrypted ( PhysicalAddress, Length, SetCBit, - TRUE + TRUE, + FALSE ); } =20 @@ -1062,6 +1067,7 @@ InternalMemEncryptSevClearMmioPageEncMask ( PhysicalAddress, Length, ClearCBit, - FALSE + FALSE, + TRUE ); } --=20 2.25.1