tests/multiboot: Add test for modules

This test case is meant to detect corruptions of the Multiboot modules
as well as the multiboot modules list and the module command lines.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Kevin Wolf 2015-01-15 12:26:44 +01:00 committed by Paolo Bonzini
parent b4168498f6
commit a9c837d8ef
7 changed files with 119 additions and 2 deletions

View File

@ -6,11 +6,14 @@ LD=ld
LDFLAGS=-melf_i386 -T link.ld LDFLAGS=-melf_i386 -T link.ld
LIBS=$(shell $(CC) $(CCFLAGS) -print-libgcc-file-name) LIBS=$(shell $(CC) $(CCFLAGS) -print-libgcc-file-name)
all: mmap.elf all: mmap.elf modules.elf
mmap.elf: start.o mmap.o libc.o mmap.elf: start.o mmap.o libc.o
$(LD) $(LDFLAGS) -o $@ $^ $(LIBS) $(LD) $(LDFLAGS) -o $@ $^ $(LIBS)
modules.elf: start.o modules.o libc.o
$(LD) $(LDFLAGS) -o $@ $^ $(LIBS)
%.o: %.c %.o: %.c
$(CC) $(CCFLAGS) -c -o $@ $^ $(CC) $(CCFLAGS) -c -o $@ $^

View File

@ -22,6 +22,18 @@
#include "libc.h" #include "libc.h"
void* memcpy(void *dest, const void *src, int n)
{
char *d = dest;
const char *s = src;
while (n--) {
*d++ = *s++;
}
return dest;
}
static void print_char(char c) static void print_char(char c)
{ {
outb(0xe9, c); outb(0xe9, c);

View File

@ -57,5 +57,6 @@ static inline void outb(uint16_t port, uint8_t data)
/* Misc functions */ /* Misc functions */
void printf(const char *fmt, ...); void printf(const char *fmt, ...);
void* memcpy(void *dest, const void *src, int n);
#endif #endif

View File

@ -0,0 +1 @@
This is a test file that is used as a multiboot module.

55
tests/multiboot/modules.c Normal file
View File

@ -0,0 +1,55 @@
/*
* Copyright (c) 2015 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.
*/
#include "libc.h"
#include "multiboot.h"
int test_main(uint32_t magic, struct mb_info *mbi)
{
struct mb_module *mod;
unsigned int i;
(void) magic;
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;
i < mbi->mods_count;
i++, mod++)
{
char buf[1024];
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);
/* Print test file, but remove the newline at the end */
if (size < sizeof(buf)) {
memcpy(buf, (void*) mod->mod_start, size);
buf[size - 1] = '\0';
printf(" Content: '%s'\n", buf);
}
}
return 0;
}

View File

@ -0,0 +1,38 @@
=== Running test case: modules.elf ===
Module list with 0 entries at 102000
=== Running test case: modules.elf -initrd module.txt ===
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.'
=== Running test case: modules.elf -initrd module.txt argument ===
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.'
=== Running test case: modules.elf -initrd module.txt argument,,with,,commas ===
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.'
=== Running test case: modules.elf -initrd module.txt,module.txt argument,module.txt ===
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.'
[102010] Module: 104000 - 104038 (56 bytes) 'module.txt argument'
Content: 'This is a test file that is used as a multiboot module.'
[102020] Module: 105000 - 105038 (56 bytes) 'module.txt'
Content: 'This is a test file that is used as a multiboot module.'

View File

@ -48,10 +48,17 @@ mmap() {
run_qemu mmap.elf -m 8G run_qemu mmap.elf -m 8G
} }
modules() {
run_qemu modules.elf
run_qemu modules.elf -initrd module.txt
run_qemu modules.elf -initrd "module.txt argument"
run_qemu modules.elf -initrd "module.txt argument,,with,,commas"
run_qemu modules.elf -initrd "module.txt,module.txt argument,module.txt"
}
make all make all
for t in mmap; do for t in mmap modules; do
echo > test.log echo > test.log
$t $t