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 [40.107.92.88]) by mx.groups.io with SMTP id smtpd.web12.9779.1597325237339700481 for ; Thu, 13 Aug 2020 06:27:17 -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=SJjFtNcU; spf=none, err=SPF record not found (domain: amd.com, ip: 40.107.92.88, mailfrom: thomas.lendacky@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GllDVCCfqeZiy5/9NkGxNRVHVPXehkiuDcqPHw0nWep39/IjHAYneHUNTEgliCoxVcIwrSpFjcnMZsWQ5zp9NryoPrhhbq1ED+JZo1BZ7+C5aZdHV+v8tbRXAOrP47T7bH2s1KQ8mM/yRs28U1oaYEo5FKh+tcFM0RnSQOmuSZTDzVChj0MAnZldMxHZM8hYH3J1g2tf1OCp4j23UiHWORvRv96gzHnenSeDy0qksMFzWPaizDtvpZapNLXN4hdnfuX54+lxzx/ADXJ1uFoJy+9FKVIrtB8vMHg+tVQ+fRLT8uu197zDrCQ4PQqw4XF+SuzqkqXlNMDWHegR6SsyyA== 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=NUFC3HBCdAe0nNH9Yt0n9+XIl519YvjoaE2NMIfDI+c=; b=AcBl5aWrLMabKtPQHpvqGqrxVUz55rQAe6yStTiUMhWA3d9yxAROZJIET11eM8sZcz6OQ3CVU/aTRE7b0hLKgnTBG5VjcAlYfX2S50z7YFr390hHeJ+oKOVZTjQQUOVpb/DMykalOaUDpQ8LtN4+0esAi3oKkSpTDK2DpGgulrM0ehbRmenFBc+aJrt/sisMQLOr0T33rncFvmEFE3udycE+fXKR7aa231CxxVUf/3BmeVGRINlQma184Y8Nlvu+TuymEuUJTLyRqu1OkJPmtLSrS7OOwOHx9mML5TFF1ZFIce8ZTxYLW0K+83/ks4b55O/6n/Z9DdIrcYYpNoWIGw== 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=NUFC3HBCdAe0nNH9Yt0n9+XIl519YvjoaE2NMIfDI+c=; b=SJjFtNcU5Z4qF7pqDm9M7OODuco3osp6NVlo5DUGBhtoMl3+lMl5eKmDLoiRuIVt9qq32ka3DWl4cH058ox8jjM17K3dWx1lbmlyJrEMyUflfQTH5IFrrg7rnP/56IXYC+hR3ShIIp47gaOUNc/22hFd9L5wYjA8yRE5g88kfTE= 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 DM6PR12MB4220.namprd12.prod.outlook.com (2603:10b6:5:21d::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3283.15; Thu, 13 Aug 2020 13:27:15 +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.3261.025; Thu, 13 Aug 2020 13:27:15 +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 v15 27/46] OvmfPkg/MemEncryptSevLib: Add an SEV-ES guest indicator function Date: Thu, 13 Aug 2020 08:23:14 -0500 Message-ID: <0381d6ff0ed83fd43a0ffddfeb3e6716795e1195.1597325013.git.thomas.lendacky@amd.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: References: X-ClientProxiedBy: DM5PR07CA0130.namprd07.prod.outlook.com (2603:10b6:3:13e::20) 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 DM5PR07CA0130.namprd07.prod.outlook.com (2603:10b6:3:13e::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3283.15 via Frontend Transport; Thu, 13 Aug 2020 13:27:15 +0000 X-Mailer: git-send-email 2.28.0 X-Originating-IP: [165.204.77.1] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: a61d1929-4e78-43e5-df27-08d83f8c9840 X-MS-TrafficTypeDiagnostic: DM6PR12MB4220: 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: zitb0mhD1aNLxsRaQuvJ5FlaBbD6UBThFnxuBQWc6RNUjox3w6hVtotObRHU4pCnXXNP5J2546nfRgasyOx0R+aLUlnTyTBBJAJE1r+C/Nlikc/GZmGPk/E/tHDtgR8LdhAncmrkQC8Ca2CM5y+WdzHnw1f7yx618dUg3QlWAl7N0FuTUvqPWVSqPR2ey7GC2MJs/lwyEAlkbQENvMNFg0ZOBglpnL2J1Vgyqc3tmo+WsXlFoWiIbquL20EmZVOuK1I3SclJ/g9pW5dpLbq1NNDMT0uvzT3Oqe7rWf8Nkjwl3NzLHfeKmxPz1ttL6yBaZDkAZG+4xRi9nmDYPObJnX4i99O1clMQ5ZO3mdpbuqrubWTZzjl74QMbefW8c8Yh7fj9TzX+J2XRpP/je1Kq9TewRHczu2HmOyvecfr7MR+F624pWONRyMWqM03DHNlKODkAv1gwS+UWAYEldkA5aA== 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;SFS:(4636009)(366004)(136003)(396003)(346002)(39860400002)(376002)(2906002)(956004)(36756003)(66556008)(54906003)(86362001)(966005)(2616005)(6916009)(478600001)(8676002)(66476007)(316002)(83380400001)(52116002)(6486002)(7696005)(8936002)(66946007)(5660300002)(186003)(4326008)(16526019)(26005)(136400200001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: feSiRspncrglwCJYm+1x3vVRqfs4BzozXTbEfluRbRMh9gf71AgF1AQgm1wR5XIObiKR3End+IjoUA80K+PHIRmkFK5+flv4vH5X5VJ933IxeoIJNQ6Wz0B2SmOf5Ufl0aixZRTQCT02l0s4vl84L4cC+Bgy7bsUZ5yQDXmFcIXQmyKV8SIB9JuDeRDibvBLcouQDhcfd/fwChTg2NwCdRy3oxLgM/RejS7un3OZ9qnkNNuDUqE5mYVW2dtTv30vmrUj1YBI7sQDY+mnf4WQv3AS0eKcNdrqoOUy3/yHGa3Kp3TOITPF7N67MXgS4nHquV3L9+q0gRjgRdpJqdquqAxk3DfIGcCF3lthZwwd83m/sbvom/zPbfDCfMDgAetcsfdzPmzINqhK3DL2HMdSsoVOULWHfjh1d2BKJsDX6QRFQkqr1cECrKiQthK6IxkoeVK6x900I7VEjeu2S40RLT1LqqqHP4OsNAsaRMZUZh1BmN9PD6JPUAjgWblsjlcVnwJ1W8+cKFfKfrXPFehfuc20aJiU9XhnxbmCzBmw/kt++E8A7Br3f5edF4czrigQUjXkCTjuEayM+fpjxGluEzHtORe6+lMiux8uOfEKfMkD/Hx7ywPtaF8Q7Ki7t4urRAzJxJ7EIsiObZIH9ry6gQ== X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: a61d1929-4e78-43e5-df27-08d83f8c9840 X-MS-Exchange-CrossTenant-AuthSource: DM5PR12MB1355.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Aug 2020 13:27:15.7793 (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: rRTQbqMFgIrbH3ZXWhMC0TqLyqyYBAJuF8n8x4csrrYZZ02yviQQ+QsNaArfpMpoB76BW31cTZpr6ycw1DtHWA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4220 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 ++++ OvmfPkg/Library/BaseMemEncryptSevLib/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..fc70b0114354 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..02b8eb225d81 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.28.0