[PATCH v3] UefiCpuPkg\CpuSmm: Save & restore CR2 on-demand paging in SMM

[PATCH v3] UefiCpuPkg\CpuSmm: Save & restore CR2 on-demand paging in SMM

[nkvangup]

BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1593

For every SMI occurrence, save and restore CR2 register only when SMM
on-demand paging support is enabled in 64 bit operation mode.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Vanguput Narendra K <narendra.k.vanguput@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Yao Jiewen <jiewen.yao@intel.com>
---
 ...CpuSmm-Save-restore-CR2-on-demand-paging-.patch | 62 ++++++++++++++++++++++
 UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c              | 22 +++++---
 UefiCpuPkg/PiSmmCpuDxeSmm/X64/PageTbl.c            |  2 +-
 3 files changed, 77 insertions(+), 9 deletions(-)
 create mode 100644 0001-UefiCpuPkg-CpuSmm-Save-restore-CR2-on-demand-paging-.patch

diff --git a/0001-UefiCpuPkg-CpuSmm-Save-restore-CR2-on-demand-paging-.patch b/0001-UefiCpuPkg-CpuSmm-Save-restore-CR2-on-demand-paging-.patch
new file mode 100644
index 0000000000..92f5ea0f4f
--- /dev/null
+++ b/0001-UefiCpuPkg-CpuSmm-Save-restore-CR2-on-demand-paging-.patch
@@ -0,0 +1,62 @@
+From 793ab6bf9facbdcd34f4a1e8ccdfdbd1657f594e Mon Sep 17 00:00:00 2001
+From: nkvangup <narendra.k.vanguput@intel.com>
+Date: Tue, 5 Mar 2019 22:43:42 +0530
+Subject: [PATCH v2] UefiCpuPkg\CpuSmm: Save & restore CR2 on-demand paging in
+ SMM
+
+BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1593
+
+For every SMI occurrence, save and restore CR2 register only when SMM
+on-demand paging support is enabled in 64 bit operation mode.
+
+Contributed-under: TianoCore Contribution Agreement 1.1
+Signed-off-by: Vanguput Narendra K <narendra.k.vanguput@intel.com>
+Cc: Eric Dong <eric.dong@intel.com>
+Cc: Ray Ni <ray.ni@intel.com>
+Cc: Laszlo Ersek <lersek@redhat.com>
+Cc: Yao Jiewen <jiewen.yao@intel.com>
+---
+ UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c | 20 ++++++++++++--------
+ 1 file changed, 12 insertions(+), 8 deletions(-)
+
+diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c b/UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c
+index 3b0b3b52ac..5be4a2b020 100644
+--- a/UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c
++++ b/UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c
+@@ -1111,10 +1111,12 @@ SmiRendezvous (
+ 
+   ASSERT(CpuIndex < mMaxNumberOfCpus);
+ 
+-  //
+-  // Save Cr2 because Page Fault exception in SMM may override its value
+-  //
+-  Cr2 = AsmReadCr2 ();
++  if ((sizeof (UINTN) == sizeof (UINT64)) && (!PcdGetBool (PcdCpuSmmStaticPageTable))) {
++    //
++    // Save Cr2 because Page Fault exception in SMM may override its value
++    //
++    Cr2 = AsmReadCr2 ();
++  }
+ 
+   //
+   // Perform CPU specific entry hooks
+@@ -1253,10 +1255,12 @@ SmiRendezvous (
+ 
+ Exit:
+   SmmCpuFeaturesRendezvousExit (CpuIndex);
+-  //
+-  // Restore Cr2
+-  //
+-  AsmWriteCr2 (Cr2);
++  if ((sizeof (UINTN) == sizeof (UINT64)) && (!PcdGetBool (PcdCpuSmmStaticPageTable))) {
++    //
++    // Restore Cr2
++    //
++    AsmWriteCr2 (Cr2);
++  }
+ }
+ 
+ /**
+-- 
+2.16.2.windows.1
+
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c b/UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c
index 3b0b3b52ac..5e3a39a234 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c
@@ -28,6 +28,7 @@ UINTN                                       mSemaphoreSize;
 SPIN_LOCK                                   *mPFLock = NULL;
 SMM_CPU_SYNC_MODE                           mCpuSmmSyncMode;
 BOOLEAN                                     mMachineCheckSupported = FALSE;
+BOOLEAN                                     mCpuSmmStaticPageTable = TRUE;
 
 /**
   Performs an atomic compare exchange operation to get semaphore.
@@ -1111,10 +1112,13 @@ SmiRendezvous (
 
   ASSERT(CpuIndex < mMaxNumberOfCpus);
 
-  //
-  // Save Cr2 because Page Fault exception in SMM may override its value
-  //
-  Cr2 = AsmReadCr2 ();
+    if (!mCpuSmmStaticPageTable) {
+    //
+    // Save and restore Cr2 when using on-demand paging for above 4G memory because Page Fault
+	// exception in SMM may override its value
+    //
+    Cr2 = AsmReadCr2 ();
+  }
 
   //
   // Perform CPU specific entry hooks
@@ -1253,10 +1257,12 @@ SmiRendezvous (
 
 Exit:
   SmmCpuFeaturesRendezvousExit (CpuIndex);
-  //
-  // Restore Cr2
-  //
-  AsmWriteCr2 (Cr2);
+    if (!mCpuSmmStaticPageTable) {
+    //
+    // Restore Cr2
+    //
+    AsmWriteCr2 (Cr2);
+  }
 }
 
 /**
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/PageTbl.c b/UefiCpuPkg/PiSmmCpuDxeSmm/X64/PageTbl.c
index 2c77cb47a4..e444b8a031 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/PageTbl.c
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/X64/PageTbl.c
@@ -21,7 +21,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 LIST_ENTRY                          mPagePool = INITIALIZE_LIST_HEAD_VARIABLE (mPagePool);
 BOOLEAN                             m1GPageTableSupport = FALSE;
-BOOLEAN                             mCpuSmmStaticPageTable;
+extern BOOLEAN                      mCpuSmmStaticPageTable;
 
 /**
   Disable CET.
-- 
2.16.2.windows.1