Changeset 60777 in vbox for trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-cmn-PagingProtect.c

Timestamp:

May 2, 2016 8:36:54 AM (9 years ago)

Author:

vboxsync

Message:

bs3kit: Must atomically replace large pages in case of very tiny TLB.

File:

• trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-cmn-PagingProtect.c (modified) (4 diffs)

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-cmn-PagingProtect.c

@@ -32 +32 @@
 #include <iprt/asm-amd64-x86.h>
 #include <iprt/param.h>
-
+                  bs3kit.h
 
 /*********************************************************************************************************************************
@@ -114 +114 @@
                     if (pPT)
                     {
-                        pPD->a[iPde].u = Bs3SelPtrToFlat(pPT)
-                                       | (pPD->a[iPde].u & ~(uint32_t)(X86_PTE_PG_MASK | X86_PDE4M_PS | X86_PDE4M_G | X86_PDE4M_D));
+                        ASMAtomicUoWriteU32(&pPD->a[iPde].u,
+                                              Bs3SelPtrToFlat(pPT)
+                                            | (  pPD->a[iPde].u
+                                               & ~(uint32_t)(X86_PTE_PG_MASK | X86_PDE4M_PS | X86_PDE4M_G | X86_PDE4M_D)));
                         BS3PAGING_DPRINTF2(("bs3PagingGetLegacyPte: iPde=%#x: %#RX32\n", iPde, pPD->a[iPde].u));
                         if (fUseInvlPg)
@@ -181 +183 @@
                     if (pPD)
                     {
-                        pPdpt->a[iPdpte].u = Bs3SelPtrToFlat(pPD)
-                                           | (  pPdpt->a[iPdpte].u
-                                              & ~(uint64_t)(X86_PDPE_PG_MASK | X86_PDE4M_PS | X86_PDE4M_G | X86_PDE4M_D));
+                        ASMAtomicUoWriteU64(&pPdpt->a[iPdpte].u,
+                                              Bs3SelPtrToFlat(pPD)
+                                            | (  pPdpt->a[iPdpte].u
+                                               & ~(uint64_t)(X86_PDPE_PG_MASK | X86_PDE4M_PS | X86_PDE4M_G | X86_PDE4M_D)));
                         if (fUseInvlPg)
                             ASMInvalidatePage(uFlat);
@@ -233 +236 @@
                 if (pPT)
                 {
-                    pPD->a[iPde].u = Bs3SelPtrToFlat(pPT)
-                                   | (pPD->a[iPde].u & ~(uint64_t)(X86_PTE_PAE_PG_MASK | X86_PDE4M_PS | X86_PDE4M_G | X86_PDE4M_D));
+                    ASMAtomicUoWriteU64(&pPD->a[iPde].u,
+                                          Bs3SelPtrToFlat(pPT)
+                                        | (  pPD->a[iPde].u
+                                           & ~(uint64_t)(X86_PTE_PAE_PG_MASK | X86_PDE4M_PS | X86_PDE4M_G | X86_PDE4M_D)));
                     if (fUseInvlPg)
                         ASMInvalidatePage(uFlat);