From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail05.groups.io (mail05.groups.io [45.79.224.7]) by spool.mail.gandi.net (Postfix) with ESMTPS id C2CA6740032 for ; Mon, 20 May 2024 17:47:17 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=WW6ZVsynSVfgoNcEng8TfQCLJlU42MvxojMrV3PyzDQ=; c=relaxed/simple; d=groups.io; h=Message-ID:Date:User-Agent:Subject:To:Cc:References:From:In-Reply-To:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Resent-Date:Resent-From:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Language:Content-Type:Content-Transfer-Encoding; s=20240206; t=1716227236; v=1; b=wIlKMxmuYIWEkdZTfPedbpv6E+d7yjPqAT52noskRaLFtAEHZuDqaRrZfJDGEceON46KLL7g TUzMEZS95bxV+z4Ki32mTd8ejsU4yr6xSHkeu7RMZb3Yg4knOepbWhFki18G6gnLGoWtD8O81N5 Sd8ZU+rpHmH2u4WzQsBUtQ1F3x2xcqEFroR+08ULPwzSgeQUu0jPISwdBDw5syn7fSsuqqGjOqz yRnLgLlkBljy1n2oWVKExzPbxOfrIAJg0DDGHpT+y3DyLEfdLbp+muJ2Hu9Vebk4JvSQkNofPF8 s8/ZYRZAhSbv+0UYrN0rXwU1Il4ShC91ginujmEB2ZQqg== X-Received: by 127.0.0.2 with SMTP id DModYY7687511xPNhtU2sU1W; Mon, 20 May 2024 10:47:16 -0700 X-Received: from NAM12-MW2-obe.outbound.protection.outlook.com (NAM12-MW2-obe.outbound.protection.outlook.com [40.107.244.89]) by mx.groups.io with SMTP id smtpd.web11.3067.1716227235609345224 for ; Mon, 20 May 2024 10:47:15 -0700 X-Received: from BL1PR12MB5732.namprd12.prod.outlook.com (2603:10b6:208:387::17) by DM4PR12MB7719.namprd12.prod.outlook.com (2603:10b6:8:101::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7587.35; Mon, 20 May 2024 17:47:12 +0000 X-Received: from BL1PR12MB5732.namprd12.prod.outlook.com ([fe80::bf0:d462:345b:dc52]) by BL1PR12MB5732.namprd12.prod.outlook.com ([fe80::bf0:d462:345b:dc52%7]) with mapi id 15.20.7587.030; Mon, 20 May 2024 17:47:12 +0000 Message-ID: <9e6c393c-cb04-a174-5161-05bb6f35e377@amd.com> Date: Mon, 20 May 2024 12:47:09 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.15.1 Subject: Re: [edk2-devel] [PATCH ovmf v3 4/5] UefiCpuPkg: Add AMD SEV-ES features support To: Alexey Kardashevskiy , devel@edk2.groups.io Cc: Liming Gao , Michael D Kinney , Zhiguang Liu , Ard Biesheuvel , Erdem Aktas , Gerd Hoffmann , Jiewen Yao , Michael Roth , Min Xu , Jiaxin Wu , Rahul Kumar , Ray Ni References: <20240502143445.526098-1-aik@amd.com> <20240502143445.526098-5-aik@amd.com> From: "Lendacky, Thomas via groups.io" In-Reply-To: <20240502143445.526098-5-aik@amd.com> X-ClientProxiedBy: SA1P222CA0132.NAMP222.PROD.OUTLOOK.COM (2603:10b6:806:3c2::15) To BL1PR12MB5732.namprd12.prod.outlook.com (2603:10b6:208:387::17) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL1PR12MB5732:EE_|DM4PR12MB7719:EE_ X-MS-Office365-Filtering-Correlation-Id: 08e986a3-0343-4a8c-0491-08dc78f4e10a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Message-Info: =?utf-8?B?QWh6RVJlUndkVytWQlJIc3dXRExSR2dGQVVPQytFTGNZbkRtN2F0MkNlSDJ5?= =?utf-8?B?V0xhalV1S0lYaHpRTTFub3hFdllNYUk2d3dES2d5RURCZWNkdUgxMm5GK0R0?= =?utf-8?B?bUhmODBqS1lkRlhrYjhObWExUEFxaFQreWZlSlRiREdIenkrRmpXWkZzRFdl?= =?utf-8?B?OEMrdFl4ZHFiTVU4QnpGQ0lxS3BOREhRMWszc2MwNktHbzZNRHVlL2FyKzIz?= =?utf-8?B?bC8vUEpRaHpYb3ZuTUk2Ni9qOEJyOFQzUGNLTDJSUHhSVVBHK3dMSFRCNVRV?= =?utf-8?B?UXk2d3BHQmpWU2VtcnBxb2tWcGRXbWdTMTMxa0ZpUnVCK2VQMWROSThsQUMr?= =?utf-8?B?MVl2NUNyTUUvNG9OUUxia1h3WFVOVHJtMkE4R0VJYmZXVzUzV3dwT1hiZTBh?= =?utf-8?B?VTByU2d2U2dTMGkwdUpTdW5JUnFieU50TE1VSnZ0ZWJ0ekVOUW4zbWFRdDFQ?= =?utf-8?B?bE5tSXp1QVR0NmpHMXV6Uzk3c1ZCajF2WUNkRUd5Qlo2TS95L2tBdzJ1ZTIx?= =?utf-8?B?Z0JGaGtzTTV5RDMraWlBalRjV3IzZ0VFNXZES0FYNVlBVExHajFJa0NyeEVq?= =?utf-8?B?dmxQL3RQUWp5dnRHZ1UyN0Q1bCt3MUN2UCtLYkwxRGVoK1hwS0JmMXhZSHVl?= =?utf-8?B?TmZNam9KbGh3SlJrcVlpd1M2ZXFJbXZoSWtldnJsUHhoZ0dTNnh5R1Z1V2pr?= =?utf-8?B?dm40UWthaElJZmdhMTB4MUY3aExybER2bXVMNjR3T290c2NYb1gzY1ZiU2R1?= =?utf-8?B?RXdiOEVzN1lZenJzMmVoMldoM3FFbjh4Y0dJZ01PeGZaa2thdjdiZVRtQXo3?= =?utf-8?B?eTh1OEt4VElqZUZDT1hFYjMxb0pEalM4MS9YdTcyNm01OE1ZTVFmZldtc3Nt?= =?utf-8?B?QlhsNmhyZWR4dlY2M1RhcGtsUkU2SGpqT1hoaFFOajZ2S1lmSTJoTmdWeFpT?= =?utf-8?B?azVZQ1VWb3VSeDlYV3BtNCtiSEtYSnlhbHlqRTZGTzFTdUlvQzFMVFVENlRj?= =?utf-8?B?eHZjZWVqTUxsbFhkMEh3Q29VOHg1cEtYN28wWUNHaWZUNEx6UXJvby9NSGxC?= =?utf-8?B?aXpmZU9QSk5adXZqUHd5SEdxVFltS0RxOSt1emo2WGZqazM2MXp1V2N1eDgv?= =?utf-8?B?alZqM0MrRGt2aldpaG9PR25oRzJKMExpTVJnYnlZTjRZNWE4Wmo4dHg2M09E?= =?utf-8?B?QlBXU2RNTlp3NFBpdGxsNUFoSkY1bnBpeitQUXB1Vm1nQW5vUU0rY0dMakR1?= =?utf-8?B?bnM4d2RTRWEybXNSczJjV0JZS0Zia0plWDdhR0dnaDMzUE5YT3E1eGlWVEdx?= =?utf-8?B?OU1wWlo1Q3pMV2tZWjFEYUxtaFlnVXZaYzJhV3RsZmxPV2ZDRzdVUU8rTS82?= =?utf-8?B?TDBDYzVZdlVBQWwrOGJ4b2F0OFlSeUYzSkpXeFBEUjVMZGNrMGlCM2Z0YlVZ?= =?utf-8?B?Q2N3M2lZRUlaMUlNQXdudHZ1NWZHVWRRc2ZGUjNrQ2VDR2V5dGRacGlPY25x?= =?utf-8?B?azdTV0NCQ1k3L3ZiaUxPbFNnUmlVNnQyOSsydmxSbi9IZU5zeU5sRERvRHJE?= =?utf-8?B?TEt5d1dQaXp6aWpqa3pLdGdrY0toT2E2QzRkaGFIS2tyQmI2R2prWlVQbDFx?= =?utf-8?B?cGhzaDRjbWI4ZzFjL0pDQzc1TDBhcGVlNjZLdk93NjFGd2E0SlpCTGNrOUMv?= =?utf-8?B?RXZKVHluRGNya2MrSGg3VDQ3N2R1K2I3MjVsT1d0d1pwSUpWNnFKMmhBPT0=?= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?UmNVVTBqMnhNNGswTEMybHhTUHFmWHpXTXg1cnpyMFZIbVVjZHR1OFU2eWhO?= =?utf-8?B?OXFPc2tSWGNXUDYvZGtqeVA1TWZtcldmdy9EYjFEWHNia0tTbVdrL01iUDU0?= =?utf-8?B?SUdrVnhZUTR4eUxEQzBYbFg3a09teE8vcFEzUUh3VEx3RnVpZkhDbmdsSUNK?= =?utf-8?B?b2F1SHZjaFVtTlM2SHRhSEpKdGRvV3h6WFlwTkZxVDVyazM3a2d0cVAvekpY?= =?utf-8?B?TjJFYmhOTzZoQ2lKcVdqNHhRampzQWdIVkhyUW9QNENDSUVvL1hoL1Z5bHlR?= =?utf-8?B?QWtwT2JwTlJNRWpWMW5TRVBUWi9yeHZVTEIrWVFZN1NHdlZ3WmZjbFJiRmwx?= =?utf-8?B?WXJ2Z2lzK1N1NTY5Y0VYK2RlVmFDa29hSlhWanhDUDJ3cWttVnJpbDYzVjZB?= =?utf-8?B?U0M0cTQrbVVGVEx4WDhKRnlJQk9rQks2cG14R2tGakhvMU0weGsyYXlWTjdK?= =?utf-8?B?d1hid0xyMHhpQXl5SHFFcHI3SHFjKzhXWWRBM1I1bkZDQi9WMFMwZkRHOGEz?= =?utf-8?B?dUtSSGFhSU5oN2MzVHI1NUJsd3p5dnVoeWsyZFBOMHB5ZER6UFNFcDZxWjE3?= =?utf-8?B?ZW9GcDJGQWM4MzdnMkRWWXNyRDlUQ1g2RzNCMzRzUS9UcVNFVEFhMDZrUHd4?= =?utf-8?B?L0x4cmxxWFRLSURWWFdXYzRucTFqSzFLenY5MWFOWllIUUVDbGM1clFmZnJ6?= =?utf-8?B?OVFwcXVueUFOQ05lNFNnTmpnWUZmcVlyMEtMNEJneWdPRStUMEE2UWtsL3hL?= =?utf-8?B?Sy8yaFlhQ25yMlRwR3BnVCsxeW51L20yS3VPVDdlTXpjMlppS1ZUU245SXdt?= =?utf-8?B?TjhLUVRMdkM2QnJXTUczNW1nUU50K1AweWhIWnlaL0c4bUEvWDhDS3Q1V3lO?= =?utf-8?B?aURvS0o3ekdZRWE4a2FlQ0ZlOEQ1UEFVWE5ORnMzQVBPWEo2K2xlU2N2TFRu?= =?utf-8?B?YkRlQ28xRDJWaDNSU0U1U084QmtPRUU5UitDTFhCNjFnRmRWRTAwREgrSGlX?= =?utf-8?B?KzhxbUFiVkJreFJsa0p2bzlBcCtST1lwS3lRVE4xdkY1TlJhM3EvVWZrY1pk?= =?utf-8?B?ZDNNY25CUkt0OGgyOEhweVNoV0FzMTRYczJmWVovTlJFVnFKR0NPTFc1VUNN?= =?utf-8?B?eHJPa1lMUWFZM2ZNcVRFWC82ZWVZUUMydFNlenBSemc0cVlTSjVGR3F3Q0t0?= =?utf-8?B?Zmd5ZU9HcjV6OVJMaGthWjFhcThZdm92OHdoNC9YWUpTY3NydmhYL0NvZXI4?= =?utf-8?B?S2tqbzN5WllEM1RtUmlTKzZUTTlUbkxabFNUYmRFRC94S2xBb0FFTnUwN1pu?= =?utf-8?B?R3pUM0xRK0RSTWpGbUdZdEZ1UlpTZmRyMkZRNUJ6aS85WGg4QlBiYUtEOFFs?= =?utf-8?B?U3dja2tQYlhHZFlVa2ptL0JSRGdJQjRpZTkydk5hZmtOVFN0S2pNZ2xreHNl?= =?utf-8?B?Y3U2b0hYdEF1dHA4cDd6Y0cwSmZ2eElqZCt6NnhTUzA1VkN3akx6c1VVT2pE?= =?utf-8?B?YmFJT1JDU3BaV1RzaTNZdWh5a1dXekVPSGQ3NHJEZ1VkcGZPTFlSQjFMeVRo?= =?utf-8?B?b2RydkpTSzZVYi9iMFRiVTRWZHlKM1lFTlFVODZ1ZmZSQTM0MGU1dUtPbFRX?= =?utf-8?B?cDNhR3hWVVVNR2k0VjNya2lkTzZralprRmhGam5Obk13S2FtS2ttenk1Rkkz?= =?utf-8?B?V0Erbm1rV1VaeXZ0OXd5YlRVRjJPRndTLzBIWis3Rm4xRWhpSE1NdVdGWU1v?= =?utf-8?B?ZGo1Y0d5QTBtZXB6cmZ3RGlXeFlJd2RMdnNqdTF1RXNGTVE1enJORGZxelBp?= =?utf-8?B?YmpkaUUrSEpYOGNRdG5USXZjaDlzYXhRbEtKRTJ1QVFzTmZvS2N0cjRUY0tU?= =?utf-8?B?Z3Z5NzIydVRTUnAvMzN1NjBUM0NaMWNKMWM4bnpVa3piZVNwdVV6cDRaUDFp?= =?utf-8?B?UkFibTBEKzRYWUhNMFU3anAweFNhQUN5bHB2aEM4amk4WEJxazlKZWhKSnpT?= =?utf-8?B?RnR5blBJYUdrT0RYc0F3Y2loSkorOVJ5NmZCUnA1K0ZqbEphWFZ5K291ZWly?= =?utf-8?B?WG1kK0J2RXBqNzFDcGExYi9JTVNlUlNCWGRjczQwYjNFMFhGMEFUWGNMMEM3?= =?utf-8?Q?o93nvWGOKKr2c/w6yAPlzblbc?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 08e986a3-0343-4a8c-0491-08dc78f4e10a X-MS-Exchange-CrossTenant-AuthSource: BL1PR12MB5732.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 May 2024 17:47:12.4351 (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: m74QiUifnjb4eIRNXX2jmuK2vIorYglSBt+oQyBNs45vfaT6CK1vnbBYXiT9GA0cac9Ym2QgAk7kZIR47/9s1g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB7719 Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Resent-Date: Mon, 20 May 2024 10:47:15 -0700 Resent-From: thomas.lendacky@amd.com Reply-To: devel@edk2.groups.io,thomas.lendacky@amd.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: f9vj85gHXEIq2Cup9ZZpDNSjx7686176AA= Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20240206 header.b=wIlKMxmu; dmarc=pass (policy=none) header.from=groups.io; spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 45.79.224.7 as permitted sender) smtp.mailfrom=bounce@groups.io On 5/2/24 09:34, Alexey Kardashevskiy wrote: > CONFIDENTIAL_COMPUTING_GUEST_ATTR is not a simple SEV level anymore > and includes a feature mask since a previous commit. >=20 > This fixes AmdMemEncryptionAttrCheck to check the level and feature > correctly and adds DebugSwap support. >=20 > Since the actual feature flag is not set yet, this should cause > no behavioural change. >=20 > Cc: Gerd Hoffmann > Cc: Jiaxin Wu > Cc: Rahul Kumar > Cc: Ray Ni > Cc: Tom Lendacky > Signed-off-by: Alexey Kardashevskiy Reviewed-by: Tom Lendacky > --- > UefiCpuPkg/Library/MpInitLib/MpLib.c | 12 +++++++++--- > 1 file changed, 9 insertions(+), 3 deletions(-) >=20 > diff --git a/UefiCpuPkg/Library/MpInitLib/MpLib.c b/UefiCpuPkg/Library/Mp= InitLib/MpLib.c > index d7244565029d..52fddfb7e571 100644 > --- a/UefiCpuPkg/Library/MpInitLib/MpLib.c > +++ b/UefiCpuPkg/Library/MpInitLib/MpLib.c > @@ -3178,19 +3178,25 @@ AmdMemEncryptionAttrCheck ( > IN CONFIDENTIAL_COMPUTING_GUEST_ATTR Attr > ) > { > + UINT64 CurrentLevel; > + > + CurrentLevel =3D CurrentAttr & CCAttrTypeMask; > + > switch (Attr) { > case CCAttrAmdSev: > // > // SEV is automatically enabled if SEV-ES or SEV-SNP is active. > // > - return CurrentAttr >=3D CCAttrAmdSev; > + return CurrentLevel >=3D CCAttrAmdSev; > case CCAttrAmdSevEs: > // > // SEV-ES is automatically enabled if SEV-SNP is active. > // > - return CurrentAttr >=3D CCAttrAmdSevEs; > + return CurrentLevel >=3D CCAttrAmdSevEs; > case CCAttrAmdSevSnp: > - return CurrentAttr =3D=3D CCAttrAmdSevSnp; > + return CurrentLevel =3D=3D CCAttrAmdSevSnp; > + case CCAttrFeatureAmdSevDebugSwap: > + return !!(CurrentAttr & CCAttrFeatureAmdSevDebugSwap); > default: > return FALSE; > } -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#119088): https://edk2.groups.io/g/devel/message/119088 Mute This Topic: https://groups.io/mt/105863831/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-