From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mx.groups.io with SMTP id smtpd.web10.9718.1672995226942036229 for ; Fri, 06 Jan 2023 00:53:47 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=Zg38SbCr; spf=pass (domain: intel.com, ip: 134.134.136.24, mailfrom: jiewen.yao@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1672995226; x=1704531226; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=7aZihYlMI+I++N1UI/VYQhZB3jBcAv9BjaCmcuKqsBY=; b=Zg38SbCrhKk9bujmiCVYS4ayIZ1K8TC4avrf3oqBM4rRFmjsTdh5pS+S WUEcWpzhpXvV5a89sLy7WWO2oDyWXfjeDyr6M9S13ogzX9vcmpaBA1Ki3 UdmqppoAYXrgWK50CK4S+1NM57GitMelR11VW1vSfA5SlzKd/O+4Li6bi S29C32GfzwvBlYm7AIaGv0ncjT41ONMOk/Ioe55HM8oLh2m0YZJufGfJ5 r5tmtZtielNLJtaME1Di3HU/2m+jcbv3Vh18UJufAIEcKpGdeZgzhJD0D ufN9XxaFsgQzp7Emqk3SS73EPGDFWcEgPl5uLUTLdUeYVIS1pwcIK2tVj g==; X-IronPort-AV: E=McAfee;i="6500,9779,10581"; a="323688542" X-IronPort-AV: E=Sophos;i="5.96,304,1665471600"; d="scan'208";a="323688542" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Jan 2023 00:53:46 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10581"; a="633441605" X-IronPort-AV: E=Sophos;i="5.96,304,1665471600"; d="scan'208";a="633441605" Received: from orsmsx603.amr.corp.intel.com ([10.22.229.16]) by orsmga006.jf.intel.com with ESMTP; 06 Jan 2023 00:53:30 -0800 Received: from orsmsx610.amr.corp.intel.com (10.22.229.23) by ORSMSX603.amr.corp.intel.com (10.22.229.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.16; Fri, 6 Jan 2023 00:53:30 -0800 Received: from ORSEDG601.ED.cps.intel.com (10.7.248.6) by orsmsx610.amr.corp.intel.com (10.22.229.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.16 via Frontend Transport; Fri, 6 Jan 2023 00:53:30 -0800 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (104.47.70.108) by edgegateway.intel.com (134.134.137.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.16; Fri, 6 Jan 2023 00:53:29 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lJqk2HFxjuRbIcrFuzztaUEZS44s64dyS/VVsdkfKB9dNPu9oqbSBEtJcLSJ7SfmAWiBDkEy3ptGeIAvmvBEOTtmk859cTT/+KaSwxExiuSGxcOx7X3Fer2fYcNfblFzYvZXzrUPSLFmEIpzKPEXZ6wTVwaa2IiMHFebGVjuGlh9RxCgNQQYb1VbozxiqSC7Ml4ShsegeQw+5JQGdGMNxpoVRxaRvXKRZ+DcluWyiaVBDwsIz8yAtVgtlrC+EuagXLLcBvaeOYVdOqod5aCVCZg8SYYt5VDd3oZPRiqGlKHO1F5on3VrjI/+ajQRt+8SnUUAXcs67hFiecQDYabqzQ== 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=fE1XLnYOp3ElWakEwJrQoFpcMNZeDU2u0Ha2jxPYgwk=; b=Wjh0jBASrDWTfaGgYumBHrmTsi0pmUaGHkF6pRE3oW+54VFshH06MzOAFWqgtMnsr0XEP24uLwlrXlsyff3t8UQSSb/S1sdXBUO+DmQevQSqs9nUdtaNAl/JAZkLZsGMnmk5VQvvzb2G4nlosa6ZavtKihR5/Bbuf79rrgFm3cs9C5JEzjkk3IwWoBie1/HgSShtV5NkPVR3NJoOjtZ/rlbXYxeuGvZKoQWHsp60sLVR6ArfnOcbZiFQ4Bih0pbyslwabESvlc1BYlqPQJwv8pKPQcK/K/niRmfnhQCeVzheQMvsMkW/1fMODEFOiAIHT9IyAV3ieK0e5rjC8iVz3A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Received: from MW4PR11MB5872.namprd11.prod.outlook.com (2603:10b6:303:169::14) by CY5PR11MB6236.namprd11.prod.outlook.com (2603:10b6:930:23::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5944.19; Fri, 6 Jan 2023 08:53:25 +0000 Received: from MW4PR11MB5872.namprd11.prod.outlook.com ([fe80::5f56:1bdc:2eae:c041]) by MW4PR11MB5872.namprd11.prod.outlook.com ([fe80::5f56:1bdc:2eae:c041%9]) with mapi id 15.20.5944.019; Fri, 6 Jan 2023 08:53:25 +0000 From: "Yao, Jiewen" To: "devel@edk2.groups.io" , "Michael.Roth@amd.com" CC: Tom Lendacky , "Ni, Ray" , Pavan Kumar Paluri Subject: Re: [edk2-devel] [PATCH 3/4] OvmfPkg/CcExitLib: Fix SEV-SNP XSave area size calculation Thread-Topic: [edk2-devel] [PATCH 3/4] OvmfPkg/CcExitLib: Fix SEV-SNP XSave area size calculation Thread-Index: AQHZFYaxWxK6nw6tA0OoM7jjr2y4/K6RLYZg Date: Fri, 6 Jan 2023 08:53:25 +0000 Message-ID: References: <20221221160651.182143-1-michael.roth@amd.com> <20221221160651.182143-4-michael.roth@amd.com> In-Reply-To: <20221221160651.182143-4-michael.roth@amd.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: MW4PR11MB5872:EE_|CY5PR11MB6236:EE_ x-ms-office365-filtering-correlation-id: 68057c66-cbc3-42ae-02fd-08daefc37940 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 5IIljCXqHhDsoX5iMHTV8YoIoQy6rj7WP5pgBVVoZjrmMwmsJ+O+s0+c6IjmJKlEj6Nesb4RU6AjF0bLWxC0a5lJGRPJXCIZPly7PTcaBZ9ulpDIJ8sOBE6wFDvQiaMvOF6ulFDaZMERh9GGdVfGhBrialqyItyuYDScHmA8A7o5Cekz8lwvO2wUTEUyneb6thLb2Az2XT3oKImy99c/XHivW1eM/Ctasw57gWq7tjdIRQTisVfeYFpALchV8orXgy+g7OqNtKbPurY/DfZK6tfoFcNgZtrcLGVvcKJNa9i6UcgZz6iqT9qZ90XyVMRv9Z9kWlPx0NjnNEbsVDJkUBi72vUMcLMfwOq1ojChnqmw4rB/U2qkP2n4C2yDTAD4Y7gkrJhPPMLOws+l/rU8+dzvqSd0TI4xRhGPpA2yaGE1wrO/JoepAlbtpbMeNlIb4+CNTHwMikxcXCcZYUG5G5rMmcjgEgj9OX9+YhRTgOfWA8bV55Bc23UwQCqGK6iig+0ItzV4pDXHKVaPw1TAtal2W51Dch5cUsnfUXWN+iXvGaNXCBpfpow+Gy7JPVq1m3nDom5tdLZVFE0F4LOS9i9XoThsMMwJH81LS8+UmI0mXkVEvYxzxf5TmAKJZ7Jx9df7WQYGGYhQpUQf9LNO6AjJYaHCXpYmWs0zFSKNr1M++elph0v9eOpOiwMEWvFiVtdH+fcvNLdTEBJpZbK2CFiqHjcF0rm5DYJ35q9pbsKYrH+DWeANHi3c8zrGbvmyMQVFagbNcOUKdPt8Q9DmKQ== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MW4PR11MB5872.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(6029001)(366004)(39860400002)(396003)(376002)(346002)(136003)(451199015)(76116006)(66556008)(4326008)(66446008)(66946007)(41300700001)(64756008)(38070700005)(316002)(8676002)(66476007)(54906003)(2906002)(86362001)(110136005)(5660300002)(52536014)(82960400001)(38100700002)(122000001)(55016003)(33656002)(6506007)(9686003)(478600001)(53546011)(966005)(66899015)(8936002)(26005)(186003)(83380400001)(71200400001)(7696005);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?X+ZwwkJw2dBEYruGH45oPrO4AbjpZcl1dNdMFRD9MnUzeNMb/295+qG3eHqJ?= =?us-ascii?Q?2rPu7ggjiRaiQZApKwuV1NoCjgV16lvgyOex7eAuNXdwHdKtNLTbG7wS5+jz?= =?us-ascii?Q?AkbSHsqySX7IR44l6c4PxCMwXbb6se1yyeHfszRJtjpuNcZ2ltYy1mvu3Htk?= =?us-ascii?Q?rhf1F27NMSAU3bzubKn7Ea3/DccdxB5ESkqmW/ceOmfHJUysOXADXqaIuHHy?= =?us-ascii?Q?SEodWdCsfSK1FkJESkv7ve5VRi4FdQGzYqECVfQeY+1uMCcRp8nGMmujiPTB?= =?us-ascii?Q?3Es0azctuDYa0r6vWJWAx1yY4NoLIoTakZtTpT2dHlvDXmcT3aw5P8dZEv/J?= =?us-ascii?Q?xrM0BVlvt56Ub4IVYvCXXKQDO9iUwuCnFdlOvFuJajQ8zNJdsiGuk+iWGw/J?= =?us-ascii?Q?0Yv6SG22sKjJiBGrubR/g+XqKshaPj2MIU6w4RP6lew/c2J2WN5Ki3qx25Fv?= =?us-ascii?Q?fVSJx4Vn2KFSWH3I7SIH4SrmCYxJuQwSRZ7w5oEer1JuK4sZTgUG9EWbn8ry?= =?us-ascii?Q?J3nvdHgYWhQfvvUfxdLaMR5rMZ9WMmS6H8JbSLNZOPvwBWwfrCTgWMaB5jZ3?= =?us-ascii?Q?l5ClEFMcu6qRjnNoR4//BpBsqohCQgiLJ+IIw+r/SELID1Oxoactns//2o34?= =?us-ascii?Q?2SdpSzs65WHActV4KeNNshKKwXEbVT/XufJT0ui9YVbDbU6cXKkvBkqoib3x?= =?us-ascii?Q?Cghu5aZiXSxzfsTK2wUjDVtCYU6VayMHYrfFOUfo5dkPE1fdI8vj9435tp8R?= =?us-ascii?Q?gIh+WPJodc35mYk4Y87e3Zo8VVeSmfiDHODJEoq+Xa/obtcqArbQl/Mssosk?= =?us-ascii?Q?WlzKB5D3UU8bHH4tuY0dkgjNDNRFWcyMfbUPZTXJ+AwKmnDHtp4OlfLihc4G?= =?us-ascii?Q?tPxo6ODJc4711VNtVXfOZKs0v39nwBKmsQA+rvLqxV82bWtpU7QQrsm2Et/U?= =?us-ascii?Q?kMi+9xrpyRh2wLicywIV77TpV+F7Bv7d8xYH7Gd8VMXsM4G88ycxjNMmU86E?= =?us-ascii?Q?RiwtVc+/GRmylWJtcskz7wMpLvsFevHQJZEBl1qzxcvW6BSrMVJtriiJeH3E?= =?us-ascii?Q?gz0IM9Z5iUVh7cZf6MwPKaBDzKCTHhMd1/bCf8enJO74ekkHnhFPtWNES74T?= =?us-ascii?Q?SG/tG3xZM8R+lVQtB7qov1AakAXrv3K6yA8Jd9AuLfANf+bR/wsOVBpLSkS9?= =?us-ascii?Q?2GysfLa3L5B2BmKxPo6P2NLxE3zRfc1b5Ci7qKKHjza5MyfUKwo7/a9+USkg?= =?us-ascii?Q?SGfC1jyEkK2XpKGVVxDFyH5Z259flH/VRU9oOFCmh+q7EQNQ4mOHRtYxjbKl?= =?us-ascii?Q?2WGNJVO5yA9HZN/sTZespDVHpAurvOj53FehJwBLzSvqIswezaYrr5QEfGo2?= =?us-ascii?Q?7Mv9GvNzYZO69Rhnsz+RxJp7fZVR/1/CsZKiG399JxoknbfGVse7nFWjNduV?= =?us-ascii?Q?WYSjFt8pUpWRc8LvRwZi/oQZciflVqT1+uO7OEwg25MKvlr7dBRnl7ZMaVjG?= =?us-ascii?Q?puRZi4XSsxFjWzyQpFsOAsj2FqeEw4oiZ/pWH+2s8ZZnTPx7WKb8yLHNm/AE?= =?us-ascii?Q?lE6etJtM/pmQLrU80msx5tYCDL/y5jO5zB+RXEzV?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MW4PR11MB5872.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 68057c66-cbc3-42ae-02fd-08daefc37940 X-MS-Exchange-CrossTenant-originalarrivaltime: 06 Jan 2023 08:53:25.7620 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: RjQgoy+Pn6pu5mVJSG8mnLU5rm/pk9+6nI8nRzgvJbtiTGO7jVW5lVwFcORBKEhjE8NmQCv+y5gDWSeUEC8pbw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR11MB6236 Return-Path: jiewen.yao@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Acked-by: Jiewen Yao > -----Original Message----- > From: devel@edk2.groups.io On Behalf Of Roth, > Michael via groups.io > Sent: Thursday, December 22, 2022 12:07 AM > To: devel@edk2.groups.io > Cc: Tom Lendacky ; Ni, Ray > ; Pavan Kumar Paluri > Subject: [edk2-devel] [PATCH 3/4] OvmfPkg/CcExitLib: Fix SEV-SNP XSave ar= ea > size calculation >=20 > 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. >=20 > 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. >=20 > Reported-by: Pavan Kumar Paluri > Cc: Pavan Kumar Paluri > Signed-off-by: Michael Roth > --- > OvmfPkg/Library/CcExitLib/CcExitVcHandler.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) >=20 > 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 =3D 0; Idx < CpuidInfo->Count; Idx++) { >=20 > SEV_SNP_CPUID_FUNCTION *CpuidFn =3D &CpuidInfo->function[Idx]; >=20 >=20 >=20 > - if (!((CpuidFn->EaxIn =3D=3D 0xD) && >=20 > - ((CpuidFn->EcxIn =3D=3D 0) || (CpuidFn->EcxIn =3D=3D 1)))) >=20 > - { >=20 > + if (!((CpuidFn->EaxIn =3D=3D 0xD) && (CpuidFn->EcxIn > 1))) { >=20 > continue; >=20 > } >=20 >=20 >=20 > -- > 2.25.1 >=20 >=20 >=20 >=20 >=20