| Message ID | 1460723596-13261-9-git-send-email-daniel.kiper@oracle.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
>>> On 15.04.16 at 14:33, <daniel.kiper@oracle.com> wrote: > @@ -19,6 +20,28 @@ > #define BOOT_PSEUDORM_CS 0x0020 > #define BOOT_PSEUDORM_DS 0x0028 > > +#define MB2_HT(name) (MULTIBOOT2_HEADER_TAG_##name) > +#define MB2_TT(name) (MULTIBOOT2_TAG_TYPE_##name) > + > + .macro mb2ht_args arg, args:vararg > + .long \arg > + .ifnb \args > + mb2ht_args \args > + .endif > + .endm > + > + .macro mb2ht_init type, req, args:vararg If you already use :vararg here and above, please also use :req on the other macro arguments. > @@ -34,6 +57,42 @@ multiboot1_header_start: /*** MULTIBOOT1 HEADER ****/ > .long -(MULTIBOOT_HEADER_MAGIC + MULTIBOOT_HEADER_FLAGS) > multiboot1_header_end: > > +/*** MULTIBOOT2 HEADER ****/ > +/* Some ideas are taken from grub-2.00/grub-core/tests/boot/kernel-i386.S file. */ > + .align MULTIBOOT2_HEADER_ALIGN > + > +multiboot2_header_start: > + /* Magic number indicating a Multiboot2 header. */ > + .long MULTIBOOT2_HEADER_MAGIC > + /* Architecture: i386. */ > + .long MULTIBOOT2_ARCHITECTURE_I386 > + /* Multiboot2 header length. */ > + .long multiboot2_header_end - multiboot2_header_start > + /* Multiboot2 header checksum. */ > + .long -(MULTIBOOT2_HEADER_MAGIC + MULTIBOOT2_ARCHITECTURE_I386 + \ > + (multiboot2_header_end - multiboot2_header_start)) > + > + /* Multiboot2 information request tag. */ > + mb2ht_init MB2_HT(INFORMATION_REQUEST), MB2_HT(REQUIRED), \ > + MB2_TT(BASIC_MEMINFO), MB2_TT(MMAP) > + > + /* Align modules at page boundry. */ > + mb2ht_init MB2_HT(MODULE_ALIGN), MB2_HT(REQUIRED) > + > + /* Console flags tag. */ > + mb2ht_init MB2_HT(CONSOLE_FLAGS), MB2_HT(OPTIONAL), \ > + MULTIBOOT2_CONSOLE_FLAGS_EGA_TEXT_SUPPORTED > + > + /* Framebuffer tag. */ > + mb2ht_init MB2_HT(FRAMEBUFFER), MB2_HT(OPTIONAL), \ > + 0, /* Number of the columns - no preference. */ \ > + 0, /* Number of the lines - no preference. */ \ > + 0 /* Number of bits per pixel - no preference. */ > + > + /* Multiboot2 header end tag. */ > + mb2ht_init MB2_HT(END), MB2_HT(REQUIRED) > +multiboot2_header_end: Imo "end" labels should always preferably be .L-prefixed, to avoid them getting used by a consumer instead of another "proper" label starting whatever comes next. > @@ -82,10 +141,49 @@ __start: > mov %ecx,%es > mov %ecx,%ss > > - /* Check for Multiboot bootloader */ > + /* Bootloaders may set multiboot{1,2}.mem_lower to a nonzero value. */ > + xor %edx,%edx > + > + /* Check for Multiboot2 bootloader. */ > + cmp $MULTIBOOT2_BOOTLOADER_MAGIC,%eax > + je multiboot2_proto > + > + /* Check for Multiboot bootloader. */ > cmp $MULTIBOOT_BOOTLOADER_MAGIC,%eax > jne not_multiboot > > + /* Get mem_lower from Multiboot information. */ > + testb $MBI_MEMLIMITS,MB_flags(%ebx) > + > + /* Not available? BDA value will be fine. */ > + cmovnz MB_mem_lower(%ebx),%edx > + jmp trampoline_setup > + > +multiboot2_proto: > + /* Skip Multiboot2 information fixed part. */ > + lea (MB2_fixed_sizeof+MULTIBOOT2_TAG_ALIGN-1)(%ebx),%ecx > + and $~(MULTIBOOT2_TAG_ALIGN-1),%ecx > + > +0: > + /* Get mem_lower from Multiboot2 information. */ > + cmpl $MULTIBOOT2_TAG_TYPE_BASIC_MEMINFO,MB2_tag_type(%ecx) > + jne 1f > + > + mov MB2_mem_lower(%ecx),%edx > + jmp trampoline_setup > + > +1: > + /* Is it the end of Multiboot2 information? */ > + cmpl $MULTIBOOT2_TAG_TYPE_END,MB2_tag_type(%ecx) > + je trampoline_setup > + > + /* Go to next Multiboot2 information tag. */ > + add MB2_tag_size(%ecx),%ecx > + add $(MULTIBOOT2_TAG_ALIGN-1),%ecx > + and $~(MULTIBOOT2_TAG_ALIGN-1),%ecx > + jmp 0b I'm missing a total size check, matching what meanwhile got added to the C equivalent(s) of this loop. There's little point in doing it there if it doesn't also get done here. > @@ -41,7 +45,16 @@ asm ( > ); > > typedef unsigned int u32; > +typedef unsigned long long u64; > + > #include "../../../include/xen/multiboot.h" > +#include "../../../include/xen/multiboot2.h" > + > +#define ALIGN_UP(addr, align) \ > + (((addr) + (typeof(addr))(align) - 1) & ~((typeof(addr))(align) - 1)) What is the left typeof() needed for here? (I can see the point of the right one.) > +static multiboot_info_t *mbi2_mbi(u32 mbi_in) > +{ > + const multiboot2_memory_map_t *mmap_src; > + const multiboot2_tag_t *tag; > + /* Do not complain that mbi_out_mods is not initialized. */ > + module_t *mbi_out_mods = (module_t *)0; Do we not have a proper NULL available in this environment? > +/* Multiboot 2 architectures. */ > +#define MULTIBOOT2_ARCHITECTURE_I386 0 > +#define MULTIBOOT2_ARCHITECTURE_MIPS32 4 What's the latter good for? I can't imagine this is a complete list... Jan
On Tue, May 24, 2016 at 09:46:13AM -0600, Jan Beulich wrote: > >>> On 15.04.16 at 14:33, <daniel.kiper@oracle.com> wrote: > > @@ -19,6 +20,28 @@ > > #define BOOT_PSEUDORM_CS 0x0020 > > #define BOOT_PSEUDORM_DS 0x0028 > > > > +#define MB2_HT(name) (MULTIBOOT2_HEADER_TAG_##name) > > +#define MB2_TT(name) (MULTIBOOT2_TAG_TYPE_##name) > > + > > + .macro mb2ht_args arg, args:vararg > > + .long \arg > > + .ifnb \args > > + mb2ht_args \args > > + .endif > > + .endm > > + > > + .macro mb2ht_init type, req, args:vararg > > If you already use :vararg here and above, please also use :req on > the other macro arguments. Why? > > @@ -34,6 +57,42 @@ multiboot1_header_start: /*** MULTIBOOT1 HEADER ****/ > > .long -(MULTIBOOT_HEADER_MAGIC + MULTIBOOT_HEADER_FLAGS) > > multiboot1_header_end: > > > > +/*** MULTIBOOT2 HEADER ****/ > > +/* Some ideas are taken from grub-2.00/grub-core/tests/boot/kernel-i386.S file. */ > > + .align MULTIBOOT2_HEADER_ALIGN > > + > > +multiboot2_header_start: > > + /* Magic number indicating a Multiboot2 header. */ > > + .long MULTIBOOT2_HEADER_MAGIC > > + /* Architecture: i386. */ > > + .long MULTIBOOT2_ARCHITECTURE_I386 > > + /* Multiboot2 header length. */ > > + .long multiboot2_header_end - multiboot2_header_start > > + /* Multiboot2 header checksum. */ > > + .long -(MULTIBOOT2_HEADER_MAGIC + MULTIBOOT2_ARCHITECTURE_I386 + \ > > + (multiboot2_header_end - multiboot2_header_start)) > > + > > + /* Multiboot2 information request tag. */ > > + mb2ht_init MB2_HT(INFORMATION_REQUEST), MB2_HT(REQUIRED), \ > > + MB2_TT(BASIC_MEMINFO), MB2_TT(MMAP) > > + > > + /* Align modules at page boundry. */ > > + mb2ht_init MB2_HT(MODULE_ALIGN), MB2_HT(REQUIRED) > > + > > + /* Console flags tag. */ > > + mb2ht_init MB2_HT(CONSOLE_FLAGS), MB2_HT(OPTIONAL), \ > > + MULTIBOOT2_CONSOLE_FLAGS_EGA_TEXT_SUPPORTED > > + > > + /* Framebuffer tag. */ > > + mb2ht_init MB2_HT(FRAMEBUFFER), MB2_HT(OPTIONAL), \ > > + 0, /* Number of the columns - no preference. */ \ > > + 0, /* Number of the lines - no preference. */ \ > > + 0 /* Number of bits per pixel - no preference. */ > > + > > + /* Multiboot2 header end tag. */ > > + mb2ht_init MB2_HT(END), MB2_HT(REQUIRED) > > +multiboot2_header_end: > > Imo "end" labels should always preferably be .L-prefixed, to avoid > them getting used by a consumer instead of another "proper" label > starting whatever comes next. Make sense, however, I am in line with multiboot1_header_end label here. So, if we wish .L here then we should change multiboot1_header_end label above too. Of course in separate patch. > > @@ -82,10 +141,49 @@ __start: > > mov %ecx,%es > > mov %ecx,%ss > > > > - /* Check for Multiboot bootloader */ > > + /* Bootloaders may set multiboot{1,2}.mem_lower to a nonzero value. */ > > + xor %edx,%edx > > + > > + /* Check for Multiboot2 bootloader. */ > > + cmp $MULTIBOOT2_BOOTLOADER_MAGIC,%eax > > + je multiboot2_proto > > + > > + /* Check for Multiboot bootloader. */ > > cmp $MULTIBOOT_BOOTLOADER_MAGIC,%eax > > jne not_multiboot > > > > + /* Get mem_lower from Multiboot information. */ > > + testb $MBI_MEMLIMITS,MB_flags(%ebx) > > + > > + /* Not available? BDA value will be fine. */ > > + cmovnz MB_mem_lower(%ebx),%edx > > + jmp trampoline_setup > > + > > +multiboot2_proto: > > + /* Skip Multiboot2 information fixed part. */ > > + lea (MB2_fixed_sizeof+MULTIBOOT2_TAG_ALIGN-1)(%ebx),%ecx > > + and $~(MULTIBOOT2_TAG_ALIGN-1),%ecx > > + > > +0: > > + /* Get mem_lower from Multiboot2 information. */ > > + cmpl $MULTIBOOT2_TAG_TYPE_BASIC_MEMINFO,MB2_tag_type(%ecx) > > + jne 1f > > + > > + mov MB2_mem_lower(%ecx),%edx > > + jmp trampoline_setup > > + > > +1: > > + /* Is it the end of Multiboot2 information? */ > > + cmpl $MULTIBOOT2_TAG_TYPE_END,MB2_tag_type(%ecx) > > + je trampoline_setup > > + > > + /* Go to next Multiboot2 information tag. */ > > + add MB2_tag_size(%ecx),%ecx > > + add $(MULTIBOOT2_TAG_ALIGN-1),%ecx > > + and $~(MULTIBOOT2_TAG_ALIGN-1),%ecx > > + jmp 0b > > I'm missing a total size check, matching what meanwhile got added > to the C equivalent(s) of this loop. There's little point in doing it > there if it doesn't also get done here. OK. > > @@ -41,7 +45,16 @@ asm ( > > ); > > > > typedef unsigned int u32; > > +typedef unsigned long long u64; > > + > > #include "../../../include/xen/multiboot.h" > > +#include "../../../include/xen/multiboot2.h" > > + > > +#define ALIGN_UP(addr, align) \ > > + (((addr) + (typeof(addr))(align) - 1) & ~((typeof(addr))(align) - 1)) > > What is the left typeof() needed for here? (I can see the point of > the right one.) AIUI, right typeof() is needed for "~" but it looks that left one is not needed and could be safely removed. > > +static multiboot_info_t *mbi2_mbi(u32 mbi_in) > > +{ > > + const multiboot2_memory_map_t *mmap_src; > > + const multiboot2_tag_t *tag; > > + /* Do not complain that mbi_out_mods is not initialized. */ > > + module_t *mbi_out_mods = (module_t *)0; > > Do we not have a proper NULL available in this environment? No, we should define it or include relevant header file. > > +/* Multiboot 2 architectures. */ > > +#define MULTIBOOT2_ARCHITECTURE_I386 0 > > +#define MULTIBOOT2_ARCHITECTURE_MIPS32 4 > > What's the latter good for? I can't imagine this is a complete list... Surprisingly it is! However, TBH, it is not really used by us. Just copied from GRUB2 multiboot2.h file for completeness. Daniel
>>> @@ -34,6 +57,42 @@ multiboot1_header_start: /*** MULTIBOOT1 HEADER ****/ >>> .long -(MULTIBOOT_HEADER_MAGIC + MULTIBOOT_HEADER_FLAGS) >>> multiboot1_header_end: >>> >>> +/*** MULTIBOOT2 HEADER ****/ >>> +/* Some ideas are taken from grub-2.00/grub-core/tests/boot/kernel-i386.S file. */ >>> + .align MULTIBOOT2_HEADER_ALIGN >>> + >>> +multiboot2_header_start: >>> + /* Magic number indicating a Multiboot2 header. */ >>> + .long MULTIBOOT2_HEADER_MAGIC >>> + /* Architecture: i386. */ >>> + .long MULTIBOOT2_ARCHITECTURE_I386 >>> + /* Multiboot2 header length. */ >>> + .long multiboot2_header_end - multiboot2_header_start >>> + /* Multiboot2 header checksum. */ >>> + .long -(MULTIBOOT2_HEADER_MAGIC + MULTIBOOT2_ARCHITECTURE_I386 + \ >>> + (multiboot2_header_end - multiboot2_header_start)) >>> + >>> + /* Multiboot2 information request tag. */ >>> + mb2ht_init MB2_HT(INFORMATION_REQUEST), MB2_HT(REQUIRED), \ >>> + MB2_TT(BASIC_MEMINFO), MB2_TT(MMAP) >>> + >>> + /* Align modules at page boundry. */ >>> + mb2ht_init MB2_HT(MODULE_ALIGN), MB2_HT(REQUIRED) >>> + >>> + /* Console flags tag. */ >>> + mb2ht_init MB2_HT(CONSOLE_FLAGS), MB2_HT(OPTIONAL), \ >>> + MULTIBOOT2_CONSOLE_FLAGS_EGA_TEXT_SUPPORTED >>> + >>> + /* Framebuffer tag. */ >>> + mb2ht_init MB2_HT(FRAMEBUFFER), MB2_HT(OPTIONAL), \ >>> + 0, /* Number of the columns - no preference. */ \ >>> + 0, /* Number of the lines - no preference. */ \ >>> + 0 /* Number of bits per pixel - no preference. */ >>> + >>> + /* Multiboot2 header end tag. */ >>> + mb2ht_init MB2_HT(END), MB2_HT(REQUIRED) >>> +multiboot2_header_end: >> Imo "end" labels should always preferably be .L-prefixed, to avoid >> them getting used by a consumer instead of another "proper" label >> starting whatever comes next. > Make sense, however, I am in line with multiboot1_header_end label here. > So, if we wish .L here then we should change multiboot1_header_end label > above too. Of course in separate patch. The multiboot1 header is very specifically not a local label, so you can distinguish the actual header from the 3 nops following it in the disassembly. ~Andrew
>>> On 26.05.16 at 12:28, <andrew.cooper3@citrix.com> wrote: >>>> @@ -34,6 +57,42 @@ multiboot1_header_start: /*** MULTIBOOT1 HEADER > ****/ >>>> .long -(MULTIBOOT_HEADER_MAGIC + MULTIBOOT_HEADER_FLAGS) >>>> multiboot1_header_end: >>>> >>>> +/*** MULTIBOOT2 HEADER ****/ >>>> +/* Some ideas are taken from grub-2.00/grub-core/tests/boot/kernel-i386.S > file. */ >>>> + .align MULTIBOOT2_HEADER_ALIGN >>>> + >>>> +multiboot2_header_start: >>>> + /* Magic number indicating a Multiboot2 header. */ >>>> + .long MULTIBOOT2_HEADER_MAGIC >>>> + /* Architecture: i386. */ >>>> + .long MULTIBOOT2_ARCHITECTURE_I386 >>>> + /* Multiboot2 header length. */ >>>> + .long multiboot2_header_end - multiboot2_header_start >>>> + /* Multiboot2 header checksum. */ >>>> + .long -(MULTIBOOT2_HEADER_MAGIC + MULTIBOOT2_ARCHITECTURE_I386 + > \ >>>> + (multiboot2_header_end - multiboot2_header_start)) >>>> + >>>> + /* Multiboot2 information request tag. */ >>>> + mb2ht_init MB2_HT(INFORMATION_REQUEST), MB2_HT(REQUIRED), \ >>>> + MB2_TT(BASIC_MEMINFO), MB2_TT(MMAP) >>>> + >>>> + /* Align modules at page boundry. */ >>>> + mb2ht_init MB2_HT(MODULE_ALIGN), MB2_HT(REQUIRED) >>>> + >>>> + /* Console flags tag. */ >>>> + mb2ht_init MB2_HT(CONSOLE_FLAGS), MB2_HT(OPTIONAL), \ >>>> + MULTIBOOT2_CONSOLE_FLAGS_EGA_TEXT_SUPPORTED >>>> + >>>> + /* Framebuffer tag. */ >>>> + mb2ht_init MB2_HT(FRAMEBUFFER), MB2_HT(OPTIONAL), \ >>>> + 0, /* Number of the columns - no preference. */ \ >>>> + 0, /* Number of the lines - no preference. */ \ >>>> + 0 /* Number of bits per pixel - no preference. */ >>>> + >>>> + /* Multiboot2 header end tag. */ >>>> + mb2ht_init MB2_HT(END), MB2_HT(REQUIRED) >>>> +multiboot2_header_end: >>> Imo "end" labels should always preferably be .L-prefixed, to avoid >>> them getting used by a consumer instead of another "proper" label >>> starting whatever comes next. >> Make sense, however, I am in line with multiboot1_header_end label here. >> So, if we wish .L here then we should change multiboot1_header_end label >> above too. Of course in separate patch. > > The multiboot1 header is very specifically not a local label, so you can > distinguish the actual header from the 3 nops following it in the > disassembly. I don't follow: Those NOPs (also not sure why you think it's three of them) are there just for padding (alignment), so no need to label them. Plus with the patch in place they would now appear after the multiboot2 header. Jan
>>> On 25.05.16 at 18:34, <daniel.kiper@oracle.com> wrote: > On Tue, May 24, 2016 at 09:46:13AM -0600, Jan Beulich wrote: >> >>> On 15.04.16 at 14:33, <daniel.kiper@oracle.com> wrote: >> > @@ -19,6 +20,28 @@ >> > #define BOOT_PSEUDORM_CS 0x0020 >> > #define BOOT_PSEUDORM_DS 0x0028 >> > >> > +#define MB2_HT(name) (MULTIBOOT2_HEADER_TAG_##name) >> > +#define MB2_TT(name) (MULTIBOOT2_TAG_TYPE_##name) >> > + >> > + .macro mb2ht_args arg, args:vararg >> > + .long \arg >> > + .ifnb \args >> > + mb2ht_args \args >> > + .endif >> > + .endm >> > + >> > + .macro mb2ht_init type, req, args:vararg >> >> If you already use :vararg here and above, please also use :req on >> the other macro arguments. > > Why? Because they're not allowed to be blank, yet it looks like if they are left blank no error would otherwise be reported by gas? >> > @@ -34,6 +57,42 @@ multiboot1_header_start: /*** MULTIBOOT1 HEADER ****/ >> > .long -(MULTIBOOT_HEADER_MAGIC + MULTIBOOT_HEADER_FLAGS) >> > multiboot1_header_end: >> > >> > +/*** MULTIBOOT2 HEADER ****/ >> > +/* Some ideas are taken from grub-2.00/grub-core/tests/boot/kernel-i386.S file. */ >> > + .align MULTIBOOT2_HEADER_ALIGN >> > + >> > +multiboot2_header_start: >> > + /* Magic number indicating a Multiboot2 header. */ >> > + .long MULTIBOOT2_HEADER_MAGIC >> > + /* Architecture: i386. */ >> > + .long MULTIBOOT2_ARCHITECTURE_I386 >> > + /* Multiboot2 header length. */ >> > + .long multiboot2_header_end - multiboot2_header_start >> > + /* Multiboot2 header checksum. */ >> > + .long -(MULTIBOOT2_HEADER_MAGIC + MULTIBOOT2_ARCHITECTURE_I386 + \ >> > + (multiboot2_header_end - multiboot2_header_start)) >> > + >> > + /* Multiboot2 information request tag. */ >> > + mb2ht_init MB2_HT(INFORMATION_REQUEST), MB2_HT(REQUIRED), \ >> > + MB2_TT(BASIC_MEMINFO), MB2_TT(MMAP) >> > + >> > + /* Align modules at page boundry. */ >> > + mb2ht_init MB2_HT(MODULE_ALIGN), MB2_HT(REQUIRED) >> > + >> > + /* Console flags tag. */ >> > + mb2ht_init MB2_HT(CONSOLE_FLAGS), MB2_HT(OPTIONAL), \ >> > + MULTIBOOT2_CONSOLE_FLAGS_EGA_TEXT_SUPPORTED >> > + >> > + /* Framebuffer tag. */ >> > + mb2ht_init MB2_HT(FRAMEBUFFER), MB2_HT(OPTIONAL), \ >> > + 0, /* Number of the columns - no preference. */ \ >> > + 0, /* Number of the lines - no preference. */ \ >> > + 0 /* Number of bits per pixel - no preference. */ >> > + >> > + /* Multiboot2 header end tag. */ >> > + mb2ht_init MB2_HT(END), MB2_HT(REQUIRED) >> > +multiboot2_header_end: >> >> Imo "end" labels should always preferably be .L-prefixed, to avoid >> them getting used by a consumer instead of another "proper" label >> starting whatever comes next. > > Make sense, however, I am in line with multiboot1_header_end label here. > So, if we wish .L here then we should change multiboot1_header_end label > above too. Of course in separate patch. Sure. My main point (as always) is that stuff that's there without a good reason shouldn't be cloned. At least the clone should be done right from the beginning. Cleaning up existing code is appreciated, but secondary. Jan
On 27/05/16 09:08, Jan Beulich wrote: >>>> On 26.05.16 at 12:28, <andrew.cooper3@citrix.com> wrote: >>>>> @@ -34,6 +57,42 @@ multiboot1_header_start: /*** MULTIBOOT1 HEADER >> ****/ >>>>> .long -(MULTIBOOT_HEADER_MAGIC + MULTIBOOT_HEADER_FLAGS) >>>>> multiboot1_header_end: >>>>> >>>>> +/*** MULTIBOOT2 HEADER ****/ >>>>> +/* Some ideas are taken from grub-2.00/grub-core/tests/boot/kernel-i386.S >> file. */ >>>>> + .align MULTIBOOT2_HEADER_ALIGN >>>>> + >>>>> +multiboot2_header_start: >>>>> + /* Magic number indicating a Multiboot2 header. */ >>>>> + .long MULTIBOOT2_HEADER_MAGIC >>>>> + /* Architecture: i386. */ >>>>> + .long MULTIBOOT2_ARCHITECTURE_I386 >>>>> + /* Multiboot2 header length. */ >>>>> + .long multiboot2_header_end - multiboot2_header_start >>>>> + /* Multiboot2 header checksum. */ >>>>> + .long -(MULTIBOOT2_HEADER_MAGIC + MULTIBOOT2_ARCHITECTURE_I386 + >> \ >>>>> + (multiboot2_header_end - multiboot2_header_start)) >>>>> + >>>>> + /* Multiboot2 information request tag. */ >>>>> + mb2ht_init MB2_HT(INFORMATION_REQUEST), MB2_HT(REQUIRED), \ >>>>> + MB2_TT(BASIC_MEMINFO), MB2_TT(MMAP) >>>>> + >>>>> + /* Align modules at page boundry. */ >>>>> + mb2ht_init MB2_HT(MODULE_ALIGN), MB2_HT(REQUIRED) >>>>> + >>>>> + /* Console flags tag. */ >>>>> + mb2ht_init MB2_HT(CONSOLE_FLAGS), MB2_HT(OPTIONAL), \ >>>>> + MULTIBOOT2_CONSOLE_FLAGS_EGA_TEXT_SUPPORTED >>>>> + >>>>> + /* Framebuffer tag. */ >>>>> + mb2ht_init MB2_HT(FRAMEBUFFER), MB2_HT(OPTIONAL), \ >>>>> + 0, /* Number of the columns - no preference. */ \ >>>>> + 0, /* Number of the lines - no preference. */ \ >>>>> + 0 /* Number of bits per pixel - no preference. */ >>>>> + >>>>> + /* Multiboot2 header end tag. */ >>>>> + mb2ht_init MB2_HT(END), MB2_HT(REQUIRED) >>>>> +multiboot2_header_end: >>>> Imo "end" labels should always preferably be .L-prefixed, to avoid >>>> them getting used by a consumer instead of another "proper" label >>>> starting whatever comes next. >>> Make sense, however, I am in line with multiboot1_header_end label here. >>> So, if we wish .L here then we should change multiboot1_header_end label >>> above too. Of course in separate patch. >> The multiboot1 header is very specifically not a local label, so you can >> distinguish the actual header from the 3 nops following it in the >> disassembly. > I don't follow: Those NOPs (also not sure why you think it's three of > them) are there just for padding (alignment), so no need to label > them. That wasn't the point I was trying to make. This is data in a code segment, so objdump/gdb disassembly tries to disassemble the data as instructions. While the instruction decode of the header is definitely junk, having the end label proves an exact boundary for the data in terms of reported raw bytes, as well as prevent the following nops being subsumed into the bogus decode. ~Andrew
>>> On 27.05.16 at 10:13, <andrew.cooper3@citrix.com> wrote: > On 27/05/16 09:08, Jan Beulich wrote: >>>>> On 26.05.16 at 12:28, <andrew.cooper3@citrix.com> wrote: >>>>>> @@ -34,6 +57,42 @@ multiboot1_header_start: /*** MULTIBOOT1 HEADER >>> ****/ >>>>>> .long -(MULTIBOOT_HEADER_MAGIC + MULTIBOOT_HEADER_FLAGS) >>>>>> multiboot1_header_end: >>>>>> >>>>>> +/*** MULTIBOOT2 HEADER ****/ >>>>>> +/* Some ideas are taken from grub-2.00/grub-core/tests/boot/kernel-i386.S >>> file. */ >>>>>> + .align MULTIBOOT2_HEADER_ALIGN >>>>>> + >>>>>> +multiboot2_header_start: >>>>>> + /* Magic number indicating a Multiboot2 header. */ >>>>>> + .long MULTIBOOT2_HEADER_MAGIC >>>>>> + /* Architecture: i386. */ >>>>>> + .long MULTIBOOT2_ARCHITECTURE_I386 >>>>>> + /* Multiboot2 header length. */ >>>>>> + .long multiboot2_header_end - multiboot2_header_start >>>>>> + /* Multiboot2 header checksum. */ >>>>>> + .long -(MULTIBOOT2_HEADER_MAGIC + MULTIBOOT2_ARCHITECTURE_I386 + >>> \ >>>>>> + (multiboot2_header_end - multiboot2_header_start)) >>>>>> + >>>>>> + /* Multiboot2 information request tag. */ >>>>>> + mb2ht_init MB2_HT(INFORMATION_REQUEST), MB2_HT(REQUIRED), \ >>>>>> + MB2_TT(BASIC_MEMINFO), MB2_TT(MMAP) >>>>>> + >>>>>> + /* Align modules at page boundry. */ >>>>>> + mb2ht_init MB2_HT(MODULE_ALIGN), MB2_HT(REQUIRED) >>>>>> + >>>>>> + /* Console flags tag. */ >>>>>> + mb2ht_init MB2_HT(CONSOLE_FLAGS), MB2_HT(OPTIONAL), \ >>>>>> + MULTIBOOT2_CONSOLE_FLAGS_EGA_TEXT_SUPPORTED >>>>>> + >>>>>> + /* Framebuffer tag. */ >>>>>> + mb2ht_init MB2_HT(FRAMEBUFFER), MB2_HT(OPTIONAL), \ >>>>>> + 0, /* Number of the columns - no preference. */ \ >>>>>> + 0, /* Number of the lines - no preference. */ \ >>>>>> + 0 /* Number of bits per pixel - no preference. */ >>>>>> + >>>>>> + /* Multiboot2 header end tag. */ >>>>>> + mb2ht_init MB2_HT(END), MB2_HT(REQUIRED) >>>>>> +multiboot2_header_end: >>>>> Imo "end" labels should always preferably be .L-prefixed, to avoid >>>>> them getting used by a consumer instead of another "proper" label >>>>> starting whatever comes next. >>>> Make sense, however, I am in line with multiboot1_header_end label here. >>>> So, if we wish .L here then we should change multiboot1_header_end label >>>> above too. Of course in separate patch. >>> The multiboot1 header is very specifically not a local label, so you can >>> distinguish the actual header from the 3 nops following it in the >>> disassembly. >> I don't follow: Those NOPs (also not sure why you think it's three of >> them) are there just for padding (alignment), so no need to label >> them. > > That wasn't the point I was trying to make. > > This is data in a code segment, so objdump/gdb disassembly tries to > disassemble the data as instructions. > > While the instruction decode of the header is definitely junk, having > the end label proves an exact boundary for the data in terms of reported > raw bytes, as well as prevent the following nops being subsumed into the > bogus decode. Where the NOPs go doesn't matter. The only relevant thing for disassembly is that the next actual instruction gets decoded correctly. And that next instruction follows its own label (__high_start). Let's please not carry more symbols at runtime than are really useful. Jan
diff --git a/xen/arch/x86/boot/Makefile b/xen/arch/x86/boot/Makefile index 5fdb5ae..06893d8 100644 --- a/xen/arch/x86/boot/Makefile +++ b/xen/arch/x86/boot/Makefile @@ -1,6 +1,7 @@ obj-bin-y += head.o -RELOC_DEPS = $(BASEDIR)/include/asm-x86/config.h $(BASEDIR)/include/xen/multiboot.h +RELOC_DEPS = $(BASEDIR)/include/asm-x86/config.h $(BASEDIR)/include/xen/multiboot.h \ + $(BASEDIR)/include/xen/multiboot2.h head.o: reloc.S diff --git a/xen/arch/x86/boot/head.S b/xen/arch/x86/boot/head.S index 1ff5937..e46d691 100644 --- a/xen/arch/x86/boot/head.S +++ b/xen/arch/x86/boot/head.S @@ -1,5 +1,6 @@ #include <xen/config.h> #include <xen/multiboot.h> +#include <xen/multiboot2.h> #include <public/xen.h> #include <asm/asm_defns.h> #include <asm/desc.h> @@ -19,6 +20,28 @@ #define BOOT_PSEUDORM_CS 0x0020 #define BOOT_PSEUDORM_DS 0x0028 +#define MB2_HT(name) (MULTIBOOT2_HEADER_TAG_##name) +#define MB2_TT(name) (MULTIBOOT2_TAG_TYPE_##name) + + .macro mb2ht_args arg, args:vararg + .long \arg + .ifnb \args + mb2ht_args \args + .endif + .endm + + .macro mb2ht_init type, req, args:vararg + .align MULTIBOOT2_TAG_ALIGN +.Lmb2ht_init_start\@: + .short \type + .short \req + .long .Lmb2ht_init_end\@ - .Lmb2ht_init_start\@ + .ifnb \args + mb2ht_args \args + .endif +.Lmb2ht_init_end\@: + .endm + ENTRY(start) jmp __start @@ -34,6 +57,42 @@ multiboot1_header_start: /*** MULTIBOOT1 HEADER ****/ .long -(MULTIBOOT_HEADER_MAGIC + MULTIBOOT_HEADER_FLAGS) multiboot1_header_end: +/*** MULTIBOOT2 HEADER ****/ +/* Some ideas are taken from grub-2.00/grub-core/tests/boot/kernel-i386.S file. */ + .align MULTIBOOT2_HEADER_ALIGN + +multiboot2_header_start: + /* Magic number indicating a Multiboot2 header. */ + .long MULTIBOOT2_HEADER_MAGIC + /* Architecture: i386. */ + .long MULTIBOOT2_ARCHITECTURE_I386 + /* Multiboot2 header length. */ + .long multiboot2_header_end - multiboot2_header_start + /* Multiboot2 header checksum. */ + .long -(MULTIBOOT2_HEADER_MAGIC + MULTIBOOT2_ARCHITECTURE_I386 + \ + (multiboot2_header_end - multiboot2_header_start)) + + /* Multiboot2 information request tag. */ + mb2ht_init MB2_HT(INFORMATION_REQUEST), MB2_HT(REQUIRED), \ + MB2_TT(BASIC_MEMINFO), MB2_TT(MMAP) + + /* Align modules at page boundry. */ + mb2ht_init MB2_HT(MODULE_ALIGN), MB2_HT(REQUIRED) + + /* Console flags tag. */ + mb2ht_init MB2_HT(CONSOLE_FLAGS), MB2_HT(OPTIONAL), \ + MULTIBOOT2_CONSOLE_FLAGS_EGA_TEXT_SUPPORTED + + /* Framebuffer tag. */ + mb2ht_init MB2_HT(FRAMEBUFFER), MB2_HT(OPTIONAL), \ + 0, /* Number of the columns - no preference. */ \ + 0, /* Number of the lines - no preference. */ \ + 0 /* Number of bits per pixel - no preference. */ + + /* Multiboot2 header end tag. */ + mb2ht_init MB2_HT(END), MB2_HT(REQUIRED) +multiboot2_header_end: + .section .init.rodata, "a", @progbits .align 4 @@ -82,10 +141,49 @@ __start: mov %ecx,%es mov %ecx,%ss - /* Check for Multiboot bootloader */ + /* Bootloaders may set multiboot{1,2}.mem_lower to a nonzero value. */ + xor %edx,%edx + + /* Check for Multiboot2 bootloader. */ + cmp $MULTIBOOT2_BOOTLOADER_MAGIC,%eax + je multiboot2_proto + + /* Check for Multiboot bootloader. */ cmp $MULTIBOOT_BOOTLOADER_MAGIC,%eax jne not_multiboot + /* Get mem_lower from Multiboot information. */ + testb $MBI_MEMLIMITS,MB_flags(%ebx) + + /* Not available? BDA value will be fine. */ + cmovnz MB_mem_lower(%ebx),%edx + jmp trampoline_setup + +multiboot2_proto: + /* Skip Multiboot2 information fixed part. */ + lea (MB2_fixed_sizeof+MULTIBOOT2_TAG_ALIGN-1)(%ebx),%ecx + and $~(MULTIBOOT2_TAG_ALIGN-1),%ecx + +0: + /* Get mem_lower from Multiboot2 information. */ + cmpl $MULTIBOOT2_TAG_TYPE_BASIC_MEMINFO,MB2_tag_type(%ecx) + jne 1f + + mov MB2_mem_lower(%ecx),%edx + jmp trampoline_setup + +1: + /* Is it the end of Multiboot2 information? */ + cmpl $MULTIBOOT2_TAG_TYPE_END,MB2_tag_type(%ecx) + je trampoline_setup + + /* Go to next Multiboot2 information tag. */ + add MB2_tag_size(%ecx),%ecx + add $(MULTIBOOT2_TAG_ALIGN-1),%ecx + and $~(MULTIBOOT2_TAG_ALIGN-1),%ecx + jmp 0b + +trampoline_setup: /* Set up trampoline segment 64k below EBDA */ movzwl 0x40e,%ecx /* EBDA segment */ cmp $0xa000,%ecx /* sanity check (high) */ @@ -100,9 +198,6 @@ __start: * Compare the value in the BDA with the information from the * multiboot structure (if available) and use the smallest. */ - testb $MBI_MEMLIMITS,(%ebx) - jz 2f /* not available? BDA value will be fine */ - mov MB_mem_lower(%ebx),%edx cmp $0x100,%edx /* is the multiboot value too small? */ jb 2f /* if so, do not use it */ shl $10-4,%edx @@ -121,8 +216,9 @@ __start: mov $sym_phys(cpu0_stack)+1024,%esp push %ecx /* Boot trampoline address. */ push %ebx /* Multiboot information address. */ + push %eax /* Multiboot magic. */ call reloc - add $8,%esp /* Remove reloc() args from stack. */ + add $12,%esp /* Remove reloc() args from stack. */ mov %eax,sym_phys(multiboot_ptr) /* Initialize BSS (no nasty surprises!). */ diff --git a/xen/arch/x86/boot/reloc.c b/xen/arch/x86/boot/reloc.c index 93b3845..84f6073 100644 --- a/xen/arch/x86/boot/reloc.c +++ b/xen/arch/x86/boot/reloc.c @@ -5,15 +5,18 @@ * and modules. This is most easily done early with paging disabled. * * Copyright (c) 2009, Citrix Systems, Inc. + * Copyright (c) 2013-2016 Oracle and/or its affiliates. All rights reserved. * * Authors: * Keir Fraser <keir@xen.org> + * Daniel Kiper <daniel.kiper@oracle.com> */ /* * This entry point is entered from xen/arch/x86/boot/head.S with: - * - 0x4(%esp) = MULTIBOOT_INFORMATION_ADDRESS, - * - 0x8(%esp) = BOOT_TRAMPOLINE_ADDRESS. + * - 0x4(%esp) = MULTIBOOT_MAGIC, + * - 0x8(%esp) = MULTIBOOT_INFORMATION_ADDRESS, + * - 0xc(%esp) = BOOT_TRAMPOLINE_ADDRESS. */ asm ( " .text \n" @@ -23,8 +26,9 @@ asm ( " mov %esp,%ebp \n" " call 1f \n" "1: pop %ecx \n" - " mov 0xc(%ebp),%eax \n" + " mov 0x10(%ebp),%eax \n" " mov %eax,alloc-1b(%ecx) \n" + " push 0xc(%ebp) \n" " push 0x8(%ebp) \n" " call reloc \n" " leave \n" @@ -41,7 +45,16 @@ asm ( ); typedef unsigned int u32; +typedef unsigned long long u64; + #include "../../../include/xen/multiboot.h" +#include "../../../include/xen/multiboot2.h" + +#define ALIGN_UP(addr, align) \ + (((addr) + (typeof(addr))(align) - 1) & ~((typeof(addr))(align) - 1)) + +#define get_mb2_data(tag, type, member) (((multiboot2_tag_##type##_t *)(tag))->member) +#define get_mb2_string(tag, type, member) ((u32)get_mb2_data(tag, type, member)) static u32 alloc_mem(u32 bytes) { @@ -59,6 +72,11 @@ static u32 alloc_mem(u32 bytes) return s; } +static void zero_mem(u32 s, u32 bytes) +{ + asm volatile("rep stosb" : "+D" (s), "+c" (bytes) : "a" (0) : "memory"); +} + static u32 copy_mem(u32 src, u32 bytes) { u32 dst, dst_asm; @@ -84,7 +102,7 @@ static u32 copy_string(u32 src) return copy_mem(src, p - src + 1); } -multiboot_info_t *reloc(u32 mbi_in) +static multiboot_info_t *mbi_mbi(u32 mbi_in) { int i; multiboot_info_t *mbi_out; @@ -125,3 +143,129 @@ multiboot_info_t *reloc(u32 mbi_in) return mbi_out; } + +static multiboot_info_t *mbi2_mbi(u32 mbi_in) +{ + const multiboot2_memory_map_t *mmap_src; + const multiboot2_tag_t *tag; + /* Do not complain that mbi_out_mods is not initialized. */ + module_t *mbi_out_mods = (module_t *)0; + memory_map_t *mmap_dst; + multiboot_info_t *mbi_out; + u32 ptr; + unsigned int i, mod_idx = 0; + + ptr = alloc_mem(sizeof(*mbi_out)); + mbi_out = (multiboot_info_t *)ptr; + zero_mem(ptr, sizeof(*mbi_out)); + + /* Skip Multiboot2 information fixed part. */ + ptr = ALIGN_UP(mbi_in + sizeof(multiboot2_fixed_t), MULTIBOOT2_TAG_ALIGN); + + /* Get the number of modules. */ + for ( tag = (multiboot2_tag_t *)ptr; ; ) + { + if ( tag->type == MULTIBOOT2_TAG_TYPE_MODULE ) + ++mbi_out->mods_count; + else if ( tag->type == MULTIBOOT2_TAG_TYPE_END ) + break; + + /* Go to next Multiboot2 information tag. */ + tag = (multiboot2_tag_t *)ALIGN_UP((u32)tag + tag->size, MULTIBOOT2_TAG_ALIGN); + + /* Check Multiboot2 information total size just in case. */ + if ( (u32)tag - mbi_in >= ((multiboot2_fixed_t *)mbi_in)->total_size ) + break; + } + + if ( mbi_out->mods_count ) + { + mbi_out->flags = MBI_MODULES; + mbi_out->mods_addr = alloc_mem(mbi_out->mods_count * sizeof(module_t)); + mbi_out_mods = (module_t *)mbi_out->mods_addr; + } + + /* Skip Multiboot2 information fixed part. */ + ptr = ALIGN_UP(mbi_in + sizeof(multiboot2_fixed_t), MULTIBOOT2_TAG_ALIGN); + + /* Put all needed data into mbi_out. */ + for ( tag = (multiboot2_tag_t *)ptr; ; ) + { + switch ( tag->type ) + { + case MULTIBOOT2_TAG_TYPE_BOOT_LOADER_NAME: + mbi_out->flags |= MBI_LOADERNAME; + ptr = get_mb2_string(tag, string, string); + mbi_out->boot_loader_name = copy_string(ptr); + break; + + case MULTIBOOT2_TAG_TYPE_CMDLINE: + mbi_out->flags |= MBI_CMDLINE; + ptr = get_mb2_string(tag, string, string); + mbi_out->cmdline = copy_string(ptr); + break; + + case MULTIBOOT2_TAG_TYPE_BASIC_MEMINFO: + mbi_out->flags |= MBI_MEMLIMITS; + mbi_out->mem_lower = get_mb2_data(tag, basic_meminfo, mem_lower); + mbi_out->mem_upper = get_mb2_data(tag, basic_meminfo, mem_upper); + break; + + case MULTIBOOT2_TAG_TYPE_MMAP: + mbi_out->flags |= MBI_MEMMAP; + mbi_out->mmap_length = get_mb2_data(tag, mmap, size); + mbi_out->mmap_length -= sizeof(multiboot2_tag_mmap_t); + mbi_out->mmap_length /= get_mb2_data(tag, mmap, entry_size); + mbi_out->mmap_length *= sizeof(memory_map_t); + + mbi_out->mmap_addr = alloc_mem(mbi_out->mmap_length); + + mmap_src = get_mb2_data(tag, mmap, entries); + mmap_dst = (memory_map_t *)mbi_out->mmap_addr; + + for ( i = 0; i < mbi_out->mmap_length / sizeof(memory_map_t); i++ ) + { + /* Init size member properly. */ + mmap_dst[i].size = sizeof(memory_map_t); + mmap_dst[i].size -= sizeof(((memory_map_t){0}).size); + /* Now copy a given region data. */ + mmap_dst[i].base_addr_low = (u32)mmap_src[i].addr; + mmap_dst[i].base_addr_high = (u32)(mmap_src[i].addr >> 32); + mmap_dst[i].length_low = (u32)mmap_src[i].len; + mmap_dst[i].length_high = (u32)(mmap_src[i].len >> 32); + mmap_dst[i].type = mmap_src[i].type; + } + break; + + case MULTIBOOT2_TAG_TYPE_MODULE: + mbi_out_mods[mod_idx].mod_start = get_mb2_data(tag, module, mod_start); + mbi_out_mods[mod_idx].mod_end = get_mb2_data(tag, module, mod_end); + ptr = get_mb2_string(tag, module, cmdline); + mbi_out_mods[mod_idx].string = copy_string(ptr); + mbi_out_mods[mod_idx].reserved = 0; + ++mod_idx; + break; + + case MULTIBOOT2_TAG_TYPE_END: + return mbi_out; + + default: + break; + } + + /* Go to next Multiboot2 information tag. */ + tag = (multiboot2_tag_t *)ALIGN_UP((u32)tag + tag->size, MULTIBOOT2_TAG_ALIGN); + + /* Check Multiboot2 information total size just in case. */ + if ( (u32)tag - mbi_in >= ((multiboot2_fixed_t *)mbi_in)->total_size ) + return mbi_out; + } +} + +multiboot_info_t *reloc(u32 mb_magic, u32 mbi_in) +{ + if ( mb_magic == MULTIBOOT2_BOOTLOADER_MAGIC ) + return mbi2_mbi(mbi_in); + else + return mbi_mbi(mbi_in); +} diff --git a/xen/arch/x86/x86_64/asm-offsets.c b/xen/arch/x86/x86_64/asm-offsets.c index 447c650..b926082 100644 --- a/xen/arch/x86/x86_64/asm-offsets.c +++ b/xen/arch/x86/x86_64/asm-offsets.c @@ -13,6 +13,7 @@ #include <asm/fixmap.h> #include <asm/hardirq.h> #include <xen/multiboot.h> +#include <xen/multiboot2.h> #define DEFINE(_sym, _val) \ asm volatile ("\n.ascii\"==>#define " #_sym " %0 /* " #_val " */<==\"" \ @@ -166,4 +167,10 @@ void __dummy__(void) OFFSET(MB_flags, multiboot_info_t, flags); OFFSET(MB_cmdline, multiboot_info_t, cmdline); OFFSET(MB_mem_lower, multiboot_info_t, mem_lower); + BLANK(); + + DEFINE(MB2_fixed_sizeof, sizeof(multiboot2_fixed_t)); + OFFSET(MB2_tag_type, multiboot2_tag_t, type); + OFFSET(MB2_tag_size, multiboot2_tag_t, size); + OFFSET(MB2_mem_lower, multiboot2_tag_basic_meminfo_t, mem_lower); } diff --git a/xen/include/xen/multiboot2.h b/xen/include/xen/multiboot2.h new file mode 100644 index 0000000..0f113f1 --- /dev/null +++ b/xen/include/xen/multiboot2.h @@ -0,0 +1,169 @@ +/* + * Copyright (C) 1999,2003,2007,2008,2009,2010 Free Software Foundation, Inc. + * + * multiboot2.h - Multiboot 2 header file. + * + * Based on grub-2.00/include/multiboot2.h file. + * + * 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 __MULTIBOOT2_H__ +#define __MULTIBOOT2_H__ + +/* The magic field should contain this. */ +#define MULTIBOOT2_HEADER_MAGIC 0xe85250d6 + +/* This should be in %eax on x86 architecture. */ +#define MULTIBOOT2_BOOTLOADER_MAGIC 0x36d76289 + +/* How many bytes from the start of the file we search for the header. */ +#define MULTIBOOT2_SEARCH 32768 + +/* Multiboot 2 header alignment. */ +#define MULTIBOOT2_HEADER_ALIGN 8 + +/* Alignment of multiboot 2 modules. */ +#define MULTIBOOT2_MOD_ALIGN 0x00001000 + +/* Alignment of the multiboot 2 info structure. */ +#define MULTIBOOT2_INFO_ALIGN 0x00000008 + +/* Multiboot 2 architectures. */ +#define MULTIBOOT2_ARCHITECTURE_I386 0 +#define MULTIBOOT2_ARCHITECTURE_MIPS32 4 + +/* Header tag types. */ +#define MULTIBOOT2_HEADER_TAG_END 0 +#define MULTIBOOT2_HEADER_TAG_INFORMATION_REQUEST 1 +#define MULTIBOOT2_HEADER_TAG_ADDRESS 2 +#define MULTIBOOT2_HEADER_TAG_ENTRY_ADDRESS 3 +#define MULTIBOOT2_HEADER_TAG_CONSOLE_FLAGS 4 +#define MULTIBOOT2_HEADER_TAG_FRAMEBUFFER 5 +#define MULTIBOOT2_HEADER_TAG_MODULE_ALIGN 6 +#define MULTIBOOT2_HEADER_TAG_EFI_BS 7 +#define MULTIBOOT2_HEADER_TAG_ENTRY_ADDRESS_EFI32 8 +#define MULTIBOOT2_HEADER_TAG_ENTRY_ADDRESS_EFI64 9 + +/* Header tag flags. */ +#define MULTIBOOT2_HEADER_TAG_REQUIRED 0 +#define MULTIBOOT2_HEADER_TAG_OPTIONAL 1 + +/* Header console tag console_flags. */ +#define MULTIBOOT2_CONSOLE_FLAGS_CONSOLE_REQUIRED 1 +#define MULTIBOOT2_CONSOLE_FLAGS_EGA_TEXT_SUPPORTED 2 + +/* Flags set in the 'flags' member of the multiboot header. */ +#define MULTIBOOT2_TAG_TYPE_END 0 +#define MULTIBOOT2_TAG_TYPE_CMDLINE 1 +#define MULTIBOOT2_TAG_TYPE_BOOT_LOADER_NAME 2 +#define MULTIBOOT2_TAG_TYPE_MODULE 3 +#define MULTIBOOT2_TAG_TYPE_BASIC_MEMINFO 4 +#define MULTIBOOT2_TAG_TYPE_BOOTDEV 5 +#define MULTIBOOT2_TAG_TYPE_MMAP 6 +#define MULTIBOOT2_TAG_TYPE_VBE 7 +#define MULTIBOOT2_TAG_TYPE_FRAMEBUFFER 8 +#define MULTIBOOT2_TAG_TYPE_ELF_SECTIONS 9 +#define MULTIBOOT2_TAG_TYPE_APM 10 +#define MULTIBOOT2_TAG_TYPE_EFI32 11 +#define MULTIBOOT2_TAG_TYPE_EFI64 12 +#define MULTIBOOT2_TAG_TYPE_SMBIOS 13 +#define MULTIBOOT2_TAG_TYPE_ACPI_OLD 14 +#define MULTIBOOT2_TAG_TYPE_ACPI_NEW 15 +#define MULTIBOOT2_TAG_TYPE_NETWORK 16 +#define MULTIBOOT2_TAG_TYPE_EFI_MMAP 17 +#define MULTIBOOT2_TAG_TYPE_EFI_BS 18 +#define MULTIBOOT2_TAG_TYPE_EFI32_IH 19 +#define MULTIBOOT2_TAG_TYPE_EFI64_IH 20 + +/* Multiboot 2 tag alignment. */ +#define MULTIBOOT2_TAG_ALIGN 8 + +/* Memory types. */ +#define MULTIBOOT2_MEMORY_AVAILABLE 1 +#define MULTIBOOT2_MEMORY_RESERVED 2 +#define MULTIBOOT2_MEMORY_ACPI_RECLAIMABLE 3 +#define MULTIBOOT2_MEMORY_NVS 4 +#define MULTIBOOT2_MEMORY_BADRAM 5 + +/* Framebuffer types. */ +#define MULTIBOOT2_FRAMEBUFFER_TYPE_INDEXED 0 +#define MULTIBOOT2_FRAMEBUFFER_TYPE_RGB 1 +#define MULTIBOOT2_FRAMEBUFFER_TYPE_EGA_TEXT 2 + +#ifndef __ASSEMBLY__ +typedef struct { + u32 total_size; + u32 reserved; +} multiboot2_fixed_t; + +typedef struct { + u32 type; + u32 size; +} multiboot2_tag_t; + +typedef struct { + u32 type; + u32 size; + char string[0]; +} multiboot2_tag_string_t; + +typedef struct { + u32 type; + u32 size; + u32 mem_lower; + u32 mem_upper; +} multiboot2_tag_basic_meminfo_t; + +typedef struct { + u64 addr; + u64 len; + u32 type; + u32 zero; +} multiboot2_memory_map_t; + +typedef struct { + u32 type; + u32 size; + u32 entry_size; + u32 entry_version; + multiboot2_memory_map_t entries[0]; +} multiboot2_tag_mmap_t; + +typedef struct { + u32 type; + u32 size; + u64 pointer; +} multiboot2_tag_efi64_t; + +typedef struct { + u32 type; + u32 size; + u64 pointer; +} multiboot2_tag_efi64_ih_t; + +typedef struct { + u32 type; + u32 size; + u32 mod_start; + u32 mod_end; + char cmdline[0]; +} multiboot2_tag_module_t; +#endif /* __ASSEMBLY__ */ + +#endif /* __MULTIBOOT2_H__ */
Add multiboot2 protocol support. Alter min memory limit handling as we now may not find it from either multiboot (v1) or multiboot2. This way we are laying the foundation for EFI + GRUB2 + Xen development. Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com> --- v3 - suggestions/fixes: - reorder reloc() arguments (suggested by Jan Beulich), - remove .L from multiboot2 header labels (suggested by Andrew Cooper, Jan Beulich and Konrad Rzeszutek Wilk), - take into account alignment when skipping multiboot2 fixed part (suggested by Konrad Rzeszutek Wilk), - create modules data if modules count != 0 (suggested by Jan Beulich), - improve macros (suggested by Jan Beulich), - reduce number of casts (suggested by Jan Beulich), - use const if possible (suggested by Jan Beulich), - drop static and __used__ attribute from reloc() (suggested by Jan Beulich), - remove isolated/stray __packed attribute from multiboot2_memory_map_t type definition (suggested by Jan Beulich), - reformat xen/include/xen/multiboot2.h (suggested by Konrad Rzeszutek Wilk), - improve comments (suggested by Konrad Rzeszutek Wilk), - remove hard tabs (suggested by Jan Beulich and Konrad Rzeszutek Wilk). v2 - suggestions/fixes: - generate multiboot2 header using macros (suggested by Jan Beulich), - improve comments (suggested by Jan Beulich), - simplify assembly in xen/arch/x86/boot/head.S (suggested by Jan Beulich), - do not include include/xen/compiler.h in xen/arch/x86/boot/reloc.c (suggested by Jan Beulich), - do not read data beyond the end of Multiboot2 information (suggested by Jan Beulich). v2 - not fixed yet: - dynamic dependency generation for xen/arch/x86/boot/reloc.S; this requires more work; I am not sure that it pays because potential patch requires more changes than addition of just multiboot2.h to Makefile (suggested by Jan Beulich), - isolated/stray __packed attribute usage for multiboot2_memory_map_t (suggested by Jan Beulich). --- xen/arch/x86/boot/Makefile | 3 +- xen/arch/x86/boot/head.S | 106 +++++++++++++++++++++-- xen/arch/x86/boot/reloc.c | 152 ++++++++++++++++++++++++++++++++- xen/arch/x86/x86_64/asm-offsets.c | 7 ++ xen/include/xen/multiboot2.h | 169 +++++++++++++++++++++++++++++++++++++ 5 files changed, 427 insertions(+), 10 deletions(-) create mode 100644 xen/include/xen/multiboot2.h