vm_arm: add priority in vm config struct

- Cleanup the definitions.
- Set a default base value for the attribute.
- Derive the other priorities in the config params template.
- Do sanity check during template processing.

Signed-off-by: Axel Heider <axel.heider@hensoldt.net>

Author: Axel Heider

components/VM_Arm/configurations/vm.h

@@ -63,7 +63,7 @@
     emits HaveNotification notification_ready_connector; \
     maybe uses VMDTBPassthrough dtb_self; \
     provides VMDTBPassthrough dtb; \
-    attribute int base_prio; \
+    attribute int base_prio = 100; \
     attribute int num_vcpus = 1; \
     attribute int num_extra_frame_caps; \
     attribute int extra_frame_map_address; \

components/VM_Arm/src/main.c

@@ -76,10 +76,8 @@ seL4_CPtr camkes_alloc(seL4_ObjectType type, size_t size, unsigned flags);
 extern void *fs_buf;
 int start_extra_frame_caps;
 
-int VM_PRIO = 100;
 int NUM_VCPUS = 1;
 
-#define IRQSERVER_PRIO      (VM_PRIO + 1)
 #define IRQ_MESSAGE_LABEL   0xCAFE
 
 #define DMA_VSTART  0x40000000
@@ -499,7 +497,7 @@ static int vmm_init(const vm_config_t *vm_config)
     assert(!err);
 
     /* Create an IRQ server */
-    _irq_server = irq_server_new(vspace, vka, IRQSERVER_PRIO,
+    _irq_server = irq_server_new(vspace, vka, vm_config->priority.irqserver,
                                  simple, simple_get_cnode(simple), fault_ep_obj.cptr,
                                  IRQ_MESSAGE_LABEL, 256, &_io_ops.malloc_ops);
     assert(_irq_server);
@@ -1167,7 +1165,7 @@ static int main_continued(void)
     assert(!err);
 
     for (int i = 0; i < NUM_VCPUS; i++) {
-        vm_vcpu_t *new_vcpu = create_vmm_plat_vcpu(&vm, VM_PRIO - 1);
+        vm_vcpu_t *new_vcpu = create_vmm_plat_vcpu(&vm, vm_config.priority.vcpu);
         assert(new_vcpu);
     }
     vm_vcpu_t *vm_vcpu = vm.vcpus[BOOT_VCPU];
@@ -1209,15 +1207,10 @@ static int main_continued(void)
 }
 
 /* base_prio and num_vcpus are optional attributes of the VM component. */
-extern const int __attribute__((weak)) base_prio;
 extern const int __attribute__((weak)) num_vcpus;
 
 int run(void)
 {
-    /* if the base_prio attribute is set, use it */
-    if (&base_prio != NULL) {
-        VM_PRIO = base_prio;
-    }
     /* if the num_vcpus attribute is set, try to use it */
     if (&num_vcpus != NULL) {
         if (num_vcpus > CONFIG_MAX_NUM_NODES) {

components/VM_Arm/vm_common.camkes

@@ -30,9 +30,6 @@ assembly {
         vm.cnode_size_bits = 23;
         vm.simple_untyped24_pool = 12;
 
-        vm.base_prio = 100;
-
-        vm._priority = 101;
         vm.sem_value = 0;
 
     }

templates/seL4VMParameters.template.c

@@ -20,6 +20,18 @@
 
 const vm_config_t vm_config = {
 
+    .priority = {
+        /*- set base_prio = config.get('base_prio') -*/
+        /*- set irqserver_prio = config.get('_priority', base_prio + 1) -*/
+        /*- set vcpu_prio = base_prio - 1 -*/
+        /*- if ((vcpu_prio < 0) or (irqserver_prio <= base_prio) or (irqserver_prio > 255)) -*/
+          /*? raise(Exception('Invalid priority configuration')) ?*/
+        /*- endif -*/
+        .irqserver = /*? irqserver_prio ?*/,
+        .vmm = /*? base_prio ?*/,
+        .vcpu = /*? base_prio - 1 ?*/,
+    },
+
 /*- if vm_address_config -*/
 
     .ram = {

templates/seL4VMParameters.template.h

@@ -9,6 +9,12 @@
 
 typedef struct {
 
+    struct {
+        uint8_t vmm;
+        uint8_t irqserver;
+        uint8_t vcpu;
+    } priority;
+
     struct {
         unsigned long phys_base;
         unsigned long base;