From nobody Wed May 8 09:24:37 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+44468+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+44468+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1564198171; cv=none; d=zoho.com; s=zohoarc; b=UVAmsHzpiIxg2nCoQhVqTlPiAqn1eqxs+WpeFt3BRaRYGtqLzi26zkRwyA86QnPm9UYxAiLOLuMjP9XNsaN/LTUbrhaotMQJVSQB+f8FxAudvm9/DONXiFlbTV87xDTDMjuFJlR+9UR8ovn288EG1gbmK9b/O4wxMx6orvA9MXg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1564198171; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=gmrU3Fqo0zmmGT2yHsPxaLMgjTxd0A8Ujr9MABNRLO0=; b=Qaya9tCa1UdO2RgyNVEs8zPkY3KZKHXe76NDEC4C2dgRQtu6URDOQtQCPDc/tpolfKdJ331AbzgvrbpscUYZxafOPPtVEr/v3b+BSFlkIupHR7V55WO7EyaLHKn7e3eVJ1/3RPL7YnQ6pEMRkHR3NjsukeECjK377rCKamBZ/X8= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+44468+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 15641981711591000.4915610817076; Fri, 26 Jul 2019 20:29:31 -0700 (PDT) Return-Path: X-Received: from mga09.intel.com (mga09.intel.com []) by groups.io with SMTP; Fri, 26 Jul 2019 20:29:30 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 26 Jul 2019 20:29:29 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,313,1559545200"; d="scan'208";a="194505169" X-Received: from ray-dev.ccr.corp.intel.com ([10.239.9.16]) by fmsmga004.fm.intel.com with ESMTP; 26 Jul 2019 20:29:29 -0700 From: "Ni, Ray" To: devel@edk2.groups.io Cc: Laszlo Ersek Subject: [edk2-devel] [PATCH 1/3] UefiCpuPkg/PiSmmCpu: Add Internal function IsStaticPageTableEnabled Date: Sat, 27 Jul 2019 11:28:48 +0800 Message-Id: <20190727032850.337840-2-ray.ni@intel.com> In-Reply-To: <20190727032850.337840-1-ray.ni@intel.com> References: <20190727032850.337840-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 Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1564198170; bh=yb0c7m4vMLVAe4Uql0Glyp2y2D3x4u4cffYjsuVqh2c=; h=Cc:Date:From:Reply-To:Subject:To; b=WNdzkwNDGhPqaDTWySSKacrsJXp1mPKpR1QvkrGQxp96Z6ok5NI34bZ1c+qhudBoiYH sdfYpgC0fLKCnD41E2aaKi1GKmyboGctmMjj45Xmd9GWMom+yMDoj7XkmjSg3pmw1v+U5 M0ulR5Zk5OX2Hvyq++G/xDIKJ7Hpw7cBImk= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" The internal function reflects the status whether static page table is enabled. Signed-off-by: Ray Ni Cc: Laszlo Ersek Cc: Eric Dong --- UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/PageTbl.c | 16 ++++++++++++++++ UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h | 15 +++++++++++++++ UefiCpuPkg/PiSmmCpuDxeSmm/X64/PageTbl.c | 16 ++++++++++++++++ 3 files changed, 47 insertions(+) diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/PageTbl.c b/UefiCpuPkg/PiSmmCpu= DxeSmm/Ia32/PageTbl.c index 05fb455936..2a9af4b77d 100644 --- a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/PageTbl.c +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/PageTbl.c @@ -28,6 +28,22 @@ EnableCet ( VOID ); =20 +/** + Return whether Static Page Table is enabled. + + Note: Static Page Table is always disabled for IA32 build. + + @retval TRUE Static Page Table is enabled. + @retval FALSE Static Page Table is disabled. +**/ +BOOLEAN +IsStaticPageTableEnabled ( + VOID + ) +{ + return FALSE; +} + /** Create PageTable for SMM use. =20 diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h b/UefiCpuPkg/PiSmmC= puDxeSmm/PiSmmCpuDxeSmm.h index 186809f431..14b7676c16 100644 --- a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h @@ -1267,6 +1267,21 @@ EFIAPI PiSmmCpuSmiEntryFixupAddress ( ); =20 + +/** + Return whether Static Page Table is enabled. + + Note: Static Page Table is always disabled for IA32 build. + + @retval TRUE Static Page Table is enabled. + @retval FALSE Static Page Table is disabled. +**/ +BOOLEAN +IsStaticPageTableEnabled ( + VOID + ) +; + /** This function reads CR2 register when on-demand paging is enabled for 64 bit and no action for 32 bit. diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/PageTbl.c b/UefiCpuPkg/PiSmmCpuD= xeSmm/X64/PageTbl.c index a3b62f7787..18e3f9e08d 100644 --- a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/PageTbl.c +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/X64/PageTbl.c @@ -37,6 +37,22 @@ EnableCet ( VOID ); =20 +/** + Return whether Static Page Table is enabled. + + Note: Static Page Table is always disabled for IA32 build. + + @retval TRUE Static Page Table is enabled. + @retval FALSE Static Page Table is disabled. +**/ +BOOLEAN +IsStaticPageTableEnabled ( + VOID + ) +{ + return mCpuSmmStaticPageTable; +} + /** Check if 1-GByte pages is supported by processor or not. =20 --=20 2.21.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 (#44468): https://edk2.groups.io/g/devel/message/44468 Mute This Topic: https://groups.io/mt/32616001/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 Wed May 8 09:24:37 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+44469+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+44469+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1564198171; cv=none; d=zoho.com; s=zohoarc; b=P+TWa4pq1TJeQj3K6COBOOXhMHw5pNjJjkcX7CtO6MkW+V41umoygB7C8bHydpAbMOv0RYcr8H5KjVYp0Jh0E7dKfQbBKcGEeuroN/nv81znSZsQvH9nRr8ON4lsmox6hoRToVr4NVilJvmC9qf8zuryF6uys7mjOB++s/pDJJo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1564198171; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=oSlZ2u03sR+k0dAvWyCc/O0RhSJ1I7CHDOAb2HusSCA=; b=nDSe5mmkVHNaa00HUTh5tzS5qk8KZzL6ih/LNKZ+6W/MESrs8XzITJfetJB2zpFLyVjuafwklRaPkLtSk/Bk0MYh6HneVHj4Tub5naniGyAd2RPDGPY+zrcE9OJYkZ2eUlKkIChBePyGqLcKWf1qkhaWayGVI4CkdkkyZN0SpMA= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+44469+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1564198171973199.01309369569105; Fri, 26 Jul 2019 20:29:31 -0700 (PDT) Return-Path: X-Received: from mga09.intel.com (mga09.intel.com []) by groups.io with SMTP; Fri, 26 Jul 2019 20:29:31 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 26 Jul 2019 20:29:30 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,313,1559545200"; d="scan'208";a="194505174" X-Received: from ray-dev.ccr.corp.intel.com ([10.239.9.16]) by fmsmga004.fm.intel.com with ESMTP; 26 Jul 2019 20:29:30 -0700 From: "Ni, Ray" To: devel@edk2.groups.io Cc: Eric Dong , Laszlo Ersek , Vanguput Narendra K Subject: [edk2-devel] [PATCH 2/3] UefiCpuPkg/PiSmmCpu: Refine CR2 save/restore logic Date: Sat, 27 Jul 2019 11:28:49 +0800 Message-Id: <20190727032850.337840-3-ray.ni@intel.com> In-Reply-To: <20190727032850.337840-1-ray.ni@intel.com> References: <20190727032850.337840-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 Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1564198171; bh=qplBm0QOPzBYtzjuJF2zQCtBwGoLxnnzHZFk4Q/FAU8=; h=Cc:Date:From:Reply-To:Subject:To; b=f3pkbOU0ut9kZ10F6/EjgyMrtRBZp3zKAXqdaDoO6N7Tyrf+FZjmeK7TRoziR8Y8w9w HZMWhrYqyfODnS27FM4sZK8S9SteKhNiOsYjqoOqIXqED9Q+fdtkgXh17wN6KGVz6AFCF ITc4L4p6i3ZdPtYmlId19qTJR/oO6UVlyXk= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Because IsStaticPageTableEnabled() is added for both IA32 and x64 build, the CR2 save/restore logic can be refined: 1. Remove arch specific SaveCr2() / RestoreCr2() implementation; 2. Conditionally save and restore CR2 in SmiRendezvous(). Signed-off-by: Ray Ni Cc: Eric Dong Cc: Laszlo Ersek Cc: Vanguput Narendra K Reviewed-by: Eric Dong Reviewed-by: Laszlo Ersek --- UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/PageTbl.c | 25 ------------------- UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c | 8 ++++-- UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h | 22 ---------------- UefiCpuPkg/PiSmmCpuDxeSmm/X64/PageTbl.c | 29 ---------------------- 4 files changed, 6 insertions(+), 78 deletions(-) diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/PageTbl.c b/UefiCpuPkg/PiSmmCpu= DxeSmm/Ia32/PageTbl.c index 2a9af4b77d..cae23d6d1d 100644 --- a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/PageTbl.c +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/PageTbl.c @@ -327,28 +327,3 @@ SetPageTableAttributes ( return ; } =20 -/** - This function returns with no action for 32 bit. - - @param[out] *Cr2 Pointer to variable to hold CR2 register value. -**/ -VOID -SaveCr2 ( - OUT UINTN *Cr2 - ) -{ - return ; -} - -/** - This function returns with no action for 32 bit. - - @param[in] Cr2 Value to write into CR2 register. -**/ -VOID -RestoreCr2 ( - IN UINTN Cr2 - ) -{ - return ; -} diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c b/UefiCpuPkg/PiSmmCpuDxe= Smm/MpService.c index ef16997547..5d0124b368 100644 --- a/UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c @@ -1575,7 +1575,9 @@ SmiRendezvous ( // when using on-demand paging for above 4G memory. // Cr2 =3D 0; - SaveCr2 (&Cr2); + if (!IsStaticPageTableEnabled ()) { + Cr2 =3D AsmReadCr2 (); + } =20 // // Call the user register Startup function first. @@ -1725,7 +1727,9 @@ Exit: // // Restore Cr2 // - RestoreCr2 (Cr2); + if (!IsStaticPageTableEnabled ()) { + AsmWriteCr2 (Cr2); + } } =20 /** diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h b/UefiCpuPkg/PiSmmC= puDxeSmm/PiSmmCpuDxeSmm.h index 14b7676c16..5a97733def 100644 --- a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h @@ -1282,28 +1282,6 @@ IsStaticPageTableEnabled ( ) ; =20 -/** - This function reads CR2 register when on-demand paging is enabled - for 64 bit and no action for 32 bit. - - @param[out] *Cr2 Pointer to variable to hold CR2 register value. -**/ -VOID -SaveCr2 ( - OUT UINTN *Cr2 - ); - -/** - This function writes into CR2 register when on-demand paging is enabled - for 64 bit and no action for 32 bit. - - @param[in] Cr2 Value to write into CR2 register. -**/ -VOID -RestoreCr2 ( - IN UINTN Cr2 - ); - /** Schedule a procedure to run on the specified CPU. =20 diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/PageTbl.c b/UefiCpuPkg/PiSmmCpuD= xeSmm/X64/PageTbl.c index 18e3f9e08d..8259b01a95 100644 --- a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/PageTbl.c +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/X64/PageTbl.c @@ -1209,32 +1209,3 @@ SetPageTableAttributes ( return ; } =20 -/** - This function reads CR2 register when on-demand paging is enabled. - - @param[out] *Cr2 Pointer to variable to hold CR2 register value. -**/ -VOID -SaveCr2 ( - OUT UINTN *Cr2 - ) -{ - if (!mCpuSmmStaticPageTable) { - *Cr2 =3D AsmReadCr2 (); - } -} - -/** - This function restores CR2 register when on-demand paging is enabled. - - @param[in] Cr2 Value to write into CR2 register. -**/ -VOID -RestoreCr2 ( - IN UINTN Cr2 - ) -{ - if (!mCpuSmmStaticPageTable) { - AsmWriteCr2 (Cr2); - } -} --=20 2.21.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 (#44469): https://edk2.groups.io/g/devel/message/44469 Mute This Topic: https://groups.io/mt/32616002/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 Wed May 8 09:24:37 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+44470+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+44470+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1564198173; cv=none; d=zoho.com; s=zohoarc; b=EtX85NrsvnnfWim03JVjfhWc502KQbEOh18dKEcmEKWGuV2qhbu0nir8UpZ/dFfn1tkRVIKJ/4+hT2cu0+HyXLgrl5MSEbK15SWeisfwcYYy4FPbSs3P+S90Tnp4weTg2twrFeyoKkWn25dLeuIwS4/VuAM4oPqx2A81LNMzfvU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1564198173; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=NKH/hTkSWYMlnT7MhOk+g3LgCDS6uAQSJBP7X+vDMYI=; b=BU7QxsZl3B0lSOVhvJB8l9N77u0s/pT6gzw0iq3Snz/PQocsodkCA8nXF+CsyQTuUp7oTRcbE4bu6DJrBNUdzgUJylniiBVtzm+kXPIS9nac1+wftJo2pTwkqFrr9vTfW3qg6lEkyE0OnSS8K9a1MGGTZJJo9k8nHnUbc4nQ2pg= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+44470+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1564198173137796.4849951360327; Fri, 26 Jul 2019 20:29:33 -0700 (PDT) Return-Path: X-Received: from mga09.intel.com (mga09.intel.com []) by groups.io with SMTP; Fri, 26 Jul 2019 20:29:32 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 26 Jul 2019 20:29:32 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,313,1559545200"; d="scan'208";a="194505177" X-Received: from ray-dev.ccr.corp.intel.com ([10.239.9.16]) by fmsmga004.fm.intel.com with ESMTP; 26 Jul 2019 20:29:31 -0700 From: "Ni, Ray" To: devel@edk2.groups.io Cc: Eric Dong , Jiewen Yao , Jian J Wang Subject: [edk2-devel] [PATCH 3/3] UefiCpuPkg/PiSmmCpu: Allow SMM access-out when static paging is OFF Date: Sat, 27 Jul 2019 11:28:50 +0800 Message-Id: <20190727032850.337840-4-ray.ni@intel.com> In-Reply-To: <20190727032850.337840-1-ray.ni@intel.com> References: <20190727032850.337840-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 Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1564198172; bh=BYiLIiktP7/AQ5gijAzajJUit9+yf1OL4BQrP8QCA1k=; h=Cc:Date:From:Reply-To:Subject:To; b=B8SosGwqmdzZaqGBBjjF+Ft2sYV20UUcMq6Z8gCS95f3+18PxqgW9LV62hbX2x4p9pE D4Ko6I4jBwhtlXfgOAeNGfLgScywk0BgPArM3J1JjD9eYTWdaS95G8Ka9mVc4lw5PHgET sr18ekiCCaR945NKVpw50akbnQ43YJDFB00= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Commit c60d36b4d1ee1f69b7cca897d3621dfa951895c2 * UefiCpuPkg/SmmCpu: Block access-out only when static paging is used updated page fault handler to treat SMM access-out as allowed address when static paging is not used. But that commit is not complete because the page table is still updated in SetUefiMemMapAttributes() for non-SMRAM memory. When SMM code accesses non-SMRAM memory, page fault is still generated. This patch skips to update page table for non-SMRAM memory and page table itself. Signed-off-by: Ray Ni Cc: Eric Dong Cc: Jiewen Yao Cc: Jian J Wang Acked-by: Laszlo Ersek Reviewed-by: Eric Dong --- UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c b/UefiCpuPkg/PiSmmC= puDxeSmm/PiSmmCpuDxeSmm.c index 69a04dfb23..d7d94c8b6d 100644 --- a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c @@ -1121,6 +1121,9 @@ FindSmramInfo ( *SmrrBase =3D (UINT32)CurrentSmramRange->CpuStart; *SmrrSize =3D (UINT32)CurrentSmramRange->PhysicalSize; =20 + // + // Extend *SmrrBase/*SmrrSize to include adjacent SMRAM ranges + // do { Found =3D FALSE; for (Index =3D 0; Index < mSmmCpuSmramRangeCount; Index++) { @@ -1432,14 +1435,20 @@ PerformRemainingTasks ( SetMemMapAttributes (); =20 // - // For outside SMRAM, we only map SMM communication buffer or MMIO. + // Protect memory outside SMRAM when SMM Static Page Table is enabled. // - SetUefiMemMapAttributes (); + if (IsStaticPageTableEnabled ()) { =20 - // - // Set page table itself to be read-only - // - SetPageTableAttributes (); + // + // For outside SMRAM, we only map SMM communication buffer or MMIO. + // + SetUefiMemMapAttributes (); + + // + // Set page table itself to be read-only + // + SetPageTableAttributes (); + } =20 // // Configure SMM Code Access Check feature if available. --=20 2.21.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 (#44470): https://edk2.groups.io/g/devel/message/44470 Mute This Topic: https://groups.io/mt/32616003/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-