From nobody Wed May 15 18:02:02 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+113936+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+113936+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1705479004; cv=none; d=zohomail.com; s=zohoarc; b=YLWbNR5Zv4ziBUikTdRMlYuLZuvHOWz9KGTBsj0G70eg/RzfDyVXe03gWEddwg68opgNVhgntOB3UyYXsQZY/la1pUXhlb3JMDVv6EjBHDqZBHVM+i39Z8G4WWFwSDepuXy838nsuCbkOBDZCLR62iDDhjwTcBS9CapnFz0WHwY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1705479004; 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=uEG2zAQd2sMXX7glapipfEn4KcWg/42HMqybJJkQy90=; b=f08r49F+ufhzHJ+p1dAL8GTxVrH1jr6kaL15qSvobCg9I0RKkiSEohzaXi7OIUkd0YDX49mL5qJ+86ICgsTfc2HiWPQksQ0YN4pTesT3fnLzXhUo+JjuVaWgOihlnU5GJ4g3KZ8GW8jtSB/o8HStuVUuuem7RJUPrFTyH+TZ7qs= 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+113936+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 1705479004896949.2533737013656; Wed, 17 Jan 2024 00:10:04 -0800 (PST) Return-Path: DKIM-Signature: a=rsa-sha256; bh=C+BLLyaNN7Qhfr2EuUFcu+NCl663NAJHa1YHnBGS2xM=; 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=1705479004; v=1; b=bgEbPKmFMflnB/Wv9oecOy0yFxiOiUd8ugbeMhPY7FCFGOK9e/K9sNbeeip/E+wZzRaVLLvL X2TiPgl8t3QR2ApCoHovGwg1AXwOfecmbHGLlymx/Z6QydjVdzWczCl/CJuLUWwpWndAKObzxP9 eY99KWea9hfTScrQbpZ/Xnj8= X-Received: by 127.0.0.2 with SMTP id dUlSYY1788612xeynkppwbaR; Wed, 17 Jan 2024 00:10:04 -0800 X-Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.10]) by mx.groups.io with SMTP id smtpd.web10.4651.1705479003939318421 for ; Wed, 17 Jan 2024 00:10:04 -0800 X-IronPort-AV: E=McAfee;i="6600,9927,10955"; a="13460539" X-IronPort-AV: E=Sophos;i="6.05,200,1701158400"; d="scan'208";a="13460539" X-Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orvoesa102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Jan 2024 00:10:04 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10955"; a="1031270195" X-IronPort-AV: E=Sophos;i="6.05,200,1701158400"; d="scan'208";a="1031270195" X-Received: from shwdesfp01.ccr.corp.intel.com ([10.239.158.151]) by fmsmga006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Jan 2024 00:10:00 -0800 From: "Zhiguang Liu" To: devel@edk2.groups.io Cc: Zhiguang Liu , Ray Ni , Laszlo Ersek , Rahul Kumar , Gerd Hoffmann , Crystal Lee Subject: [edk2-devel] [PATCH v2] UefiCpuPkg: Fix issue that IsModified is wrongly set in PageTableMap Date: Wed, 17 Jan 2024 16:09:54 +0800 Message-Id: <20240117080954.1414-1-zhiguang.liu@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,zhiguang.liu@intel.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: yoa2kITHIhabKAQZmPnHnaSyx1787277AA= Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1705479005809100001 Content-Type: text/plain; charset="utf-8" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4614 About the IsModified, current function doesn't consider that hardware also may change the pagetable. The issue is that in the first call of internal function PageTableLibMapInLevel, the function assume page table is not changed, and add ASSERT to check. But hardware may change the page table, which cause the ASSERT happens. Fix the issue by considering the hardware may also change page table, and document the detail in function header. Cc: Ray Ni Cc: Laszlo Ersek Cc: Rahul Kumar Cc: Gerd Hoffmann Cc: Crystal Lee Signed-off-by: Zhiguang Liu --- .../Library/CpuPageTableLib/CpuPageTableMap.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/UefiCpuPkg/Library/CpuPageTableLib/CpuPageTableMap.c b/UefiCpu= Pkg/Library/CpuPageTableLib/CpuPageTableMap.c index 36b2c4e6a3..a3076ff2f6 100644 --- a/UefiCpuPkg/Library/CpuPageTableLib/CpuPageTableMap.c +++ b/UefiCpuPkg/Library/CpuPageTableLib/CpuPageTableMap.c @@ -274,7 +274,7 @@ IsAttributesAndMaskValidForNonPresentEntry ( Page table entries that map the linear= address range are reset to 0 before set to the new attribute when a new physical base address is se= t. @param[in] Mask The mask used for attribute. The corre= sponding field in Attribute is ignored if that in Mask is 0. - @param[out] IsModified TRUE means page table is modified. FAL= SE means page table is not modified. + @param[in, out] IsModified Change IsModified to True if page tabl= e is modified and input parameter Modify is TRUE. =20 @retval RETURN_INVALID_PARAMETER For non-present range, Mask->Bits.Pres= ent is 0 but some other attributes are provided. @retval RETURN_INVALID_PARAMETER For non-present range, Mask->Bits.Pres= ent is 1, Attribute->Bits.Present is 1 but some other attributes are not pr= ovided. @@ -567,7 +567,10 @@ PageTableLibMapInLevel ( OriginalCurrentPagingEntry.Uint64 =3D CurrentPagingEntry->Uint64; PageTableLibSetPle (Level, CurrentPagingEntry, Offset, Attribute, = &CurrentMask); =20 - if (OriginalCurrentPagingEntry.Uint64 !=3D CurrentPagingEntry->Uin= t64) { + if (Modify && (OriginalCurrentPagingEntry.Uint64 !=3D CurrentPagin= gEntry->Uint64)) { + // + // The page table entry can be changed by this function only whe= n Modify is true. + // *IsModified =3D TRUE; } } @@ -609,7 +612,10 @@ PageTableLibMapInLevel ( // Check if ParentPagingEntry entry is modified here is enough. Except t= he changes happen in leaf PagingEntry during // the while loop, if there is any other change happens in page table, t= he ParentPagingEntry must has been modified. // - if (OriginalParentPagingEntry.Uint64 !=3D ParentPagingEntry->Uint64) { + if (Modify && (OriginalParentPagingEntry.Uint64 !=3D ParentPagingEntry->= Uint64)) { + // + // The page table entry can be changed by this function only when Modi= fy is true. + // *IsModified =3D TRUE; } =20 @@ -633,7 +639,9 @@ PageTableLibMapInLevel ( Page table entries that map the linear ad= dress range are reset to 0 before set to the new attribute when a new physical base address is set. @param[in] Mask The mask used for attribute. The correspo= nding field in Attribute is ignored if that in Mask is 0. - @param[out] IsModified TRUE means page table is modified. FALSE = means page table is not modified. + @param[out] IsModified TRUE means page table is modified by soft= ware or hardware. FALSE means page table is not modified by software. + If the output IsModified is FALSE, there = is possibility that the page table is changed by hardware. It is ok + because page table can be changed by hard= ware anytime, and caller don't need to Flush TLB. =20 @retval RETURN_UNSUPPORTED PagingMode is not supported. @retval RETURN_INVALID_PARAMETER PageTable, BufferSize, Attribute or Ma= sk is NULL. --=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 (#113936): https://edk2.groups.io/g/devel/message/113936 Mute This Topic: https://groups.io/mt/103781942/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-