From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (NAM11-DM6-obe.outbound.protection.outlook.com [40.107.223.59]) by mx.groups.io with SMTP id smtpd.web11.23687.1671641582681387401 for ; Wed, 21 Dec 2022 08:53:02 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@amd.com header.s=selector1 header.b=gSCbFJq5; spf=permerror, err=parse error for token &{10 18 %{i}._ip.%{h}._ehlo.%{d}._spf.vali.email}: invalid domain name (domain: amd.com, ip: 40.107.223.59, mailfrom: thomas.lendacky@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MZ2WOs7hk31Q73qIMiFNiGweIFZCYK3zwAVYGDSpqzSOH2KBekpsIO01kJR6pk7R3wHBe73sHDAIFHnWZGUEL9GXGgvypWOqDvZiQccoun6+O/EqoO6I7O4GuX+miKzeBag64J36Fh6go3MTPn0hKmxnkEyKTEL/UQ2OtdONuSai3zzkk4oQp882aqj/O60a4mDZYdxklREdjIGlmvC3A004Nr/4Mcq0ABik+EqOLg28fEk/StTeS88shsF16ILpqVvCgOKJmUVGOVcPJMzLxQoxtFRFTrUQmohfESmFUwZsFNhPRxjRUJFvwESXVNHctLEGASu4FTp10F77Sb1tkA== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Dkk1hsdoqJbVBlKlNJESA6w6COaFXFAL/n2Eu6g/dmw=; b=mg2+/GZ6DFXjDEWfCeqdK+k/MBzoopPRuAhVmdUMT0e4W9r7u2woP+H8xRVmrkDk9r7qLmBYaGSXNm4FT0yhWt70OCiZnwUqKfoT+69qYqwM2RtuEa4vKFNE4aMuD5RA9f6bklCBHLqh/d0FOsnaGJpaEKRL9PqgtzX/adLzp2PAl9mD0/e+yDcgiqekPjHpViXLU0ruGAJfuZE0T82moD8ujA+YHfpu75+7OFoxbC7gHLqXTNnWb/aLqrC1j4lvVXS3D1qcb2UvMv7ioNBEdOViFJBsZZEr7istsEvOVhrUBgtA+EUsTzogtifoAmwR3iv3+yNFrvhAwAEdSGmGkA== 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=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Dkk1hsdoqJbVBlKlNJESA6w6COaFXFAL/n2Eu6g/dmw=; b=gSCbFJq5y86YY5TX/DPt7NjL2zNGl5WOSEiOH18WR9RiOtuMaaGEuy37hz/v1WsMPRMSB9Ko1ef/gehkJWSvbUmJJRSlbT54DFDjXJGOBtAyRJof9rijgRVOSc7aoAX480Jah32pSoOZabKQS5CbY8a1xeX5ToXDVa5MkRj/9no= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=amd.com; Received: from DM4PR12MB5229.namprd12.prod.outlook.com (2603:10b6:5:398::12) by DM4PR12MB5134.namprd12.prod.outlook.com (2603:10b6:5:391::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5924.16; Wed, 21 Dec 2022 16:53:01 +0000 Received: from DM4PR12MB5229.namprd12.prod.outlook.com ([fe80::8200:4042:8db4:63d7]) by DM4PR12MB5229.namprd12.prod.outlook.com ([fe80::8200:4042:8db4:63d7%3]) with mapi id 15.20.5924.016; Wed, 21 Dec 2022 16:53:00 +0000 Message-ID: <6fa55df0-417e-c9cb-f61c-ddd4da12ec1a@amd.com> Date: Wed, 21 Dec 2022 10:52:58 -0600 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.4.2 Subject: Re: [PATCH 3/4] OvmfPkg/CcExitLib: Fix SEV-SNP XSave area size calculation To: Michael Roth , devel@edk2.groups.io Cc: ray.ni@intel.com, Pavan Kumar Paluri References: <20221221160651.182143-1-michael.roth@amd.com> <20221221160651.182143-4-michael.roth@amd.com> From: "Lendacky, Thomas" In-Reply-To: <20221221160651.182143-4-michael.roth@amd.com> X-ClientProxiedBy: SN7PR04CA0105.namprd04.prod.outlook.com (2603:10b6:806:122::20) To DM4PR12MB5229.namprd12.prod.outlook.com (2603:10b6:5:398::12) Return-Path: Thomas.Lendacky@amd.com MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM4PR12MB5229:EE_|DM4PR12MB5134:EE_ X-MS-Office365-Filtering-Correlation-Id: 38c4d727-a182-425d-7a91-08dae373d1d1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Q5P8+hfVVXXLqYDEWIQWDGfdkvyAxZ+eNLTt+RNveU7x0wv4hu6zFW83XDokAZZY0P11VxCaPYyxIB53X0seGAmeTiki9mPVHn/hoHiK8L3xkqYoyAEWmWGKWUtTJzc3S0Mb2Uo/qeCAgxOQP3U+WenkSHmUmTjEaG6PTCEq7rkiAr8lWivJmVf1ntPeMGr/d9VVy84vCLYDPnubC1tYBIVj9rNbND1mK/kdBoD0Nm21h9mVtUeRuyefTBYn/jDywkA6uvSpJwGP+xABOyjckx7akDL4rMGErItKlOEDfrF/OBp421/p0xsv3aZYTsuEffJkXqbN0bAp5feftaPcl6JLF/W876Xz8ySOPIHORuyWrxLmkSg4wQUEaetvLtOQ1nUxpFADINjB2Sv9842Ea4ORcUSdSM+Mg/IuxfNju3QijlBNPQFD+TwXft2LThxXReyTUt1ees0hfRtscWbgRvC3Wb+qxoY/RIWrWy04W8AHbTZBHqvnkMPr+dMMakMFJxD63HaCJ2p4CCn4aJsQ/XB5QmDdPL+VMKVj1bhaJqDnb/FjCs/29puY2FTVGy61fYTP6b+exUjk7pMAP60jn+uRZQDkurm0596yVXcpOmPOW5VEYdZ99hdDaspPfIhq0jrldusc8kNOyTGfAvBxCIz5pz+5RBrmVIGFpJC9y1sGsxouWoH2fDnrhThaqtPRDQtipvEaYOmH2QtJ0FduIaw0hW9FYOFjJFvDU2/fs1o= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM4PR12MB5229.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(6029001)(4636009)(346002)(39860400002)(396003)(376002)(136003)(366004)(451199015)(5660300002)(6486002)(6506007)(186003)(31686004)(53546011)(478600001)(4326008)(66556008)(8676002)(66476007)(66946007)(26005)(6512007)(316002)(2616005)(36756003)(8936002)(41300700001)(83380400001)(38100700002)(2906002)(86362001)(31696002)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?UnNaQTFyOEdNWnJYaGFSaXNSUEVwYlBzcE1sUUJNdVJGYStpWmVOdDd5a2sv?= =?utf-8?B?QWhSd2VCbkpHSnJBbm5Ucm1zWXFlazk2VGRMR20wZHM4ekpHUEYwSVd3VFdy?= =?utf-8?B?VXE4NkloVWpUVSs3UStjc2VreDVuR1JDQ2poa2pvUWFLTkM2bjZqU1UvTW92?= =?utf-8?B?dGVQV1VjMWdBYUN6N2dMc1NqYVhpZlJvb1pGRmw0SDRPOVZSM0V4RUlOeXJJ?= =?utf-8?B?Z3J5SGp4R2JPdFNxL2RXcUJPVk4zRTRCOS8yZzNxMHQxTW5oUjBqMmJqMWoz?= =?utf-8?B?ZkpMeDdhK0NKcFpRSXhWTUdSQjErUm8xaEd5L3NOMW5teXJpeGFlRURZc2t5?= =?utf-8?B?alZyNXN4eTZOV0MvWDYxa2ZvT3pnbDVFRFBrYzFlOUREYUFoL0kySEwyaG9n?= =?utf-8?B?WVZrbjVPQzh1NGxKQ2tQcmFUTkw5Wk9NLzVoVzhtVy9ENStGYUJ0dHpkbEpk?= =?utf-8?B?S0pEMTlWblFDQ1hZSTQ1NmwyUVcwNzhkZEs5WDlobXIrczhVYTVhMmFPeGY1?= =?utf-8?B?M3R0N1h4d0tNY0NueG4xSkR2bFdIblUzUVZ2YzRNUTg1ejBkY1p2ZHZKSEN6?= =?utf-8?B?Z1hQYXIrdDY3M1ZFU1h0c1FkT2RlV0NEUmZ3Zk1UNFk5QzFkYWE4WDBnM3Qy?= =?utf-8?B?RnFoZ1FieWJXQVYvTDhoTXMybDR4MTJUU0EybFlwcWY4N0psazR2RjMxQXMz?= =?utf-8?B?N3VuWExnbUQxenp6SXo4TzJ4VkFkNDRDc0FGb1M5VDF3azB0SFZWMTFaelVF?= =?utf-8?B?cEpqV3NhQ3Q2NXBNNCtkeHl0ZkpDaXlqZkc4MEJmSEV1a052NU5weUxLalRt?= =?utf-8?B?dVZVZVFEaHVMaHdRbXBpUkgvWm9FYkxONTlFMklOeVZOcDRhM3QrTGZLd09X?= =?utf-8?B?Ung4MGN0U0tKdTNQakswR0s1a1Z1Ykt1SGlFNGhLZUpITlJFMHlNcTRnWVIr?= =?utf-8?B?c1RHTEwrRW5MZFFxY0ZEbVFtMW1TUmVVR0E1c1AxSDJJSzkyaFRLZHJ5Sjk1?= =?utf-8?B?Ym45aEk5YVo0VWlYbnhmdXlHWDQ5NmlTV3pvTnQ1MitGMTBXOVdyb1p1dDRB?= =?utf-8?B?RHUyZUFROGFoMGZRY1lpVitrS2JtbHRNVzAyZEs4T01iUVhRYTZaeWloeWg2?= =?utf-8?B?Tll3YjM0NVRFU3VWdVhSRGxPNmh5MW1VaThsbXRuaGxYQ3VSZk1NRG5EbEdW?= =?utf-8?B?RWYvaS96VytSUEpxcXErY0RBNHdtaXMrTzJzRnh1dCt2SkZsY1hvYkwvMUV0?= =?utf-8?B?cWZZajJ0SDNsV0NGbWZyRTVLeGszdWlocTlNd09HMEhBNTVyOGE1M3BEOTZC?= =?utf-8?B?ZTl1QTRpNXA5ZDNxdWZicmZiQUJHc2FVY1Y1RC9hNzlTazY5cmNDYTNmMGlu?= =?utf-8?B?azQ1Ni9KbXlZU0NGWWhpM2FiQWxERDlpNmtHNTRjaHdLaFFUNFFVZzBkdWp0?= =?utf-8?B?SDFQSEl2MDl4dXA5ZnFDUlpJWWFDSjNIRnFLNDBYWVNoL2lUMnFwS0RYTS9L?= =?utf-8?B?NFl0YVlhSWFJOVIyMytWSlhBNndqUWc2OW1LQ05yVEpmeTl2bHRMaEg1R1VX?= =?utf-8?B?WEppdTNxZzdlRGprSkRIcnVFWnhrVUQyMDlWUC9TVnprdE1BSlo3YjNPbytv?= =?utf-8?B?aEhMVDh1UlFrd0dBaUV6U3VRNHVtbnpBTno2ZVh5TkNXQ09ZNUNWNEUrakg3?= =?utf-8?B?TUd6TFJVczd0ZjVBSzA1aWxTOHRUNExRYk1JdkxOZi93KzB1aHFCd3BTUWlo?= =?utf-8?B?RitPY0R3amNYTEUvQmRKR1RnVUx2ZTFHeGI2clgyWDVIN2ZTcWVGL2QzRkx5?= =?utf-8?B?QnhqYm4wUFV0eVBQK1JMWmRWc1dLNXpUZHViRVZlckFXK3BzTzRqZkd4d2gw?= =?utf-8?B?aEJZNC9UV0JhNjdrUTB2UzRpSS9pem1rYm5VY3M0cUM5SlJWaE9GNFoxR0dr?= =?utf-8?B?SDJkQTV4a3lNTkhIWTU2N3VCdnpSRUh3L1huTkxqeFJrR3gxQlYxVHV5d09P?= =?utf-8?B?cUF1UkZyaEV1MFJZdExuWE5hMW5ScmgxdHhjV0J2eXkzbXJ0eTZscTJYSGtO?= =?utf-8?B?WVpSUXR2bTBSd1JITVVLRWhvVjJ3YU54VnVmTFBuYmhHMjVON0h0MG9URDhw?= =?utf-8?Q?0wLyl+rLRgtkAzA2CScrABuWJ?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 38c4d727-a182-425d-7a91-08dae373d1d1 X-MS-Exchange-CrossTenant-AuthSource: DM4PR12MB5229.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Dec 2022 16:53:00.8819 (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: iXDLnHhVEl/SOuvs8TqJuFuSVcQiw200zkZy7mKgmv8FEYRm1qFIvfsPOl4U9Q+F85mJBZeAe9p5x+Pt0bY+NQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB5134 Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 12/21/22 10:06, Michael Roth wrote: > CPUID leaf 0xD sub-leafs 0x0 and 0x1 contain cumulative sizes for the > enabled XSave areas. Those sizes are calculated by tallying up all the > other sub-leafs that contain per-area size information for XSave areas > that are currently enabled in XCr0/XSS. The current check has the logic > inverted. Fix that. > > This doesn't seem to cause problems currently, but could in the future > if OVMF made more extensive use of XSave areas. It was noticed while > implementing SNP-related tests for KVM Unit Tests, which re-uses the > OVMF #VC handler in some cases. > > Reported-by: Pavan Kumar Paluri > Cc: Pavan Kumar Paluri > Signed-off-by: Michael Roth Reviewed-by: Tom Lendacky > --- > OvmfPkg/Library/CcExitLib/CcExitVcHandler.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/OvmfPkg/Library/CcExitLib/CcExitVcHandler.c b/OvmfPkg/Library/CcExitLib/CcExitVcHandler.c > index 985e547977..cd117d5a31 100644 > --- a/OvmfPkg/Library/CcExitLib/CcExitVcHandler.c > +++ b/OvmfPkg/Library/CcExitLib/CcExitVcHandler.c > @@ -1678,9 +1678,7 @@ GetCpuidXSaveSize ( > for (Idx = 0; Idx < CpuidInfo->Count; Idx++) { > SEV_SNP_CPUID_FUNCTION *CpuidFn = &CpuidInfo->function[Idx]; > > - if (!((CpuidFn->EaxIn == 0xD) && > - ((CpuidFn->EcxIn == 0) || (CpuidFn->EcxIn == 1)))) > - { > + if (!((CpuidFn->EaxIn == 0xD) && (CpuidFn->EcxIn > 1))) { > continue; > } >