From cabb9b13c47d9ed524451e38a068389c5bf9623d Mon Sep 17 00:00:00 2001
From: Michael Mueller <michael.mueller@uos.de>
Date: Tue, 21 Jan 2025 15:13:29 +0100
Subject: [PATCH] Start drivers as sub-components of Hoitaja.

---
 repos/mml/run/blinktree_server.run | 342 ++++++++---------------------
 1 file changed, 97 insertions(+), 245 deletions(-)

diff --git a/repos/mml/run/blinktree_server.run b/repos/mml/run/blinktree_server.run
index 9129223d17..a9b4801d4f 100644
--- a/repos/mml/run/blinktree_server.run
+++ b/repos/mml/run/blinktree_server.run
@@ -1,18 +1,10 @@
 set build_components {
-    app/blinktree_server hoitaja
+    core init timer app/blinktree_server hoitaja server/nic_router
 }
 
 
 create_boot_directory
-import_from_depot [depot_user]/src/[base_src] \
-                  [depot_user]/pkg/[drivers_nic_pkg] \
-                  [depot_user]/src/dynamic_rom \
-                  [depot_user]/src/init \
-                  [depot_user]/src/libc \
-                  [depot_user]/src/nic_router \
-                  [depot_user]/src/vfs_audit \
-                  [depot_user]/src/vfs_lwip \
-                  [depot_user]/src/vfs
+import_from_depot [depot_user]/pkg/[drivers_nic_pkg] \
 
 build $build_components
 set config {
@@ -45,80 +37,13 @@ set config {
 }
 
 append config {
-    <start name="drivers" caps="1000" managing_system="yes">
-        <resource name="RAM" quantum="512M"/>
-        <binary name="init"/>
-        <route>
-            <service name="ROM" label="config"> <parent label="drivers.config"/> </service>
-            <service name="Timer"> <child name="timer"/> </service>
-            <service name="Uplink"> <child name="nic_router"/> </service>
-            <any-service> <parent/> </any-service>
-        </route>
-    </start>
-    <start name="nic_router" caps="200">
-        <resource name="RAM" quantum="20M"/>
-        <provides>
-            <service name="Nic"/>
-            <service name="Uplink"/>
-        </provides>
-        <config verbose_domain_state="yes">
 
-            <policy label_prefix="socket_fs" domain="downlink"/>
-            <policy label_prefix="drivers"   domain="uplink"/>
+    <!-- Actual benchmark -->
 
-            <domain name="uplink" interface="192.168.0.2/24" gateway="192.168.0.2" verbose_packets="false">
-
-                <nat domain="downlink"
-                    tcp-ports="16384"
-                    udp-ports="16384"
-                    icmp-ids="16384"/>
-
-                <tcp-forward port="12345" domain="downlink" to="10.0.3.55"/>
-
-                <udp-forward port="7"    domain="downlink" to="10.0.3.55"/>
-                <udp-forward port="7070" domain="downlink" to="10.0.3.55"/>
-
-            </domain>
-
-            <domain name="downlink" interface="10.0.3.1/24" verbose_packets="false">
-
-                <dhcp-server ip_first="10.0.3.55" ip_last="10.0.3.55">
-                    <dns-server ip="8.8.8.8"/>
-                    <dns-server ip="1.1.1.1"/>
-                </dhcp-server>
-
-                <tcp dst="0.0.0.0/0"><permit-any domain="uplink" /></tcp>
-                <udp dst="0.0.0.0/0"><permit-any domain="uplink" /></udp>
-                <icmp dst="0.0.0.0/0" domain="uplink"/>
-
-            </domain>
-
-    </config>
-    </start>
-    <start name="socket_fs" caps="200">
-        <binary name="vfs"/>
-        <resource name="RAM" quantum="32M"/>
-        <provides> <service name="File_system"/> </provides>
-        <route>
-            <service name="Nic"> <child name="nic_router"/> </service> 
-            <any-service> <parent/> <any-child/> </any-service>
-        </route>
-        <config ld_verbose="yes">
-            <vfs>
-                <dir name="socket">
-                    <lwip ip_addr="10.0.3.55" netmask="255.255.255.0" gateway="10.0.3.1" nameserver="8.8.8.8"/>
-                    <!-- <lxip dhcp="yes"/> -->
-                </dir>
-            </vfs>
-            <default-policy root="/socket" writeable="yes" />
-        </config> 
-    </start> 
-    <start name="hoitaja" caps="62000">
+    <start name="hoitaja" caps="1048576" managing_system="yes">
         <resource name="RAM" quantum="250G"/>
         <provides>
             <service name="TASKING"/>
-            <service name="Uplink"/>
-            <service name="File_system"/>
         </provides>
         <config prio_levels="32">
             <parent-provides>
@@ -137,187 +62,114 @@ append config {
                 <service name="Timer"/>
                 <service name="TASKING"/>
                 <service name="TRACE"/>
-                <service name="File_system"/>
             </parent-provides>
             <default-route>
                 <any-service><parent/><any-child/></any-service>
             </default-route>
-            <default caps="600"/> 
+            <default caps="1800"/> 
             <affinity-space width="64" height="1"/>
-
-            <!-- Actual benchmark -->
-            <start name="blinktree_server" caps="1000">
-                <binary name="blinktree_daemon"/>
-                <affinity xpos="1" ypos="0" width="16" height="1"/>
-                <resource name="RAM" quantum="75G"/>
-                <!--<resource name="CPU" quantum="90"/>-->
-                <config>
-                    <vfs>
-                        <dir name="dev"> 
-                            <log/> 
-                            <inline name="rtc">2022-07-20 14:30</inline> 
-                        </dir>
-                        <dir name="socket"> <fs/> </dir>
-                        <dir name="tmp">    <ram/> </dir>
-                    </vfs>
-                    <libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc" socket="/socket"/>
-                </config>
-            </start>
-            
-            <!--
-            <start name="blinktree2" caps="1000">
-                <binary name="blinktree"/>
+           
+            <start name="drivers" caps="1000" managing_system="yes" brick="yes">
+                <resource name="RAM" quantum="512M"/>
                 <affinity xpos="1" ypos="0" width="1" height="1"/>
-                <resource name="RAM" quantum="60G"/>
-                <config>
-                    <vfs>
-                        <dir name="dev"> 
-                            <log/> 
-                            <inline name="rtc">2022-07-20 14:30</inline> 
-                        </dir>
-                        <dir name="workloads">
-                            <rom name="fill_randint_workloada"/>
-                            <rom name="mixed_randint_workloada"/>
-                        </dir>
-                    </vfs>
-                    <libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc"/>
-                </config>
-            </start>
-            <start name="blinktree3" caps="1000">
-                <binary name="blinktree"/>
-                <affinity xpos="1" ypos="0" width="1" height="1"/>
-                <resource name="RAM" quantum="60G"/>
-                <config>
-                    <vfs>
-                        <dir name="dev"> 
-                            <log/> 
-                            <inline name="rtc">2022-07-20 14:30</inline> 
-                        </dir>
-                        <dir name="workloads">
-                            <rom name="fill_randint_workloada"/>
-                            <rom name="mixed_randint_workloada"/>
-                        </dir>
-                    </vfs>
-                    <libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc"/>
-                </config>
-            </start>
-            
-            <start name="blinktree4" caps="1000">
-                <binary name="blinktree"/>
-                <affinity xpos="32" ypos="0" width="1" height="1"/>
-                <resource name="RAM" quantum="60G"/>
+                <binary name="init"/>
                 <route>
-                    <service name="Timer"> <child name="timer"/> </service>
-                    <any-service> <parent/> <any-child/> </any-service>
+                    <service name="ROM" label="config"> <parent label="drivers.config"/> </service>
+                    <service name="Timer"> <parent/> </service>
+                    <service name="Uplink"> <child name="nic_router"/> </service>
+                    <any-service> <parent/> </any-service>
                 </route>
-                <config>
-                    <vfs>
-                        <dir name="dev"> 
-                            <log/> 
-                            <inline name="rtc">2022-07-20 14:30</inline> 
-                        </dir>
-                        <dir name="workloads">
-                            <rom name="fill_randint_workloada"/>
-                            <rom name="mixed_randint_workloada"/>
-                        </dir>
-                    </vfs>
-                    <libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc"/>
+            </start>
+            <start name="nic_router" caps="2000" brick="yes">
+                <affinity xpos="2" ypos="0" width="1" height="1"/>
+                <resource name="RAM" quantum="16G"/>
+                <provides>
+                    <service name="Nic"/>
+                    <service name="Uplink"/>
+                </provides>
+                <config verbose_domain_state="yes" max_packets_per_signal="10">
+
+                    <policy label_prefix="blinktree_server" domain="downlink"/>
+                    <policy label_prefix="drivers"   domain="uplink"/>
+
+                    <domain name="uplink" interface="10.0.2.55/24" gateway="10.0.2.1" verbose_packets="no">
+                    <!--
+                    <domain name="uplink" interface="192.168.0.2/24" gateway="192.168.0.2" verbose_packets="false">
+                    -->
+
+                        <nat domain="downlink"
+                            tcp-ports="16384"
+                            udp-ports="16384"
+                            icmp-ids="16384"/>
+
+                        <tcp-forward port="12345" domain="downlink" to="10.0.3.55"/>
+
+                        <udp-forward port="7"    domain="downlink" to="10.0.3.55"/>
+                        <udp-forward port="7070" domain="downlink" to="10.0.3.55"/>
+
+                    </domain>
+
+                    <domain name="downlink" interface="10.0.3.1/24" verbose_packets="no">
+
+                        <dhcp-server ip_first="10.0.3.55" ip_last="10.0.3.55">
+                            <dns-server ip="8.8.8.8"/>
+                            <dns-server ip="1.1.1.1"/>
+                        </dhcp-server>
+
+                        <tcp dst="0.0.0.0/0"><permit-any domain="uplink" /></tcp>
+                        <udp dst="0.0.0.0/0"><permit-any domain="uplink" /></udp>
+                        <icmp dst="0.0.0.0/0" domain="uplink"/>
+
+                    </domain>
                 </config>
             </start>
-            <start name="blinktree5" caps="1000">
-                <binary name="blinktree"/>
-                <affinity xpos="1" ypos="0" width="63" height="1"/>
-                <resource name="RAM" quantum="60G"/>
-                <route>
-                    <service name="Timer"> <child name="timer"/> </service>
-                    <any-service> <parent/> <any-child/> </any-service>
-                </route>
-                <config>
-                    <vfs>
-                        <dir name="dev"> 
-                            <log/> 
-                            <inline name="rtc">2022-07-20 14:30</inline> 
-                        </dir>
-                        <dir name="workloads">
-                            <rom name="fill_randint_workloada"/>
-                            <rom name="mixed_randint_workloada"/>
-                        </dir>
-                    </vfs>
-                    <libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc"/>
-                </config>
-            </start>
-            <start name="blinktree6" caps="1000">
-                <binary name="blinktree"/>
-                <affinity xpos="1" ypos="0" width="63" height="1"/>
-                <resource name="RAM" quantum="60G"/>
-                <route>
-                    <service name="Timer"> <child name="timer"/> </service>
-                    <any-service> <parent/> <any-child/> </any-service>
-                </route>
-                <config>
-                    <vfs>
-                        <dir name="dev"> 
-                            <log/> 
-                            <inline name="rtc">2022-07-20 14:30</inline> 
-                        </dir>
-                        <dir name="workloads">
-                            <rom name="fill_randint_workloada"/>
-                            <rom name="mixed_randint_workloada"/>
-                        </dir>
-                    </vfs>
-                    <libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc"/>
-                </config>
-            </start>
-            <start name="blinktree7" caps="1000">
-                <binary name="blinktree"/>
-                <affinity xpos="1" ypos="0" width="63" height="1"/>
-                <resource name="RAM" quantum="30G"/>
-                <route>
-                    <service name="Timer"> <child name="timer"/> </service>
-                    <any-service> <parent/> <any-child/> </any-service>
-                </route>
-                <config>
-                    <vfs>
-                        <dir name="dev"> 
-                            <log/> 
-                            <inline name="rtc">2022-07-20 14:30</inline> 
-                        </dir>
-                        <dir name="workloads">
-                            <rom name="fill_randint_workloada"/>
-                            <rom name="mixed_randint_workloada"/>
-                        </dir>
-                    </vfs>
-                    <libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc"/>
-                </config>
-            </start>-->
-        </config>
-        <route>
-            <service name="Timer"> <child name="timer"/> </service>
-            <service name="Uplink"> <child name="nic_router"/> </service>
-            <service name="File_system"> <child name="socket_fs"/> </service>
-            <any-service><parent/><any-child/></any-service>
-        </route>
-    </start>
-</config>
-}
+                
+                <start name="blinktree_server" caps="1000">
+                    <binary name="blinktree_daemon"/>
+                    <resource name="RAM" quantum="200G"/>
+                    <!--<resource name="CPU" quantum="90"/>-->
+                    <config ip_addr="10.0.3.55">
+                        <vfs>
+                            <dir name="dev"> 
+                                <log/> 
+                                <inline name="rtc">2022-07-20 14:30</inline> 
+                            </dir>
+                            <dir name="tmp">    <ram/> </dir>
+                        </vfs>
+                        <libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc"/>
+                    </config>
+                    <route>
+                        <service name="Nic"> <child name="nic_router"/> </service>
+                        <any-service> <parent/> <any-child/> </any-service>
+                    </route>
+                </start>
+            </config>
+            <route>
+                <service name="Timer"> <child name="timer"/> </service>
+                <service name="Nic"> <child name="nic_router"/> </service>
+                <any-service><parent/><any-child/></any-service>
+            </route>
+        </start>
+    </config>
+    }
 
-install_config $config
+    install_config $config
 
-build_boot_image { ld.lib.so libm.lib.so libc.lib.so stdcxx.lib.so blinktree_daemon hoitaja }
+    build_boot_image { core init timer ld.lib.so libm.lib.so libc.lib.so stdcxx.lib.so vfs.lib.so blinktree_daemon hoitaja nic_router }
 
-append qemu_args "-nographic"
-append_qemu_nic_args "host=10.0.2.1,dhcpstart=10.0.2.55,hostfwd=tcp::12345-:12345,hostfwd=tcp::18080-:12345,hostfwd=udp::10007-:7,hostfwd=udp::17070-:7070"
+    append qemu_args "-nographic"
+    append_qemu_nic_args "host=10.0.2.1,dhcpstart=10.0.2.55,hostfwd=tcp::12345-:12345,hostfwd=tcp::18080-:12345,hostfwd=udp::10007-:7,hostfwd=udp::17070-:7070"
 
-run_genode_until forever
+    run_genode_until forever
 
-set rounds 100
-set succeeded 0
+    set rounds 100
+    set succeeded 0
 
-for {set r 0} {$r < $rounds} {incr r} {
-    run_genode_until {\[init -> hoitaja -> blinktree1\] Finished\.} 300
-    kill_spawned [output_spawn_id]
-    incr succeeded
-}
+    for {set r 0} {$r < $rounds} {incr r} {
+        run_genode_until {\[init -> hoitaja -> blinktree1\] Finished\.} 300
+        kill_spawned [output_spawn_id]
+        incr succeeded
+    }
 
-puts "$succeeded of $rounds rounds succeeded."
+    puts "$succeeded of $rounds rounds succeeded."