From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (NAM11-CO1-obe.outbound.protection.outlook.com []) by mx.groups.io with SMTP id smtpd.web12.964.1589925117656726354 for ; Tue, 19 May 2020 14:51:58 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@amdcloud.onmicrosoft.com header.s=selector2-amdcloud-onmicrosoft-com header.b=kNkQOSqi; 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=ab4kb/iwJB/eujVAIPKcs1trXdEsgSFQocHiNFcp8bGdSWSjw6Y+OZr22UixGIbMmQ/MawrJeyEHF7w0NADYFo0JVDsMk9clBU7xy4nG1HZa52FraQdxS6tvh0FTw1a3NWbV8d/FWlWS2bTvep+hdHwpb7vL5NS71xVkgyOUaeW3J7YO9+rVzKNmGBTmYsBprySZbuyfvCmOhdzVYoIAT3pPRpS6t1TYJtvLP/IXBa30Ry1+ItKb0bN907SEvI8X7M62M9m4sfmchElkYHe+D2TO0+aDetXUyAofz887WzcviiTPqcsrR5DWVZxYgHZeDCO3lgMpgccvKlPLPAF48A== 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=3WkepNWWK6vq4wZfGGkzEK+MfX/RzAQc/39Mizzg0ds=; b=mC+D3Hphf5e5DSBMMVwy+OoJ5oHgYgH2aXBG2zfHUpbOgWO7z2UnVvVoSdQZBUd4STdRuiVf0pWpaV+/BOMNit0xPfB+5HpWu+jgpZhAPh111Bwbvp+JXurSuWqqyKk+nEcRNciV1lN/pXvu4f//Inc+2QMgsTpp5uPg2DmGs1RL+0pziWykpkRu10bIOa5SiOlwKma8pROjDlVu7hYndcY2E51w28V+jBON0Euwh2jYo6S+XElhYjUWLXjuebjv3uI7DnDxEaWeiB2UaTsOqQLkpPDP7EDlwDZvJ/jCZXmVSIHJV0QZuyCGWDOYaKaVGuAFEhTF0RS2CecRnitbzA== 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=3WkepNWWK6vq4wZfGGkzEK+MfX/RzAQc/39Mizzg0ds=; b=kNkQOSqiZKPju3nZ8fgwPrZbSKG54yzAM3swcVcgflQMR1QLUm0MatM9yqrwhZGlPkX4tzQ6Vfrt7ExDFPceYawd4HqBEqFTuCwT7cEbjfaibW3KE9libvQU5kz+62RK7xhwYfH6FNKD+vb209LjlQM+m/ScA50R6V5RiKYwnFc= 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 DM5PR12MB2504.namprd12.prod.outlook.com (2603:10b6:4:b5::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3000.20; Tue, 19 May 2020 21:51:57 +0000 Received: from DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::4ce1:9947:9681:c8b1]) by DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::4ce1:9947:9681:c8b1%10]) with mapi id 15.20.3000.034; Tue, 19 May 2020 21:51:57 +0000 From: "Lendacky, Thomas" To: devel@edk2.groups.io Cc: Jordan Justen , Laszlo Ersek , Ard Biesheuvel , Michael D Kinney , Liming Gao , Eric Dong , Ray Ni , Brijesh Singh Subject: [PATCH v8 27/46] OvmfPkg/MemEncryptSevLib: Add an SEV-ES guest indicator function Date: Tue, 19 May 2020 16:50:55 -0500 Message-Id: X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-ClientProxiedBy: DM6PR11CA0048.namprd11.prod.outlook.com (2603:10b6:5:14c::25) 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 DM6PR11CA0048.namprd11.prod.outlook.com (2603:10b6:5:14c::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3000.25 via Frontend Transport; Tue, 19 May 2020 21:51:55 +0000 X-Mailer: git-send-email 2.17.1 X-Originating-IP: [165.204.77.1] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: deef2ff1-1972-46c4-9b81-08d7fc3ed984 X-MS-TrafficTypeDiagnostic: DM5PR12MB2504: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4125; X-Forefront-PRVS: 040866B734 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: r9+CPQkEIo4oiDWzJA6HnO4TayL1dUMzztX2BvFe4dVHMfu2kMjbcUrXYrJexl04zMqugQbe93Y/Rzv2O69KxVFxzboUBJxSATlUS70qBtlzwMCJFWKYm5IvD7jHFPqCRaIPEg91JX5cRftzm74Pc15epeHWRCMpTzuo5Ng1MV4+T+ycN7l9B3OqT6oL+1sV58s9W+AAO+dpyWKX8gHLCVvOXMIDwwkPP547Mhx2WiGf1e4PpXgNzuJYBI6o0Dpb7V3H3oyYzcH8Q9X5aq36VUe5K7HNoCzHMcKjGYdt3d4+4jC03tQZs4OqBjLy1Y/+pvEavCzz0EcXhzcHLskQQjRH8K7fNjhc5AjohR8GnAqhUTZbkRtWxbfX42Nub0vvTD1NVgEtI/VO0alJM/fOFJPjrTrWKuZ9p1rGET/IS5/VJKXwRht/ori5fCySCfiNJXQ47RME7RGY93cm3EJ4oj4MB3N2pNcAmeXa7OzHDvO407RuS56Ifa5SW4CAgCl0+Q0ps8RFk8yDgGt8fh4BifPiJ5MJ+Oni3F+FENvCiTPIJGZMGJit7S1A4HagD85ifpfHb4jmdJXEOGRiN2nLyw== 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)(376002)(39860400002)(136003)(346002)(396003)(366004)(316002)(86362001)(2906002)(54906003)(7696005)(52116002)(2616005)(956004)(66946007)(66476007)(66556008)(36756003)(26005)(16526019)(186003)(4326008)(8676002)(5660300002)(966005)(6486002)(8936002)(6916009)(478600001)(136400200001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: f9J7aDKS9slcsf/12H87IhrH0yC3VmliIqi6sW1UNwmBY6E+zBUj3fZG/WAdhm+x5mcIBfkTn+qO7mRZUmU8JzegCPvunDDRiJekldRSm+vfb00JPe2AaYUZwIO1mrsuoEMq3JdcBJVZb2/TwkvIrCVz/hImfLTcC/5TWPhp26/3au9ep7XScRcCEJuW434+KSMiEJ1tukxbnr25h9rG9stgyJj+/VXvb2GDZA4tUQsqhcnpuLDpZ+gHSDv75QL41y2fACzGor8LsC0P64Fuykf+QuE9t/pCyIB0SIaScM9W4MN+546DdlUoVaCTHT2T1rVgb+wE6uFRM6Zjc+/CyMyp/lAuClxJ1LdpCdcT6VCdRysp7HP72V6ZjfOIIDDQCi0hWxC6OKkdWFqgXjn9KDOZjsPU7PyY8FcrDuuQ4gwVhBnlkTc1A62PbpGH96GUHfGpqib/u3ngXwuRUdxNKHUxl80HHNO7qbS7S7GndMc= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: deef2ff1-1972-46c4-9b81-08d7fc3ed984 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 May 2020 21:51:56.5442 (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: zFrYi3x09BzIOglhNV8h/Rzi/PxwjwCsqdIM5hB9InuSZ3mOW9yDPSDbgxyqND0dtvGlQduN1MCGjsHskiyCNg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB2504 Content-Type: text/plain BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=2198 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/Library/MemEncryptSevLib.h index 64dd6977b0f8..a50a0de9c870 100644 --- a/OvmfPkg/Include/Library/MemEncryptSevLib.h +++ b/OvmfPkg/Include/Library/MemEncryptSevLib.h @@ -13,6 +13,18 @@ #include +/** + 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 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 STATIC BOOLEAN mSevStatus = FALSE; +STATIC BOOLEAN mSevEsStatus = FALSE; STATIC BOOLEAN mSevStatusChecked = FALSE; /** + Reads and sets the status of SEV features - 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 = AsmReadMsr32 (MSR_SEV_STATUS); if (Msr.Bits.SevBit) { - return TRUE; + mSevStatus = TRUE; + } + + // + // Check MSR_0xC0010131 Bit 1 (Sev-Es Enabled) + // + if (Msr.Bits.SevEsBit) { + mSevEsStatus = TRUE; } } } - 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 = InternalMemEncryptSevIsEnabled(); mSevStatusChecked = 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 (); + } return mSevStatus; } -- 2.17.1