Skip to contentSkip to conversation

x86: Build ISO images from x86/*.elf

PATCH In review Yi Sun 2 participants 6 messages Jun 4, 2021 KVM

lore
Share & tools
lore

Yi Sun

author
#0 lore raw

PATCH 1/2 x86: Build ISO images from x86/*.elf

Make use of tool grub-mkresure to wrap x86/*.elf in ISO images. VMM could load test cases just like a CD-ROM, which could extend usage of those cases.

Refine Makefile to clean *.iso when running 'make clean'.

lib/grub/grub.cfg new file +7 -0
new file mode 100644
index 0000000..b287cf4
@@ -0,0 +1,7 @@
+set timeout=0
+set default=0
+
+menuentry "my os" {
+    multiboot /boot/kernel.bin
+    boot
+}
x86/Makefile.common +17 -1
index 52bb7aa..62eea51 100644
@@ -50,6 +50,22 @@ FLATLIBS = lib/libcflat.a
 	$(OBJCOPY) -O elf32-i386 $^ $@
 	@chmod a-x $@
 
+grub_cfg := lib/grub/grub.cfg
+
+elf_files := $(wildcard ./x86/*.elf)
+iso_files := $(patsubst %.elf,%.iso,$(elf_files))
+
+%.iso: %.elf
+	@echo "Creating ISO for case: $(notdir $<)"
+	@rm -rf build/isofiles
+	@mkdir -p build/isofiles/boot/grub
+	@cp $< build/isofiles/boot/kernel.bin
+	@cp $(grub_cfg) build/isofiles/boot/grub
+	@grub-mkrescue -o $@ build/isofiles 2> /dev/null
+
+iso: $(iso_files)
+	echo "All ISO created successfully!"
+
 tests-common = $(TEST_DIR)/vmexit.flat $(TEST_DIR)/tsc.flat \
                $(TEST_DIR)/smptest.flat  \
                $(TEST_DIR)/realmode.flat $(TEST_DIR)/msr.flat \
@@ -81,5 +97,5 @@ $(TEST_DIR)/hyperv_stimer.elf: $(TEST_DIR)/hyperv.o
 $(TEST_DIR)/hyperv_connections.elf: $(TEST_DIR)/hyperv.o
 
 arch_clean:
-	$(RM) $(TEST_DIR)/*.o $(TEST_DIR)/*.flat $(TEST_DIR)/*.elf \
+	$(RM) $(TEST_DIR)/*.o $(TEST_DIR)/*.flat $(TEST_DIR)/*.elf $(TEST_DIR)/*.iso \
 	$(TEST_DIR)/.*.d lib/x86/.*.d \
Signature · 1 line
2.27.0
author
#1 lore raw

PATCH 2/2 x86: Create ISO images according to unittests.cfg

Create ISO image according to the configure file unittests.cfg, where describes the parameters of each test case.

x86/create_iso.sh new file +71 -0
new file mode 100755
index 0000000..8486be7
@@ -0,0 +1,71 @@
+#!/bin/bash
+set -e
+config_file=$1
+
+opts=
+extra_params=
+kernel=
+smp=
+testname=
+
+
+grub_cfg() {
+
+	kernel_elf=$1
+	kernel_para=$2
+
+	cat << EOF
+set timeout=0
+set default=0
+
+
+menuentry "${kernel_elf}" {
+    multiboot /boot/${kernel_elf} ${kernel_para}
+    boot
+}
+EOF
+
+}
+
+create_iso() {
+	case_name=$1
+	kernel_elf=$2
+	kernel_params=$3
+	if [ -f $kernel_elf ]; then
+		rm -rf build/isofiles
+		mkdir -p build/isofiles/boot/grub
+
+		cp $kernel_elf build/isofiles/boot/
+		grub_cfg ${kernel_elf##*/} $kernel_params> build/isofiles/boot/grub/grub.cfg
+
+		rm -rf ${testname}.iso
+		grub-mkrescue -o ${case_name}.iso build/isofiles 2> /dev/null
+		[ $? == 0 ] && echo "Creating ISO for case: ${case_name}"
+	fi
+}
+
+nline=`wc $config_file | cut -d' ' -f 2`
+
+while read -r line; do
+	if [[ "$line" =~ ^\[(.*)\]$ || $nline == 1 ]]; then
+		rematch=${BASH_REMATCH[1]}
+		if [[ "${testname}" != "" ]]; then
+			create_iso $testname ${kernel}.elf $extra_params
+		fi
+		testname=$rematch
+
+	elif [[ $line =~ ^file\ *=\ *(.*)\.flat$ ]]; then
+		kernel=${BASH_REMATCH[1]}
+	elif [[ $line =~ ^smp\ *=\ *(.*)$ ]]; then
+		smp=${BASH_REMATCH[1]}
+	elif [[ $line =~ ^extra_params\ *=\ *(.*)$ ]]; then
+		opts=${BASH_REMATCH[1]}
+		if [[ "$opts" =~ .*append\ (.*)$ ]]; then
+			extra_params=${BASH_REMATCH[1]}
+		fi
+	elif [[ $line =~ ^groups\ *=\ *(.*)$ ]]; then
+		groups=${BASH_REMATCH[1]}
+	fi
+	(( nline -= 1))
+
+done < $config_file
Signature · 1 line
2.27.0
#2 lore raw

Re: [kvm-unit-tests PATCH 2/2] x86: Create ISO images according to unittests.cfg

