From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (NAM11-BN8-obe.outbound.protection.outlook.com [40.107.236.49]) by mx.groups.io with SMTP id smtpd.web11.482.1587577364342410896 for ; Wed, 22 Apr 2020 10:42:44 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@amdcloud.onmicrosoft.com header.s=selector2-amdcloud-onmicrosoft-com header.b=us6zcnqY; spf=none, err=SPF record not found (domain: amd.com, ip: 40.107.236.49, mailfrom: thomas.lendacky@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=N2cTqy5HjXeytxz99deBwt+BtVKCfkPkWjYuSmkI8nWqM+HorJfGKK5mjj2fDJ9+Fnj7m0HQciWxidEdKvOC8EqUoWSykUOJRy5gnZ+XLrF1Ru6A0t5QrSCNkyp3N2FF2XuC8JTt2cra3GH3Y5Z8DbH0BTy9FHIoX9aAEFQKDe9fHJqe2lSu3qjqvNBhDo/QjxnTpniUI6Sqkwpz0eI/rpdu4cmSOePCJAmOE6ssbeLDlP4CwrQyHP6nDjJDRmExhhDUDGFgmLO/mtjt/uyaxxLr+DI4YRCFtX6Bqvf8bCZmDu+w0nWDeTberI60vjlYQ5kaKQ43JaaUf5Z/v67/8A== 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=W8yDNzeIbl67p8m/VI+iTzyzyIkfmuCudAycZcrKSMjVLBfWfmi2DHHOCOO/UzIqY6ezP4J8O8K6wbLCEgvifBj8zEoxSpIa5k4VqrQ6Y7OjVq0UyA6k9QckV+11IwlufOqY/Ksgg+CYX4Dui7S31NJjZI8lW85TJv47Gr7lAyEMf1zJb/GvOzT0oBUibgsnDUcw6Rt8/AsE5ReSRPahoKp+KLUjiaMkL66u2KmUw1hOfRF3S/o3I8Ohfqoh8Wy/sGYrgoJZHUwCOdEfkV69OCfg4YxGqT8rKiDAr6FyVo3veod9tlciDDosvztQsF4Uql1lNOPEbPVVxTVrsMyZEA== 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=us6zcnqY1JyIhD/e+KKqZrGrW43yJLOe4KoIA8deBygVNBaoxN6/jhqvq/im6m8laUWfOm6ChWDmBCckXjomWontMGPIEx7MjBi27FJ1poQI8rcyAIrkTVNexNSPbuUx2+4P2AOi3+tiz/aYVFKCj8Devo4bv3Y69666mhNlN5c= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Thomas.Lendacky@amd.com; Received: from DM6PR12MB3163.namprd12.prod.outlook.com (2603:10b6:5:15e::26) by DM6PR12MB3673.namprd12.prod.outlook.com (2603:10b6:5:1c5::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2921.29; Wed, 22 Apr 2020 17:42:42 +0000 Received: from DM6PR12MB3163.namprd12.prod.outlook.com ([fe80::9ae:cb95:c925:d5bf]) by DM6PR12MB3163.namprd12.prod.outlook.com ([fe80::9ae:cb95:c925:d5bf%4]) with mapi id 15.20.2921.030; Wed, 22 Apr 2020 17:42:42 +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 v7 26/43] OvmfPkg/MemEncryptSevLib: Add an SEV-ES guest indicator function Date: Wed, 22 Apr 2020 12:41:41 -0500 Message-Id: X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-ClientProxiedBy: DM5PR04CA0060.namprd04.prod.outlook.com (2603:10b6:3:ef::22) To DM6PR12MB3163.namprd12.prod.outlook.com (2603:10b6:5:15e::26) 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 DM5PR04CA0060.namprd04.prod.outlook.com (2603:10b6:3:ef::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.13 via Frontend Transport; Wed, 22 Apr 2020 17:42:41 +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: 0305ce32-85c1-4de9-eb22-08d7e6e48f21 X-MS-TrafficTypeDiagnostic: DM6PR12MB3673:|DM6PR12MB3673: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4125; X-Forefront-PRVS: 03818C953D X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR12MB3163.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(10009020)(4636009)(346002)(136003)(396003)(366004)(39860400002)(376002)(16526019)(186003)(8936002)(8676002)(956004)(4326008)(316002)(6916009)(86362001)(2616005)(36756003)(26005)(52116002)(7696005)(5660300002)(2906002)(478600001)(81156014)(966005)(66556008)(66946007)(66476007)(6486002)(54906003)(136400200001);DIR:OUT;SFP:1101; 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: 8j7ra4BVjI75zG4fTXu5kqzDl30eXqBOP95BorvUhycFw49A4keVUxIT2zr/rEvxNktl8vyw1wqzvwlYePf/xNI24zWgCm3rmfJEKz4TqILSp6mNHawmEjphtYhOERVeZWtIo06c3UCHhBjJdL+nNg2xOK1qdUJlxJDeFK57T1tzOfo6koqpESEfSF6uSXsZSQ+x23jc/py43I+s7c1QTHFUyHeu0hmu9QPUx7G6Q8PACCOmJLL8onDNlUMeKLDh4ZamAJtj8ph8JE7UGcvMX07AmWRbIOYvH1PS18t41SEyuDfnb3yfyQMqGqC676BLK+x85bIduF2qujzYMe7u72doAXm5vFaANF3q09CZP8PBy9yOMLdvPb9qUXJ53WKrXzmNSxd2/8/La5zWJcbraxJlqT/NINWMefrhRafNjzOKF0dsdSDr2k1d6k8R3aU3URRunxuOJJgeA6R7VpKDB3R6eW2+hb0CObDjbX8i7mke2h7SausUAEMIdcc+TuX1ZiJ5BBzuJRxBrPV1h1sr2KUCGcMzJBuu1/taRr83CCADNmiQqLQJV/pzqq1BQS2fHry+8fx66j8A+LAIAgrqZQ== X-MS-Exchange-AntiSpam-MessageData: Ilcn5wkIu7G16TfvGMAljKgUNhequ/sNOrQFPXkk2rvUUjggtJv5gCOWVPKjDbBGVO4bqSj4QEwqxexgT9ra4ZnxdJgxao+UMEfIzEdiXr8QytVtKPFV1FqQcX3DaUhDGUD8AdhWgL1WBACHeRajqA== X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0305ce32-85c1-4de9-eb22-08d7e6e48f21 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Apr 2020 17:42:42.5760 (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: GXp6pXurfQvWh0rbLvfn+zUo2Gxa/XMFvcMPSL5EwqDyxcBHehA3UtAFzmPJQSHGRGznoB9vUwaBbnb4jq3qnw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB3673 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