From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id 1A98F9412DB for ; Tue, 21 Nov 2023 07:53:49 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=wXZVJIKoDnd7jwSlPAunIyg9iTsp+IG6NJYKIrAauqI=; c=relaxed/simple; d=groups.io; h=ARC-Seal:ARC-Message-Signature:ARC-Authentication-Results:From:To:CC:Subject:Thread-Topic:Thread-Index:Date:Message-ID:References:In-Reply-To:Accept-Language:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Language:Content-Type:Content-Transfer-Encoding; s=20140610; t=1700553228; v=1; b=Ierjghcq9vvy2rannEUj8IhO9Z3yW7vuUNSknXSxwCe5IVoo5lODyXpzD3E0RxcpCwxMLkuj swE8xuKoFnAjdb6OiBRxZHNsbIn/sW255NK1WSpfnHuN1XuHCnI5HhMgqdeByLuWZaScCUgJTmp +kb4WavJt9trd/AX3E2J0saw= X-Received: by 127.0.0.2 with SMTP id bBmSYY7687511xCJCb4fiJ1h; Mon, 20 Nov 2023 23:53:48 -0800 X-Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.151]) by mx.groups.io with SMTP id smtpd.web11.30946.1700553228315909172 for ; Mon, 20 Nov 2023 23:53:48 -0800 X-IronPort-AV: E=McAfee;i="6600,9927,10900"; a="371959568" X-IronPort-AV: E=Sophos;i="6.04,215,1695711600"; d="scan'208";a="371959568" X-Received: from fmviesa001.fm.intel.com ([10.60.135.141]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Nov 2023 23:53:48 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.04,215,1695711600"; d="scan'208";a="14831594" X-Received: from orsmsx602.amr.corp.intel.com ([10.22.229.15]) by fmviesa001.fm.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 20 Nov 2023 23:53:47 -0800 X-Received: from orsmsx612.amr.corp.intel.com (10.22.229.25) by ORSMSX602.amr.corp.intel.com (10.22.229.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.34; Mon, 20 Nov 2023 23:53:47 -0800 X-Received: from orsmsx601.amr.corp.intel.com (10.22.229.14) by ORSMSX612.amr.corp.intel.com (10.22.229.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.34; Mon, 20 Nov 2023 23:53:47 -0800 X-Received: from ORSEDG602.ED.cps.intel.com (10.7.248.7) by orsmsx601.amr.corp.intel.com (10.22.229.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.34 via Frontend Transport; Mon, 20 Nov 2023 23:53:46 -0800 X-Received: from NAM10-BN7-obe.outbound.protection.outlook.com (104.47.70.100) by edgegateway.intel.com (134.134.137.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.34; Mon, 20 Nov 2023 23:53:46 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=D/JpV5YQ2xj3fB8pmKsS1HuOlKNaOu68/GdnlsXseBeElY246qTWfiH6tk/TKSMNgvi9IqZFUWV2eYjg94qV+rx1rneSb5nAFPveVp5Wqx1r4yVhzQ50PsbkmnOlrkgbRzpPwHmqMSMteCPEq8wQt5zs/iuxmVNtoZyPUVDxxiCWYPgG78u80pcaoztQ0tZHpbX4qkAfgoDBpYrzZnWmfavFR7qnq+LzGDyn6XXSYaI8MlhjSxN9aPsXEuISK+xUo/Jo4Birdhb4SSu6YiA5OgB+zf2rhqo7jQiq1GRD+UW7/VwfTg7o666D+lmeic6vUw8XHzDqgwEOD9+FsM6jow== 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=JW1qW5rFgocPmNcqt3+lKxrVpuHTqaPZ6l8wHkbdRVw=; b=m9QGGCSEq4eTvs8WgB75i144Sm6Zk5ayIXRCSRmerxg1rf7PDouzHRvC6Mwpj7Wty1hDTq/rcZhPvSE1iIzk9tg613gx6VvCnsmqEnRfvZo8NC4BMdTHFfrOT25KAKIVs2/sc6OXDcpE6Inax2phswa7tWHFmStN8WyEACLCy99QI0nL51PTjN6gZxXudDJgQ1C6IKEIp1BoYLcAelMicxm020Zhf8XWZM4pM2Kl5oAnZ1/RaA732dLjTu1kKCERDMLoOE1c1oMa757dhLNq+vcHsLCF0iJLlKVDNTq88Ow9RO0xQcNCdblrVtSMLhDp1iFZa2B/oDrsJoTaoj3R+Q== 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 X-Received: from MN6PR11MB8244.namprd11.prod.outlook.com (2603:10b6:208:470::14) by MW5PR11MB5857.namprd11.prod.outlook.com (2603:10b6:303:19d::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7002.27; Tue, 21 Nov 2023 07:53:44 +0000 X-Received: from MN6PR11MB8244.namprd11.prod.outlook.com ([fe80::b614:1f5e:8b0c:9858]) by MN6PR11MB8244.namprd11.prod.outlook.com ([fe80::b614:1f5e:8b0c:9858%4]) with mapi id 15.20.7002.028; Tue, 21 Nov 2023 07:53:44 +0000 From: "Ni, Ray" To: "Sheng, W" , "devel@edk2.groups.io" CC: "Dong, Eric" , Laszlo Ersek , "Wu, Jiaxin" , "Tan, Dun" Subject: Re: [edk2-devel] [PATCH v6 3/6] UefiCpuPkg: Use CET macro definitions in Cet.inc for SmiEntry.nasm files. Thread-Topic: [PATCH v6 3/6] UefiCpuPkg: Use CET macro definitions in Cet.inc for SmiEntry.nasm files. Thread-Index: AQHaHEjFjUtFakIrxkqnKXhHSW9fz7CEZvFg Date: Tue, 21 Nov 2023 07:53:44 +0000 Message-ID: References: <20231121070246.505-1-w.sheng@intel.com> <20231121070246.505-4-w.sheng@intel.com> In-Reply-To: <20231121070246.505-4-w.sheng@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-ms-traffictypediagnostic: MN6PR11MB8244:EE_|MW5PR11MB5857:EE_ x-ms-office365-filtering-correlation-id: f1b91c58-5c7c-40db-3e3f-08dbea66fc4e x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam-message-info: 0c7vr0EtvwZF0fK5p0Ir4rLXUVsJiyiiN9KnfqnFUnZMzXnj1NseovtEk/VHDZCeJrUW9gjc5+kS0mxAMR2WgOl2urhh7SKIvzM6QD/6BbkXmBcA8iJWja83SE15gldpeXAn1HSce8x5XiVGbYTwDAQoCkqENd/adNDNzX8bktdW4Wlt3NBNO+V7vb4kvfmQG37KZp69GcaD0xnVtUYFHOqMVM2R9cZnWe0fDFc5l+NTLD7zLoDMp2SP8eM1hbpN/XD6GukKvWSYuxPIfFZaMl3716+rlMJTNO1RUZt4EX2x8LqsRDnVCy8wDUG1mRrqtncv5LiY/yaryBK/lo9mzz4ekTU9ErlEtVDMb9Z9sMx0XRuc6RvznJBVLxIyjikzeQK5MJX+oC3at4/sWoarCdYUNlYvDM457ICSjD5ppNsZ//VHqc9GZJosWaxKekJ8fZxm6A6fG+DIoIm6oNPApdtlNHDlz91692j0uWA8fTe6SoujY1asDR+aHLpvw88s/voYaPZsQnZShpbXIAh/Bsr+tc7hDFQ0BzshG39QdNIl7hFDKA0WorFbidVR3SyZeoCvN7YDezeYjdZlNAx4lzt4CgC4prekWkOcHusVi9Wfbw7vTLZZi5uk4K++IycuqdoR11Jp6XylYKenoaL5T/uN1gBKkvKu6Z33m28mfq0= x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?nxaI3IJ7LOgHgSYMyyyrXMX0DC5kqBdxAQGBqRIrM/LFHyt7E8oGbVYv6Nh7?= =?us-ascii?Q?/Cl+hPTZ23AUoLxLx3+YVmA4ARApUyhXvBTZe35xxSm0bFWJrJzIUInL/DZq?= =?us-ascii?Q?Dg3s1FYX7LSP5X/q0FowBoMU9psE066s2Q2vw+6UJG9sOywm7kLHa7u5oTBa?= =?us-ascii?Q?hJ2KzJg1WOaZnoLDMovnw+vwXEFk984jUvyjCXFelWxEBZBB8sUpoKLa2C4y?= =?us-ascii?Q?1laszTtMcZ7Gg9zSL9AzP5vM2sMkCUYPyloX13ZqnXuaPKNr3HsVutYj8i11?= =?us-ascii?Q?JFnFd078mMADWI5zGcTMpGyfHhfGcdeZXL3+php75iOn6+T3ZbrjDe1V1JJV?= =?us-ascii?Q?Sj/lQPDSDxKMhScmv3C39HNJnZohFz29C9nSH3YtypA9PauLLO1fjvWM9ONu?= =?us-ascii?Q?qvll18JnuUPe8C/THV9YOQVG4XQcLo11ZcfZTBitIRfEQaLjJW7GFZxYXBld?= =?us-ascii?Q?7ATpllYmay/CI37UF36xUeaE/pGiTrOJWsuhEPsJONc5ak3zGeMu/IqZGd0z?= =?us-ascii?Q?hH8aXiD32TrviAe1bhlZs578bEuf88Ho7dZ8K9TpZKUPvdTyXX4Y1CIM8AwR?= =?us-ascii?Q?mdGDeLs0OwI9XOo0YqMrFRgBvpqgmZrGJJtoCWdejE5yFJyh/knsUdmVNUAU?= =?us-ascii?Q?45N3I+cpqzkXELkywyRHKkTQjfD28tw5gIOMkpXOp4PhJvqI83HRuYjCTDOI?= =?us-ascii?Q?6CM40bNLKHPSD/YUqQwoS7whjqrvFVjPPJ23H6MUmu0oGySVJ6Y2Bb3rRs9m?= =?us-ascii?Q?6swgLwS3xXJ1H8t3iY1bc/RJicOlgx4yn1Fbq/uCqlpXxe8GJk+zKcogp6Pn?= =?us-ascii?Q?nc59XKwK6hYb4CmxzQN/EF1KIv4HJ/5YYfpWhdbyqQJ+5WtgWIQMchXl9XVx?= =?us-ascii?Q?KJZDR9yrEuMDF//mPbradcQQqa/0FyEiXlFJ9cTmCBOTxjDvDftTbjGNVE5L?= =?us-ascii?Q?YpVkz/PFOWcTDOJSiNQXNagSeIFEX37pGl4S8kLdPmljHwmgDF09pGo5aKQD?= =?us-ascii?Q?07cDzXIGNdqNPANlWI5eMBWvRasL9fMlHSMo/oIvih8aOhkI6HmgDY2Co+8q?= =?us-ascii?Q?pul3V+BThlW8F0KDG98WV/olWU00oyKWPLJNcRfB2mAifqVDes0nKxFPF2Hp?= =?us-ascii?Q?Ppr6KGW8kp9a69SIaTXe3y4f7lV7Mu1l1cKYpqnq20cd1OIUMvrdk7LXbgv+?= =?us-ascii?Q?z5esSKUlFCvSkk1wcBf6u/f6nBVGWwNtsc6/5u9+HfN0xuV/zPnPqKq7xFnh?= =?us-ascii?Q?6pWjYc7CXLdKdCJg4Pn3B0A8xtOqtIBVaO3Vjids4hsRZZsGxSECEHPB50sy?= =?us-ascii?Q?+ifNqncjgL4K+mhpZGMAQyZAZNJfWsogvNPQpShrLFEuxCBeHaCpCpi34oEj?= =?us-ascii?Q?1FKztpgoPqsAgAyI8K2BpOGWpKe4QuoKkRjRiDDdotg0D+kLrJT+Y3ccZqXV?= =?us-ascii?Q?yuONnjt8Jh8vvJaOOZohvrIFVoE4GKRlKo2IhFytcpqkw2XzWtFzkPXSO0ly?= =?us-ascii?Q?d+1F2lbwxx8wMi/YenwGUWEQ9nmNfO9j+GMmaCbCeOtnpU7Vcz4RGnxeDYW7?= =?us-ascii?Q?UgaUZms76oVCVignZJY=3D?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MN6PR11MB8244.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f1b91c58-5c7c-40db-3e3f-08dbea66fc4e X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Nov 2023 07:53:44.3504 (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: s74FqVx+rM3DpJDwoAYzM4/qbsssvyI2+3+Kep2sjjeGmzyU3hb02gwo9IYp83P06TRpoY3wAVA6KKUEehVdyA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW5PR11MB5857 X-OriginatorOrg: intel.com 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 Reply-To: devel@edk2.groups.io,ray.ni@intel.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: 6l0RXgwJ7WSh2DbOw1Z6fdjxx7686176AA= Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=Ierjghcq; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=intel.com (policy=none); spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io Reviewed-by: Ray Ni Thanks, Ray > -----Original Message----- > From: Sheng, W > Sent: Tuesday, November 21, 2023 3:03 PM > To: devel@edk2.groups.io > Cc: Dong, Eric ; Ni, Ray ; Laszlo > Ersek ; Wu, Jiaxin ; Tan, Dun > > Subject: [PATCH v6 3/6] UefiCpuPkg: Use CET macro definitions in Cet.inc = for > SmiEntry.nasm files. >=20 > Signed-off-by: Sheng Wei > Cc: Eric Dong > Cc: Ray Ni > Cc: Laszlo Ersek > Cc: Wu Jiaxin > Cc: Tan Dun > Reviewed-by: Laszlo Ersek > --- > UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiEntry.nasm | 14 +------------- > UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm | 15 +-------------- > 2 files changed, 2 insertions(+), 27 deletions(-) >=20 > diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiEntry.nasm > b/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiEntry.nasm > index 19de5f614e..6368982433 100644 > --- a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiEntry.nasm > +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiEntry.nasm > @@ -15,19 +15,7 @@ >=20 >=20 > %include "StuffRsbNasm.inc" >=20 > %include "Nasm.inc" >=20 > - >=20 > -%define MSR_IA32_S_CET 0x6A2 >=20 > -%define MSR_IA32_CET_SH_STK_EN 0x1 >=20 > -%define MSR_IA32_CET_WR_SHSTK_EN 0x2 >=20 > -%define MSR_IA32_CET_ENDBR_EN 0x4 >=20 > -%define MSR_IA32_CET_LEG_IW_EN 0x8 >=20 > -%define MSR_IA32_CET_NO_TRACK_EN 0x10 >=20 > -%define MSR_IA32_CET_SUPPRESS_DIS 0x20 >=20 > -%define MSR_IA32_CET_SUPPRESS 0x400 >=20 > -%define MSR_IA32_CET_TRACKER 0x800 >=20 > -%define MSR_IA32_PL0_SSP 0x6A4 >=20 > - >=20 > -%define CR4_CET 0x800000 >=20 > +%include "Cet.inc" >=20 >=20 >=20 > %define MSR_IA32_MISC_ENABLE 0x1A0 >=20 > %define MSR_EFER 0xc0000080 >=20 > diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm > b/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm > index d302ca8d01..9a225bc3be 100644 > --- a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm > +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm > @@ -15,25 +15,12 @@ >=20 >=20 > %include "StuffRsbNasm.inc" >=20 > %include "Nasm.inc" >=20 > +%include "Cet.inc" >=20 >=20 >=20 > ; >=20 > ; Variables referenced by C code >=20 > ; >=20 >=20 >=20 > -%define MSR_IA32_S_CET 0x6A2 >=20 > -%define MSR_IA32_CET_SH_STK_EN 0x1 >=20 > -%define MSR_IA32_CET_WR_SHSTK_EN 0x2 >=20 > -%define MSR_IA32_CET_ENDBR_EN 0x4 >=20 > -%define MSR_IA32_CET_LEG_IW_EN 0x8 >=20 > -%define MSR_IA32_CET_NO_TRACK_EN 0x10 >=20 > -%define MSR_IA32_CET_SUPPRESS_DIS 0x20 >=20 > -%define MSR_IA32_CET_SUPPRESS 0x400 >=20 > -%define MSR_IA32_CET_TRACKER 0x800 >=20 > -%define MSR_IA32_PL0_SSP 0x6A4 >=20 > -%define MSR_IA32_INTERRUPT_SSP_TABLE_ADDR 0x6A8 >=20 > - >=20 > -%define CR4_CET 0x800000 >=20 > - >=20 > %define MSR_IA32_MISC_ENABLE 0x1A0 >=20 > %define MSR_EFER 0xc0000080 >=20 > %define MSR_EFER_XD 0x800 >=20 > -- > 2.26.2.windows.1 -=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 (#111527): https://edk2.groups.io/g/devel/message/111527 Mute This Topic: https://groups.io/mt/102724274/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/leave/12367111/7686176/19134562= 12/xyzzy [rebecca@openfw.io] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-