From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (NAM12-MW2-obe.outbound.protection.outlook.com []) by mx.groups.io with SMTP id smtpd.web11.21252.1594737490560993734 for ; Tue, 14 Jul 2020 07:38:12 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@amdcloud.onmicrosoft.com header.s=selector2-amdcloud-onmicrosoft-com header.b=yr5XxKGv; spf=none, err=SPF record not found (domain: amd.com, ip: , mailfrom: thomas.lendacky@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fBexgz3jzL8Bkq2V1Apt2n9w4rgsdO2yk6qVcpYTiDmueV3qhWpNKcFe+Y0nXFTMCfUnZswSYSnozgQnygZNamP0cbZQNxItz5dU7cifUYYH4t0wIWa7KXj3GDnVv4HnI+40nesOKpc+eAjOKUhnTDOfW5coXO3+jlSBXCMh89SshuNZ46k+Yv50E1V9voldo1QNRUhImuKDpaljPvToVMXJ+zcUmLwHWaBHNFtJtw+PkrIpY7hu+znL8IYIn5DPdICWhCDaljBz9WKdfLnmG637mAJ+9QJb+G2tUyBPuHHlYQR97GheVcHVxeTySm6o3DW8ICmxmrM9p9jWjzvqSg== 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=vjUCEgWiruW32rdghdGFw/QPeneWsq53gmsGSiMfqdM=; b=M/mosxCa8xxI7VMwza7iwIohGqRSdPTQPQr4OBxFw6BO73yPupqCy3rxNgptlTsHXxY91k+GVz22ZvIpijv9z22GFeTeJ5adv5VcTZ7+Cq07YlVUCmD1eWhfPyBj88rYhmr7zi+8i9K9icDNVY7Cdq/hGyN74GbHHjqejaZHP5COkOOlF6PDViwEQxbYIPYF9C+r14NpYuC3nn1xVULdmrC5V4/yPtTJyAOt6N5dHAzWIlZxlzcqUmvMFgGVDeJvXx2DAfmYCDnMeBGh7/mshMos36j7BOSUTQph2oYaTXI04iTPN0/iuIRhEaW52C9IAVhxqyXjr/N+d7n5hAZgMA== 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=amdcloud.onmicrosoft.com; s=selector2-amdcloud-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=vjUCEgWiruW32rdghdGFw/QPeneWsq53gmsGSiMfqdM=; b=yr5XxKGvhrvs08AiyJP2S17GA4sx95ZRTB9R2Ufi+0/FrVOqMsrhGztP4eiDrXrPS9gRiMyf6vzRJewkFdPTMZMq/+yth1ukYJbHzl52uSGb2U/fijKsrDeBRXkjvzCasnfScIk0ybl/tRPqrm9yR1V3b097SrBpv0k7aCs/ogU= 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 DM5PR12MB1355.namprd12.prod.outlook.com (2603:10b6:3:6e::7) by DM6PR12MB4219.namprd12.prod.outlook.com (2603:10b6:5:217::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3195.17; Tue, 14 Jul 2020 14:38:10 +0000 Received: from DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::25ec:e6ba:197c:4eb0]) by DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::25ec:e6ba:197c:4eb0%8]) with mapi id 15.20.3174.026; Tue, 14 Jul 2020 14:38:10 +0000 From: "Lendacky, Thomas" To: devel@edk2.groups.io CC: Brijesh Singh , Ard Biesheuvel , Eric Dong , Jordan Justen , Laszlo Ersek , Liming Gao , Michael D Kinney , Ray Ni Subject: [PATCH v10 27/46] OvmfPkg/MemEncryptSevLib: Add an SEV-ES guest indicator function Date: Tue, 14 Jul 2020 09:37:34 -0500 Message-ID: <3f0e4480d375c3d99bba383714bf12d43d91b51b.1594736896.git.thomas.lendacky@amd.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-ClientProxiedBy: DM5PR20CA0032.namprd20.prod.outlook.com (2603:10b6:3:13d::18) To DM5PR12MB1355.namprd12.prod.outlook.com (2603:10b6:3:6e::7) Return-Path: thomas.lendacky@amd.com MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from tlendack-t1.amd.com (165.204.77.1) by DM5PR20CA0032.namprd20.prod.outlook.com (2603:10b6:3:13d::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3174.21 via Frontend Transport; Tue, 14 Jul 2020 14:38:08 +0000 X-Mailer: git-send-email 2.27.0 X-Originating-IP: [165.204.77.1] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 4140905b-af60-4a8a-1e85-08d828038747 X-MS-TrafficTypeDiagnostic: DM6PR12MB4219: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4125; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jzYOZ5A+e1HBtQFwM0ccdQzcTSh8TnlgeP25wQSb6572z4iP31HPeZZXrJH5rmAIouHFVRlUpjGmRq2JgUeTn7H/9hpoSa5Amqfoh5Azli1dLwrTLZYFjgcnk+zSD38vqFQiapNo9FXWWCwoDlHZfas4tNsSVNWKYVuhantdusMVfDH106whjk7Gzrn7iP1ulRulDiBcQ9vrjHenT2p0KcQJ8wf3vQcvJHrOqylsG2bNFBaFv3KpsBSL7rVUjZhdaVeXjy776UepgFqIcoLXDv2nvFFEBcsjn+Uu4Sr7XKqv+bc0d3odB2MABzTWMXIZZQXPCfDYIhDc7Nwm1djUx99Xjs9bDLnMF0TSAmSWgAMUpCM+CeV+6Ym4qka2SVL5Xt1hy3RtgaoDRn0rRVMnxqy5o4gTu//18B4p1Jb5ifpZKXhhdqKE0YmSoNgbJXwbZtG+v54gBlXpkUDbkJpAyQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM5PR12MB1355.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(346002)(136003)(39860400002)(366004)(376002)(396003)(4326008)(316002)(66476007)(2616005)(6916009)(36756003)(2906002)(66556008)(66946007)(54906003)(52116002)(7696005)(6486002)(956004)(8676002)(86362001)(5660300002)(6666004)(186003)(966005)(16526019)(26005)(83380400001)(478600001)(8936002)(136400200001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: FQZxR1qnDR9KTW6Ct8PCWCEnFAW844uyba2OH0jv/5lXxrb3m8JqzaNvxKCL42OlZFOrq07jfBr+UCsm1aVEJLTr1FAmY5NRGYQRBvJn6bqDKcv4eOT23kGapO7Uxf614EpDpqAXgSgYBkpEp1nlkckVnSBiy/z5D4y3DjW4KKboYjRzM3X7QtHNyJ/EqjJ1KTD7TnrdOKltt1XTzlKR7j57EBnXRa2EZFjxFZ8xKujMg//P6V7ea+OPe5OZRi0heGIpUdz1etl1RgLKM6e6ZhVxJmd7N8XMeGxXk8v4UDTeh9FndPESZeKYtihKXv/YBcWI/DXA7rlIWgSvYJUvI9hVCX0cwGi24Lx44AaycMjH5VLOl7BE+ZVFDfY3RGwwyRO5h9mwPR57R1Ttfsvl3VuSeCFH4CmcDHrG4p4LdGV71uCiaQ61mjZraGtQ82FlpSHRfR4r9yOuF1X6shuGtYn2RcWqZxstcVDXROGHjcU= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4140905b-af60-4a8a-1e85-08d828038747 X-MS-Exchange-CrossTenant-AuthSource: DM5PR12MB1355.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jul 2020 14:38:09.5122 (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: 6T01cu3pEVr7kslg11gx0PtUTEg8ncK/Pg3bt9bD47EcH/YGYBcMWyj3eSqW5Cv2uldwo8FBvEO3RuSXF7tPsQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4219 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable From: Tom Lendacky BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2198 Create a function that can be used to determine if the VM is running as an SEV-ES guest. Cc: Jordan Justen Cc: Laszlo Ersek Cc: Ard Biesheuvel Reviewed-by: Laszlo Ersek Signed-off-by: Tom Lendacky --- OvmfPkg/Include/Library/MemEncryptSevLib.h | 12 +++ .../MemEncryptSevLibInternal.c | 75 ++++++++++++------- 2 files changed, 60 insertions(+), 27 deletions(-) diff --git a/OvmfPkg/Include/Library/MemEncryptSevLib.h b/OvmfPkg/Include/L= ibrary/MemEncryptSevLib.h index 64dd6977b0f8..a50a0de9c870 100644 --- a/OvmfPkg/Include/Library/MemEncryptSevLib.h +++ b/OvmfPkg/Include/Library/MemEncryptSevLib.h @@ -13,6 +13,18 @@ =20 #include =20 +/** + Returns a boolean to indicate whether SEV-ES is enabled + + @retval TRUE SEV-ES is enabled + @retval FALSE SEV-ES is not enabled +**/ +BOOLEAN +EFIAPI +MemEncryptSevEsIsEnabled ( + VOID + ); + /** Returns a boolean to indicate whether SEV is enabled =20 diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/MemEncryptSevLibInternal.= c b/OvmfPkg/Library/BaseMemEncryptSevLib/MemEncryptSevLibInternal.c index 96a66e373f11..3301c5c2862f 100644 --- a/OvmfPkg/Library/BaseMemEncryptSevLib/MemEncryptSevLibInternal.c +++ b/OvmfPkg/Library/BaseMemEncryptSevLib/MemEncryptSevLibInternal.c @@ -20,19 +20,17 @@ #include =20 STATIC BOOLEAN mSevStatus =3D FALSE; +STATIC BOOLEAN mSevEsStatus =3D FALSE; STATIC BOOLEAN mSevStatusChecked =3D FALSE; =20 /** + Reads and sets the status of SEV features =20 - Returns a boolean to indicate whether SEV is enabled - - @retval TRUE SEV is enabled - @retval FALSE SEV is not enabled **/ STATIC -BOOLEAN +VOID EFIAPI -InternalMemEncryptSevIsEnabled ( +InternalMemEncryptSevStatus ( VOID ) { @@ -56,32 +54,55 @@ InternalMemEncryptSevIsEnabled ( // Msr.Uint32 =3D AsmReadMsr32 (MSR_SEV_STATUS); if (Msr.Bits.SevBit) { - return TRUE; + mSevStatus =3D TRUE; + } + + // + // Check MSR_0xC0010131 Bit 1 (Sev-Es Enabled) + // + if (Msr.Bits.SevEsBit) { + mSevEsStatus =3D TRUE; } } } =20 - return FALSE; -} - -/** - Returns a boolean to indicate whether SEV is enabled - - @retval TRUE SEV is enabled - @retval FALSE SEV is not enabled -**/ -BOOLEAN -EFIAPI -MemEncryptSevIsEnabled ( - VOID - ) -{ - if (mSevStatusChecked) { - return mSevStatus; - } - - mSevStatus =3D InternalMemEncryptSevIsEnabled(); mSevStatusChecked =3D TRUE; +} + +/** + Returns a boolean to indicate whether SEV-ES is enabled + + @retval TRUE SEV-ES is enabled + @retval FALSE SEV-ES is not enabled +**/ +BOOLEAN +EFIAPI +MemEncryptSevEsIsEnabled ( + VOID + ) +{ + if (!mSevStatusChecked) { + InternalMemEncryptSevStatus (); + } + + return mSevEsStatus; +} + +/** + Returns a boolean to indicate whether SEV is enabled + + @retval TRUE SEV is enabled + @retval FALSE SEV is not enabled +**/ +BOOLEAN +EFIAPI +MemEncryptSevIsEnabled ( + VOID + ) +{ + if (!mSevStatusChecked) { + InternalMemEncryptSevStatus (); + } =20 return mSevStatus; } --=20 2.27.0