From nobody Fri May 17 06:07:37 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+113570+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+113570+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1704939094; cv=none; d=zohomail.com; s=zohoarc; b=fvP9DHeKpXmD6DxRf8R5CshQjZ5Ou3vNWt1r4QGzZQxWpi1lsBbVTZydx8dXvNcRSbL+EdLuefI43XlOZLHVleacZPXigF6kpn6DB8jQ/Y7YDHglID2sJdNzaFirwkI0D3wCKZ5rDujnTgtwQnS0dlqGdV/TWyLxYOT/9UL8HlU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1704939094; 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=8fLyDqzxessJMFEsBVHmhVoPUO4FiFGdgojtO8JTD04=; b=JTxxBS2rcM+VeTLZOyx2XIRUXZf95285qWuZsptnc89EgvdLVyT0vaM1tNQ16LCuVW9MV5jOcRuTt+3IGOGKHwc8uRJDhWomdCddty3fCkeFCFp9cpbaQTplgyHgharN9QidYE/kdnFxOx9RECxrIsC2sMjrSh1/IOnu4ZBfFZs= 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+113570+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 1704939094056585.1749151777129; Wed, 10 Jan 2024 18:11:34 -0800 (PST) Return-Path: DKIM-Signature: a=rsa-sha256; bh=MoKSp7WNEsUPUamjqdUDcIm2GuhqikGe0G2fhXKeVEk=; 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=1704939093; v=1; b=ekWbLR1TWJn9vAXHCHfnPufpmd/wIxwBS1QRdZ7V7oI+eC72y69wVvsCwAtPv+KgJXtDdsAc QSjLvciGuRIihzR6oaS3Sm/KZd6X8tdOo5WfCqtXqfo8WRnurApQeO7GbzYyN8KqdFO2hVOYeYw 2/tziyIqyWH5YWibUPkZFo9Q= X-Received: by 127.0.0.2 with SMTP id aWC6YY1788612xWaCzErgxhW; Wed, 10 Jan 2024 18:11:33 -0800 X-Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.115]) by mx.groups.io with SMTP id smtpd.web10.2577.1704939092604802073 for ; Wed, 10 Jan 2024 18:11:33 -0800 X-IronPort-AV: E=McAfee;i="6600,9927,10949"; a="398408042" X-IronPort-AV: E=Sophos;i="6.04,185,1695711600"; d="scan'208";a="398408042" X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Jan 2024 18:11:31 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10949"; a="758592010" X-IronPort-AV: E=Sophos;i="6.04,185,1695711600"; d="scan'208";a="758592010" X-Received: from shwdeopenlab702.ccr.corp.intel.com ([10.239.55.43]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Jan 2024 18:11:29 -0800 From: "duntan" To: devel@edk2.groups.io Cc: Ray Ni , Laszlo Ersek , Rahul Kumar , Gerd Hoffmann Subject: [edk2-devel] [Patch V2] UefiCpuPkg:Limit PhysicalAddressBits in speicial case Date: Thu, 11 Jan 2024 10:11:18 +0800 Message-Id: <20240111021118.1453-1-dun.tan@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,dun.tan@intel.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: YhxcHL6z6ghQgDx2mfEDS9jXx1787277AA= Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1704939095842100003 Content-Type: text/plain; charset="utf-8" When creating smm page table, limit maximum supported physical address bits returned by CalculateMaximumSupportAddress() to 47 if 5-Level Paging is disabled. When 5-Level Paging is disabled and the PhysicalAddressBits retrived from CPU HOB or CpuId is bigger than 47, and since virtual addresses are sign-extended, only [0, 2^47-1] range in 52-bit physical address is mapped in page table. Signed-off-by: Dun Tan Cc: Ray Ni Cc: Laszlo Ersek Cc: Rahul Kumar Cc: Gerd Hoffmann Reviewed-by: Ray Ni --- UefiCpuPkg/PiSmmCpuDxeSmm/X64/PageTbl.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/PageTbl.c b/UefiCpuPkg/PiSmmCpuD= xeSmm/X64/PageTbl.c index ddd9be66b5..35c282a771 100644 --- a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/PageTbl.c +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/X64/PageTbl.c @@ -137,11 +137,13 @@ GetSubEntriesNum ( /** Calculate the maximum support address. =20 + @param[in] Is5LevelPagingNeeded If 5-level paging enabling is needed. + @return the maximum support address. **/ UINT8 CalculateMaximumSupportAddress ( - VOID + BOOLEAN Is5LevelPagingNeeded ) { UINT32 RegEax; @@ -164,6 +166,15 @@ CalculateMaximumSupportAddress ( } } =20 + // + // Only [0, 2^47 -1] in 52-bit physical addresses is mapped in page table + // when 5-Level Paging is disabled. + // + ASSERT (PhysicalAddressBits <=3D 52); + if (!Is5LevelPagingNeeded && (PhysicalAddressBits > 47)) { + PhysicalAddressBits =3D 47; + } + return PhysicalAddressBits; } =20 @@ -197,7 +208,7 @@ SmmInitPageTable ( mCpuSmmRestrictedMemoryAccess =3D PcdGetBool (PcdCpuSmmRestrictedMemoryA= ccess); m1GPageTableSupport =3D Is1GPageSupport (); m5LevelPagingNeeded =3D Is5LevelPagingNeeded (); - mPhysicalAddressBits =3D CalculateMaximumSupportAddress (); + mPhysicalAddressBits =3D CalculateMaximumSupportAddress (m5Leve= lPagingNeeded); PatchInstructionX86 (gPatch5LevelPagingNeeded, m5LevelPagingNeeded, 1); if (m5LevelPagingNeeded) { mPagingMode =3D m1GPageTableSupport ? Paging5Level1GB : Paging5Level; --=20 2.31.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 (#113570): https://edk2.groups.io/g/devel/message/113570 Mute This Topic: https://groups.io/mt/103655312/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-