multiboot: Clean up mmap loop and report correct mmap_length
PATCH 1/1 multiboot: Clean up mmap loop and report correct mmap_length
Previously, the multiboot option ROM set the mmap_length field of the multiboot info structure to the length of the mmap array *excluding* the final element of the array, rather than the total length of the array. The multiboot specification indicates that this is incorrect, and it's incompatible with GRUB's [1] and SYSLINUX's [2] multiboot loaders, which both set mmap_length to the length of the entire mmap array.
This bug is easy to miss: if the VM is configured with 3584 MB of RAM or less, the last E820 entry is simply a reserved region that does not overlap with any other region, so there's no harm in omitting it. However, if it's started with more than 3584 MB of RAM, the memory above the high memory hole appears as the last entry in the E820 map and will be omitted from the multiboot mmap array.
This patch rewrites the loop that constructs the mmap array from the E820 map to simplify it and fix the final mmap_length value.
[1] grub-core/loader/i386/multiboot_mbi.c:grub_multiboot_make_mbi
[2] com32/mboot/mem.c:mboot_make_memmap
--- pc-bios/multiboot.bin | Bin 1024 -> 1024 bytes pc-bios/optionrom/multiboot.S | 25 +++++++++---------------- 2 files changed, 9 insertions(+), 16 deletions(-)
pc-bios/multiboot.bin binary +0 -0
pc-bios/optionrom/multiboot.S +9 -16
@@ -89,41 +89,34 @@ run_multiboot: /* Initialize multiboot mmap structs using int 0x15(e820) */ xor %ebx, %ebx - /* mmap start after first size */ - movl $4, %edi + /* edi = position in mmap struct list */ + movl $0, %edi mmap_loop: /* entry size (mmap struct) & max buffer size (int15) */ movl $20, %ecx /* store entry size */ - /* old as(1) doesn't like this insn so emit the bytes instead: - movl %ecx, %es:-4(%edi) - */ - .dc.b 0x26,0x67,0x66,0x89,0x4f,0xfc + mov %cx, %es:(%di) + add $4, %di /* e820 */ movl $0x0000e820, %eax /* 'SMAP' magic */ movl $0x534d4150, %edx int $0x15 -mmap_check_entry: + /* move entry pointer forward */ + add $20, %di /* last entry? then we're done */ jb mmap_done and %bx, %bx jz mmap_done /* valid entry, so let's loop on */ - -mmap_store_entry: - /* %ax = entry_number * 24 */ - mov $24, %ax - mul %bx - mov %ax, %di - movw %di, %fs:0x2c - /* %di = 4 + (entry_number * 24) */ - add $4, %di jmp mmap_loop mmap_done: + /* update mmap_length in bootinfo */ + movw %di, %fs:0x2c + real_to_prot: /* Load the GDT before going into protected mode */ lgdt:
Signature · 1 line
1.7.10.4
Ping. I never heard back about this bug fix to the multiboot loader.
Quoth myself on Mar 14 at 6:55 pm:
Quoted 27 lines
Previously, the multiboot option ROM set the
mmap_lengthfield of the multiboot info structure to the length of the mmap array *excluding* the final element of the array, rather than the total length of the array. The multiboot specification indicates that this is incorrect, and it's incompatible with GRUB's [1] and SYSLINUX's [2] multiboot loaders, which both setmmap_lengthto the length of the entire mmap array.This bug is easy to miss: if the VM is configured with 3584 MB of RAM or less, the last E820 entry is simply a reserved region that does not overlap with any other region, so there's no harm in omitting it. However, if it's started with more than 3584 MB of RAM, the memory above the high memory hole appears as the last entry in the E820 map and will be omitted from the multiboot mmap array.
This patch rewrites the loop that constructs the mmap array from the E820 map to simplify it and fix the final
mmap_lengthvalue.[1] grub-core/loader/i386/multiboot_mbi.c:grub_multiboot_make_mbi
[2] com32/mboot/mem.c:mboot_make_memmap
Signed-off-by Austin Clements <[email protected]>--- pc-bios/multiboot.bin | Bin 1024 -> 1024 bytes pc-bios/optionrom/multiboot.S | 25 +++++++++---------------- 2 files changed, 9 insertions(+), 16 deletions(-)