From nobody Tue May 7 20:52:03 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+72963+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+72963+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1615979212; cv=none; d=zohomail.com; s=zohoarc; b=HZMXUp5LumIt8wk7AlytQw1lGcYCv1QjLi0L1YYTBDnesfoCOIBUT+3tcweIpFyIuzaVuSZgo0WCR2uSTT7vivEfSR7t1C9nK0HlGTfgW5n2di0lSRott3c+wDKzV0J/l7h4Da2t2+ePC+W6DLFCstczWz+ZX6/UOYSy8TtP3Xs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615979212; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=avRNT2zpsDueMPdGJCmSKl8e88Tt25jMgxrrmlFJfn8=; b=lVX49QPIQbNK7LZ4RDgQEx+4Alr+bXvReYLikytMxL7IGz91MAvH1MMxUSf5MItziJh7KjdV8/c9M5TPgkJ7TBGAslBbrsSK/cirFau63mioAjTRgFg+lQd/W07/JzSdb4wKoMW9d83UqzhYX66Jr8D10J4dWCIUNh80XnwisAg= 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+72963+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 161597921205542.755950536058435; Wed, 17 Mar 2021 04:06:52 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id m9Z5YY1788612xiWAyXL0XqB; Wed, 17 Mar 2021 04:06:51 -0700 X-Received: from mga06.intel.com (mga06.intel.com []) by mx.groups.io with SMTP id smtpd.web10.4830.1615979210659892135 for ; Wed, 17 Mar 2021 04:06:51 -0700 IronPort-SDR: wih1w/1StN/CcmPe2VtArrvrsoYnLK5sc7fi7bPPohom5vIQcbX/po5KtzIu6rpECXAd5uSbDD /4OrT/LLNpXw== X-IronPort-AV: E=McAfee;i="6000,8403,9925"; a="250798772" X-IronPort-AV: E=Sophos;i="5.81,256,1610438400"; d="scan'208";a="250798772" X-Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Mar 2021 04:06:50 -0700 IronPort-SDR: /GKPw7GmkpKCKTnNpGt0MfC1xqM/Wo8OUxgFLvH1pSUkcJ8lUWmfS1YbxplwuFvMfHnhfXNH2X yoh2GgGInVNA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,256,1610438400"; d="scan'208";a="379244608" X-Received: from ray-dev.ccr.corp.intel.com ([10.239.158.87]) by fmsmga007.fm.intel.com with ESMTP; 17 Mar 2021 04:06:49 -0700 From: "Ni, Ray" To: devel@edk2.groups.io Cc: Eric Dong , Laszlo Ersek , Rahul Kumar Subject: [edk2-devel] [PATCH v2 1/2] UefiCpuPkg/CpuDxe: Rename variables to follow EDKII coding standard Date: Wed, 17 Mar 2021 19:06:39 +0800 Message-Id: <20210317110640.489-2-ray.ni@intel.com> In-Reply-To: <20210317110640.489-1-ray.ni@intel.com> References: <20210317110640.489-1-ray.ni@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: 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,ray.ni@intel.com X-Gm-Message-State: B93ZZvGk1Nmc5og67usteOpjx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1615979211; bh=zmxWZQvhrXbfdq//GlPJvZFXtCob+AQxRljVjhZbso8=; h=Cc:Date:From:Reply-To:Subject:To; b=W1xoR/IRu0rfv3Pcsyl+W1O6iKmfnG7G/7CmcrDwcSQe+I3LZqAcTQlfr4uAf+0y4sL HmtcoMW14J/1GgJ4SkMlJrkCt5Qw9Og5NW114FRG9FzwE+DWnQSm4ZDowBZEo8sfzAELJ PRek6rTD58FzbHomg9YrGRlWzQj2C6vUDws= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" The change doesn't impact any functionality. Signed-off-by: Ray Ni Cc: Eric Dong Cc: Laszlo Ersek Cc: Rahul Kumar Reviewed-by: Eric Dong Reviewed-by: Laszlo Ersek --- UefiCpuPkg/CpuDxe/CpuGdt.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/UefiCpuPkg/CpuDxe/CpuGdt.c b/UefiCpuPkg/CpuDxe/CpuGdt.c index a1ab543f2d..8847bc4819 100644 --- a/UefiCpuPkg/CpuDxe/CpuGdt.c +++ b/UefiCpuPkg/CpuDxe/CpuGdt.c @@ -2,7 +2,7 @@ C based implementation of IA32 interrupt handling only requiring a minimal assembly interrupt entry point. =20 - Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.
+ Copyright (c) 2006 - 2021, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ @@ -13,7 +13,7 @@ // // Global descriptor table (GDT) Template // -STATIC GDT_ENTRIES GdtTemplate =3D { +STATIC GDT_ENTRIES mGdtTemplate =3D { // // NULL_SEL // @@ -124,27 +124,27 @@ InitGlobalDescriptorTable ( VOID ) { - GDT_ENTRIES *gdt; - IA32_DESCRIPTOR gdtPtr; + GDT_ENTRIES *Gdt; + IA32_DESCRIPTOR Gdtr; =20 // // Allocate Runtime Data for the GDT // - gdt =3D AllocateRuntimePool (sizeof (GdtTemplate) + 8); - ASSERT (gdt !=3D NULL); - gdt =3D ALIGN_POINTER (gdt, 8); + Gdt =3D AllocateRuntimePool (sizeof (mGdtTemplate) + 8); + ASSERT (Gdt !=3D NULL); + Gdt =3D ALIGN_POINTER (Gdt, 8); =20 // // Initialize all GDT entries // - CopyMem (gdt, &GdtTemplate, sizeof (GdtTemplate)); + CopyMem (Gdt, &mGdtTemplate, sizeof (mGdtTemplate)); =20 // // Write GDT register // - gdtPtr.Base =3D (UINT32)(UINTN)(VOID*) gdt; - gdtPtr.Limit =3D (UINT16) (sizeof (GdtTemplate) - 1); - AsmWriteGdtr (&gdtPtr); + Gdtr.Base =3D (UINT32) (UINTN) Gdt; + Gdtr.Limit =3D (UINT16) (sizeof (mGdtTemplate) - 1); + AsmWriteGdtr (&Gdtr); =20 // // Update selector (segment) registers base on new GDT @@ -152,4 +152,3 @@ InitGlobalDescriptorTable ( SetCodeSelector ((UINT16)CPU_CODE_SEL); SetDataSelectors ((UINT16)CPU_DATA_SEL); } - --=20 2.27.0.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 (#72963): https://edk2.groups.io/g/devel/message/72963 Mute This Topic: https://groups.io/mt/81400141/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 7 20:52:03 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+72964+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+72964+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1615979213; cv=none; d=zohomail.com; s=zohoarc; b=eIBvmLYUxqnPVz72dEwMcYGrjIrVbqWGI+CuKFR7fX0kPrFMwgAAGRI0NNziJTP6uXbWyUpnO4xZXDhHFyupAV66MK/e40HwGiU5HPkfzrmYqxb8gqRzDCgBmSnltFWSVy7ONpbEW4z91hDfhDEjrQdd30rmwoqrUb05r3NpxlE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615979213; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=k9Risto0YMjkLTAzACOwd/mZfMjko5PZxWOtsDphtXI=; b=Aib30GuHiIUQsRsv4W7loUkZDnHLO/M//tRzhYS3FfUNGoMwYgXaJ0KNGNk3DLaeJpoZDq/YU+Pg0aLYeQfgkcD1jAkKAyBI5xH0l7vZ12jldOn8HFlLfsjGsrZXSfFv5Lq4SHyeoj00AngZbWkigrbC0DfJdkCcLiePdD5n+Jg= 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+72964+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 161597921305035.203807600145296; Wed, 17 Mar 2021 04:06:53 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id blrnYY1788612xaMdGUkLqD9; Wed, 17 Mar 2021 04:06:52 -0700 X-Received: from mga06.intel.com (mga06.intel.com []) by mx.groups.io with SMTP id smtpd.web10.4830.1615979210659892135 for ; Wed, 17 Mar 2021 04:06:52 -0700 IronPort-SDR: JoRJja70u2IesQDwX9tOd42+PytivuNcJ3HcdSRMymCcVw4m/Wup9XlygtKO+ybDTmRmsYPf7t QM8sMbUkT9Mg== X-IronPort-AV: E=McAfee;i="6000,8403,9925"; a="250798773" X-IronPort-AV: E=Sophos;i="5.81,256,1610438400"; d="scan'208";a="250798773" X-Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Mar 2021 04:06:52 -0700 IronPort-SDR: gMI7Dy0MA1ndoK7XmQs3iw/gdei9QTr7kbBzxRZ4D6yF8hIXp/ni7fSVjr3ZHwIgwsqyZvQtEE zD7cbw4TcYTw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,256,1610438400"; d="scan'208";a="379244623" X-Received: from ray-dev.ccr.corp.intel.com ([10.239.158.87]) by fmsmga007.fm.intel.com with ESMTP; 17 Mar 2021 04:06:50 -0700 From: "Ni, Ray" To: devel@edk2.groups.io Cc: Eric Dong , Laszlo Ersek , Rahul Kumar Subject: [edk2-devel] [PATCH v2 2/2] UefiCpuPkg/CpuDxe: Guarantee GDT is below 4GB Date: Wed, 17 Mar 2021 19:06:40 +0800 Message-Id: <20210317110640.489-3-ray.ni@intel.com> In-Reply-To: <20210317110640.489-1-ray.ni@intel.com> References: <20210317110640.489-1-ray.ni@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: 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,ray.ni@intel.com X-Gm-Message-State: S9rIW4WLbiYDYAYD72WjnsUtx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1615979212; bh=fvJPbkC5M7HO//NEbn6b4+PIAUDmwyHKCjSTA+5IyMo=; h=Cc:Date:From:Reply-To:Subject:To; b=Be41ApaX4pEzQxMElYvWOKcKSi/UNdayW0hzHT80ZZjEnvohod/D4brG5XFgIMqV5jr h/V31omc6kgskg/IlJKGO44B5d6b7t5u3zwoTznUB7xAKQU0r1rK5hyVMWL6U7BLPIw/f v5keJCzYDrafznMjHaZdPnj4qNHvSc9SDZM= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3233 GDT needs to be allocated below 4GB in 64bit environment because AP needs it for entering to protected mode. CPU running in big real mode cannot access above 4GB GDT. But CpuDxe driver contains below code: gdt =3D AllocateRuntimePool (sizeof (GdtTemplate) + 8); ..... gdtPtr.Base =3D (UINT32)(UINTN)(VOID*) gdt; The AllocateRuntimePool() may allocate memory above 4GB. Thus, we cannot use AllocateRuntimePool (), instead, we should use AllocatePages() to make sure GDT is below 4GB space. Signed-off-by: Ray Ni Reviewed-by: Eric Dong Reviewed-by: Laszlo Ersek Cc: Rahul Kumar --- UefiCpuPkg/CpuDxe/CpuGdt.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/UefiCpuPkg/CpuDxe/CpuGdt.c b/UefiCpuPkg/CpuDxe/CpuGdt.c index 8847bc4819..692402c55d 100644 --- a/UefiCpuPkg/CpuDxe/CpuGdt.c +++ b/UefiCpuPkg/CpuDxe/CpuGdt.c @@ -124,15 +124,26 @@ InitGlobalDescriptorTable ( VOID ) { + EFI_STATUS Status; GDT_ENTRIES *Gdt; IA32_DESCRIPTOR Gdtr; + EFI_PHYSICAL_ADDRESS Memory; =20 // - // Allocate Runtime Data for the GDT - // - Gdt =3D AllocateRuntimePool (sizeof (mGdtTemplate) + 8); - ASSERT (Gdt !=3D NULL); - Gdt =3D ALIGN_POINTER (Gdt, 8); + // Allocate Runtime Data below 4GB for the GDT + // AP uses the same GDT when it's waken up from real mode so + // the GDT needs to be below 4GB. + // + Memory =3D SIZE_4GB - 1; + Status =3D gBS->AllocatePages ( + AllocateMaxAddress, + EfiRuntimeServicesData, + EFI_SIZE_TO_PAGES (sizeof (mGdtTemplate)), + &Memory + ); + ASSERT_EFI_ERROR (Status); + ASSERT ((Memory !=3D 0) && (Memory < SIZE_4GB)); + Gdt =3D (GDT_ENTRIES *) (UINTN) Memory; =20 // // Initialize all GDT entries --=20 2.27.0.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 (#72964): https://edk2.groups.io/g/devel/message/72964 Mute This Topic: https://groups.io/mt/81400142/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-