From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (NAM10-BN7-obe.outbound.protection.outlook.com []) by mx.groups.io with SMTP id smtpd.web09.1698.1580857346746299392 for ; Tue, 04 Feb 2020 15:02:27 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@amdcloud.onmicrosoft.com header.s=selector2-amdcloud-onmicrosoft-com header.b=PqEQvj8Y; 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=ICXIBv6IyZUIFkf/NpwUJGCS+q2Q2N8iYLkMio4xNQhkag/ZRwiZ/WuDgEmo1wsJJ1s9gC7lfoai5DzcuCEuY3zXL+DweacqC2jlWLesETeRV4uphdXOYTNGX0ON/mYAbKmmPxn7B99BCRVYp0dBJCLPJqqZTjtEgv/g9eTC/y9zdpgIccLBn/S+3uKrqC2jT8ogpgk1rGyZoYsAktL9l92GTy7YrRXZZfgxjKukvpevrV07n92rKJyUFE69T7zOZWhDymnqUdj3i3jZBI7U3MDSAaMbbcDlj0b/Jfz04a1BNhDeStw4MfiYlsBqWj2kFH5kekY8L2oLftvJA4h3CA== 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=leVy/1jMt4vkgIwUhcvhFGhuHT6gyzYQe7pro2sMB0A=; b=XLkWnpffIV98Cq7Fnr9TPl+935a5FDL4MQMkNfkcHBA7QvaMNC21pRaZMzOJ6QOSOaT6jqUIeJfR5aRQxq0rOtvhkssIR1urYhWy5nzmcINwmhzx++tXqIxtbzhj+djGMd+DKAaNkG4P1jaCqBQ4VgvKTuulQUlCdgd3uZH9CxZUaebHB6TBFXZvm+W7xlSgyBLNmwzN5sH7DpNljIZt4+JnzSL3ECYERNhFnizgKelVK1AwIfDeYyIjAgoUzbsey88viLyk6dqFz1sLpufvOeT3gq2trPVqhvG689uV3kVrY+GN7xtfJD8ezOnHgRJc3rlJpNPHZDzasSt8kvT5OA== 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=leVy/1jMt4vkgIwUhcvhFGhuHT6gyzYQe7pro2sMB0A=; b=PqEQvj8YV+ElTZsvxjrpiJvdBMoGgf4dYUXoWGdKrBzPFl+KPHA2dghNpZQ8aMCrT0BTXNYR9OUQJtPSTXbAeU+56S/i2Pc5XuH1bAJOmKDecEzBQ00GLz+zmOPO0/KbNGZlET6L8kKfNA+ak9Tu5kJUZvmza8dQDedYNbD4hNE= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Thomas.Lendacky@amd.com; Received: from DM6PR12MB3163.namprd12.prod.outlook.com (20.179.71.154) by DM6PR12MB3930.namprd12.prod.outlook.com (10.255.174.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2686.29; Tue, 4 Feb 2020 23:02:26 +0000 Received: from DM6PR12MB3163.namprd12.prod.outlook.com ([fe80::a0cd:463:f444:c270]) by DM6PR12MB3163.namprd12.prod.outlook.com ([fe80::a0cd:463:f444:c270%7]) with mapi id 15.20.2707.020; Tue, 4 Feb 2020 23:02:26 +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 v4 23/40] OvmfPkg/MemEncryptSevLib: Add an SEV-ES guest indicator function Date: Tue, 4 Feb 2020 17:01:27 -0600 Message-Id: <72fe7b157cad7782b81be256f7396aeb32fb04c5.1580857303.git.thomas.lendacky@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-ClientProxiedBy: SN6PR16CA0062.namprd16.prod.outlook.com (2603:10b6:805:ca::39) To DM6PR12MB3163.namprd12.prod.outlook.com (2603:10b6:5:15e::26) Return-Path: thomas.lendacky@amd.com MIME-Version: 1.0 Received: from tlendack-t1.amd.com (165.204.77.1) by SN6PR16CA0062.namprd16.prod.outlook.com (2603:10b6:805:ca::39) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2686.32 via Frontend Transport; Tue, 4 Feb 2020 23:02:25 +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: 3ffb3adb-9d3d-4e7a-b5df-08d7a9c64d4c X-MS-TrafficTypeDiagnostic: DM6PR12MB3930:|DM6PR12MB3930: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4125; X-Forefront-PRVS: 03030B9493 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(4636009)(39860400002)(366004)(376002)(136003)(396003)(346002)(199004)(189003)(4326008)(478600001)(6916009)(81156014)(2616005)(956004)(81166006)(8676002)(966005)(316002)(54906003)(2906002)(6486002)(66476007)(66556008)(52116002)(7696005)(186003)(26005)(16526019)(5660300002)(86362001)(36756003)(66946007)(8936002);DIR:OUT;SFP:1101;SCL:1;SRVR:DM6PR12MB3930;H:DM6PR12MB3163.namprd12.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wxztremLK46yOfA4lj0o7wmHq74YCu1gzSaPWiGLnXtFxDh0klAx6p3vEQtz7AlzR4HbdFQhF+xmNvAtA2z2QZPbe3e8eztO6xL8sEGhtCSDmUcJ6RFEbmEBnSGJtvUK1W3fhv0L90QMQzh/DDD+EE4Fi1OL03cLXl5poWPlZdcs8Q4JZxB61Witgr26LUA0xephKOBX7sPRJHYpXfP7IdWrhACGdRgQcuWTQjQbdrKlMjnhX4aMgBab/3GoyutLkaO0tycBCCVZpOoOkxWh2yVqtJIV7rDfcotdD4RQXpt9o62bimmJgj2Ysz63mJc/E0HXKQLl8sVFSajXFjUIU0wgm9cv26tE+7TSXGZ3WLSZiPjsQVuKuN1HQxTRncPJLGuGvYOS10+zQO6En0DHkxYkBCw5dwojxtFSQW7OTnrUR0M1LGAd3JbMetndmLNuhWtaHUDZcUag9d1HchpYhympt8o3C5fhqtgGCO6B1ub/EAkh/n4EZhWocwVyoJjt+kPx/mZvNDoLSZGuI/oBDQ== X-MS-Exchange-AntiSpam-MessageData: QwwI1yH5CXaT8KSmjKGjJXWazDVFt+wsuWHF6FPZHKAEQOR8QRbY2vLCBwBrV3IIrwhiTY5lmc9TWLnMHkgNrdSAk/AgUiYSOKhMdlOX8khzqupeo/5ZtFpC/blemV3//u8KZNpbasAC7LrTbJTx/w== X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3ffb3adb-9d3d-4e7a-b5df-08d7a9c64d4c X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Feb 2020 23:02:26.4184 (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: gC5D/TiX7sxA9vMAK8mNtNwxELJ209CGqnzyp5jhJk1Ti2A4vX3LvgY+twJpDpER2w2Qu3WQXAgtuf2hmh8xng== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB3930 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..c859bb141963 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; /** - Returns a boolean to indicate whether SEV is enabled - - @retval TRUE SEV is enabled - @retval FALSE SEV is not enabled + Reads and sets the status of SEV features **/ 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