From nobody Tue May 14 01:59:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+111123+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+111123+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1699856571; cv=none; d=zohomail.com; s=zohoarc; b=XG6rvw+gcdndU907Wg4KdJHTDnN18yLI/5AUkT3Ba5tPSeTjYktEJ71oKCq0GkhJNd8HohR0OOn7jwdVqyiftCitkcjJqnjvj4zrwQfhX9qoYaCArQt6jFJm15xX9eQ/O4Vbw7eXxr4Y3gq0VSx6uIklhQe5a01Fisoc0e9dHEs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1699856571; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=3/4ayvtNAW7LbD+l1OyrYQ8HrdxG22/lQhMpY6Zwk7k=; b=F16O/T4qBtey401Bqj0IN0tjoKVjfOKhY0P/S/+xsAV78w9uqjxVP67ZspJK4k0MG0YH+jqdVegG+divNihCk+XvC4DSaIHpL/p7MnjPhgWscHTTP1d0hxQaBDlboASlpUO/4p7q4wNLKu4zrwOWrCYVorZMau3yW/WBXhyKmAo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+111123+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1699856571104139.21265126997423; Sun, 12 Nov 2023 22:22:51 -0800 (PST) Return-Path: DKIM-Signature: a=rsa-sha256; bh=rkyf5+O/mRC0AjEaLzEBuHJRmS3pHszTBcJ0d2vqi5I=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: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=1699856570; v=1; b=dqv/kKDG+cifdgUl8Q0uV+p6R8IgmhJBBvtoTrQlpwVKPJJ3MMYkolGWArldNk+Hen1oZhjR n7HDvwn9eyE/Q22aKmH+J+JzIGHYuxwljTiefofikBBcVQqVCbu5pe1hEwS3Xrm7sgWsJqRy527 swCQFMBFoIPcX+iCSBOLb90w= X-Received: by 127.0.0.2 with SMTP id 4PMPYY1788612xf6Jb9IoCe5; Sun, 12 Nov 2023 22:22:50 -0800 X-Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) by mx.groups.io with SMTP id smtpd.web10.31729.1699856568636155442 for ; Sun, 12 Nov 2023 22:22:50 -0800 X-IronPort-AV: E=McAfee;i="6600,9927,10892"; a="9028386" X-IronPort-AV: E=Sophos;i="6.03,298,1694761200"; d="scan'208";a="9028386" X-Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Nov 2023 22:22:50 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10892"; a="887849565" X-IronPort-AV: E=Sophos;i="6.03,298,1694761200"; d="scan'208";a="887849565" X-Received: from shwdesssddpdwei.ccr.corp.intel.com ([10.239.157.28]) by orsmga004.jf.intel.com with ESMTP; 12 Nov 2023 22:22:48 -0800 From: "Sheng Wei" To: devel@edk2.groups.io Cc: Eric Dong , Ray Ni , Laszlo Ersek , Wu Jiaxin , Tan Dun Subject: [edk2-devel] [PATCH v4 1/5] UefiCpuPkg: Add macro definitions for CET feature for NASM files. Date: Mon, 13 Nov 2023 14:22:41 +0800 Message-Id: <20231113062245.649-2-w.sheng@intel.com> In-Reply-To: <20231113062245.649-1-w.sheng@intel.com> References: <20231113062245.649-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: 1h7zxBuIpbAyRYLJozQTIC7Zx1787277AA= Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1699856573139100007 Content-Type: text/plain; charset="utf-8" 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/Include/Cet.inc | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 UefiCpuPkg/Include/Cet.inc diff --git a/UefiCpuPkg/Include/Cet.inc b/UefiCpuPkg/Include/Cet.inc new file mode 100644 index 0000000000..a4038a0682 --- /dev/null +++ b/UefiCpuPkg/Include/Cet.inc @@ -0,0 +1,26 @@ +;-------------------------------------------------------------------------= ----- +; +; Copyright (c) 2023, Intel Corporation. All rights reserved.
+; SPDX-License-Identifier: BSD-2-Clause-Patent +; +; Abstract: +; +; This file provides macro definitions for CET feature for NASM files. +; +;-------------------------------------------------------------------------= ----- + +%define MSR_IA32_U_CET 0x6A0 +%define MSR_IA32_S_CET 0x6A2 +%define MSR_IA32_CET_SH_STK_EN 0x1 +%define MSR_IA32_CET_WR_SHSTK_EN 0x2 +%define MSR_IA32_CET_ENDBR_EN 0x4 +%define MSR_IA32_CET_LEG_IW_EN 0x8 +%define MSR_IA32_CET_NO_TRACK_EN 0x10 +%define MSR_IA32_CET_SUPPRESS_DIS 0x20 +%define MSR_IA32_CET_SUPPRESS 0x400 +%define MSR_IA32_CET_TRACKER 0x800 +%define MSR_IA32_PL0_SSP 0x6A4 +%define MSR_IA32_INTERRUPT_SSP_TABLE_ADDR 0x6A8 + +%define CR4_CET_BIT 23 +%define CR4_CET 0x800000 --=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 (#111123): https://edk2.groups.io/g/devel/message/111123 Mute This Topic: https://groups.io/mt/102556833/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Tue May 14 01:59:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+111124+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+111124+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1699856573; cv=none; d=zohomail.com; s=zohoarc; b=ZxCkXkROPfOmXn0X/nUjOFroUln59UY3Un05PvFDBEbgDhvYiGBcse3gPLDQM+GxAqIIVEcfnDgddIPCCizx4Q1xzjkqfSdX9nmBHLAt1/+c2OjYRCmn0eAMln06TWtxknO55YI3QcgTOdNrAPVwwRD8VoV0yFNJb9HGtvq1Zi0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1699856573; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=fha5CY1tlHTI6IY7kgtdrQ6QD5M7ueKn5PdKTH+A7R8=; b=GwlehgKHRB8llwUYNQRFG1J9LDO5AvNAiBGnmMYExioj1OeLqdvBPgSmeSCK5raWpHqTDrGnGSIv66aMH+dF5ndq0KuddUj8sRBNyhrznygi0WMeHHGsyQ3+Qk5L1oILToeeuIbp5d19oeqkNXHgHUw//yDnMV1f7h8JkpStIWM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+111124+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1699856573859952.9600397994182; Sun, 12 Nov 2023 22:22:53 -0800 (PST) Return-Path: DKIM-Signature: a=rsa-sha256; bh=fq4WtJ54fav+1H8UL2unqRUOC7WlQBsTJpDxUBrGqC4=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: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=1699856573; v=1; b=wsd91Urb5LVV2fkKXI/6c3kmaogn3e6VzqrQt3AZI5UhxIosBxtUaF87PJA0sQlDSYk1F2x2 031Bn+3JF8mtlSMAj6Si5dqRkgp2KnT6usMCTvG994TsZsawtu8qvKF85F8HJvrQJ/hoM9axHQ6 63cRk8RIX2rcv7ks9fgn3sXo= X-Received: by 127.0.0.2 with SMTP id fmADYY1788612xIbtozDUPBj; Sun, 12 Nov 2023 22:22:53 -0800 X-Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) by mx.groups.io with SMTP id smtpd.web10.31729.1699856568636155442 for ; Sun, 12 Nov 2023 22:22:53 -0800 X-IronPort-AV: E=McAfee;i="6600,9927,10892"; a="9028392" X-IronPort-AV: E=Sophos;i="6.03,298,1694761200"; d="scan'208";a="9028392" X-Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Nov 2023 22:22:52 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10892"; a="887849601" X-IronPort-AV: E=Sophos;i="6.03,298,1694761200"; d="scan'208";a="887849601" X-Received: from shwdesssddpdwei.ccr.corp.intel.com ([10.239.157.28]) by orsmga004.jf.intel.com with ESMTP; 12 Nov 2023 22:22:50 -0800 From: "Sheng Wei" To: devel@edk2.groups.io Cc: Eric Dong , Ray Ni , Laszlo Ersek , Wu Jiaxin , Tan Dun Subject: [edk2-devel] [PATCH v4 2/5] UefiCpuPkg: Use macro CR4_CET_BIT to replace hard code value in Cet.nasm. Date: Mon, 13 Nov 2023 14:22:42 +0800 Message-Id: <20231113062245.649-3-w.sheng@intel.com> In-Reply-To: <20231113062245.649-1-w.sheng@intel.com> References: <20231113062245.649-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: ZihQvmIHI2FdUxP5ArpbTaVHx1787277AA= Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1699856575164100011 Content-Type: text/plain; charset="utf-8" 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/Cet.nasm | 5 +++-- UefiCpuPkg/PiSmmCpuDxeSmm/X64/Cet.nasm | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/Cet.nasm b/UefiCpuPkg/PiSmmCpuD= xeSmm/Ia32/Cet.nasm index 9d66b9c5da..3d07da1cd4 100644 --- a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/Cet.nasm +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/Cet.nasm @@ -5,6 +5,7 @@ ;-------------------------------------------------------------------------= ------ =20 %include "Nasm.inc" +%include "Cet.inc" =20 SECTION .text =20 @@ -16,7 +17,7 @@ ASM_PFX(DisableCet): incsspd eax =20 mov eax, cr4 - btr eax, 23 ; clear CET + btr eax, CR4_CET_BIT ; clear CET mov cr4, eax ret =20 @@ -24,7 +25,7 @@ global ASM_PFX(EnableCet) ASM_PFX(EnableCet): =20 mov eax, cr4 - bts eax, 23 ; set CET + bts eax, CR4_CET_BIT ; set CET mov cr4, eax =20 ; use jmp to skip the check for ret diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/Cet.nasm b/UefiCpuPkg/PiSmmCpuDx= eSmm/X64/Cet.nasm index 8bbdbb31cc..700aef4703 100644 --- a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/Cet.nasm +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/X64/Cet.nasm @@ -5,6 +5,7 @@ ;-------------------------------------------------------------------------= ------ =20 %include "Nasm.inc" +%include "Cet.inc" =20 DEFAULT REL SECTION .text @@ -17,7 +18,7 @@ ASM_PFX(DisableCet): incsspq rax =20 mov rax, cr4 - btr eax, 23 ; clear CET + btr eax, CR4_CET_BIT ; clear CET mov cr4, rax ret =20 @@ -25,7 +26,7 @@ global ASM_PFX(EnableCet) ASM_PFX(EnableCet): =20 mov rax, cr4 - bts eax, 23 ; set CET + bts eax, CR4_CET_BIT ; set CET mov cr4, rax =20 ; use jmp to skip the check for ret --=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 (#111124): https://edk2.groups.io/g/devel/message/111124 Mute This Topic: https://groups.io/mt/102556834/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Tue May 14 01:59:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+111125+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+111125+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1699856575; cv=none; d=zohomail.com; s=zohoarc; b=DlCUrQYa0AEcJF6+ubRZKQ6eZvq7a2R113NcMcPuwuQxVLkn53HaLb6SdEem04azjVS/JODIp9c1VVIU2htIk8z/wd3Pv6imtP7PQXYNg2AChNPBow6EoFbhWF2GdVnpz8IQ+2FQ2rb+816CNdC2IQiKqYzbSR7y8B+EZjeMHV4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1699856575; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=WD+euMMlsF4Rojx7RrRfJtZJF1dlefg+GUtDmFpe6n0=; b=eoALvcGjm+eo2LsXKJ8RKR6CJxeyY12Vcxokgg09E2cGCzlUnkK6Iewf7EUrsimkxHJ4J2ArQGykfBt04VYgE4MnQyqOdzXAWY5nrpoRP46oClfoNm25Bb9TwHhXDv87sX4hRbp8jLb7udlVmmIrjv0nn28nafk+hGAsoF3KLZ0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+111125+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1699856575165956.1445986955667; Sun, 12 Nov 2023 22:22:55 -0800 (PST) Return-Path: DKIM-Signature: a=rsa-sha256; bh=1NWbZiqXlEfFtRlzzKEVx9vtsqqzJ6lsXsBUbixtscs=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: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=1699856574; v=1; b=ai38y+xirAtybRQZFBgH1A76Rn1UHCJov5Z8xwtBPJ2gWOBHY1hV0pvDG8vDySu/ewPq0aOr 5lve2+Fby+MNEk4XeqqYw6uqcDwSq3nKXsxhqLkbK20p/HXqBS5i36GP+k8FTHHly8fcGt9aWEo QljHUbZKI3zHqAi5BDiQMQ38= X-Received: by 127.0.0.2 with SMTP id sIs4YY1788612x6HT18WfG5D; Sun, 12 Nov 2023 22:22:54 -0800 X-Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) by mx.groups.io with SMTP id smtpd.web10.31729.1699856568636155442 for ; Sun, 12 Nov 2023 22:22:54 -0800 X-IronPort-AV: E=McAfee;i="6600,9927,10892"; a="9028400" X-IronPort-AV: E=Sophos;i="6.03,298,1694761200"; d="scan'208";a="9028400" X-Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Nov 2023 22:22:54 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10892"; a="887849627" X-IronPort-AV: E=Sophos;i="6.03,298,1694761200"; d="scan'208";a="887849627" X-Received: from shwdesssddpdwei.ccr.corp.intel.com ([10.239.157.28]) by orsmga004.jf.intel.com with ESMTP; 12 Nov 2023 22:22:52 -0800 From: "Sheng Wei" To: devel@edk2.groups.io Cc: Eric Dong , Ray Ni , Laszlo Ersek , Wu Jiaxin , Tan Dun Subject: [edk2-devel] [PATCH v4 3/5] UefiCpuPkg: Use CET macro definitions in Cet.inc for SmiEntry.nasm files. Date: Mon, 13 Nov 2023 14:22:43 +0800 Message-Id: <20231113062245.649-4-w.sheng@intel.com> In-Reply-To: <20231113062245.649-1-w.sheng@intel.com> References: <20231113062245.649-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: Hd8wXn1EB7riEIwKrPgaA8qEx1787277AA= Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1699856577183100015 Content-Type: text/plain; charset="utf-8" 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(-) diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiEntry.nasm b/UefiCpuPkg/PiSm= mCpuDxeSmm/Ia32/SmiEntry.nasm index 19de5f614e..6368982433 100644 --- a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiEntry.nasm +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiEntry.nasm @@ -15,19 +15,7 @@ =20 %include "StuffRsbNasm.inc" %include "Nasm.inc" - -%define MSR_IA32_S_CET 0x6A2 -%define MSR_IA32_CET_SH_STK_EN 0x1 -%define MSR_IA32_CET_WR_SHSTK_EN 0x2 -%define MSR_IA32_CET_ENDBR_EN 0x4 -%define MSR_IA32_CET_LEG_IW_EN 0x8 -%define MSR_IA32_CET_NO_TRACK_EN 0x10 -%define MSR_IA32_CET_SUPPRESS_DIS 0x20 -%define MSR_IA32_CET_SUPPRESS 0x400 -%define MSR_IA32_CET_TRACKER 0x800 -%define MSR_IA32_PL0_SSP 0x6A4 - -%define CR4_CET 0x800000 +%include "Cet.inc" =20 %define MSR_IA32_MISC_ENABLE 0x1A0 %define MSR_EFER 0xc0000080 diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm b/UefiCpuPkg/PiSmm= CpuDxeSmm/X64/SmiEntry.nasm index d302ca8d01..9a225bc3be 100644 --- a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm @@ -15,25 +15,12 @@ =20 %include "StuffRsbNasm.inc" %include "Nasm.inc" +%include "Cet.inc" =20 ; ; Variables referenced by C code ; =20 -%define MSR_IA32_S_CET 0x6A2 -%define MSR_IA32_CET_SH_STK_EN 0x1 -%define MSR_IA32_CET_WR_SHSTK_EN 0x2 -%define MSR_IA32_CET_ENDBR_EN 0x4 -%define MSR_IA32_CET_LEG_IW_EN 0x8 -%define MSR_IA32_CET_NO_TRACK_EN 0x10 -%define MSR_IA32_CET_SUPPRESS_DIS 0x20 -%define MSR_IA32_CET_SUPPRESS 0x400 -%define MSR_IA32_CET_TRACKER 0x800 -%define MSR_IA32_PL0_SSP 0x6A4 -%define MSR_IA32_INTERRUPT_SSP_TABLE_ADDR 0x6A8 - -%define CR4_CET 0x800000 - %define MSR_IA32_MISC_ENABLE 0x1A0 %define MSR_EFER 0xc0000080 %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 (#111125): https://edk2.groups.io/g/devel/message/111125 Mute This Topic: https://groups.io/mt/102556836/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Tue May 14 01:59:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+111126+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+111126+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1699856577; cv=none; d=zohomail.com; s=zohoarc; b=W0gNAj9lcFFLitkTUfEKEzHFP9sTdHfaByFtzHdVDIDIC3ZdhOWrVqlmxCtbwk89GIIbBQirTqsDBDkHOLJJ4dm+zmWT5pb7lEsOAgYFeyWJQaSXQSAXX/kF4DTLg7MQzz0pwqUBHqQie+Oa3a4tQ2sHCXiQjoIzT8ys88WVFZU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1699856577; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=/AjEjHUX1Ta0vuHREOqLNVh5jBHJWBVxrOWG1B/aD08=; b=A/tEc2J8dZRcmWeD8XozMfY/fl5PyCe1HU0mMtZK5wK+TcYTqJtV5IRaOf4y2o9IbvlVlDuMATslCwNKOg0j+nqaZrIkDcdyYaE53JBoUJpSPOFa23IFJDwANPt1rKowg1833bgQ2WfjwSftwLj70U0JDng0toSlteqJlWKYFHY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+111126+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1699856577188684.3258632735921; Sun, 12 Nov 2023 22:22:57 -0800 (PST) Return-Path: DKIM-Signature: a=rsa-sha256; bh=C4idJbCYOvm04tk7Ptc3ggvDampqUQVaqM5lreevDeE=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: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=1699856576; v=1; b=R0jMqdXApJ8w8RpImi79dU+iLHh7eDhBIj2bAqEyC7y+kszHqbmpE959EHQSxDecKS0YczIb u+Vd5dD4Q9kTcvDYCPH161t3nSRg7ykALK8y3d4h4MRaFuECZUPbEimKDlDLvEYyhHiplC2wA8f 2q5TaxlrbAdZcFK30zdxh0YY= X-Received: by 127.0.0.2 with SMTP id CESGYY1788612xMCzYffOae9; Sun, 12 Nov 2023 22:22:56 -0800 X-Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) by mx.groups.io with SMTP id smtpd.web10.31729.1699856568636155442 for ; Sun, 12 Nov 2023 22:22:56 -0800 X-IronPort-AV: E=McAfee;i="6600,9927,10892"; a="9028405" X-IronPort-AV: E=Sophos;i="6.03,298,1694761200"; d="scan'208";a="9028405" X-Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Nov 2023 22:22:56 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10892"; a="887849655" X-IronPort-AV: E=Sophos;i="6.03,298,1694761200"; d="scan'208";a="887849655" X-Received: from shwdesssddpdwei.ccr.corp.intel.com ([10.239.157.28]) by orsmga004.jf.intel.com with ESMTP; 12 Nov 2023 22:22:54 -0800 From: "Sheng Wei" To: devel@edk2.groups.io Cc: Eric Dong , Ray Ni , Laszlo Ersek , Wu Jiaxin , Tan Dun Subject: [edk2-devel] [PATCH v4 4/5] UefiCpuPkg: Only change CR4.CET bit for enable and disable CET. Date: Mon, 13 Nov 2023 14:22:44 +0800 Message-Id: <20231113062245.649-5-w.sheng@intel.com> In-Reply-To: <20231113062245.649-1-w.sheng@intel.com> References: <20231113062245.649-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: 5VjY1JFIV98eg6pJrg7VflTHx1787277AA= Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1699856579142100019 Content-Type: text/plain; charset="utf-8" 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 | 10 +++++++--- UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm | 10 +++++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiEntry.nasm b/UefiCpuPkg/PiSm= mCpuDxeSmm/Ia32/SmiEntry.nasm index 6368982433..1da9afab97 100644 --- a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiEntry.nasm +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiEntry.nasm @@ -237,7 +237,9 @@ CetInterruptDone: bts ecx, 16 ; set WP mov cr0, ecx =20 - mov eax, 0x668 | CR4_CET + ; set CR4.CET bit for enable CET + mov eax, cr4 + bts eax, CR4_CET_BIT mov cr4, eax =20 setssbsy @@ -264,8 +266,10 @@ CetDone: cmp al, 0 jz CetDone2 =20 - mov eax, 0x668 - mov cr4, eax ; disable CET + ; clear CR4.CET bit for disable CET + mov eax, cr4 + btr eax, CR4_CET_BIT + mov cr4, eax =20 mov ecx, MSR_IA32_PL0_SSP pop eax diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm b/UefiCpuPkg/PiSmm= CpuDxeSmm/X64/SmiEntry.nasm index 9a225bc3be..abf9f1a90a 100644 --- a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm @@ -263,7 +263,9 @@ CetInterruptDone: bts ecx, 16 ; set WP mov cr0, rcx =20 - mov eax, 0x668 | CR4_CET + ; set CR4.CET bit for enable CET + mov rax, cr4 + bts rax, CR4_CET_BIT mov cr4, rax =20 setssbsy @@ -308,8 +310,10 @@ mCetSupportedAbsAddr: cmp al, 0 jz CetDone2 =20 - mov eax, 0x668 - mov cr4, rax ; disable CET + ; clear CR4.CET bit for disable CET + mov rax, cr4 + btr rax, CR4_CET_BIT + mov cr4, rax =20 mov ecx, MSR_IA32_INTERRUPT_SSP_TABLE_ADDR pop rax --=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 (#111126): https://edk2.groups.io/g/devel/message/111126 Mute This Topic: https://groups.io/mt/102556837/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Tue May 14 01:59:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+111127+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+111127+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1699856580; cv=none; d=zohomail.com; s=zohoarc; b=CUiwfEr1b62zn67qtNi/JbmnGx3C52pwfJHU5FhyE08fqGyh954dFuEzKmmup9UFoaIHIanU0Ji+jUYNwFMlYgA0j1vgGEyn8Ok5kw8x3mM9W3AKWNNQIAS1A/dgjbrLDeuPk0HsOnwjwrLBgVHkmgsPC5z9ty/h2lgFCcHc3LA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1699856580; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=2UiWvRJHs/IxQEXtwPDZOuEzKdgSGmFUdwgkfRemdI0=; b=Ly4mu6dU4eZnr8y4o1AXfD5pmPPUhLR6ga/N4+WVydOpCMEVkIzQ38wZPp4NKJGBzNN+wi/HJ5oOJcsiEhB0gefeMUHICLtvxsnh2510H0CujBxmoRmCh8PydNJu9X5ZPRDMpef+FcAQPuVwQLs/5f+PCqQXfoUh7Uw2JrqIZqw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+111127+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1699856580384757.7050950832028; Sun, 12 Nov 2023 22:23:00 -0800 (PST) Return-Path: DKIM-Signature: a=rsa-sha256; bh=B2TfukVbUS0QNKdT3vo0OmgE5MFmoSgxfnCigUpJOQI=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: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=1699856580; v=1; b=iwfXrtW0J5vwTTZPDoSWgJXkRXg9HJ63Sd+rNgvVzuaZ/NfKwXysqkxkaG6UJn2N3hWFa14x weAULsQcOWvrkjnj6gs4RxTzPGhKMB+bXz484eJK+lIIJ4ttbxBMQG7BnR9h2B3UJQj3WlRJaKG hPfVi7CMSegEQkLnUA7mqUZg= X-Received: by 127.0.0.2 with SMTP id msHZYY1788612xu9r4c0EflG; Sun, 12 Nov 2023 22:23:00 -0800 X-Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) by mx.groups.io with SMTP id smtpd.web10.31729.1699856568636155442 for ; Sun, 12 Nov 2023 22:22:59 -0800 X-IronPort-AV: E=McAfee;i="6600,9927,10892"; a="9028412" X-IronPort-AV: E=Sophos;i="6.03,298,1694761200"; d="scan'208";a="9028412" X-Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Nov 2023 22:22:59 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10892"; a="887849670" X-IronPort-AV: E=Sophos;i="6.03,298,1694761200"; d="scan'208";a="887849670" X-Received: from shwdesssddpdwei.ccr.corp.intel.com ([10.239.157.28]) by orsmga004.jf.intel.com with ESMTP; 12 Nov 2023 22:22:56 -0800 From: "Sheng Wei" To: devel@edk2.groups.io Cc: Eric Dong , Ray Ni , Laszlo Ersek , Wu Jiaxin , Tan Dun Subject: [edk2-devel] [PATCH v4 5/5] UefiCpuPkg: Backup and Restore MSR IA32_U_CET in SMI handler. Date: Mon, 13 Nov 2023 14:22:45 +0800 Message-Id: <20231113062245.649-6-w.sheng@intel.com> In-Reply-To: <20231113062245.649-1-w.sheng@intel.com> References: <20231113062245.649-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: agbXKeTv52nUEBYcCKjbVcOlx1787277AA= Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1699856581281100001 Content-Type: text/plain; charset="utf-8" OS may enable CET-IBT feature by set MSR IA32_U_CET.bit2. If IA32_U_CET.bit2 is set, CPU is in WAIT_FOR_ENDBRANCH state and the next assemble code is not ENDBR, it will trigger #CP exception when set CR4.CET bit. SMI handler needs to backup MSR IA32_U_CET and clear MSR IA32_U_CET before set CR4.CET bit, And SMI handler needs to restore MSR IA32_U_CET when exit SMI handler. 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 | 15 +++++++++++++++ UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm | 15 +++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiEntry.nasm b/UefiCpuPkg/PiSm= mCpuDxeSmm/Ia32/SmiEntry.nasm index 1da9afab97..9e1155dee6 100644 --- a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiEntry.nasm +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiEntry.nasm @@ -202,11 +202,21 @@ ASM_PFX(mPatchCetSupported): push edx push eax =20 + mov ecx, MSR_IA32_U_CET + rdmsr + push edx + push eax + mov ecx, MSR_IA32_PL0_SSP rdmsr push edx push eax =20 + mov ecx, MSR_IA32_U_CET + xor eax, eax + xor edx, edx + wrmsr + mov ecx, MSR_IA32_S_CET mov eax, MSR_IA32_CET_SH_STK_EN xor edx, edx @@ -276,6 +286,11 @@ CetDone: pop edx wrmsr =20 + mov ecx, MSR_IA32_U_CET + pop eax + pop edx + wrmsr + mov ecx, MSR_IA32_S_CET pop eax pop edx diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm b/UefiCpuPkg/PiSmm= CpuDxeSmm/X64/SmiEntry.nasm index abf9f1a90a..881d3177f7 100644 --- a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm @@ -217,6 +217,11 @@ ASM_PFX(mPatchCetSupported): push rdx push rax =20 + mov ecx, MSR_IA32_U_CET + rdmsr + push rdx + push rax + mov ecx, MSR_IA32_PL0_SSP rdmsr push rdx @@ -227,6 +232,11 @@ ASM_PFX(mPatchCetSupported): push rdx push rax =20 + mov ecx, MSR_IA32_U_CET + xor eax, eax + xor edx, edx + wrmsr + mov ecx, MSR_IA32_S_CET mov eax, MSR_IA32_CET_SH_STK_EN xor edx, edx @@ -325,6 +335,11 @@ mCetSupportedAbsAddr: pop rdx wrmsr =20 + mov ecx, MSR_IA32_U_CET + pop rax + pop rdx + wrmsr + mov ecx, MSR_IA32_S_CET pop rax pop rdx --=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 (#111127): https://edk2.groups.io/g/devel/message/111127 Mute This Topic: https://groups.io/mt/102556838/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-