From nobody Tue May 14 23:56:59 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+97971+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+97971+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1672899680; cv=none; d=zohomail.com; s=zohoarc; b=TdBmcBAbHF3niICjDy7xDgIcrAtbpMsdPj6Wilvn908/gBaQGKFDo1hcTVpce30xgsiDz+JeaFkkO/EYYY/D7w0DVDNXP7JgAAFklVkS886b4B0BHvBauCAaDCQxpoxpd8XJPGcCj6PUWJ/FGQW19vb8NbRc527WEyKfD8ZOyQY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1672899680; h=Content-Transfer-Encoding:Date:From:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=DjAwH95N+vtBiOMz0VglMhNK9PYoYCxDK8NOfp8+7Mw=; b=XcxiEMGXtBQ6wNk/brXF/3yWkdIX8G6nY/1CgZ2ULjIYSz6QxgjJ62nzUF9BIXAHyEu1mOn51dZwEU6e2nLxNfDao9DlTzqyOnsjmVX7i558a3kurRgVmAlK6LbHanzPMg26IsnOnQu3s2PMU0tcW8dQBDN8TgP3khFAW8g0w68= 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+97971+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 1672899680462378.41068712070114; Wed, 4 Jan 2023 22:21:20 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id edViYY1788612xGu2wPidlGS; Wed, 04 Jan 2023 22:21:20 -0800 X-Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by mx.groups.io with SMTP id smtpd.web11.7279.1672899678439664522 for ; Wed, 04 Jan 2023 22:21:19 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10580"; a="408378434" X-IronPort-AV: E=Sophos;i="5.96,302,1665471600"; d="scan'208";a="408378434" X-Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Jan 2023 22:21:18 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10580"; a="657388051" X-IronPort-AV: E=Sophos;i="5.96,302,1665471600"; d="scan'208";a="657388051" X-Received: from shwdeopenlab705.ccr.corp.intel.com ([10.239.182.166]) by fmsmga007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Jan 2023 22:21:17 -0800 From: "Yuanhao Xie" To: devel@edk2.groups.io Subject: [edk2-devel] [PATCH] UefiCpuPkg:Fixed AsmRelocateApLoopStart and ensure allocated memory <4GB Date: Thu, 5 Jan 2023 14:21:08 +0800 Message-Id: <20230105062108.1796-1-yuanhao.xie@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: 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 X-Gm-Message-State: d2IC8koo52QEYapCQ6mNdLUzx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1672899680; bh=7iYL8ds/1RtKwTfCxtTTTqSIhgoZ4Vkyui0APHmKP8E=; h=Date:From:Reply-To:Subject:To; b=iEnjpoK5E9G66w95kqz/LLRYsBFqswRFmpSjhcOpS+NrMSwHbxkBbiTKwQYFTCagCXg w57YBUKVO+QyXuOC/MR73RxJMxhsu1Tex3JrAeQwIkWeH4yUk1AyyNfzCloWNwxMjNcMT /TDbHTorMirSltd4p4vQj951B2v9a8cCEE0= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1672899682180100001 Content-Type: text/plain; charset="utf-8" Kept 4GB allocation limit for the case that APs are still transferred to 32-bit protected mode on long mode DXE. Fixed AsmRelocateApLoopStart stack offset in Ia32. Bugzilla: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4234 Cc: Eric Dong eric.dong@intel.com Cc: Ray Ni ray.ni@intel.com Cc: Rahul Kumar rahul1.kumar@intel.com Signed-off-by: Yuanhao Xie --- UefiCpuPkg/Library/MpInitLib/DxeMpLib.c | 35 ++++++++++++------- .../Library/MpInitLib/Ia32/MpFuncs.nasm | 9 ++--- 2 files changed, 25 insertions(+), 19 deletions(-) diff --git a/UefiCpuPkg/Library/MpInitLib/DxeMpLib.c b/UefiCpuPkg/Library/M= pInitLib/DxeMpLib.c index beab06a5b1..1994ee44c2 100644 --- a/UefiCpuPkg/Library/MpInitLib/DxeMpLib.c +++ b/UefiCpuPkg/Library/MpInitLib/DxeMpLib.c @@ -389,7 +389,7 @@ RelocateApLoop ( MpInitLibWhoAmI (&ProcessorNumber); CpuMpData =3D GetCpuMpData (); MwaitSupport =3D IsMwaitSupport (); - if (StandardSignatureIsAuthenticAMD ()) { + if (StandardSignatureIsAuthenticAMD () && (sizeof (UINTN) =3D=3D sizeof = (UINT64))) { StackStart =3D CpuMpData->UseSevEsAPMethod ? CpuMpData->= SevEsAPResetStackStart : mReservedTopOfApStack; AsmRelocateApLoopFuncAmd =3D (ASM_RELOCATE_AP_LOOP_AMD)(UINTN)mReserve= dApLoopFunc; AsmRelocateApLoopFuncAmd ( @@ -480,6 +480,7 @@ InitMpGlobalData ( EFI_GCD_MEMORY_SPACE_DESCRIPTOR MemDesc; UINTN StackBase; CPU_INFO_IN_HOB *CpuInfoInHob; + EFI_PHYSICAL_ADDRESS Address; =20 SaveCpuMpData (CpuMpData); =20 @@ -536,9 +537,9 @@ InitMpGlobalData ( =20 // // Avoid APs access invalid buffer data which allocated by BootServices, - // so we will allocate reserved data for AP loop code. We also need to - // allocate this buffer below 4GB due to APs may be transferred to 32bit - // protected mode on long mode DXE. + // so we will allocate reserved data for AP loop code. We need to + // allocate this buffer below 4GB for the case that APs are transferred + // to 32-bit protected mode on long mode DXE. // Allocating it in advance since memory services are not available in // Exit Boot Services callback function. // @@ -555,19 +556,25 @@ InitMpGlobalData ( ) ); =20 - mReservedTopOfApStack =3D (UINTN)AllocateReservedPages (EFI_SIZE_TO_PAGE= S (ApSafeBufferSize)); - ASSERT (mReservedTopOfApStack !=3D 0); - ASSERT ((mReservedTopOfApStack & (UINTN)(CPU_STACK_ALIGNMENT - 1)) =3D= =3D 0); - ASSERT ((AP_SAFE_STACK_SIZE & (CPU_STACK_ALIGNMENT - 1)) =3D=3D 0); - - mReservedApLoopFunc =3D (VOID *)(mReservedTopOfApStack + CpuMpData->CpuC= ount * AP_SAFE_STACK_SIZE); - if (StandardSignatureIsAuthenticAMD ()) { + if (StandardSignatureIsAuthenticAMD () && (sizeof (UINTN) =3D=3D sizeof = (UINT64))) { + Address =3D BASE_4GB - 1; + Status =3D gBS->AllocatePages ( + AllocateMaxAddress, + EfiReservedMemoryType, + EFI_SIZE_TO_PAGES (ApSafeBufferSize), + &Address + ); + ASSERT_EFI_ERROR (Status); + mReservedApLoopFunc =3D (VOID *)((UINTN)Address + CpuMpData->CpuCount = * AP_SAFE_STACK_SIZE); CopyMem ( mReservedApLoopFunc, CpuMpData->AddressMap.RelocateApLoopFuncAddressAmd, CpuMpData->AddressMap.RelocateApLoopFuncSizeAmd ); } else { + Address =3D (UINTN)AllocateReservedPages (EFI_SIZE_TO_PAGES (ApSafeBuf= ferSize)); + ASSERT (Address !=3D 0); + mReservedApLoopFunc =3D (VOID *)((UINTN)Address + CpuMpData->CpuCount = * AP_SAFE_STACK_SIZE); CopyMem ( mReservedApLoopFunc, CpuMpData->AddressMap.RelocateApLoopFuncAddress, @@ -575,12 +582,14 @@ InitMpGlobalData ( ); =20 mApPageTable =3D CreatePageTable ( - mReservedTopOfApStack, + (UINTN)Address, ApSafeBufferSize ); } =20 - mReservedTopOfApStack +=3D CpuMpData->CpuCount * AP_SAFE_STACK_SIZE; + mReservedTopOfApStack =3D (UINTN)Address + CpuMpData->CpuCount * AP_SAFE= _STACK_SIZE; + ASSERT ((mReservedTopOfApStack & (UINTN)(CPU_STACK_ALIGNMENT - 1)) =3D= =3D 0); + ASSERT ((AP_SAFE_STACK_SIZE & (CPU_STACK_ALIGNMENT - 1)) =3D=3D 0); =20 Status =3D gBS->CreateEvent ( EVT_TIMER | EVT_NOTIFY_SIGNAL, diff --git a/UefiCpuPkg/Library/MpInitLib/Ia32/MpFuncs.nasm b/UefiCpuPkg/Li= brary/MpInitLib/Ia32/MpFuncs.nasm index bfcdbd31c1..5cffa632ab 100644 --- a/UefiCpuPkg/Library/MpInitLib/Ia32/MpFuncs.nasm +++ b/UefiCpuPkg/Library/MpInitLib/Ia32/MpFuncs.nasm @@ -219,20 +219,17 @@ SwitchToRealProcEnd: RendezvousFunnelProcEnd: =20 ;-------------------------------------------------------------------------= ------------ -; AsmRelocateApLoop (MwaitSupport, ApTargetCState, PmCodeSegment, TopOfAp= Stack, CountTofinish, Pm16CodeSegment, SevEsAPJumpTable, WakeupBuffer); -; -; The last three parameters (Pm16CodeSegment, SevEsAPJumpTable and Wakeup= Buffer) are -; specific to SEV-ES support and are not applicable on IA32. +; AsmRelocateApLoop (MwaitSupport, ApTargetCState, TopOfApStack, CountTof= inish, Cr3); ;-------------------------------------------------------------------------= ------------ AsmRelocateApLoopStart: mov eax, esp - mov esp, [eax + 16] ; TopOfApStack + mov esp, [eax + 12] ; TopOfApStack push dword [eax] ; push return address for stack trace push ebp mov ebp, esp mov ebx, [eax + 8] ; ApTargetCState mov ecx, [eax + 4] ; MwaitSupport - mov eax, [eax + 20] ; CountTofinish + mov eax, [eax + 16] ; CountTofinish lock dec dword [eax] ; (*CountTofinish)-- cmp cl, 1 ; Check mwait-monitor support jnz HltLoop --=20 2.36.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 (#97971): https://edk2.groups.io/g/devel/message/97971 Mute This Topic: https://groups.io/mt/96067843/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-