| Message ID | 20180129204344.196196-1-anatol.pomozov@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/4] multiboot: Change multiboot_info from array of bytes to a C struct | expand |
Hi Anatol and Kevin. Even though I am new to Qemu, I have a patch to deliver for multiboot.c (as you know) and so I feel familiar enough to do a review of this patch. One comment is probably more for maintainers. Comments inline... On 01/29/18 12:43, Anatol Pomozov wrote: > Using C structs makes the code more readable and prevents type conversion > errors. > > Borrow multiboot1 header from GRUB project. > > Signed-off-by: Anatol Pomozov <anatol.pomozov@gmail.com> > --- > hw/i386/multiboot.c | 124 +++++++++------------ > hw/i386/multiboot_header.h | 254 ++++++++++++++++++++++++++++++++++++++++++++ > tests/multiboot/mmap.c | 14 +-- > tests/multiboot/mmap.out | 10 ++ > tests/multiboot/modules.c | 12 ++- > tests/multiboot/modules.out | 10 ++ > tests/multiboot/multiboot.h | 66 ------------ > 7 files changed, 339 insertions(+), 151 deletions(-) > create mode 100644 hw/i386/multiboot_header.h > delete mode 100644 tests/multiboot/multiboot.h > > diff --git a/hw/i386/multiboot.c b/hw/i386/multiboot.c > index c7b70c91d5..c6d05ca46b 100644 > --- a/hw/i386/multiboot.c > +++ b/hw/i386/multiboot.c > @@ -28,6 +28,7 @@ > #include "hw/hw.h" > #include "hw/nvram/fw_cfg.h" > #include "multiboot.h" > +#include "multiboot_header.h" > #include "hw/loader.h" > #include "elf.h" > #include "sysemu/sysemu.h" > @@ -47,39 +48,9 @@ > #error multiboot struct needs to fit in 16 bit real mode > #endif > > -enum { > - /* Multiboot info */ > - MBI_FLAGS = 0, > - MBI_MEM_LOWER = 4, > - MBI_MEM_UPPER = 8, > - MBI_BOOT_DEVICE = 12, > - MBI_CMDLINE = 16, > - MBI_MODS_COUNT = 20, > - MBI_MODS_ADDR = 24, > - MBI_MMAP_ADDR = 48, > - MBI_BOOTLOADER = 64, > - > - MBI_SIZE = 88, > - > - /* Multiboot modules */ > - MB_MOD_START = 0, > - MB_MOD_END = 4, > - MB_MOD_CMDLINE = 8, > - > - MB_MOD_SIZE = 16, > - > - /* Region offsets */ > - ADDR_E820_MAP = MULTIBOOT_STRUCT_ADDR + 0, > - ADDR_MBI = ADDR_E820_MAP + 0x500, > - > - /* Multiboot flags */ > - MULTIBOOT_FLAGS_MEMORY = 1 << 0, > - MULTIBOOT_FLAGS_BOOT_DEVICE = 1 << 1, > - MULTIBOOT_FLAGS_CMDLINE = 1 << 2, > - MULTIBOOT_FLAGS_MODULES = 1 << 3, > - MULTIBOOT_FLAGS_MMAP = 1 << 6, > - MULTIBOOT_FLAGS_BOOTLOADER = 1 << 9, > -}; > +/* Region offsets */ > +#define ADDR_E820_MAP MULTIBOOT_STRUCT_ADDR > +#define ADDR_MBI (ADDR_E820_MAP + 0x500) > > typedef struct { > /* buffer holding kernel, cmdlines and mb_infos */ > @@ -128,14 +99,15 @@ static void mb_add_mod(MultibootState *s, > hwaddr start, hwaddr end, > hwaddr cmdline_phys) > { > - char *p; > + multiboot_module_t *mod; > assert(s->mb_mods_count < s->mb_mods_avail); > > - p = (char *)s->mb_buf + s->offset_mbinfo + MB_MOD_SIZE * s->mb_mods_count; > + mod = s->mb_buf + s->offset_mbinfo + > + sizeof(multiboot_module_t) * s->mb_mods_count; > > - stl_p(p + MB_MOD_START, start); > - stl_p(p + MB_MOD_END, end); > - stl_p(p + MB_MOD_CMDLINE, cmdline_phys); > + stl_p(&mod->mod_start, start); > + stl_p(&mod->mod_end, end); > + stl_p(&mod->cmdline, cmdline_phys); > > mb_debug("mod%02d: "TARGET_FMT_plx" - "TARGET_FMT_plx"\n", > s->mb_mods_count, start, end); > @@ -151,26 +123,29 @@ int load_multiboot(FWCfgState *fw_cfg, > int kernel_file_size, > uint8_t *header) > { > - int i, is_multiboot = 0; > + int i; > + bool is_multiboot = false; > uint32_t flags = 0; > uint32_t mh_entry_addr; > uint32_t mh_load_addr; > uint32_t mb_kernel_size; > MultibootState mbs; > - uint8_t bootinfo[MBI_SIZE]; > + multiboot_info_t bootinfo; > uint8_t *mb_bootinfo_data; > uint32_t cmdline_len; > + struct multiboot_header *multiboot_header; > > /* Ok, let's see if it is a multiboot image. > The header is 12x32bit long, so the latest entry may be 8192 - 48. */ > for (i = 0; i < (8192 - 48); i += 4) { > - if (ldl_p(header+i) == 0x1BADB002) { > - uint32_t checksum = ldl_p(header+i+8); > - flags = ldl_p(header+i+4); > + multiboot_header = (struct multiboot_header *)(header + i); > + if (ldl_p(&multiboot_header->magic) == MULTIBOOT_HEADER_MAGIC) { > + uint32_t checksum = ldl_p(&multiboot_header->checksum); > + flags = ldl_p(&multiboot_header->flags); > checksum += flags; > - checksum += (uint32_t)0x1BADB002; > + checksum += (uint32_t)MULTIBOOT_HEADER_MAGIC; > if (!checksum) { > - is_multiboot = 1; > + is_multiboot = true; > break; > } > } > @@ -180,13 +155,13 @@ int load_multiboot(FWCfgState *fw_cfg, > return 0; /* no multiboot */ > > mb_debug("qemu: I believe we found a multiboot image!\n"); > - memset(bootinfo, 0, sizeof(bootinfo)); > + memset(&bootinfo, 0, sizeof(bootinfo)); > memset(&mbs, 0, sizeof(mbs)); > > - if (flags & 0x00000004) { /* MULTIBOOT_HEADER_HAS_VBE */ > + if (flags & MULTIBOOT_VIDEO_MODE) { > fprintf(stderr, "qemu: multiboot knows VBE. we don't.\n"); > } > - if (!(flags & 0x00010000)) { /* MULTIBOOT_HEADER_HAS_ADDR */ > + if (!(flags & MULTIBOOT_AOUT_KLUDGE)) { > uint64_t elf_entry; > uint64_t elf_low, elf_high; > int kernel_size; > @@ -217,12 +192,12 @@ int load_multiboot(FWCfgState *fw_cfg, > mb_debug("qemu: loading multiboot-elf kernel (%#x bytes) with entry %#zx\n", > mb_kernel_size, (size_t)mh_entry_addr); > } else { > - /* Valid if mh_flags sets MULTIBOOT_HEADER_HAS_ADDR. */ > - uint32_t mh_header_addr = ldl_p(header+i+12); > - uint32_t mh_load_end_addr = ldl_p(header+i+20); > - uint32_t mh_bss_end_addr = ldl_p(header+i+24); > + /* Valid if mh_flags sets MULTIBOOT_AOUT_KLUDGE. */ > + uint32_t mh_header_addr = ldl_p(&multiboot_header->header_addr); > + uint32_t mh_load_end_addr = ldl_p(&multiboot_header->load_end_addr); > + uint32_t mh_bss_end_addr = ldl_p(&multiboot_header->bss_end_addr); > + mh_load_addr = ldl_p(&multiboot_header->load_addr); > > - mh_load_addr = ldl_p(header+i+16); > if (mh_header_addr < mh_load_addr) { > fprintf(stderr, "invalid mh_load_addr address\n"); > exit(1); > @@ -230,7 +205,7 @@ int load_multiboot(FWCfgState *fw_cfg, > > uint32_t mb_kernel_text_offset = i - (mh_header_addr - mh_load_addr); > uint32_t mb_load_size = 0; > - mh_entry_addr = ldl_p(header+i+28); > + mh_entry_addr = ldl_p(&multiboot_header->entry_addr); > > if (mh_load_end_addr) { > if (mh_bss_end_addr < mh_load_addr) { > @@ -253,11 +228,11 @@ int load_multiboot(FWCfgState *fw_cfg, > mb_load_size = mb_kernel_size; > } > > - /* Valid if mh_flags sets MULTIBOOT_HEADER_HAS_VBE. > - uint32_t mh_mode_type = ldl_p(header+i+32); > - uint32_t mh_width = ldl_p(header+i+36); > - uint32_t mh_height = ldl_p(header+i+40); > - uint32_t mh_depth = ldl_p(header+i+44); */ > + /* Valid if mh_flags sets MULTIBOOT_VIDEO_MODE. > + uint32_t mh_mode_type = ldl_p(&multiboot_header->mode_type); > + uint32_t mh_width = ldl_p(&multiboot_header->width); > + uint32_t mh_height = ldl_p(&multiboot_header->height); > + uint32_t mh_depth = ldl_p(&multiboot_header->depth); */ This question is probably more for maintainers... In the patch series I submitted, people were OK that I was going to delete these lines since they were only comments anyway. Your approach leaves these lines in and updates them even though they are comments. Which way is preferred? > mb_debug("multiboot: mh_header_addr = %#x\n", mh_header_addr); > mb_debug("multiboot: mh_load_addr = %#x\n", mh_load_addr); > @@ -295,14 +270,15 @@ int load_multiboot(FWCfgState *fw_cfg, > } > > mbs.mb_buf_size += cmdline_len; > - mbs.mb_buf_size += MB_MOD_SIZE * mbs.mb_mods_avail; > + mbs.mb_buf_size += sizeof(multiboot_module_t) * mbs.mb_mods_avail; > mbs.mb_buf_size += strlen(bootloader_name) + 1; > > mbs.mb_buf_size = TARGET_PAGE_ALIGN(mbs.mb_buf_size); > > /* enlarge mb_buf to hold cmdlines, bootloader, mb-info structs */ > mbs.mb_buf = g_realloc(mbs.mb_buf, mbs.mb_buf_size); > - mbs.offset_cmdlines = mbs.offset_mbinfo + mbs.mb_mods_avail * MB_MOD_SIZE; > + mbs.offset_cmdlines = mbs.offset_mbinfo + > + mbs.mb_mods_avail * sizeof(multiboot_module_t); > mbs.offset_bootloader = mbs.offset_cmdlines + cmdline_len; > > if (initrd_filename) { > @@ -348,22 +324,22 @@ int load_multiboot(FWCfgState *fw_cfg, > char kcmdline[strlen(kernel_filename) + strlen(kernel_cmdline) + 2]; > snprintf(kcmdline, sizeof(kcmdline), "%s %s", > kernel_filename, kernel_cmdline); > - stl_p(bootinfo + MBI_CMDLINE, mb_add_cmdline(&mbs, kcmdline)); > + stl_p(&bootinfo.cmdline, mb_add_cmdline(&mbs, kcmdline)); > > - stl_p(bootinfo + MBI_BOOTLOADER, mb_add_bootloader(&mbs, bootloader_name)); > + stl_p(&bootinfo.boot_loader_name, mb_add_bootloader(&mbs, bootloader_name)); > > - stl_p(bootinfo + MBI_MODS_ADDR, mbs.mb_buf_phys + mbs.offset_mbinfo); > - stl_p(bootinfo + MBI_MODS_COUNT, mbs.mb_mods_count); /* mods_count */ > + stl_p(&bootinfo.mods_addr, mbs.mb_buf_phys + mbs.offset_mbinfo); > + stl_p(&bootinfo.mods_count, mbs.mb_mods_count); /* mods_count */ > > /* the kernel is where we want it to be now */ > - stl_p(bootinfo + MBI_FLAGS, MULTIBOOT_FLAGS_MEMORY > - | MULTIBOOT_FLAGS_BOOT_DEVICE > - | MULTIBOOT_FLAGS_CMDLINE > - | MULTIBOOT_FLAGS_MODULES > - | MULTIBOOT_FLAGS_MMAP > - | MULTIBOOT_FLAGS_BOOTLOADER); > - stl_p(bootinfo + MBI_BOOT_DEVICE, 0x8000ffff); /* XXX: use the -boot switch? */ > - stl_p(bootinfo + MBI_MMAP_ADDR, ADDR_E820_MAP); > + stl_p(&bootinfo.flags, MULTIBOOT_INFO_MEMORY > + | MULTIBOOT_INFO_BOOTDEV > + | MULTIBOOT_INFO_CMDLINE > + | MULTIBOOT_INFO_MODS > + | MULTIBOOT_INFO_MEM_MAP > + | MULTIBOOT_INFO_BOOT_LOADER_NAME); > + stl_p(&bootinfo.boot_device, 0x8000ffff); /* XXX: use the -boot switch? */ > + stl_p(&bootinfo.mmap_addr, ADDR_E820_MAP); > > mb_debug("multiboot: mh_entry_addr = %#x\n", mh_entry_addr); > mb_debug(" mb_buf_phys = "TARGET_FMT_plx"\n", mbs.mb_buf_phys); > @@ -371,7 +347,7 @@ int load_multiboot(FWCfgState *fw_cfg, > mb_debug(" mb_mods_count = %d\n", mbs.mb_mods_count); > > /* save bootinfo off the stack */ > - mb_bootinfo_data = g_memdup(bootinfo, sizeof(bootinfo)); > + mb_bootinfo_data = g_memdup(&bootinfo, sizeof(bootinfo)); > > /* Pass variables to option rom */ > fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_ENTRY, mh_entry_addr); <snip> > diff --git a/tests/multiboot/mmap.c b/tests/multiboot/mmap.c > index 766b003f38..9cba8b07e0 100644 > --- a/tests/multiboot/mmap.c > +++ b/tests/multiboot/mmap.c > @@ -21,15 +21,17 @@ > */ > > #include "libc.h" > -#include "multiboot.h" > +#include "../../hw/i386/multiboot_header.h" Suggestion: create a multiboot subdir under include, and put multiboot_header.h and other multiboot includes there. This way you can just #include "multiboot/multiboot_header.h" which seems cleaner to me than "../../hw/i386/multiboot_header.h" > -int test_main(uint32_t magic, struct mb_info *mbi) > +int test_main(uint32_t magic, struct multiboot_info *mbi) > { > uintptr_t entry_addr; > - struct mb_mmap_entry *entry; > + struct multiboot_mmap_entry *entry; > > (void) magic; > > + printf("Multiboot header at %x\n\n", mbi); > + > printf("Lower memory: %dk\n", mbi->mem_lower); > printf("Upper memory: %dk\n", mbi->mem_upper); > > @@ -39,11 +41,11 @@ int test_main(uint32_t magic, struct mb_info *mbi) > entry_addr < mbi->mmap_addr + mbi->mmap_length; > entry_addr += entry->size + 4) > { > - entry = (struct mb_mmap_entry*) entry_addr; > + entry = (struct multiboot_mmap_entry*) entry_addr; > > printf("%#llx - %#llx: type %d [entry size: %d]\n", > - entry->base_addr, > - entry->base_addr + entry->length, > + entry->addr, > + entry->addr + entry->len, > entry->type, > entry->size); > } <snip> > > diff --git a/tests/multiboot/modules.c b/tests/multiboot/modules.c > index 531601fb30..a1da0ded44 100644 > --- a/tests/multiboot/modules.c > +++ b/tests/multiboot/modules.c > @@ -21,19 +21,21 @@ > */ > > #include "libc.h" > -#include "multiboot.h" > +#include "../../hw/i386/multiboot_header.h" Same comment about putting multiboot_header.h into a multiboot subdir in "include" subtree. I have this same comment, as well as one other, for patch 2 sent separately. Thanks, Jack > -int test_main(uint32_t magic, struct mb_info *mbi) > +int test_main(uint32_t magic, struct multiboot_info *mbi) > { > - struct mb_module *mod; > + struct multiboot_mod_list *mod; > unsigned int i; > > (void) magic; > > + printf("Multiboot header at %x\n\n", mbi); > + > printf("Module list with %d entries at %x\n", > mbi->mods_count, mbi->mods_addr); > > - for (i = 0, mod = (struct mb_module*) mbi->mods_addr; > + for (i = 0, mod = (struct multiboot_mod_list*) mbi->mods_addr; > i < mbi->mods_count; > i++, mod++) > { > @@ -41,7 +43,7 @@ int test_main(uint32_t magic, struct mb_info *mbi) > unsigned int size = mod->mod_end - mod->mod_start; > > printf("[%p] Module: %x - %x (%d bytes) '%s'\n", > - mod, mod->mod_start, mod->mod_end, size, mod->string); > + mod, mod->mod_start, mod->mod_end, size, mod->cmdline); > > /* Print test file, but remove the newline at the end */ > if (size < sizeof(buf)) { > <snip>
Am 31.01.2018 um 00:15 hat Jack Schwartz geschrieben: > Hi Anatol and Kevin. > > Even though I am new to Qemu, I have a patch to deliver for > multiboot.c (as you know) and so I feel familiar enough to do a review > of this patch. One comment is probably more for maintainers. The Multiboot code is essentially unmaintained. It's technically part of the PC/x86 subsystem, but their maintainers don't seem to care at all. So in order to make any progress here, I decided that I will send a pull request for Multiboot once we have the patches ready (as a one-time thing, without officially making myself the maintainer). So I am the closest thing to a maintainer that we have here, and while I'm familiar with some of the Multiboot-specific code, I don't really know the ELF code and don't have a lot of time to spend here. Therefore it's very welcome if you review the patches of each other, even if you're not perfectly familiar with the code, as there is probably noone else who could do a better review. > On 01/29/18 12:43, Anatol Pomozov wrote: > > @@ -253,11 +228,11 @@ int load_multiboot(FWCfgState *fw_cfg, > > mb_load_size = mb_kernel_size; > > } > > - /* Valid if mh_flags sets MULTIBOOT_HEADER_HAS_VBE. > > - uint32_t mh_mode_type = ldl_p(header+i+32); > > - uint32_t mh_width = ldl_p(header+i+36); > > - uint32_t mh_height = ldl_p(header+i+40); > > - uint32_t mh_depth = ldl_p(header+i+44); */ > > + /* Valid if mh_flags sets MULTIBOOT_VIDEO_MODE. > > + uint32_t mh_mode_type = ldl_p(&multiboot_header->mode_type); > > + uint32_t mh_width = ldl_p(&multiboot_header->width); > > + uint32_t mh_height = ldl_p(&multiboot_header->height); > > + uint32_t mh_depth = ldl_p(&multiboot_header->depth); */ > This question is probably more for maintainers... > > In the patch series I submitted, people were OK that I was going to delete > these lines since they were only comments anyway. Your approach leaves > these lines in and updates them even though they are comments. Which way is > preferred? As far as I am concerned, I honestly don't mind either way. It's trivial code, so we won't lose anything by removing it. The ideal solution would be just implementing support for it, of course. If we wanted to do that, I think we would have to pass the values through fw_cfg and then set the VBE mode in the Mutiboot option rom. > > mb_debug("multiboot: mh_header_addr = %#x\n", mh_header_addr); > > mb_debug("multiboot: mh_load_addr = %#x\n", mh_load_addr); > > @@ -295,14 +270,15 @@ int load_multiboot(FWCfgState *fw_cfg, > > } > > mbs.mb_buf_size += cmdline_len; > > - mbs.mb_buf_size += MB_MOD_SIZE * mbs.mb_mods_avail; > > + mbs.mb_buf_size += sizeof(multiboot_module_t) * mbs.mb_mods_avail; > > mbs.mb_buf_size += strlen(bootloader_name) + 1; > > mbs.mb_buf_size = TARGET_PAGE_ALIGN(mbs.mb_buf_size); > > /* enlarge mb_buf to hold cmdlines, bootloader, mb-info structs */ > > mbs.mb_buf = g_realloc(mbs.mb_buf, mbs.mb_buf_size); > > - mbs.offset_cmdlines = mbs.offset_mbinfo + mbs.mb_mods_avail * MB_MOD_SIZE; > > + mbs.offset_cmdlines = mbs.offset_mbinfo + > > + mbs.mb_mods_avail * sizeof(multiboot_module_t); > > mbs.offset_bootloader = mbs.offset_cmdlines + cmdline_len; > > if (initrd_filename) { > > @@ -348,22 +324,22 @@ int load_multiboot(FWCfgState *fw_cfg, > > char kcmdline[strlen(kernel_filename) + strlen(kernel_cmdline) + 2]; > > snprintf(kcmdline, sizeof(kcmdline), "%s %s", > > kernel_filename, kernel_cmdline); > > - stl_p(bootinfo + MBI_CMDLINE, mb_add_cmdline(&mbs, kcmdline)); > > + stl_p(&bootinfo.cmdline, mb_add_cmdline(&mbs, kcmdline)); > > - stl_p(bootinfo + MBI_BOOTLOADER, mb_add_bootloader(&mbs, bootloader_name)); > > + stl_p(&bootinfo.boot_loader_name, mb_add_bootloader(&mbs, bootloader_name)); > > - stl_p(bootinfo + MBI_MODS_ADDR, mbs.mb_buf_phys + mbs.offset_mbinfo); > > - stl_p(bootinfo + MBI_MODS_COUNT, mbs.mb_mods_count); /* mods_count */ > > + stl_p(&bootinfo.mods_addr, mbs.mb_buf_phys + mbs.offset_mbinfo); > > + stl_p(&bootinfo.mods_count, mbs.mb_mods_count); /* mods_count */ > > /* the kernel is where we want it to be now */ > > - stl_p(bootinfo + MBI_FLAGS, MULTIBOOT_FLAGS_MEMORY > > - | MULTIBOOT_FLAGS_BOOT_DEVICE > > - | MULTIBOOT_FLAGS_CMDLINE > > - | MULTIBOOT_FLAGS_MODULES > > - | MULTIBOOT_FLAGS_MMAP > > - | MULTIBOOT_FLAGS_BOOTLOADER); > > - stl_p(bootinfo + MBI_BOOT_DEVICE, 0x8000ffff); /* XXX: use the -boot switch? */ > > - stl_p(bootinfo + MBI_MMAP_ADDR, ADDR_E820_MAP); > > + stl_p(&bootinfo.flags, MULTIBOOT_INFO_MEMORY > > + | MULTIBOOT_INFO_BOOTDEV > > + | MULTIBOOT_INFO_CMDLINE > > + | MULTIBOOT_INFO_MODS > > + | MULTIBOOT_INFO_MEM_MAP > > + | MULTIBOOT_INFO_BOOT_LOADER_NAME); > > + stl_p(&bootinfo.boot_device, 0x8000ffff); /* XXX: use the -boot switch? */ > > + stl_p(&bootinfo.mmap_addr, ADDR_E820_MAP); > > mb_debug("multiboot: mh_entry_addr = %#x\n", mh_entry_addr); > > mb_debug(" mb_buf_phys = "TARGET_FMT_plx"\n", mbs.mb_buf_phys); > > @@ -371,7 +347,7 @@ int load_multiboot(FWCfgState *fw_cfg, > > mb_debug(" mb_mods_count = %d\n", mbs.mb_mods_count); > > /* save bootinfo off the stack */ > > - mb_bootinfo_data = g_memdup(bootinfo, sizeof(bootinfo)); > > + mb_bootinfo_data = g_memdup(&bootinfo, sizeof(bootinfo)); > > /* Pass variables to option rom */ > > fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_ENTRY, mh_entry_addr); > <snip> > > diff --git a/tests/multiboot/mmap.c b/tests/multiboot/mmap.c > > index 766b003f38..9cba8b07e0 100644 > > --- a/tests/multiboot/mmap.c > > +++ b/tests/multiboot/mmap.c > > @@ -21,15 +21,17 @@ > > */ > > #include "libc.h" > > -#include "multiboot.h" > > +#include "../../hw/i386/multiboot_header.h" > Suggestion: create a multiboot subdir under include, and put > multiboot_header.h and other multiboot includes there. This way you can > just #include "multiboot/multiboot_header.h" which seems cleaner to me than > "../../hw/i386/multiboot_header.h" Good point, but do we even have multiple header files for Multiboot to justify a whole subdirectory? There is include/hw/loader.h and include/elf.h, so I would suggest that we add the new header as either include/hw/multiboot.h or directly include/multiboot.h. Kevin
Hi On Wed, Jan 31, 2018 at 1:12 AM, Kevin Wolf <kwolf@redhat.com> wrote: > Am 31.01.2018 um 00:15 hat Jack Schwartz geschrieben: >> Hi Anatol and Kevin. >> >> Even though I am new to Qemu, I have a patch to deliver for >> multiboot.c (as you know) and so I feel familiar enough to do a review >> of this patch. One comment is probably more for maintainers. > > The Multiboot code is essentially unmaintained. It's technically part of > the PC/x86 subsystem, but their maintainers don't seem to care at all. > So in order to make any progress here, I decided that I will send a > pull request for Multiboot once we have the patches ready (as a one-time > thing, without officially making myself the maintainer). > > So I am the closest thing to a maintainer that we have here, and while > I'm familiar with some of the Multiboot-specific code, I don't really > know the ELF code and don't have a lot of time to spend here. > > Therefore it's very welcome if you review the patches of each other, > even if you're not perfectly familiar with the code, as there is > probably noone else who could do a better review. > >> On 01/29/18 12:43, Anatol Pomozov wrote: >> > @@ -253,11 +228,11 @@ int load_multiboot(FWCfgState *fw_cfg, >> > mb_load_size = mb_kernel_size; >> > } >> > - /* Valid if mh_flags sets MULTIBOOT_HEADER_HAS_VBE. >> > - uint32_t mh_mode_type = ldl_p(header+i+32); >> > - uint32_t mh_width = ldl_p(header+i+36); >> > - uint32_t mh_height = ldl_p(header+i+40); >> > - uint32_t mh_depth = ldl_p(header+i+44); */ >> > + /* Valid if mh_flags sets MULTIBOOT_VIDEO_MODE. >> > + uint32_t mh_mode_type = ldl_p(&multiboot_header->mode_type); >> > + uint32_t mh_width = ldl_p(&multiboot_header->width); >> > + uint32_t mh_height = ldl_p(&multiboot_header->height); >> > + uint32_t mh_depth = ldl_p(&multiboot_header->depth); */ >> This question is probably more for maintainers... >> >> In the patch series I submitted, people were OK that I was going to delete >> these lines since they were only comments anyway. Your approach leaves >> these lines in and updates them even though they are comments. Which way is >> preferred? > > As far as I am concerned, I honestly don't mind either way. It's > trivial code, so we won't lose anything by removing it. This change suppose to be a refactoring and tries to avoid functional changes. I can remove it in a separate change. > > The ideal solution would be just implementing support for it, of course. > If we wanted to do that, I think we would have to pass the values > through fw_cfg and then set the VBE mode in the Mutiboot option rom. > >> > mb_debug("multiboot: mh_header_addr = %#x\n", mh_header_addr); >> > mb_debug("multiboot: mh_load_addr = %#x\n", mh_load_addr); >> > @@ -295,14 +270,15 @@ int load_multiboot(FWCfgState *fw_cfg, >> > } >> > mbs.mb_buf_size += cmdline_len; >> > - mbs.mb_buf_size += MB_MOD_SIZE * mbs.mb_mods_avail; >> > + mbs.mb_buf_size += sizeof(multiboot_module_t) * mbs.mb_mods_avail; >> > mbs.mb_buf_size += strlen(bootloader_name) + 1; >> > mbs.mb_buf_size = TARGET_PAGE_ALIGN(mbs.mb_buf_size); >> > /* enlarge mb_buf to hold cmdlines, bootloader, mb-info structs */ >> > mbs.mb_buf = g_realloc(mbs.mb_buf, mbs.mb_buf_size); >> > - mbs.offset_cmdlines = mbs.offset_mbinfo + mbs.mb_mods_avail * MB_MOD_SIZE; >> > + mbs.offset_cmdlines = mbs.offset_mbinfo + >> > + mbs.mb_mods_avail * sizeof(multiboot_module_t); >> > mbs.offset_bootloader = mbs.offset_cmdlines + cmdline_len; >> > if (initrd_filename) { >> > @@ -348,22 +324,22 @@ int load_multiboot(FWCfgState *fw_cfg, >> > char kcmdline[strlen(kernel_filename) + strlen(kernel_cmdline) + 2]; >> > snprintf(kcmdline, sizeof(kcmdline), "%s %s", >> > kernel_filename, kernel_cmdline); >> > - stl_p(bootinfo + MBI_CMDLINE, mb_add_cmdline(&mbs, kcmdline)); >> > + stl_p(&bootinfo.cmdline, mb_add_cmdline(&mbs, kcmdline)); >> > - stl_p(bootinfo + MBI_BOOTLOADER, mb_add_bootloader(&mbs, bootloader_name)); >> > + stl_p(&bootinfo.boot_loader_name, mb_add_bootloader(&mbs, bootloader_name)); >> > - stl_p(bootinfo + MBI_MODS_ADDR, mbs.mb_buf_phys + mbs.offset_mbinfo); >> > - stl_p(bootinfo + MBI_MODS_COUNT, mbs.mb_mods_count); /* mods_count */ >> > + stl_p(&bootinfo.mods_addr, mbs.mb_buf_phys + mbs.offset_mbinfo); >> > + stl_p(&bootinfo.mods_count, mbs.mb_mods_count); /* mods_count */ >> > /* the kernel is where we want it to be now */ >> > - stl_p(bootinfo + MBI_FLAGS, MULTIBOOT_FLAGS_MEMORY >> > - | MULTIBOOT_FLAGS_BOOT_DEVICE >> > - | MULTIBOOT_FLAGS_CMDLINE >> > - | MULTIBOOT_FLAGS_MODULES >> > - | MULTIBOOT_FLAGS_MMAP >> > - | MULTIBOOT_FLAGS_BOOTLOADER); >> > - stl_p(bootinfo + MBI_BOOT_DEVICE, 0x8000ffff); /* XXX: use the -boot switch? */ >> > - stl_p(bootinfo + MBI_MMAP_ADDR, ADDR_E820_MAP); >> > + stl_p(&bootinfo.flags, MULTIBOOT_INFO_MEMORY >> > + | MULTIBOOT_INFO_BOOTDEV >> > + | MULTIBOOT_INFO_CMDLINE >> > + | MULTIBOOT_INFO_MODS >> > + | MULTIBOOT_INFO_MEM_MAP >> > + | MULTIBOOT_INFO_BOOT_LOADER_NAME); >> > + stl_p(&bootinfo.boot_device, 0x8000ffff); /* XXX: use the -boot switch? */ >> > + stl_p(&bootinfo.mmap_addr, ADDR_E820_MAP); >> > mb_debug("multiboot: mh_entry_addr = %#x\n", mh_entry_addr); >> > mb_debug(" mb_buf_phys = "TARGET_FMT_plx"\n", mbs.mb_buf_phys); >> > @@ -371,7 +347,7 @@ int load_multiboot(FWCfgState *fw_cfg, >> > mb_debug(" mb_mods_count = %d\n", mbs.mb_mods_count); >> > /* save bootinfo off the stack */ >> > - mb_bootinfo_data = g_memdup(bootinfo, sizeof(bootinfo)); >> > + mb_bootinfo_data = g_memdup(&bootinfo, sizeof(bootinfo)); >> > /* Pass variables to option rom */ >> > fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_ENTRY, mh_entry_addr); >> <snip> >> > diff --git a/tests/multiboot/mmap.c b/tests/multiboot/mmap.c >> > index 766b003f38..9cba8b07e0 100644 >> > --- a/tests/multiboot/mmap.c >> > +++ b/tests/multiboot/mmap.c >> > @@ -21,15 +21,17 @@ >> > */ >> > #include "libc.h" >> > -#include "multiboot.h" >> > +#include "../../hw/i386/multiboot_header.h" >> Suggestion: create a multiboot subdir under include, and put >> multiboot_header.h and other multiboot includes there. This way you can >> just #include "multiboot/multiboot_header.h" which seems cleaner to me than >> "../../hw/i386/multiboot_header.h" > > Good point, but do we even have multiple header files for Multiboot to > justify a whole subdirectory? I do not think there is a justification for it. +1 for keeping it in "/include/" > There is include/hw/loader.h and include/elf.h, so I would suggest that > we add the new header as either include/hw/multiboot.h or directly > include/multiboot.h. There is already ./hw/i386/multiboot.h file so it is going to be confusing to have multiple files with the same name. I propose to rename ./hw/i386/multiboot.h to something like ./hw/i386/multiboot_loader.h or ./hw/i386/load_multiboot.h
Hi Anatol and Kevin. Kevin and Anatol, thanks for your replies. A few comments inline close to the bottom... On 2018-02-05 13:43, Anatol Pomozov wrote: > Hi > > On Wed, Jan 31, 2018 at 1:12 AM, Kevin Wolf <kwolf@redhat.com> wrote: >> Am 31.01.2018 um 00:15 hat Jack Schwartz geschrieben: >>> Hi Anatol and Kevin. >>> >>> Even though I am new to Qemu, I have a patch to deliver for >>> multiboot.c (as you know) and so I feel familiar enough to do a review >>> of this patch. One comment is probably more for maintainers. >> The Multiboot code is essentially unmaintained. It's technically part of >> the PC/x86 subsystem, but their maintainers don't seem to care at all. >> So in order to make any progress here, I decided that I will send a >> pull request for Multiboot once we have the patches ready (as a one-time >> thing, without officially making myself the maintainer). >> >> So I am the closest thing to a maintainer that we have here, and while >> I'm familiar with some of the Multiboot-specific code, I don't really >> know the ELF code and don't have a lot of time to spend here. >> >> Therefore it's very welcome if you review the patches of each other, >> even if you're not perfectly familiar with the code, as there is >> probably noone else who could do a better review. >> >>> On 01/29/18 12:43, Anatol Pomozov wrote: >>>> @@ -253,11 +228,11 @@ int load_multiboot(FWCfgState *fw_cfg, >>>> mb_load_size = mb_kernel_size; >>>> } >>>> - /* Valid if mh_flags sets MULTIBOOT_HEADER_HAS_VBE. >>>> - uint32_t mh_mode_type = ldl_p(header+i+32); >>>> - uint32_t mh_width = ldl_p(header+i+36); >>>> - uint32_t mh_height = ldl_p(header+i+40); >>>> - uint32_t mh_depth = ldl_p(header+i+44); */ >>>> + /* Valid if mh_flags sets MULTIBOOT_VIDEO_MODE. >>>> + uint32_t mh_mode_type = ldl_p(&multiboot_header->mode_type); >>>> + uint32_t mh_width = ldl_p(&multiboot_header->width); >>>> + uint32_t mh_height = ldl_p(&multiboot_header->height); >>>> + uint32_t mh_depth = ldl_p(&multiboot_header->depth); */ >>> This question is probably more for maintainers... >>> >>> In the patch series I submitted, people were OK that I was going to delete >>> these lines since they were only comments anyway. Your approach leaves >>> these lines in and updates them even though they are comments. Which way is >>> preferred? >> As far as I am concerned, I honestly don't mind either way. It's >> trivial code, so we won't lose anything by removing it. > This change suppose to be a refactoring and tries to avoid functional > changes. I can remove it in a separate change. > >> The ideal solution would be just implementing support for it, of course. >> If we wanted to do that, I think we would have to pass the values >> through fw_cfg and then set the VBE mode in the Mutiboot option rom. >> >>>> mb_debug("multiboot: mh_header_addr = %#x\n", mh_header_addr); >>>> mb_debug("multiboot: mh_load_addr = %#x\n", mh_load_addr); >>>> @@ -295,14 +270,15 @@ int load_multiboot(FWCfgState *fw_cfg, >>>> } >>>> mbs.mb_buf_size += cmdline_len; >>>> - mbs.mb_buf_size += MB_MOD_SIZE * mbs.mb_mods_avail; >>>> + mbs.mb_buf_size += sizeof(multiboot_module_t) * mbs.mb_mods_avail; >>>> mbs.mb_buf_size += strlen(bootloader_name) + 1; >>>> mbs.mb_buf_size = TARGET_PAGE_ALIGN(mbs.mb_buf_size); >>>> /* enlarge mb_buf to hold cmdlines, bootloader, mb-info structs */ >>>> mbs.mb_buf = g_realloc(mbs.mb_buf, mbs.mb_buf_size); >>>> - mbs.offset_cmdlines = mbs.offset_mbinfo + mbs.mb_mods_avail * MB_MOD_SIZE; >>>> + mbs.offset_cmdlines = mbs.offset_mbinfo + >>>> + mbs.mb_mods_avail * sizeof(multiboot_module_t); >>>> mbs.offset_bootloader = mbs.offset_cmdlines + cmdline_len; >>>> if (initrd_filename) { >>>> @@ -348,22 +324,22 @@ int load_multiboot(FWCfgState *fw_cfg, >>>> char kcmdline[strlen(kernel_filename) + strlen(kernel_cmdline) + 2]; >>>> snprintf(kcmdline, sizeof(kcmdline), "%s %s", >>>> kernel_filename, kernel_cmdline); >>>> - stl_p(bootinfo + MBI_CMDLINE, mb_add_cmdline(&mbs, kcmdline)); >>>> + stl_p(&bootinfo.cmdline, mb_add_cmdline(&mbs, kcmdline)); >>>> - stl_p(bootinfo + MBI_BOOTLOADER, mb_add_bootloader(&mbs, bootloader_name)); >>>> + stl_p(&bootinfo.boot_loader_name, mb_add_bootloader(&mbs, bootloader_name)); >>>> - stl_p(bootinfo + MBI_MODS_ADDR, mbs.mb_buf_phys + mbs.offset_mbinfo); >>>> - stl_p(bootinfo + MBI_MODS_COUNT, mbs.mb_mods_count); /* mods_count */ >>>> + stl_p(&bootinfo.mods_addr, mbs.mb_buf_phys + mbs.offset_mbinfo); >>>> + stl_p(&bootinfo.mods_count, mbs.mb_mods_count); /* mods_count */ >>>> /* the kernel is where we want it to be now */ >>>> - stl_p(bootinfo + MBI_FLAGS, MULTIBOOT_FLAGS_MEMORY >>>> - | MULTIBOOT_FLAGS_BOOT_DEVICE >>>> - | MULTIBOOT_FLAGS_CMDLINE >>>> - | MULTIBOOT_FLAGS_MODULES >>>> - | MULTIBOOT_FLAGS_MMAP >>>> - | MULTIBOOT_FLAGS_BOOTLOADER); >>>> - stl_p(bootinfo + MBI_BOOT_DEVICE, 0x8000ffff); /* XXX: use the -boot switch? */ >>>> - stl_p(bootinfo + MBI_MMAP_ADDR, ADDR_E820_MAP); >>>> + stl_p(&bootinfo.flags, MULTIBOOT_INFO_MEMORY >>>> + | MULTIBOOT_INFO_BOOTDEV >>>> + | MULTIBOOT_INFO_CMDLINE >>>> + | MULTIBOOT_INFO_MODS >>>> + | MULTIBOOT_INFO_MEM_MAP >>>> + | MULTIBOOT_INFO_BOOT_LOADER_NAME); >>>> + stl_p(&bootinfo.boot_device, 0x8000ffff); /* XXX: use the -boot switch? */ >>>> + stl_p(&bootinfo.mmap_addr, ADDR_E820_MAP); >>>> mb_debug("multiboot: mh_entry_addr = %#x\n", mh_entry_addr); >>>> mb_debug(" mb_buf_phys = "TARGET_FMT_plx"\n", mbs.mb_buf_phys); >>>> @@ -371,7 +347,7 @@ int load_multiboot(FWCfgState *fw_cfg, >>>> mb_debug(" mb_mods_count = %d\n", mbs.mb_mods_count); >>>> /* save bootinfo off the stack */ >>>> - mb_bootinfo_data = g_memdup(bootinfo, sizeof(bootinfo)); >>>> + mb_bootinfo_data = g_memdup(&bootinfo, sizeof(bootinfo)); >>>> /* Pass variables to option rom */ >>>> fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_ENTRY, mh_entry_addr); >>> <snip> >>>> diff --git a/tests/multiboot/mmap.c b/tests/multiboot/mmap.c >>>> index 766b003f38..9cba8b07e0 100644 >>>> --- a/tests/multiboot/mmap.c >>>> +++ b/tests/multiboot/mmap.c >>>> @@ -21,15 +21,17 @@ >>>> */ >>>> #include "libc.h" >>>> -#include "multiboot.h" >>>> +#include "../../hw/i386/multiboot_header.h" >>> Suggestion: create a multiboot subdir under include, and put >>> multiboot_header.h and other multiboot includes there. This way you can >>> just #include "multiboot/multiboot_header.h" which seems cleaner to me than >>> "../../hw/i386/multiboot_header.h" >> Good point, but do we even have multiple header files for Multiboot to >> justify a whole subdirectory? > I do not think there is a justification for it. +1 for keeping it in "/include/" >> There is include/hw/loader.h and include/elf.h, so I would suggest that >> we add the new header as either include/hw/multiboot.h or directly >> include/multiboot.h. OK. This makes the include list cleaner without having to add another subdirectory. ... or put both multiboot header files under include/hw/i386 to keep them together in an existing, appropriate and more specific directory. >> There is already ./hw/i386/multiboot.h file so it is going to be >> confusing to have multiple files with the same name. >> >> I propose to rename ./hw/i386/multiboot.h to something like >> ./hw/i386/multiboot_loader.h or ./hw/i386/load_multiboot.h Filename change sounds good. Also, to avoid confusion with tests/multiboot/multiboot.h, I suggest renaming that header file to tests/multiboot/multiboot_test.h Thanks, Jack
diff --git a/hw/i386/multiboot.c b/hw/i386/multiboot.c index c7b70c91d5..c6d05ca46b 100644 --- a/hw/i386/multiboot.c +++ b/hw/i386/multiboot.c @@ -28,6 +28,7 @@ #include "hw/hw.h" #include "hw/nvram/fw_cfg.h" #include "multiboot.h" +#include "multiboot_header.h" #include "hw/loader.h" #include "elf.h" #include "sysemu/sysemu.h" @@ -47,39 +48,9 @@ #error multiboot struct needs to fit in 16 bit real mode #endif -enum { - /* Multiboot info */ - MBI_FLAGS = 0, - MBI_MEM_LOWER = 4, - MBI_MEM_UPPER = 8, - MBI_BOOT_DEVICE = 12, - MBI_CMDLINE = 16, - MBI_MODS_COUNT = 20, - MBI_MODS_ADDR = 24, - MBI_MMAP_ADDR = 48, - MBI_BOOTLOADER = 64, - - MBI_SIZE = 88, - - /* Multiboot modules */ - MB_MOD_START = 0, - MB_MOD_END = 4, - MB_MOD_CMDLINE = 8, - - MB_MOD_SIZE = 16, - - /* Region offsets */ - ADDR_E820_MAP = MULTIBOOT_STRUCT_ADDR + 0, - ADDR_MBI = ADDR_E820_MAP + 0x500, - - /* Multiboot flags */ - MULTIBOOT_FLAGS_MEMORY = 1 << 0, - MULTIBOOT_FLAGS_BOOT_DEVICE = 1 << 1, - MULTIBOOT_FLAGS_CMDLINE = 1 << 2, - MULTIBOOT_FLAGS_MODULES = 1 << 3, - MULTIBOOT_FLAGS_MMAP = 1 << 6, - MULTIBOOT_FLAGS_BOOTLOADER = 1 << 9, -}; +/* Region offsets */ +#define ADDR_E820_MAP MULTIBOOT_STRUCT_ADDR +#define ADDR_MBI (ADDR_E820_MAP + 0x500) typedef struct { /* buffer holding kernel, cmdlines and mb_infos */ @@ -128,14 +99,15 @@ static void mb_add_mod(MultibootState *s, hwaddr start, hwaddr end, hwaddr cmdline_phys) { - char *p; + multiboot_module_t *mod; assert(s->mb_mods_count < s->mb_mods_avail); - p = (char *)s->mb_buf + s->offset_mbinfo + MB_MOD_SIZE * s->mb_mods_count; + mod = s->mb_buf + s->offset_mbinfo + + sizeof(multiboot_module_t) * s->mb_mods_count; - stl_p(p + MB_MOD_START, start); - stl_p(p + MB_MOD_END, end); - stl_p(p + MB_MOD_CMDLINE, cmdline_phys); + stl_p(&mod->mod_start, start); + stl_p(&mod->mod_end, end); + stl_p(&mod->cmdline, cmdline_phys); mb_debug("mod%02d: "TARGET_FMT_plx" - "TARGET_FMT_plx"\n", s->mb_mods_count, start, end); @@ -151,26 +123,29 @@ int load_multiboot(FWCfgState *fw_cfg, int kernel_file_size, uint8_t *header) { - int i, is_multiboot = 0; + int i; + bool is_multiboot = false; uint32_t flags = 0; uint32_t mh_entry_addr; uint32_t mh_load_addr; uint32_t mb_kernel_size; MultibootState mbs; - uint8_t bootinfo[MBI_SIZE]; + multiboot_info_t bootinfo; uint8_t *mb_bootinfo_data; uint32_t cmdline_len; + struct multiboot_header *multiboot_header; /* Ok, let's see if it is a multiboot image. The header is 12x32bit long, so the latest entry may be 8192 - 48. */ for (i = 0; i < (8192 - 48); i += 4) { - if (ldl_p(header+i) == 0x1BADB002) { - uint32_t checksum = ldl_p(header+i+8); - flags = ldl_p(header+i+4); + multiboot_header = (struct multiboot_header *)(header + i); + if (ldl_p(&multiboot_header->magic) == MULTIBOOT_HEADER_MAGIC) { + uint32_t checksum = ldl_p(&multiboot_header->checksum); + flags = ldl_p(&multiboot_header->flags); checksum += flags; - checksum += (uint32_t)0x1BADB002; + checksum += (uint32_t)MULTIBOOT_HEADER_MAGIC; if (!checksum) { - is_multiboot = 1; + is_multiboot = true; break; } } @@ -180,13 +155,13 @@ int load_multiboot(FWCfgState *fw_cfg, return 0; /* no multiboot */ mb_debug("qemu: I believe we found a multiboot image!\n"); - memset(bootinfo, 0, sizeof(bootinfo)); + memset(&bootinfo, 0, sizeof(bootinfo)); memset(&mbs, 0, sizeof(mbs)); - if (flags & 0x00000004) { /* MULTIBOOT_HEADER_HAS_VBE */ + if (flags & MULTIBOOT_VIDEO_MODE) { fprintf(stderr, "qemu: multiboot knows VBE. we don't.\n"); } - if (!(flags & 0x00010000)) { /* MULTIBOOT_HEADER_HAS_ADDR */ + if (!(flags & MULTIBOOT_AOUT_KLUDGE)) { uint64_t elf_entry; uint64_t elf_low, elf_high; int kernel_size; @@ -217,12 +192,12 @@ int load_multiboot(FWCfgState *fw_cfg, mb_debug("qemu: loading multiboot-elf kernel (%#x bytes) with entry %#zx\n", mb_kernel_size, (size_t)mh_entry_addr); } else { - /* Valid if mh_flags sets MULTIBOOT_HEADER_HAS_ADDR. */ - uint32_t mh_header_addr = ldl_p(header+i+12); - uint32_t mh_load_end_addr = ldl_p(header+i+20); - uint32_t mh_bss_end_addr = ldl_p(header+i+24); + /* Valid if mh_flags sets MULTIBOOT_AOUT_KLUDGE. */ + uint32_t mh_header_addr = ldl_p(&multiboot_header->header_addr); + uint32_t mh_load_end_addr = ldl_p(&multiboot_header->load_end_addr); + uint32_t mh_bss_end_addr = ldl_p(&multiboot_header->bss_end_addr); + mh_load_addr = ldl_p(&multiboot_header->load_addr); - mh_load_addr = ldl_p(header+i+16); if (mh_header_addr < mh_load_addr) { fprintf(stderr, "invalid mh_load_addr address\n"); exit(1); @@ -230,7 +205,7 @@ int load_multiboot(FWCfgState *fw_cfg, uint32_t mb_kernel_text_offset = i - (mh_header_addr - mh_load_addr); uint32_t mb_load_size = 0; - mh_entry_addr = ldl_p(header+i+28); + mh_entry_addr = ldl_p(&multiboot_header->entry_addr); if (mh_load_end_addr) { if (mh_bss_end_addr < mh_load_addr) { @@ -253,11 +228,11 @@ int load_multiboot(FWCfgState *fw_cfg, mb_load_size = mb_kernel_size; } - /* Valid if mh_flags sets MULTIBOOT_HEADER_HAS_VBE. - uint32_t mh_mode_type = ldl_p(header+i+32); - uint32_t mh_width = ldl_p(header+i+36); - uint32_t mh_height = ldl_p(header+i+40); - uint32_t mh_depth = ldl_p(header+i+44); */ + /* Valid if mh_flags sets MULTIBOOT_VIDEO_MODE. + uint32_t mh_mode_type = ldl_p(&multiboot_header->mode_type); + uint32_t mh_width = ldl_p(&multiboot_header->width); + uint32_t mh_height = ldl_p(&multiboot_header->height); + uint32_t mh_depth = ldl_p(&multiboot_header->depth); */ mb_debug("multiboot: mh_header_addr = %#x\n", mh_header_addr); mb_debug("multiboot: mh_load_addr = %#x\n", mh_load_addr); @@ -295,14 +270,15 @@ int load_multiboot(FWCfgState *fw_cfg, } mbs.mb_buf_size += cmdline_len; - mbs.mb_buf_size += MB_MOD_SIZE * mbs.mb_mods_avail; + mbs.mb_buf_size += sizeof(multiboot_module_t) * mbs.mb_mods_avail; mbs.mb_buf_size += strlen(bootloader_name) + 1; mbs.mb_buf_size = TARGET_PAGE_ALIGN(mbs.mb_buf_size); /* enlarge mb_buf to hold cmdlines, bootloader, mb-info structs */ mbs.mb_buf = g_realloc(mbs.mb_buf, mbs.mb_buf_size); - mbs.offset_cmdlines = mbs.offset_mbinfo + mbs.mb_mods_avail * MB_MOD_SIZE; + mbs.offset_cmdlines = mbs.offset_mbinfo + + mbs.mb_mods_avail * sizeof(multiboot_module_t); mbs.offset_bootloader = mbs.offset_cmdlines + cmdline_len; if (initrd_filename) { @@ -348,22 +324,22 @@ int load_multiboot(FWCfgState *fw_cfg, char kcmdline[strlen(kernel_filename) + strlen(kernel_cmdline) + 2]; snprintf(kcmdline, sizeof(kcmdline), "%s %s", kernel_filename, kernel_cmdline); - stl_p(bootinfo + MBI_CMDLINE, mb_add_cmdline(&mbs, kcmdline)); + stl_p(&bootinfo.cmdline, mb_add_cmdline(&mbs, kcmdline)); - stl_p(bootinfo + MBI_BOOTLOADER, mb_add_bootloader(&mbs, bootloader_name)); + stl_p(&bootinfo.boot_loader_name, mb_add_bootloader(&mbs, bootloader_name)); - stl_p(bootinfo + MBI_MODS_ADDR, mbs.mb_buf_phys + mbs.offset_mbinfo); - stl_p(bootinfo + MBI_MODS_COUNT, mbs.mb_mods_count); /* mods_count */ + stl_p(&bootinfo.mods_addr, mbs.mb_buf_phys + mbs.offset_mbinfo); + stl_p(&bootinfo.mods_count, mbs.mb_mods_count); /* mods_count */ /* the kernel is where we want it to be now */ - stl_p(bootinfo + MBI_FLAGS, MULTIBOOT_FLAGS_MEMORY - | MULTIBOOT_FLAGS_BOOT_DEVICE - | MULTIBOOT_FLAGS_CMDLINE - | MULTIBOOT_FLAGS_MODULES - | MULTIBOOT_FLAGS_MMAP - | MULTIBOOT_FLAGS_BOOTLOADER); - stl_p(bootinfo + MBI_BOOT_DEVICE, 0x8000ffff); /* XXX: use the -boot switch? */ - stl_p(bootinfo + MBI_MMAP_ADDR, ADDR_E820_MAP); + stl_p(&bootinfo.flags, MULTIBOOT_INFO_MEMORY + | MULTIBOOT_INFO_BOOTDEV + | MULTIBOOT_INFO_CMDLINE + | MULTIBOOT_INFO_MODS + | MULTIBOOT_INFO_MEM_MAP + | MULTIBOOT_INFO_BOOT_LOADER_NAME); + stl_p(&bootinfo.boot_device, 0x8000ffff); /* XXX: use the -boot switch? */ + stl_p(&bootinfo.mmap_addr, ADDR_E820_MAP); mb_debug("multiboot: mh_entry_addr = %#x\n", mh_entry_addr); mb_debug(" mb_buf_phys = "TARGET_FMT_plx"\n", mbs.mb_buf_phys); @@ -371,7 +347,7 @@ int load_multiboot(FWCfgState *fw_cfg, mb_debug(" mb_mods_count = %d\n", mbs.mb_mods_count); /* save bootinfo off the stack */ - mb_bootinfo_data = g_memdup(bootinfo, sizeof(bootinfo)); + mb_bootinfo_data = g_memdup(&bootinfo, sizeof(bootinfo)); /* Pass variables to option rom */ fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_ENTRY, mh_entry_addr); diff --git a/hw/i386/multiboot_header.h b/hw/i386/multiboot_header.h new file mode 100644 index 0000000000..563014698c --- /dev/null +++ b/hw/i386/multiboot_header.h @@ -0,0 +1,254 @@ +/* multiboot.h - Multiboot header file. */ +/* Copyright (C) 1999,2003,2007,2008,2009,2010 Free Software Foundation, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL ANY + * DEVELOPER OR DISTRIBUTOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR + * IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +#ifndef MULTIBOOT_HEADER +#define MULTIBOOT_HEADER 1 + +/* How many bytes from the start of the file we search for the header. */ +#define MULTIBOOT_SEARCH 8192 +#define MULTIBOOT_HEADER_ALIGN 4 + +/* The magic field should contain this. */ +#define MULTIBOOT_HEADER_MAGIC 0x1BADB002 + +/* This should be in %eax. */ +#define MULTIBOOT_BOOTLOADER_MAGIC 0x2BADB002 + +/* Alignment of multiboot modules. */ +#define MULTIBOOT_MOD_ALIGN 0x00001000 + +/* Alignment of the multiboot info structure. */ +#define MULTIBOOT_INFO_ALIGN 0x00000004 + +/* Flags set in the 'flags' member of the multiboot header. */ + +/* Align all boot modules on i386 page (4KB) boundaries. */ +#define MULTIBOOT_PAGE_ALIGN 0x00000001 + +/* Must pass memory information to OS. */ +#define MULTIBOOT_MEMORY_INFO 0x00000002 + +/* Must pass video information to OS. */ +#define MULTIBOOT_VIDEO_MODE 0x00000004 + +/* This flag indicates the use of the address fields in the header. */ +#define MULTIBOOT_AOUT_KLUDGE 0x00010000 + +/* Flags to be set in the 'flags' member of the multiboot info structure. */ + +/* is there basic lower/upper memory information? */ +#define MULTIBOOT_INFO_MEMORY 0x00000001 +/* is there a boot device set? */ +#define MULTIBOOT_INFO_BOOTDEV 0x00000002 +/* is the command-line defined? */ +#define MULTIBOOT_INFO_CMDLINE 0x00000004 +/* are there modules to do something with? */ +#define MULTIBOOT_INFO_MODS 0x00000008 + +/* These next two are mutually exclusive */ + +/* is there a symbol table loaded? */ +#define MULTIBOOT_INFO_AOUT_SYMS 0x00000010 +/* is there an ELF section header table? */ +#define MULTIBOOT_INFO_ELF_SHDR 0X00000020 + +/* is there a full memory map? */ +#define MULTIBOOT_INFO_MEM_MAP 0x00000040 + +/* Is there drive info? */ +#define MULTIBOOT_INFO_DRIVE_INFO 0x00000080 + +/* Is there a config table? */ +#define MULTIBOOT_INFO_CONFIG_TABLE 0x00000100 + +/* Is there a boot loader name? */ +#define MULTIBOOT_INFO_BOOT_LOADER_NAME 0x00000200 + +/* Is there a APM table? */ +#define MULTIBOOT_INFO_APM_TABLE 0x00000400 + +/* Is there video information? */ +#define MULTIBOOT_INFO_VBE_INFO 0x00000800 +#define MULTIBOOT_INFO_FRAMEBUFFER_INFO 0x00001000 + +struct multiboot_header { + /* Must be MULTIBOOT_MAGIC - see above. */ + uint32_t magic; + + /* Feature flags. */ + uint32_t flags; + + /* The above fields plus this one must equal 0 mod 2^32. */ + uint32_t checksum; + + /* These are only valid if MULTIBOOT_AOUT_KLUDGE is set. */ + uint32_t header_addr; + uint32_t load_addr; + uint32_t load_end_addr; + uint32_t bss_end_addr; + uint32_t entry_addr; + + /* These are only valid if MULTIBOOT_VIDEO_MODE is set. */ + uint32_t mode_type; + uint32_t width; + uint32_t height; + uint32_t depth; +}; + +/* The symbol table for a.out. */ +struct multiboot_aout_symbol_table { + uint32_t tabsize; + uint32_t strsize; + uint32_t addr; + uint32_t reserved; +}; +typedef struct multiboot_aout_symbol_table multiboot_aout_symbol_table_t; + +/* The section header table for ELF. */ +struct multiboot_elf_section_header_table { + uint32_t num; + uint32_t size; + uint32_t addr; + uint32_t shndx; +}; +typedef struct multiboot_elf_section_header_table + multiboot_elf_section_header_table_t; + +struct multiboot_info { + /* Multiboot info version number */ + uint32_t flags; + + /* Available memory from BIOS */ + uint32_t mem_lower; + uint32_t mem_upper; + + /* "root" partition */ + uint32_t boot_device; + + /* Kernel command line */ + uint32_t cmdline; + + /* Boot-Module list */ + uint32_t mods_count; + uint32_t mods_addr; + + union { + multiboot_aout_symbol_table_t aout_sym; + multiboot_elf_section_header_table_t elf_sec; + } u; + + /* Memory Mapping buffer */ + uint32_t mmap_length; + uint32_t mmap_addr; + + /* Drive Info buffer */ + uint32_t drives_length; + uint32_t drives_addr; + + /* ROM configuration table */ + uint32_t config_table; + + /* Boot Loader Name */ + uint32_t boot_loader_name; + + /* APM table */ + uint32_t apm_table; + + /* Video */ + uint32_t vbe_control_info; + uint32_t vbe_mode_info; + uint16_t vbe_mode; + uint16_t vbe_interface_seg; + uint16_t vbe_interface_off; + uint16_t vbe_interface_len; + + uint64_t framebuffer_addr; + uint32_t framebuffer_pitch; + uint32_t framebuffer_width; + uint32_t framebuffer_height; + uint8_t framebuffer_bpp; +#define MULTIBOOT_FRAMEBUFFER_TYPE_INDEXED 0 +#define MULTIBOOT_FRAMEBUFFER_TYPE_RGB 1 +#define MULTIBOOT_FRAMEBUFFER_TYPE_EGA_TEXT 2 + uint8_t framebuffer_type; + union { + struct { + uint32_t framebuffer_palette_addr; + uint16_t framebuffer_palette_num_colors; + }; + struct { + uint8_t framebuffer_red_field_position; + uint8_t framebuffer_red_mask_size; + uint8_t framebuffer_green_field_position; + uint8_t framebuffer_green_mask_size; + uint8_t framebuffer_blue_field_position; + uint8_t framebuffer_blue_mask_size; + }; + }; +}; +typedef struct multiboot_info multiboot_info_t; + +struct multiboot_color { + uint8_t red; + uint8_t green; + uint8_t blue; +}; + +struct multiboot_mmap_entry { + uint32_t size; + uint64_t addr; + uint64_t len; +#define MULTIBOOT_MEMORY_AVAILABLE 1 +#define MULTIBOOT_MEMORY_RESERVED 2 +#define MULTIBOOT_MEMORY_ACPI_RECLAIMABLE 3 +#define MULTIBOOT_MEMORY_NVS 4 +#define MULTIBOOT_MEMORY_BADRAM 5 + uint32_t type; +} __attribute__ ((packed)); +typedef struct multiboot_mmap_entry multiboot_memory_map_t; + +struct multiboot_mod_list { + /* the memory used goes from bytes 'mod_start' to 'mod_end-1' inclusive */ + uint32_t mod_start; + uint32_t mod_end; + + /* Module command line */ + uint32_t cmdline; + + /* padding to take it to 16 bytes (must be zero) */ + uint32_t pad; +}; +typedef struct multiboot_mod_list multiboot_module_t; + +/* APM BIOS info. */ +struct multiboot_apm_info { + uint16_t version; + uint16_t cseg; + uint32_t offset; + uint16_t cseg_16; + uint16_t dseg; + uint16_t flags; + uint16_t cseg_len; + uint16_t cseg_16_len; + uint16_t dseg_len; +}; + +#endif /* ! MULTIBOOT_HEADER */ diff --git a/tests/multiboot/mmap.c b/tests/multiboot/mmap.c index 766b003f38..9cba8b07e0 100644 --- a/tests/multiboot/mmap.c +++ b/tests/multiboot/mmap.c @@ -21,15 +21,17 @@ */ #include "libc.h" -#include "multiboot.h" +#include "../../hw/i386/multiboot_header.h" -int test_main(uint32_t magic, struct mb_info *mbi) +int test_main(uint32_t magic, struct multiboot_info *mbi) { uintptr_t entry_addr; - struct mb_mmap_entry *entry; + struct multiboot_mmap_entry *entry; (void) magic; + printf("Multiboot header at %x\n\n", mbi); + printf("Lower memory: %dk\n", mbi->mem_lower); printf("Upper memory: %dk\n", mbi->mem_upper); @@ -39,11 +41,11 @@ int test_main(uint32_t magic, struct mb_info *mbi) entry_addr < mbi->mmap_addr + mbi->mmap_length; entry_addr += entry->size + 4) { - entry = (struct mb_mmap_entry*) entry_addr; + entry = (struct multiboot_mmap_entry*) entry_addr; printf("%#llx - %#llx: type %d [entry size: %d]\n", - entry->base_addr, - entry->base_addr + entry->length, + entry->addr, + entry->addr + entry->len, entry->type, entry->size); } diff --git a/tests/multiboot/mmap.out b/tests/multiboot/mmap.out index 003e109b4c..e3a28237ab 100644 --- a/tests/multiboot/mmap.out +++ b/tests/multiboot/mmap.out @@ -3,6 +3,8 @@ === Running test case: mmap.elf === +Multiboot header at 9500 + Lower memory: 639k Upper memory: 129920k @@ -21,6 +23,8 @@ real mmap end: 0x9090 === Running test case: mmap.elf -m 1.1M === +Multiboot header at 9500 + Lower memory: 639k Upper memory: 104k @@ -38,6 +42,8 @@ real mmap end: 0x9078 === Running test case: mmap.elf -m 2G === +Multiboot header at 9500 + Lower memory: 639k Upper memory: 2096000k @@ -56,6 +62,8 @@ real mmap end: 0x9090 === Running test case: mmap.elf -m 4G === +Multiboot header at 9500 + Lower memory: 639k Upper memory: 3144576k @@ -75,6 +83,8 @@ real mmap end: 0x90a8 === Running test case: mmap.elf -m 8G === +Multiboot header at 9500 + Lower memory: 639k Upper memory: 3144576k diff --git a/tests/multiboot/modules.c b/tests/multiboot/modules.c index 531601fb30..a1da0ded44 100644 --- a/tests/multiboot/modules.c +++ b/tests/multiboot/modules.c @@ -21,19 +21,21 @@ */ #include "libc.h" -#include "multiboot.h" +#include "../../hw/i386/multiboot_header.h" -int test_main(uint32_t magic, struct mb_info *mbi) +int test_main(uint32_t magic, struct multiboot_info *mbi) { - struct mb_module *mod; + struct multiboot_mod_list *mod; unsigned int i; (void) magic; + printf("Multiboot header at %x\n\n", mbi); + printf("Module list with %d entries at %x\n", mbi->mods_count, mbi->mods_addr); - for (i = 0, mod = (struct mb_module*) mbi->mods_addr; + for (i = 0, mod = (struct multiboot_mod_list*) mbi->mods_addr; i < mbi->mods_count; i++, mod++) { @@ -41,7 +43,7 @@ int test_main(uint32_t magic, struct mb_info *mbi) unsigned int size = mod->mod_end - mod->mod_start; printf("[%p] Module: %x - %x (%d bytes) '%s'\n", - mod, mod->mod_start, mod->mod_end, size, mod->string); + mod, mod->mod_start, mod->mod_end, size, mod->cmdline); /* Print test file, but remove the newline at the end */ if (size < sizeof(buf)) { diff --git a/tests/multiboot/modules.out b/tests/multiboot/modules.out index 1636708035..0da7b39374 100644 --- a/tests/multiboot/modules.out +++ b/tests/multiboot/modules.out @@ -3,11 +3,15 @@ === Running test case: modules.elf === +Multiboot header at 9500 + Module list with 0 entries at 102000 === Running test case: modules.elf -initrd module.txt === +Multiboot header at 9500 + Module list with 1 entries at 102000 [102000] Module: 103000 - 103038 (56 bytes) 'module.txt' Content: 'This is a test file that is used as a multiboot module.' @@ -15,6 +19,8 @@ Module list with 1 entries at 102000 === Running test case: modules.elf -initrd module.txt argument === +Multiboot header at 9500 + Module list with 1 entries at 102000 [102000] Module: 103000 - 103038 (56 bytes) 'module.txt argument' Content: 'This is a test file that is used as a multiboot module.' @@ -22,6 +28,8 @@ Module list with 1 entries at 102000 === Running test case: modules.elf -initrd module.txt argument,,with,,commas === +Multiboot header at 9500 + Module list with 1 entries at 102000 [102000] Module: 103000 - 103038 (56 bytes) 'module.txt argument,with,commas' Content: 'This is a test file that is used as a multiboot module.' @@ -29,6 +37,8 @@ Module list with 1 entries at 102000 === Running test case: modules.elf -initrd module.txt,module.txt argument,module.txt === +Multiboot header at 9500 + Module list with 3 entries at 102000 [102000] Module: 103000 - 103038 (56 bytes) 'module.txt' Content: 'This is a test file that is used as a multiboot module.' diff --git a/tests/multiboot/multiboot.h b/tests/multiboot/multiboot.h deleted file mode 100644 index 4eb1fbe5d4..0000000000 --- a/tests/multiboot/multiboot.h +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright (c) 2013 Kevin Wolf <kwolf@redhat.com> - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -#ifndef MULTIBOOT_H -#define MULTIBOOT_H - -#include "libc.h" - -struct mb_info { - uint32_t flags; - uint32_t mem_lower; - uint32_t mem_upper; - uint32_t boot_device; - uint32_t cmdline; - uint32_t mods_count; - uint32_t mods_addr; - char syms[16]; - uint32_t mmap_length; - uint32_t mmap_addr; - uint32_t drives_length; - uint32_t drives_addr; - uint32_t config_table; - uint32_t boot_loader_name; - uint32_t apm_table; - uint32_t vbe_control_info; - uint32_t vbe_mode_info; - uint16_t vbe_mode; - uint16_t vbe_interface_seg; - uint16_t vbe_interface_off; - uint16_t vbe_interface_len; -} __attribute__((packed)); - -struct mb_module { - uint32_t mod_start; - uint32_t mod_end; - uint32_t string; - uint32_t reserved; -} __attribute__((packed)); - -struct mb_mmap_entry { - uint32_t size; - uint64_t base_addr; - uint64_t length; - uint32_t type; -} __attribute__((packed)); - -#endif
Using C structs makes the code more readable and prevents type conversion errors. Borrow multiboot1 header from GRUB project. Signed-off-by: Anatol Pomozov <anatol.pomozov@gmail.com> --- hw/i386/multiboot.c | 124 +++++++++------------ hw/i386/multiboot_header.h | 254 ++++++++++++++++++++++++++++++++++++++++++++ tests/multiboot/mmap.c | 14 +-- tests/multiboot/mmap.out | 10 ++ tests/multiboot/modules.c | 12 ++- tests/multiboot/modules.out | 10 ++ tests/multiboot/multiboot.h | 66 ------------ 7 files changed, 339 insertions(+), 151 deletions(-) create mode 100644 hw/i386/multiboot_header.h delete mode 100644 tests/multiboot/multiboot.h