Changeset 92262 in vbox for trunk/src/VBox/ValidationKit

Timestamp:

Nov 8, 2021 11:12:17 AM (3 years ago)

Author:

vboxsync

Message:

ValKit/bs3kit: Added Bs3PagingMapRamAbove4GForLM and made Bs3InitMemory_rm_far produce global variable g_uBs3EndOfRamAbove4G. bugref:10093

Location:

trunk/src/VBox/ValidationKit/bootsectors/bs3kit

Files:

• Makefile.kmk (modified) (2 diffs)
• bs3-cmn-PagingMapRamAbove4GForLM.c (added)
• bs3-rm-InitMemory.c (modified) (2 diffs)
• bs3kit-autostubs.kmk (modified) (2 diffs)
• bs3kit-mangling-code-define.h (modified) (1 diff)
• bs3kit-mangling-code-undef.h (modified) (1 diff)
• bs3kit.h (modified) (2 diffs)

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/Makefile.kmk

@@ -290 +290 @@
 bs3kit-common-32_ASDEFS   = RT_ASMDEFS_INC_FIRST_FILE
 bs3kit-common-32_SOURCES  = $(VBOX_BS3KIT_COMMON_SOURCES) \
+       bs3-cmn-PagingMapRamAbove4GForLM.c \
        bs3-cmn-SwitchHlpConvFlatRetToRetfProtMode.asm \
         bs3-cmn-UInt64Div.c \
@@ -307 +308 @@
 bs3kit-common-64_ASDEFS   = RT_ASMDEFS_INC_FIRST_FILE
 bs3kit-common-64_SOURCES  = $(VBOX_BS3KIT_COMMON_SOURCES) \
+       bs3-cmn-PagingMapRamAbove4GForLM.c \
        bs3-cmn-SwitchHlpConvFlatRetToRetfProtMode.asm \
        bs3-c64-Trap64Generic.asm \

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-rm-InitMemory.c

@@ -94 +94 @@
 
 
-/** The last RAM address below 4GB (approximately). */
+/** The end RAM address below 4GB (approximately). */
 uint32_t                g_uBs3EndOfRamBelow4G = 0;
-
+/** The end RAM address above 4GB, zero if no memory above 4GB. */
+uint64_t                g_uBs3EndOfRamAbove4G = 0;
 
 
@@ -241 +242 @@
         {
             if (Entry.uType == INT15E820_TYPE_USABLE)
+            {
                 if (!(Entry.uBaseAddr >> 32))
                     /* Convert from 64-bit to 32-bit value and record it. */
                     bs3InitMemoryAddRange32((uint32_t)Entry.uBaseAddr,
                                             (Entry.cbRange >> 32) ? UINT32_C(0xfffff000) : (uint32_t)Entry.cbRange);
+                else
+                {
+                    uint64_t uEnd = Entry.uBaseAddr + Entry.cbRange;
+                    if (uEnd > g_uBs3EndOfRamAbove4G)
+                        g_uBs3EndOfRamAbove4G = uEnd;
+                }
+            }
 
             /* next */

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3kit-autostubs.kmk

@@ -49 +49 @@
 $(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3PagingInitRootForPAE)
 $(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3PagingInitRootForPP)
+$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3PagingMapRamAbove4GForLM)
 $(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3PagingProtect)
 $(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3PagingProtectPtr)
@@ -143 +144 @@
 $(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,bs3PagingGetLegacyPte)
 $(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,bs3PagingGetPaePte)
+$(call BS3KIT_FN_GEN_MODE_NEARSTUB,bs3kit-common-16,Bs3BiosInt15hE820)
 $(call BS3KIT_FN_GEN_MODE_NEARSTUB,bs3kit-common-16,Bs3SwitchTo32BitAndCallC)
 $(call BS3KIT_FN_GEN_MODE_NEARSTUB,bs3kit-common-16,Bs3BiosInt15h88)
-$(call BS3KIT_FN_GEN_MODE_NEARSTUB,bs3kit-common-16,Bs3BiosInt15hE820)
 $(call BS3KIT_FN_GEN_MODE_NEARSTUB,bs3kit-common-16,Bs3TrapInit)

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3kit-mangling-code-define.h

@@ -65 +65 @@
 #define Bs3PagingInitRootForPAE BS3_CMN_MANGLER(Bs3PagingInitRootForPAE)
 #define Bs3PagingInitRootForPP BS3_CMN_MANGLER(Bs3PagingInitRootForPP)
+#define Bs3PagingMapRamAbove4GForLM BS3_CMN_MANGLER(Bs3PagingMapRamAbove4GForLM)
 #define Bs3PagingProtect BS3_CMN_MANGLER(Bs3PagingProtect)
 #define Bs3PagingProtectPtr BS3_CMN_MANGLER(Bs3PagingProtectPtr)

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3kit-mangling-code-undef.h

@@ -65 +65 @@
 #undef Bs3PagingInitRootForPAE
 #undef Bs3PagingInitRootForPP
+#undef Bs3PagingMapRamAbove4GForLM
 #undef Bs3PagingProtect
 #undef Bs3PagingProtectPtr

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3kit.h

@@ -2186 +2186 @@
 BS3_CMN_PROTO_STUB(void, Bs3MemPrintInfo, (void));
 
-/** Highes RAM byte below 4G. */
+/** The end RAM address below 4GB (approximately). */
 extern uint32_t  g_uBs3EndOfRamBelow4G;
+/** The end RAM address above 4GB, zero if no memory above 4GB. */
+extern uint64_t  g_uBs3EndOfRamAbove4G;
 
 
@@ -2246 +2248 @@
  */
 BS3_CMN_PROTO_STUB(int, Bs3PagingInitRootForLM,(void));
+
+/**
+ * Maps all RAM above 4GB into the long mode page tables.
+ *
+ * This requires Bs3PagingInitRootForLM to have been called first.
+ *
+ * @returns IPRT status code.
+ * @retval  VERR_WRONG_ORDER if Bs3PagingInitRootForLM wasn't called.
+ * @retval  VINF_ALREADY_INITIALIZED if already called or someone mapped
+ *          something else above 4GiB already.
+ * @retval  VERR_OUT_OF_RANGE if too much RAM (more than 2^47 bytes).
+ * @retval  VERR_NO_MEMORY if no more memory for paging structures.
+ * @retval  VERR_UNSUPPORTED_ALIGNMENT if the bs3kit allocator malfunctioned and
+ *          didn't give us page aligned memory as it should.
+ *
+ * @param   puFailurePoint      Where to return the address where we encountered
+ *                              a failure.  Optional.
+ *
+ * @remarks Must be called in 32-bit or 64-bit mode as paging structures will be
+ *          allocated using BS3MEMKIND_FLAT32, as there might not be sufficient
+ *          BS3MEMKIND_TILED memory around.  (Also, too it's simply too much of
+ *          a bother to deal with 16-bit for something that's long-mode only.)
+ */
+BS3_CMN_PROTO_STUB(int, Bs3PagingMapRamAbove4GForLM,(uint64_t *puFailurePoint));
 
 /**