From nobody Wed May 15 10:25:01 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+111035+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+111035+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1699619813; cv=none; d=zohomail.com; s=zohoarc; b=dhFuI5mjsQ/KuD/Fs8E4WjO8R7v/kq5fzIWOXlEGO04Amqvf+un4J5uV9PjgY4kRSwdgXuvGI0dZnw6zk6MMlZCiCLuldfRw9Vsq3j3JEV1V5LR6t1lySWcUKiG0758NPcr5QPRic84Ed7QXPPVJeZNAfqNoU3uRCR12w11vioQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1699619813; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:Sender:Subject:Subject:To:To:Message-Id; bh=jOgTfmg3HkuzRhZHhjo9+WAZpFmalfmELpFMxlPsKDU=; b=ILRjbpnmmQtgCrAvePcQWvUQno9p5ImlD5UJ3nOf+kWr+z5eqsATNcQt0yFkKh+7/FSX5Xh1ojNu5rk6IagrLf2cN0+ISepYBSEWSDfNHkcW++9iBx365ytgd40BZ8GrPhd1uWsbQZe85bVcGrSlXAMJt01kw+55yxDEX7Rca24= 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+111035+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 1699619813416694.7914482074184; Fri, 10 Nov 2023 04:36:53 -0800 (PST) Return-Path: DKIM-Signature: a=rsa-sha256; bh=+fnyZOjcfjBq1tdZoifrPatda8qEq5g2ZCILzpaAe78=; c=relaxed/simple; d=groups.io; h=From:To:Cc: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=1699619813; v=1; b=sdAkaigl1nt1j26gnJPkv+tz2yaszh47udolRv69LxKHZ4SHbqjiMTswnvPbi4JCnk1ausVR 9Kw8rTmJkseyWP76/G/IriFS1T8nAL/sdX+nxpIxcShmmEZF+kiPBLjvqVtJ0HCdOVcsmL2hKd0 +QLH7C5zKb0sbBGA7DF5DuGY= X-Received: by 127.0.0.2 with SMTP id fx37YY1788612xUAJZ2q5Zz3; Fri, 10 Nov 2023 04:36:53 -0800 X-Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.20]) by mx.groups.io with SMTP id smtpd.web11.26345.1699619811822842456 for ; Fri, 10 Nov 2023 04:36:52 -0800 X-IronPort-AV: E=McAfee;i="6600,9927,10889"; a="380566959" X-IronPort-AV: E=Sophos;i="6.03,291,1694761200"; d="scan'208";a="380566959" X-Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Nov 2023 04:36:51 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10889"; a="1095181479" X-IronPort-AV: E=Sophos;i="6.03,291,1694761200"; d="scan'208";a="1095181479" X-Received: from shwdeopenlab813.ccr.corp.intel.com ([10.239.55.230]) by fmsmga005.fm.intel.com with ESMTP; 10 Nov 2023 04:36:48 -0800 From: "Yuanhao Xie" To: devel@edk2.groups.io Cc: Yuanhao Xie , Eric Dong , Ray Ni , Rahul Kumar , Gerd Hoffmann Subject: [edk2-devel] [Patch V2] UefiCpuPkg/MpInitLib: Enable execute disable bit. Date: Fri, 10 Nov 2023 20:36:45 +0800 Message-Id: <20231110123645.1634-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: BT5mTlbXpqbTDs8w59exVSzSx1787277AA= Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1699619815539100003 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 Cc: Eric Dong Cc: Ray Ni Cc: Rahul Kumar Cc: Gerd Hoffmann --- UefiCpuPkg/Library/MpInitLib/MpLib.c | 17 +++++++++++++---- UefiCpuPkg/Library/MpInitLib/MpLib.h | 1 + 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/UefiCpuPkg/Library/MpInitLib/MpLib.c b/UefiCpuPkg/Library/MpIn= itLib/MpLib.c index 9a6ec5db5c..c7527f8662 100644 --- a/UefiCpuPkg/Library/MpInitLib/MpLib.c +++ b/UefiCpuPkg/Library/MpInitLib/MpLib.c @@ -910,11 +910,19 @@ DxeApEntryPoint ( CPU_MP_DATA *CpuMpData ) { - UINTN ProcessorNumber; + UINTN ProcessorNumber; + MSR_IA32_EFER_REGISTER EferMsr; =20 GetProcessorNumber (CpuMpData, &ProcessorNumber); - RestoreVolatileRegisters (&CpuMpData->CpuData[0].VolatileRegisters, FALS= E); InterlockedIncrement ((UINT32 *)&CpuMpData->FinishedCount); + + 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); PlaceAPInMwaitLoopOrRunLoop ( CpuMpData->ApLoopMode, CpuMpData->CpuData[ProcessorNumber].StartupApSignal, @@ -2188,8 +2196,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 (#111035): https://edk2.groups.io/g/devel/message/111035 Mute This Topic: https://groups.io/mt/102505492/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-