Quoted 7 lines · Yi Sun

Create ISO image according to the configure file unittests.cfg, where describes the parameters of each test case.

Looks cool!

Quoted 19 lines
x86/create_iso.sh new file +13 -0
new file mode 100755
index 0000000..8486be7
@@ -0,0 +1,71 @@
+#!/bin/bash
+set -e
+config_file=$1
+
+opts=
+extra_params=
+kernel=
+smp=
+testname=
+
+
+grub_cfg() {
+

x86/create_iso.sh line 23

Quoted 10 lines
x86/create_iso.sh new file +10 -0
+	kernel_elf=$1
+	kernel_para=$2
+
+	cat << EOF
+set timeout=0
+set default=0
+
+
+menuentry "${kernel_elf}" {
+    multiboot /boot/${kernel_elf} ${kernel_para}

Any chance you can add an optional “module” command here, that would be configurable as a parameter to create_iso.sh?

I use such a command to provide parameters that kvm-unit-tests usually gets from the “firmware" (and therefore are not available in certain environments).

The “module” can look something like:

	NR_CPUS=56
	MEMSIZE=4096
	TEST_DEVICE=0
	BOOTLOADER=1 

(kvm-unit-tests already knows to use these values)

This “module" would need to be copied into build/isofiles/boot as well.

author
#3 lore raw

RE: [kvm-unit-tests PATCH 2/2] x86: Create ISO images according to unittests.cfg

Hi Nadav,

Let me confirm if I got what you meant. Do you want the grub entry look like following?
Take case memory as an example:
Add module command line taking '/boot/module' as its parameter, meanwhile package the file 'module' in the folder?

menuentry "memory.elf" {
multiboot /boot/memory.elf tscdeadline_immed
module /boot/module # Add one line like this ?
}

Thanks

    --Sun, Yi
Quoted 63 lines

-----Original Message-----
From: Nadav Amit <[email protected]>
Sent: Friday, June 4, 2021 11:06
To: Sun, Yi <[email protected]>
Cc: [email protected]
Subject: Re: [kvm-unit-tests PATCH 2/2] x86: Create ISO images according to unittests.cfg

Quoted 5 lines · Yi Sun

Create ISO image according to the configure file unittests.cfg, where describes the parameters of each test case.

Looks cool!

Quoted 18 lines
x86/create_iso.sh new file mode renamed from x86/create_iso.sh +0 -0

100755 index 0000000..8486be7

x86/create_iso.sh new file +13 -0
@@ -0,0 +1,71 @@
+#!/bin/bash
+set -e
+config_file=$1
+
+opts=
+extra_params=
+kernel=
+smp=
+testname=
+
+
+grub_cfg() {
+

x86/create_iso.sh line 23

Quoted 10 lines
x86/create_iso.sh new file +10 -0
+	kernel_elf=$1
+	kernel_para=$2
+
+	cat << EOF
+set timeout=0
+set default=0
+
+
+menuentry "${kernel_elf}" {
+    multiboot /boot/${kernel_elf} ${kernel_para}

Any chance you can add an optional “module” command here, that would be configurable as a parameter to create_iso.sh?

I use such a command to provide parameters that kvm-unit-tests usually gets from the “firmware" (and therefore are not available in certain environments).

The “module” can look something like:

	NR_CPUS=56
	MEMSIZE=4096
	TEST_DEVICE=0
	BOOTLOADER=1

(kvm-unit-tests already knows to use these values)

This “module" would need to be copied into build/isofiles/boot as well.

#4 lore raw

Re: [kvm-unit-tests PATCH 2/2] x86: Create ISO images according to unittests.cfg

Quoted 14 lines · Yi

Hi Nadav,

Let me confirm if I got what you meant. Do you want the grub entry look like following?
Take case memory as an example:
Add module command line taking '/boot/module' as its parameter, meanwhile package the file 'module' in the folder?

menuentry "memory.elf" {
multiboot /boot/memory.elf tscdeadline_immed
module /boot/module # Add one line like this ?
}

Yes. The entry should look exactly like that.

Just to make sure we are on the same page, the “module” should be provided as a second parameter for the script. The additional “module” entry should only be added if a second parameter is provided.

Thanks,
Nadav

author
#5 lore raw

RE: [kvm-unit-tests PATCH 2/2] x86: Create ISO images according to unittests.cfg

Ok, get it now. Send you the second version soon.

Thanks

    --Sun, Yi
Quoted 33 lines

-----Original Message-----
From: Nadav Amit <[email protected]>
Sent: Saturday, June 5, 2021 01:09
To: Sun, Yi <[email protected]>
Cc: [email protected]
Subject: Re: [kvm-unit-tests PATCH 2/2] x86: Create ISO images according to unittests.cfg

Quoted 5 lines · Yi

Hi Nadav,

Let me confirm if I got what you meant. Do you want the grub entry look

like following?

Quoted 2 lines

Take case memory as an example:
Add module command line taking '/boot/module' as its parameter,

meanwhile package the file 'module' in the folder?

Quoted 5 lines

menuentry "memory.elf" {
multiboot /boot/memory.elf tscdeadline_immed
module /boot/module # Add one line like this ?
}

Yes. The entry should look exactly like that.

Just to make sure we are on the same page, the “module” should be provided as a second parameter for the script. The additional “module” entry should only be added if a second parameter is provided.

Thanks,
Nadav