From nobody Mon May 6 13:12:56 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+72855+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+72855+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1615865645; cv=none; d=zohomail.com; s=zohoarc; b=Sci49uveA+RX7ds21NA0co6J2miMH1epsz2cDYJ1FerFxm5Tx2qvjdvTQYwoFZf2mZppwEDBpgWFnYtK3s9LWOuY/tIhC8HPlqYteAXWJC87Tb8nnbPwM0DuHGyh73ag2dEj/VUzhQaTgpt/k5OwTJqA04xl4swIyh6NP4pJApc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615865645; 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=FOfCMT+Gqk12nvz16lbTHM34yY2CgJUi7YJdomFZuDE=; b=FQ9FulqZkN5tqyhsdrXCkuWGUcbMaE7CLr5nek2HDp2Hu0OcCUL4+pE5ZnbrSiNRf/5Y2yfdX/uUlyt1Sk+o2CnighuopyWqr4VOXK5QCyeevjlXiXwznsiX+snlsEzp1DFPlgudQ+lXujdffBJGpdchRS/g0d1IoaFL/ehpBL8= 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+72855+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 1615865645280266.0343090695934; Mon, 15 Mar 2021 20:34:05 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id sArHYY1788612x9IFDyayrnV; Mon, 15 Mar 2021 20:34:04 -0700 X-Received: from mga06.intel.com (mga06.intel.com []) by mx.groups.io with SMTP id smtpd.web08.3799.1615865640867281038 for ; Mon, 15 Mar 2021 20:34:04 -0700 IronPort-SDR: qX0NpT/BeuO1mX+Epuzf0PMZYGP5C+m/nS+LQcolg4EpNb6Pk0f1hAR87er9yU6aGdbS8Pq6hd e11mtDSoEOFg== X-IronPort-AV: E=McAfee;i="6000,8403,9924"; a="250557998" X-IronPort-AV: E=Sophos;i="5.81,251,1610438400"; d="scan'208";a="250557998" X-Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Mar 2021 20:34:04 -0700 IronPort-SDR: 8qASAEox/mZ4f6KjcLpaxUZfCzoi/dfuF9z7oCgEdW1jFVx5R7tqr1jgDV1nQzQyOdiTpBKFA+ 36a4Ofy/OqIQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,251,1610438400"; d="scan'208";a="605098120" X-Received: from ray-dev.ccr.corp.intel.com ([10.239.158.87]) by fmsmga005.fm.intel.com with ESMTP; 15 Mar 2021 20:33:59 -0700 From: "Ni, Ray" To: devel@edk2.groups.io Cc: Eric Dong , Laszlo Ersek , Rahul Kumar Subject: [edk2-devel] [PATCH 1/2] UefiCpuPkg/CpuDxe: Rename variables to follow EDKII coding standard Date: Tue, 16 Mar 2021 11:33:49 +0800 Message-Id: <20210316033350.2026-2-ray.ni@intel.com> In-Reply-To: <20210316033350.2026-1-ray.ni@intel.com> References: <20210316033350.2026-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: 40B7N1CqG8r6qTCqj2XLBCJex1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1615865644; bh=K9OQGeH29xZ89vfwFEi/8MJL7fLvlvGVvFW2odOOn4I=; h=Cc:Date:From:Reply-To:Subject:To; b=jp0AJzU14t1pCD6DKuAkLVDenxE9GYPvur/vtSKZJpwjj61Van7TVxZ0+KC6L1AnZBP h1/eLo1MZ3yNmvVmOGs6kTN1K4IG2j/LYkgzMzsxYtBn47wVr8yHEG2ryqNMzKcA4h1mW kpGZKonAtT7/aPjMBOHAZVrYZK+gLwKPB9w= 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 --- UefiCpuPkg/CpuDxe/CpuGdt.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/UefiCpuPkg/CpuDxe/CpuGdt.c b/UefiCpuPkg/CpuDxe/CpuGdt.c index a1ab543f2d..322ce87142 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 gGdtTemplate =3D { // // NULL_SEL // @@ -124,32 +124,31 @@ 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 (gGdtTemplate) + 8); + ASSERT (Gdt !=3D NULL); + Gdt =3D ALIGN_POINTER (Gdt, 8); =20 // // Initialize all GDT entries // - CopyMem (gdt, &GdtTemplate, sizeof (GdtTemplate)); + CopyMem (Gdt, &gGdtTemplate, sizeof (gGdtTemplate)); =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 (gGdtTemplate) - 1); + AsmWriteGdtr (&Gdtr); =20 // // Update selector (segment) registers base on new GDT // - SetCodeSelector ((UINT16)CPU_CODE_SEL); - SetDataSelectors ((UINT16)CPU_DATA_SEL); + 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 (#72855): https://edk2.groups.io/g/devel/message/72855 Mute This Topic: https://groups.io/mt/81368664/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 Mon May 6 13:12:56 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+72856+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+72856+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1615865646; cv=none; d=zohomail.com; s=zohoarc; b=hPNZal5A0a7azWXOifh6pagD38H3/MfFhzSeUIDsZlObAR5OlpxLjkalpDv5v8KgDOQHAZ5F3s5WdSI2SUnzXDm+PIjGjEQuwxXr/LsvKQAHuRZWC1PavXVjSWvYGD/luTUBl9P2znLtPNE0cX6ptnqWWGrkTfdBtzEy/ky+Fzg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615865646; 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=CFVW0/bVCxIBbbWrH132NtgK/unSFqK+bIJyDPmX4OY=; b=VyTQuFPNFm3o2sK0p4Dx8GqGDF+mNMaK4/pmNOf6G3fM5DzsBjJaDHFWPnBjYhy6GhO+17AAbNIX0VW+Ugp5zVNnhB4iZ77Y3eUv2p6jqvaRqt7owETFIEA2Ou0WHG4VCBFtx6woFNjfK0hisND1IdCwJYiCpSec0O/kq/ZKbf0= 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+72856+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 1615865646785289.4988044393393; Mon, 15 Mar 2021 20:34:06 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 2n6RYY1788612x0uwFaENP0Z; Mon, 15 Mar 2021 20:34:06 -0700 X-Received: from mga06.intel.com (mga06.intel.com []) by mx.groups.io with SMTP id smtpd.web08.3799.1615865640867281038 for ; Mon, 15 Mar 2021 20:34:05 -0700 IronPort-SDR: wEz4WkUkalIOe80ktJXDYvmu24f+9e0xVNP9xiW51HhG1cK10vD7CvGCs9FgOUmw06uIbnN49t ZMNUeA9nKBhg== X-IronPort-AV: E=McAfee;i="6000,8403,9924"; a="250558003" X-IronPort-AV: E=Sophos;i="5.81,251,1610438400"; d="scan'208";a="250558003" X-Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Mar 2021 20:34:05 -0700 IronPort-SDR: b1bzIkxtuHQnyO1Jw1KMpFRjZIpjPoETd3lN7L7XpI4u3ucpC6ohOuymjWRWRBZOTyYW1Ci8K7 bK9INailnoIw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,251,1610438400"; d="scan'208";a="605098151" X-Received: from ray-dev.ccr.corp.intel.com ([10.239.158.87]) by fmsmga005.fm.intel.com with ESMTP; 15 Mar 2021 20:34:01 -0700 From: "Ni, Ray" To: devel@edk2.groups.io Cc: Eric Dong , Laszlo Ersek , Rahul Kumar Subject: [edk2-devel] [PATCH 2/2] UefiCpuPkg/CpuDxe: Guarantee GDT is below 4GB Date: Tue, 16 Mar 2021 11:33:50 +0800 Message-Id: <20210316033350.2026-3-ray.ni@intel.com> In-Reply-To: <20210316033350.2026-1-ray.ni@intel.com> References: <20210316033350.2026-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: G6ls8Skc911UgNCkBc6QmCNrx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1615865646; bh=SZPzB1eBauYZqfnYp4SeCMZGEiT0EST6RyeL3woDwOA=; h=Cc:Date:From:Reply-To:Subject:To; b=sNfC72nFJzuWVne0FTFUzS4pm1FiYb05iMjJEX7/I8eEUOxIEbRYO0oxhue3QRdG6Fi OfCBmYgFZZenWsWnv0RaqzmsSX7qcp950mI6Si7vUrBVZmad5+fogUMSkxc3rMpw0t4aN otBEGh/f6spAlqJBWzPTeMJ9H31RIo8NTC0= 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 Cc: Eric Dong Cc: Laszlo Ersek Cc: Rahul Kumar Reviewed-by: Eric Dong Reviewed-by: Laszlo Ersek --- 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 322ce87142..98d5551702 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 (gGdtTemplate) + 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 (gGdtTemplate)), + &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 (#72856): https://edk2.groups.io/g/devel/message/72856 Mute This Topic: https://groups.io/mt/81368665/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-