From nobody Tue May 14 02:29:40 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+111454+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+111454+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1700456098; cv=none; d=zohomail.com; s=zohoarc; b=GhC9N9wxiPfowplxmzM71R6jP5d12Qg8Vi8afFLhb6gZ3F12UG0DFn9VSteoCwpZ/Rg1M/G4uls3zPyqWHPsHFZC9eLtncn9jT+puvLif79okaIvtJnpUhPg+ETcZpBETmPcrEtvgy9LtRIJcxDftLm4gD5HzXhDo+gGFn5UoKw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1700456098; 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=JpPlwXO0amvbpATWnw/ARybnA3X4t09KLF/w6AzFdEU=; b=C21nu5KMRo1hfo3lM5vJamk3lbT6+vAEA3alPkPl4GQM/C6V0gKDGZYuYbIHdMvqLqW7rrC6DW/oC0N4PTApdIcSJQDEHj2xPDZTWnecfr7gMbeMByThPFTLQ9FkNiTAiT/dfD6G2RzziYJWb+/0o8ft71mUC+4xXDTr7OKvg6M= 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+111454+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 1700456098380621.680601771334; Sun, 19 Nov 2023 20:54:58 -0800 (PST) Return-Path: DKIM-Signature: a=rsa-sha256; bh=Bju3bPxAaiEBUbvjEe8DyriL2f3G/ktjo0qne8qZ1sM=; 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=1700456098; v=1; b=uXMy8uW9AsdSSJFWrYkHN2XGvb4nR6nH4q/0W5zsAFUhj08RbCUmTgofYTy9qnmrpau0o9Hx tXjGPdPhktP3NzQJ0GbvBQN0x4DdtKdEgIXYDZXGVGgdWIVZv5xcP5w2rpWIxULxQQoSFoH6FLC h8BZvGcZ6TYKaOe2/VN8JHT0= X-Received: by 127.0.0.2 with SMTP id 00giYY1788612xcKVPu57TVf; Sun, 19 Nov 2023 20:54:58 -0800 X-Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.65]) by mx.groups.io with SMTP id smtpd.web11.44351.1700456095278275149 for ; Sun, 19 Nov 2023 20:54:57 -0800 X-IronPort-AV: E=McAfee;i="6600,9927,10899"; a="395480359" X-IronPort-AV: E=Sophos;i="6.04,212,1695711600"; d="scan'208";a="395480359" X-Received: from orviesa001.jf.intel.com ([10.64.159.141]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Nov 2023 20:54:57 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.04,212,1695711600"; d="scan'208";a="14040816" X-Received: from shwdeopenlab813.ccr.corp.intel.com ([10.239.55.230]) by orviesa001.jf.intel.com with ESMTP; 19 Nov 2023 20:54:55 -0800 From: "Yuanhao Xie" To: devel@edk2.groups.io Cc: Yuanhao Xie , Laszlo Ersek , Eric Dong , Ray Ni , Rahul Kumar , Gerd Hoffmann Subject: [edk2-devel] [Patch V6 1/2] UefiCpuPkg/MpInitLib: Enable execute disable bit. Date: Mon, 20 Nov 2023 12:54:51 +0800 Message-Id: <20231120045452.2324-2-yuanhao.xie@intel.com> In-Reply-To: <20231120045452.2324-1-yuanhao.xie@intel.com> References: <20231120045452.2324-1-yuanhao.xie@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,yuanhao.xie@intel.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: XhKXUtcgSCbvQAfCUzWkV8iEx1787277AA= Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1700456099446100005 Content-Type: text/plain; charset="utf-8" From: Yuanhao Xie This patch synchronizes the No-Execute bit in the IA32_EFER register for the APs before the RestoreVolatileRegisters operation. The commit 964a4f0, titled "Eliminate the second INIT-SIPI-SIPI sequence," replaces the second INIT-SIPI-SIPI sequence with the BSP calling the SwitchApContext function to initiate a specialized start-up signal, waking up APs in the DXE instead of using INIT-SIPI-SIPI. Due to this change, the logic for "Enable execute disable bit" in MpFuncs.nasm is no longer executed. However, to ensure the proper setup of the page table, it is necessary to synchronize the IA32_EFER.NXE for APs before executing RestoreVolatileRegisters . Based on SDM: If IA32_EFER.NXE is set to 1, it signifies execute-disable, meaning instruction fetches are not allowed from the 4-KByte page controlled by this entry. Conversely, if it is set to 0, it is reserved. Signed-off-by: Yuanhao Xie Reviewed-by: Laszlo Ersek Cc: Laszlo Ersek lersek@redhat.com Cc: Eric Dong Cc: Ray Ni Cc: Rahul Kumar Cc: Gerd Hoffmann Reviewed-by: Ray Ni --- UefiCpuPkg/Library/MpInitLib/MpLib.c | 14 +++++++++++--- UefiCpuPkg/Library/MpInitLib/MpLib.h | 1 + 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/UefiCpuPkg/Library/MpInitLib/MpLib.c b/UefiCpuPkg/Library/MpIn= itLib/MpLib.c index 9a6ec5db5c..f29e66a14f 100644 --- a/UefiCpuPkg/Library/MpInitLib/MpLib.c +++ b/UefiCpuPkg/Library/MpInitLib/MpLib.c @@ -910,9 +910,16 @@ DxeApEntryPoint ( CPU_MP_DATA *CpuMpData ) { - UINTN ProcessorNumber; + UINTN ProcessorNumber; + MSR_IA32_EFER_REGISTER EferMsr; =20 GetProcessorNumber (CpuMpData, &ProcessorNumber); + if (CpuMpData->EnableExecuteDisableForSwitchContext) { + EferMsr.Uint64 =3D AsmReadMsr64 (MSR_IA32_EFER); + EferMsr.Bits.NXE =3D 1; + AsmWriteMsr64 (MSR_IA32_EFER, EferMsr.Uint64); + } + RestoreVolatileRegisters (&CpuMpData->CpuData[0].VolatileRegisters, FALS= E); InterlockedIncrement ((UINT32 *)&CpuMpData->FinishedCount); PlaceAPInMwaitLoopOrRunLoop ( @@ -2188,8 +2195,9 @@ MpInitLibInitialize ( if (MpHandOff->WaitLoopExecutionMode =3D=3D sizeof (VOID *)) { ASSERT (CpuMpData->ApLoopMode !=3D ApInHltLoop); =20 - CpuMpData->FinishedCount =3D 0; - CpuMpData->InitFlag =3D ApInitDone; + CpuMpData->FinishedCount =3D 0; + CpuMpData->InitFlag =3D ApInitDone; + CpuMpData->EnableExecuteDisableForSwitchContext =3D IsBspExecuteDisa= bleEnabled (); SaveCpuMpData (CpuMpData); // // In scenarios where both the PEI and DXE phases run in the same diff --git a/UefiCpuPkg/Library/MpInitLib/MpLib.h b/UefiCpuPkg/Library/MpIn= itLib/MpLib.h index 763db4963d..af296f6ac0 100644 --- a/UefiCpuPkg/Library/MpInitLib/MpLib.h +++ b/UefiCpuPkg/Library/MpInitLib/MpLib.h @@ -270,6 +270,7 @@ struct _CPU_MP_DATA { UINT64 TotalTime; EFI_EVENT WaitEvent; UINTN **FailedCpuList; + BOOLEAN EnableExecuteDisableForSwitchContext; =20 AP_INIT_STATE InitFlag; BOOLEAN SwitchBspFlag; --=20 2.39.1.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 (#111454): https://edk2.groups.io/g/devel/message/111454 Mute This Topic: https://groups.io/mt/102702384/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 02:29:40 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+111455+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+111455+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1700456105; cv=none; d=zohomail.com; s=zohoarc; b=Xhb186T5gRWIpQNYfr51akaLBZ1MBYmYfDU5Wm6PNTmP2C+gjnfn6DfLiWQFFi90t/lZzirgZs/woRvxZZ05cEYo1pvU0gddjejzil/nhhjcx70qyMCCliR9mMpu1Z3eU0n9ajBTtDKs/TjN+urWa45dYxb1YlABfhhjZ9eQYI4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1700456105; 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=m0TtCAtvo/tQ+P7gRqmqe9FPXQdWw/AguaO47eg1V0A=; b=IQP0lIPj1QSoqOBQQCJUui6kOUPw1bMRa+9OPgcAFpNfKFkahmkJ1j2uUd8qPhqqjgYwaCPoBlrSWQafkbQZjBuqGzJGIL5/VeT3twa1uUUkBkuo6+hGlJ9xmavDn8ZxDpihcsHKGb6wov2gv2nruV+HTJxCOg+XBL3e4kq3FpU= 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+111455+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 1700456105567459.3341548924735; Sun, 19 Nov 2023 20:55:05 -0800 (PST) Return-Path: DKIM-Signature: a=rsa-sha256; bh=GQgxy4bVPieNqwEwEOphVOhtqyoQTP+dIcgbr0GNjdQ=; 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=1700456105; v=1; b=QEhY4WvMwvVs5MQa0EJh6r7Cr7fpEfA6fb1C13EdgvNON1dnOe6uTdEB/h/jfNkkIqUKD7An jYGQUuh2kyeDO1K1F1PeWbNqBZlCca0f8/MD4IM4BQRDa9n9zYNYPSzm3jgO8zh1pw/L0JvESH5 RYWk4F/l7FiqIYo9UF2KNrTU= X-Received: by 127.0.0.2 with SMTP id mkCsYY1788612xacvqOhb10i; Sun, 19 Nov 2023 20:55:05 -0800 X-Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.65]) by mx.groups.io with SMTP id smtpd.web11.44351.1700456095278275149 for ; Sun, 19 Nov 2023 20:54:59 -0800 X-IronPort-AV: E=McAfee;i="6600,9927,10899"; a="395480364" X-IronPort-AV: E=Sophos;i="6.04,212,1695711600"; d="scan'208";a="395480364" X-Received: from orviesa001.jf.intel.com ([10.64.159.141]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Nov 2023 20:54:59 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.04,212,1695711600"; d="scan'208";a="14040826" X-Received: from shwdeopenlab813.ccr.corp.intel.com ([10.239.55.230]) by orviesa001.jf.intel.com with ESMTP; 19 Nov 2023 20:54:57 -0800 From: "Yuanhao Xie" To: devel@edk2.groups.io Cc: xieyuanh , Eric Dong , Ray Ni , Rahul Kumar , Gerd Hoffmann Subject: [edk2-devel] [Patch V6 2/2] UefiCpuPkg/MpInitLib: Update the comments of _CPU_MP_DATA. Date: Mon, 20 Nov 2023 12:54:52 +0800 Message-Id: <20231120045452.2324-3-yuanhao.xie@intel.com> In-Reply-To: <20231120045452.2324-1-yuanhao.xie@intel.com> References: <20231120045452.2324-1-yuanhao.xie@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,yuanhao.xie@intel.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: NBlUHdIbL21GpZnhpcBykyeQx1787277AA= Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1700456107448100001 Content-Type: text/plain; charset="utf-8" No functional changes in this patch. Updated the comments of _CPU_MP_DATA to delcared that duplications in CpuMpData are present to avoid to be direct accessed and comprehended in assembly code. CpuMpData: Intended for use in C code while ExchangeInfo are used in assembly code in this module. Signed-off-by: Yuanhao Xie Cc: Laszlo Ersek lersek@redhat.com Cc: Eric Dong Cc: Ray Ni Cc: Rahul Kumar Cc: Gerd Hoffmann --- UefiCpuPkg/Library/MpInitLib/MpLib.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/UefiCpuPkg/Library/MpInitLib/MpLib.h b/UefiCpuPkg/Library/MpIn= itLib/MpLib.h index af296f6ac0..924677d823 100644 --- a/UefiCpuPkg/Library/MpInitLib/MpLib.h +++ b/UefiCpuPkg/Library/MpInitLib/MpLib.h @@ -239,7 +239,11 @@ typedef struct { #pragma pack() =20 // -// CPU MP Data save in memory +// CPU MP Data save in memory, and intended for use in C code. +// There are some duplicated fields, such as XD status, between +// CpuMpData and ExchangeInfo. These duplications in CpuMpData +// are present to avoid to be direct accessed and comprehended +// in assembly code. // struct _CPU_MP_DATA { UINT64 CpuInfoInHob; --=20 2.39.1.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 (#111455): https://edk2.groups.io/g/devel/message/111455 Mute This Topic: https://groups.io/mt/102702385/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-