Move Solo5 to genode-world

Fixes #3761
This commit is contained in:
Norman Feske 2020-06-26 11:16:26 +02:00
parent 1f91fd3f7d
commit 5249f3358f
38 changed files with 0 additions and 780 deletions

View File

@ -711,7 +711,6 @@ set default_test_pkgs {
test-sequence
test-signal
test-slab
test-solo5
test-stack_smash
test-stdcxx
test-synced_interface
@ -764,7 +763,6 @@ set skip_test(test-rm_fault) [expr [have_spec linux] || ![non_executable_
set skip_test(test-rm_fault_no_nox) [expr [have_spec linux] || ![skip_test test-rm_fault]]
set skip_test(test-rm_nested) [expr [have_spec linux]]
set skip_test(test-slab) [expr ![interactive] && [have_include "power_on/qemu"]]
set skip_test(test-solo5) [expr ![have_spec x86_64]]
set skip_test(test-spark_exception) [expr [have_spec arm]]
set skip_test(test-tcp_bulk_lwip) [expr ![have_spec x86] && ![have_include "power_on/qemu"]]
set skip_test(test-tcp_bulk_lxip) [expr ![have_spec x86] && ![have_include "power_on/qemu"]]

View File

@ -1,140 +0,0 @@
if {![have_spec x86_64]} {
puts "\nSolo5 requires a 64bit architecture\n"
exit 0
}
if {![file exists bin/mirage]} {
puts ""
puts "A mirage image must be provided at 'bin/mirage' to execute this scenario."
puts ""
exit 1
}
if {[have_spec linux]} {
puts ""
puts "This scenario is not available for Linux."
puts ""
exit 1
}
create_boot_directory
import_from_depot \
[depot_user]/src/[base_src] \
[depot_user]/src/init \
[depot_user]/src/ipxe_nic_drv \
[depot_user]/src/rtc_drv \
[depot_user]/pkg/terminal
source ${genode_dir}/repos/base/run/platform_drv.inc
set build_components {
app/log_core
drivers/framebuffer
drivers/input/dummy
lib/solo5
server/terminal_log
}
append_platform_drv_build_components
build $build_components
set fb_drv "vesa_fb_drv"
if {[have_include "image/uefi"]} {
set fb_drv "fb_boot_drv"
}
append config {
<config>
<default caps="256"/>
<parent-provides>
<service name="CPU"/>
<service name="IO_MEM"/>
<service name="IO_PORT"/>
<service name="IRQ"/>
<service name="LOG"/>
<service name="PD"/>
<service name="RAM"/>
<service name="RM"/>
<service name="ROM"/>
</parent-provides>
<default-route>
<any-service> <parent/> <any-child/> </any-service> </default-route>}
append_platform_drv_config
append config {
<start name="timer" caps="96">
<resource name="RAM" quantum="1M"/>
<provides> <service name="Timer"/> </provides>
</start>
<start name="nic_drv">
<binary name="ipxe_nic_drv"/>
<resource name="RAM" quantum="4M"/>
<provides><service name="Nic"/></provides>
</start>
<start name="rtc_drv">
<resource name="RAM" quantum="1M"/>
<provides><service name="Rtc"/></provides>
</start>
<start name="} $fb_drv {" caps="200">
<resource name="RAM" quantum="32M"/>
<provides><service name="Framebuffer"/></provides>
</start>
<start name="dummy_input_drv">
<resource name="RAM" quantum="2M"/>
<provides><service name="Input"/></provides>
</start>
<start name="terminal">
<resource name="RAM" quantum="2M"/>
<provides><service name="Terminal"/></provides>
<route>
<service name="ROM" label="config"> <parent label="terminal.config"/> </service>
<any-service> <parent/> <any-child/> </any-service>
</route>
</start>
<start name="terminal_log">
<resource name="RAM" quantum="1M"/>
<provides><service name="LOG"/></provides>
</start>
<start name="log_core">
<resource name="RAM" quantum="10M"/>
<config period_ms="2000"/>
<route>
<service name="ROM" unscoped_label="log_core"> <parent/> </service>
<service name="ROM" unscoped_label="ld.lib.so"> <parent/> </service>
<service name="ROM" label="log"> <parent label="core_log"/> </service>
<service name="LOG"> <child name="terminal_log" label="core_log"/> </service>
<any-service> <parent/> <any-child/> </any-service>
</route>
</start>
<start name="mirage" caps="512">
<resource name="RAM" quantum="64M"/>
<config> <nic/> <rtc/> </config>
</start>
</config>
}
install_config $config
append boot_modules {
dummy_input_drv
log_core
terminal_log
mirage
solo5.lib.so
}
append boot_modules " $fb_drv"
# platform-specific modules
append_platform_drv_boot_modules
build_boot_image $boot_modules
append qemu_args " -netdev user,id=net0 "
append qemu_args " -net nic,model=e1000,netdev=net0 "
run_genode_until forever

View File

@ -1,12 +0,0 @@
#include <base/fixed_stdint.h>
typedef genode_uint8_t uint8_t;
typedef genode_int8_t int8_t;
typedef genode_uint16_t uint16_t;
typedef genode_int16_t int16_t;
typedef genode_uint32_t uint32_t;
typedef genode_int32_t int32_t;
typedef genode_uint64_t uint64_t;
typedef genode_int64_t int64_t;
typedef unsigned long uintptr_t;
typedef unsigned long size_t;

View File

@ -1,4 +0,0 @@
REQUIRES += 64bit
INC_DIR += $(call select_from_repositories,include/solo5)
INC_DIR += $(call select_from_ports,solo5)/include/solo5

View File

@ -1,23 +0,0 @@
REQUIRES += 64bit
SHARED_LIB = yes
CC_OPT += -D__SOLO5_BINDINGS__ -Drestrict=__restrict__
# GCC 8 complains about a mismatch of the 'log()' function declaration.
# Since the solo5 'log()' function is unrelated to the builtin function,
# we disable the error message.
CC_OPT += -Wno-builtin-declaration-mismatch
SRC_CC = bindings.cc
SOLO5_PORT_DIR := $(call select_from_ports,solo5)
INC_DIR += $(SOLO5_PORT_DIR)/src/lib/solo5/bindings
INC_DIR += $(SOLO5_PORT_DIR)/include/solo5
INC_DIR += $(REP_DIR)/include/solo5
vpath bindings.cc $(SOLO5_PORT_DIR)/src/lib/solo5/bindings/genode
# ignore warning about use of deprecated Xml_node API
CC_CXX_WARN_STRICT :=

View File

@ -1,13 +0,0 @@
solo5_abort T
solo5_app_main U
solo5_block_info T
solo5_block_read T
solo5_block_write T
solo5_clock_monotonic T
solo5_clock_wall T
solo5_console_write T
solo5_exit T
solo5_net_info T
solo5_net_read T
solo5_net_write T
solo5_yield T

View File

@ -1 +0,0 @@
55dd4fb026c0d4a7cc192c8228e4a6344f5781ef

View File

@ -1,11 +0,0 @@
LICENSE := ISC
VERSION := HEAD
DOWNLOADS := solo5.archive
REV := 7dca1a677f548ea0bc911a209f34ceb55d8f10fd
URL(solo5) := https://genode.org/files/solo5-$(REV).tar.gz
SHA(solo5) := 87a8e8e047bc6fffe0384f1cbb2bfde1e4c88c545287899be29444ec9a4d6b95
DIR(solo5) := src/lib/solo5
DIRS := include/solo5
DIR_CONTENT(include/solo5) = src/lib/solo5/include/solo5/solo5.h

View File

@ -1,16 +0,0 @@
MIRROR_FROM_REP_DIR = lib/import/import-solo5.mk lib/symbols/solo5
content: $(MIRROR_FROM_REP_DIR) include/solo5 LICENSE
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/solo5)/src/lib/solo5
include/solo5:
mkdir -p $@
cp -r $(PORT_DIR)/include/solo5/* $@
cp -r $(REP_DIR)/include/solo5/* $@
$(MIRROR_FROM_REP_DIR):
$(mirror_from_rep_dir)
LICENSE:
cp $(PORT_DIR)/$@ $@

View File

@ -1 +0,0 @@
2019-05-05 8f54bd69a92ed4e090124d69a6a3b92689b39536

View File

@ -1 +0,0 @@
Test of the Solo5 unikernel middleware.

View File

@ -1,8 +0,0 @@
_/src/init
_/src/nic_loopback
_/src/vfs_block
_/src/sequence
_/src/solo5
_/src/test-solo5
_/src/vfs
_/src/vfs_import

View File

@ -1 +0,0 @@
2020-06-18-b 32b32ac1918d2a2aebb7636e6faae4ea958b5eeb

View File

@ -1,79 +0,0 @@
<runtime ram="40M" caps="1000" binary="init">
<events>
<timeout meaning="failed" sec="60" />
<log meaning="succeeded">
[init] child "test" exited with exit value 0
</log>
<log meaning="failed">Error: </log>
</events>
<content>
<rom label="ld.lib.so"/>
<rom label="nic_loopback"/>
<rom label="sequence"/>
<rom label="sequence"/>
<rom label="solo5.lib.so"/>
<rom label="solo5-test_blk"/>
<rom label="solo5-test_fpu"/>
<rom label="solo5-test_globals"/>
<rom label="solo5-test_hello"/>
<rom label="solo5-test_quiet"/>
<rom label="test-solo5"/>
<rom label="vfs.lib.so"/>
<rom label="vfs_block"/>
<rom label="vfs_import.lib.so"/>
</content>
<config>
<parent-provides>
<service name="CPU"/>
<service name="LOG"/>
<service name="PD"/>
<service name="RM"/>
<service name="ROM"/>
<service name="Timer"/>
</parent-provides>
<default-route> <any-service> <parent/> <any-child/> </any-service> </default-route>
<start name="nic_loopback" caps="96">
<resource name="RAM" quantum="1M"/>
<provides> <service name="Nic"/> </provides>
</start>
<start name="vfs_block" caps="96">
<resource name="RAM" quantum="17M"/>
<provides> <service name="Block"/> </provides>
<config>
<vfs>
<ram/>
<import>
<zero name="block_file" size="8M"/>
</import>
</vfs>
<default-policy file="/block_file" block_size="4096"
writeable="yes"/>
</config>
</start>
<start name="test" caps="256">
<binary name="sequence"/>
<resource name="RAM" quantum="16M"/>
<config>
<start name="solo5-test_hello">
<config>
<solo5 cmdline="Hello_Solo5"/>
<nic/> <blk/>
</config>
</start>
<start name="solo5-test_fpu"/>
<start name="solo5-test_globals"/>
<start name="solo5-test_quiet"/>
<start name="solo5-test_blk">
<config> <block/> </config>
</start>
</config>
</start>
</config>
</runtime>

View File

@ -1 +0,0 @@
solo5

View File

@ -1,20 +0,0 @@
PORT_DIR_SOLO5 := $(call port_dir,$(REP_DIR)/ports/solo5)
SRC_DIR = src/lib/solo5
MIRROR_FROM_REP_DIR = \
include/solo5 \
lib/import/import-solo5.mk \
lib/mk/solo5.mk \
content: $(SRC_DIR) $(MIRROR_FROM_REP_DIR)
$(SRC_DIR):
mkdir -p $@
cp -r $(PORT_DIR_SOLO5)/$@/* $@/
cp -r $(PORT_DIR_SOLO5)/include/solo5/* $@/bindings
cp $(PORT_DIR_SOLO5)/$@/LICENSE .
echo 'LIBS=solo5' > $@/target.mk
$(MIRROR_FROM_REP_DIR):
$(mirror_from_rep_dir)

View File

@ -1 +0,0 @@
2020-05-26 b3a592352ce08a4c62cd8abb6718ddee44b0b184

View File

@ -1,7 +0,0 @@
base
os
block_session
nic_session
rtc_session
timer_session
solo5

View File

@ -1,19 +0,0 @@
MIRROR_FROM_REP_DIR := src/test/solo5
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/solo5)
content: $(MIRROR_FROM_REP_DIR) src/lib/solo5/tests src/lib/solo5/bindings LICENSE
src/lib/solo5/bindings: $(PORT_DIR)
mkdir -p $@
cp $(PORT_DIR)/$@/*.c $@
src/lib/solo5/tests: $(PORT_DIR)
mkdir -p $@
cp -r $(PORT_DIR)/$@/test_* $@
$(MIRROR_FROM_REP_DIR):
$(mirror_from_rep_dir)
LICENSE:
cp $(PORT_DIR)/src/lib/solo5/LICENSE $@

View File

@ -1 +0,0 @@
2020-05-26 827f99e63057492c51a8f7c2cf86f23ba35d840e

View File

@ -1,2 +0,0 @@
base
solo5

View File

@ -1,105 +0,0 @@
if {![have_spec x86_64]} {
puts "\nSolo5 requires a 64bit architecture\n"
exit 0
}
if {![file exists bin/mirage]} {
puts ""
puts "A mirage image must be provided at 'bin/mirage' to execute this scenario."
puts ""
exit 1
}
if {[have_spec linux]} {
puts ""
puts "This scenario is not available for the Linux platform."
puts ""
exit 1
}
create_boot_directory
import_from_depot \
[depot_user]/src/[base_src] \
[depot_user]/src/init \
[depot_user]/src/rtc_drv \
source ${genode_dir}/repos/base/run/platform_drv.inc
set build_components {
drivers/nic
drivers/rtc
lib/solo5
}
append_platform_drv_build_components
build $build_components
append config {
<config>
<default caps="256"/>
<parent-provides>
<service name="CPU"/>
<service name="IO_MEM"/>
<service name="IO_PORT"/>
<service name="IRQ"/>
<service name="LOG"/>
<service name="PD"/>
<service name="RAM"/>
<service name="RM"/>
<service name="ROM"/>
</parent-provides>
<default-route>
<any-service> <parent/> <any-child/> </any-service> </default-route>}
append_platform_drv_config
append config {
<start name="timer" caps="96">
<resource name="RAM" quantum="1M"/>
<provides> <service name="Timer"/> </provides>
</start>
<start name="nic_drv">
<binary name="ipxe_nic_drv"/>
<resource name="RAM" quantum="4M"/>
<provides><service name="Nic"/></provides>
</start>
<start name="rtc_drv">
<resource name="RAM" quantum="1M"/>
<provides><service name="Rtc"/></provides>
</start>
<start name="mirage" caps="256">
<resource name="RAM" quantum="32M"/>
<config> <nic/> <rtc/> </config>
</start>
</config>
}
install_config $config
set boot_modules {
mirage
rtc_drv
ipxe_nic_drv
solo5.lib.so
}
# platform-specific modules
append_platform_drv_boot_modules
build_boot_image $boot_modules
append qemu_args " -nographic "
proc qemu_nic_model {} {
if [have_spec x86] { return e1000 }
if [have_spec lan9118] { return lan9118 }
if [have_spec zynq] { return cadence_gem }
return nic_model_missing
}
append qemu_args " -netdev user,id=net0 "
append qemu_args " -net nic,model=[qemu_nic_model],netdev=net0 "
run_genode_until forever

View File

@ -1,116 +0,0 @@
if {![have_spec x86_64]} {
puts "\nTest requires x86_64\n"
exit 0
}
if {[have_spec linux]} {
puts "\nRun script is not supported on this platform\n"
exit 0
}
create_boot_directory
import_from_depot \
[depot_user]/src/[base_src] \
[depot_user]/src/init \
[depot_user]/src/nic_loopback \
[depot_user]/src/vfs_block \
[depot_user]/src/rtc_drv \
[depot_user]/src/sequence \
[depot_user]/src/vfs \
[depot_user]/src/vfs_import
append config {
<config>
<parent-provides>
<service name="CPU"/>
<service name="LOG"/>
<service name="PD"/>
<service name="RAM"/>
<service name="ROM"/>
<service name="IRQ"/>
<service name="IO_PORT"/>
</parent-provides>
<default-route>
<any-service> <parent/> <any-child/> </any-service> </default-route>
<start name="timer" caps="96">
<resource name="RAM" quantum="1M"/>
<provides> <service name="Timer"/> </provides>
</start>
<start name="rtc_drv" caps="96">
<resource name="RAM" quantum="1M"/>
<provides> <service name="Rtc"/> </provides>
</start>
<start name="nic_loopback" caps="96">
<resource name="RAM" quantum="1M"/>
<provides> <service name="Nic"/> </provides>
</start>
<start name="vfs_block" caps="96">
<resource name="RAM" quantum="40M"/>
<provides> <service name="Block"/> </provides>
<config>
<vfs>
<ram/>
<import>
<zero name="block_file" size="32M"/>
</import>
</vfs>
<default-policy file="/block_file" block_size="4096"
writeable="yes"/>
</config>
</start>
<start name="test" caps="256">
<binary name="sequence"/>
<resource name="RAM" quantum="16M"/>
<config>
<start name="solo5-test_hello">
<config>
<solo5 cmdline="Hello_Solo5"/>
<rtc/> <nic/> <block/>
</config>
</start>
<start name="solo5-test_fpu"/>
<start name="solo5-test_globals"/>
<start name="solo5-test_quiet"/>
<start name="solo5-test_blk">
<config> <block/> </config>
</start>}
if { ![get_cmd_switch --autopilot] || ![have_include "power_on/qemu"] } {
append config {
<start name="solo5-test_time">
<config> <rtc/> </config>
</start>}
}
append config {
</config>
</start>
</config>
}
install_config $config
build {
test/solo5
}
build_boot_image {
solo5.lib.so
solo5-test_blk
solo5-test_fpu
solo5-test_globals
solo5-test_hello
solo5-test_quiet
solo5-test_time
}
append qemu_args " -nographic "
run_genode_until {child "test" exited with exit value 0} 40

View File

@ -1,122 +0,0 @@
if {![have_spec x86_64]} {
puts "\nTest requires x86_64\n"
exit 0
}
if {[have_spec linux]} {
puts "\nRun script is not supported on this platform\n"
exit 0
}
create_boot_directory
import_from_depot \
[depot_user]/src/[base_src] \
[depot_user]/src/init \
[depot_user]/src/rtc_drv \
source ${genode_dir}/repos/base/run/platform_drv.inc
append config {
<config>
<parent-provides>
<service name="ROM"/>
<service name="IRQ"/>
<service name="IO_MEM"/>
<service name="IO_PORT"/>
<service name="PD"/>
<service name="RM"/>
<service name="CPU"/>
<service name="LOG"/>
</parent-provides>
<default-route>
<any-service> <parent/> <any-child/> </any-service>
</default-route>
<default caps="128"/>}
append_platform_drv_config
append config {
<start name="timer" caps="96">
<resource name="RAM" quantum="1M"/>
<provides> <service name="Timer"/> </provides>
</start>
<start name="rtc_drv" caps="96">
<resource name="RAM" quantum="1M"/>
<provides> <service name="Rtc"/> </provides>
</start>
<start name="nic_drv" caps="150">
<binary name="ipxe_nic_drv"/>
<resource name="RAM" quantum="20M"/>
<provides><service name="Nic"/></provides>
</start>
<start name="nic_bridge" caps="200">
<resource name="RAM" quantum="8M"/>
<provides><service name="Nic"/></provides>
<config mac="02:02:02:02:03:00">
<policy label_prefix="solo5" ip_addr="10.0.0.2"/>
<default-policy/>
</config>
<route>
<service name="Nic"> <child name="nic_drv"/> </service>
<any-service> <parent/> <any-child/> </any-service>
</route>
</start>
<start name="solo5-test_ping_serve" caps="256">
<resource name="RAM" quantum="4M"/>
<config>
<solo5 cmdline="limit"/>
<nic/>
</config>
<route>
<service name="Nic"> <child name="nic_bridge"/> </service>
<any-service> <parent/> <any-child/> </any-service>
</route>
</start>
<start name="ping">
<resource name="RAM" quantum="8M"/>
<config interface="10.0.0.72/24"
dst_ip="10.0.0.2"
period_sec="1"
verbose="no"
count="8"/>
<route>
<service name="Nic"> <child name="nic_bridge"/> </service>
<any-service> <parent/> <any-child/> </any-service>
</route>
</start>
</config>
}
install_config $config
append build_components {
app/ping
drivers/nic
server/nic_bridge
test/solo5/ping_serve
}
append_platform_drv_build_components
build $build_components
append boot_modules {
nic_bridge
ping
ipxe_nic_drv
solo5-test_ping_serve
solo5.lib.so
}
append_platform_drv_boot_modules
build_boot_image $boot_modules
append qemu_args " -nographic "
run_genode_until {child "ping" exited with exit value 0} 60

View File

@ -1,51 +0,0 @@
if {![have_spec x86_64]} {
puts "\nTest requires x86_64\n"
exit 0
}
create_boot_directory
import_from_depot \
[depot_user]/src/[base_src] \
[depot_user]/src/init \
append config {
<config>
<parent-provides>
<service name="CPU"/>
<service name="LOG"/>
<service name="PD"/>
<service name="RAM"/>
<service name="ROM"/>
<service name="IRQ"/>
<service name="IO_PORT"/>
</parent-provides>
<default-route>
<any-service> <parent/> <any-child/> </any-service> </default-route>
<start name="timer" caps="96">
<resource name="RAM" quantum="1M"/>
<provides> <service name="Timer"/> </provides>
</start>
<start name="solo5-test_ssp" caps="256">
<resource name="RAM" quantum="2M"/>
</start>
</config>
}
install_config $config
build {
test/solo5
}
build_boot_image {
solo5.lib.so
solo5-test_ssp
}
append qemu_args " -nographic "
run_genode_until {Error: stack protector check failed} 20

View File

@ -1,2 +0,0 @@
TARGET = dummy-solo5
LIBS = solo5

View File

@ -1 +0,0 @@
include $(REP_DIR)/src/test/solo5/test.inc

View File

@ -1 +0,0 @@
include $(REP_DIR)/src/test/solo5/test.inc

View File

@ -1 +0,0 @@
include $(REP_DIR)/src/test/solo5/test.inc

View File

@ -1 +0,0 @@
include $(REP_DIR)/src/test/solo5/test.inc

View File

@ -1 +0,0 @@
include $(REP_DIR)/src/test/solo5/test.inc

View File

@ -1 +0,0 @@
include $(REP_DIR)/src/test/solo5/test.inc

View File

@ -1 +0,0 @@
include $(REP_DIR)/src/test/solo5/test.inc

View File

@ -1 +0,0 @@
include $(REP_DIR)/src/test/solo5/test.inc

View File

@ -1 +0,0 @@
include $(REP_DIR)/src/test/solo5/test.inc

View File

@ -1,10 +0,0 @@
TEST_NAME := test_$(subst $(REP_DIR)/src/test/solo5/,,$(PRG_DIR))
TARGET = solo5-$(TEST_NAME)
LIBS += base solo5
CC_OPT += -fstack-protector-strong
SRC_C += $(TEST_NAME).c
vpath %.c $(call select_from_ports,solo5)/src/lib/solo5/tests/$(TEST_NAME)

View File

@ -1 +0,0 @@
include $(REP_DIR)/src/test/solo5/test.inc

View File

@ -54,7 +54,6 @@ smartcard
smbios_decoder
smp
sntp_client
solo5
sub_rm
tar_rom
thread