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 BCC63D807AB for ; Wed, 15 Nov 2023 04:12:23 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=4yo/fMs+7P6EWnkell2QLIgD/aBxjWNuPQFDRbvV2Z0=; c=relaxed/simple; d=groups.io; h=From:To:Subject:Date:Message-Id:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding; s=20140610; t=1700021542; v=1; b=mE7WlMn9GAk2ZuVAm003MXB7w0ZsMiqJRgnoXOZNvfjtzl5kdTtSjZmGuDYX7IsUI5PV6pEj XEjQF5WNCNkKz7NrUCO3fXxW7DxjiJc86F8Suvg450ds2U+btwuiS4yEy9SPyNOFpjVXdaT7P+J J5iOkSQWDI8OtJFuVg/5tpRI= X-Received: by 127.0.0.2 with SMTP id cSTrYY7687511xWWDH8LuQCL; Tue, 14 Nov 2023 20:12:22 -0800 X-Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.24]) by mx.groups.io with SMTP id smtpd.web10.5844.1700021541097014257 for ; Tue, 14 Nov 2023 20:12:21 -0800 X-IronPort-AV: E=McAfee;i="6600,9927,10894"; a="393666235" X-IronPort-AV: E=Sophos;i="6.03,303,1694761200"; d="scan'208";a="393666235" X-Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Nov 2023 20:12:20 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10894"; a="882266102" X-IronPort-AV: E=Sophos;i="6.03,303,1694761200"; d="scan'208";a="882266102" X-Received: from shwdesssddpdwei.ccr.corp.intel.com ([10.239.157.28]) by fmsmga002.fm.intel.com with ESMTP; 14 Nov 2023 20:12:19 -0800 From: "Sheng Wei" To: devel@edk2.groups.io Subject: [edk2-devel] [PATCH v5 0/6] MdePkg: Add macro definitions for CET feature for NASM files. Date: Wed, 15 Nov 2023 12:12:10 +0800 Message-Id: <20231115041216.2016-1-w.sheng@intel.com> MIME-Version: 1.0 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,w.sheng@intel.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: Kycc04EDCSfFDAwM7FCWZBL4x7686176AA= Content-Transfer-Encoding: 8bit X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=mE7WlMn9; spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=intel.com (policy=none) Patch V5: File cet.inc will be used in both MdePkg UefiCpuPkg. Move cet.inc file from UefiCpuPkg to MdePkg. Use macro CR4_CET_BIT to replace hard code value for both LongJump.nasm and SetJump.nasm. Patch V4: Separate the changes to 5 patches. 1) Add macro definitions for CET feature for NASM files. 2) Use macro CR4_CET_BIT to replace hard code value in Cet.nasm. 3) Use CET macro definitions in Cet.inc for SmiEntry.nasm files. 4) Only change CR4.CET bit for enable/disable CET. 5) Backup and Restore MSR IA32_U_CET in SMI handler. Remove some unused code. It is no need to clear MSR IA32_S_CET, because clear CR4.CET bit will disable all CET functions. Since CET is disabled between clear CR4.CET and run 'rsm', it is no need to delay MSR IA32_S_CET restoration. Patch V3: Remove the 3rd patch. mSmmInterruptSspTables is a global variable. It is unnecessary to initializ it to zero manually. Patch V2: No function change with Patch V1. Split the patch to into 3 separate patches. Sheng Wei (6): MdePkg: Add macro definitions for CET feature for NASM files. UefiCpuPkg: Use macro CR4_CET_BIT to replace hard code value in Cet.nasm. UefiCpuPkg: Use CET macro definitions in Cet.inc for SmiEntry.nasm files. UefiCpuPkg: Only change CR4.CET bit for enable and disable CET. UefiCpuPkg: Backup and Restore MSR IA32_U_CET in SMI handler. MdePkg: Use macro CR4_CET_BIT to replace hard code value. MdePkg/Include/Cet.inc | 26 +++++++++++++ MdePkg/Library/BaseLib/Ia32/LongJump.nasm | 3 +- MdePkg/Library/BaseLib/Ia32/SetJump.nasm | 3 +- MdePkg/Library/BaseLib/X64/LongJump.nasm | 3 +- MdePkg/Library/BaseLib/X64/SetJump.nasm | 3 +- UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/Cet.nasm | 5 ++- UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiEntry.nasm | 39 +++++++++++-------- UefiCpuPkg/PiSmmCpuDxeSmm/X64/Cet.nasm | 5 ++- UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm | 40 +++++++++++--------- 9 files changed, 86 insertions(+), 41 deletions(-) create mode 100644 MdePkg/Include/Cet.inc -- 2.26.2.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#111234): https://edk2.groups.io/g/devel/message/111234 Mute This Topic: https://groups.io/mt/102599348/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-