fix(core/remio): number of objects in the OBJPOOL_ALLOC

Signed-off-by: João Peixoto <[email protected]>

Author: joaopeixoto13

scripts/config_defs_gen.c

@@ -6,6 +6,21 @@
 #include <stdio.h>
 #include <config.h>
 
+static size_t remio_dev_num(void)
+{
+    size_t dev_num = 0;
+    for (size_t vm_id = 0; vm_id < config.vmlist_size; vm_id++) {
+        struct vm_config* vm_config = &config.vmlist[vm_id];
+        for (size_t i = 0; i < vm_config->platform.remio_dev_num; i++) {
+            struct remio_dev* dev = &vm_config->platform.remio_devs[i];
+            if (dev->type == REMIO_DEV_BACKEND) {
+                dev_num++;
+            }
+        }
+    }
+    return dev_num;
+}
+
 int main() {
     size_t vcpu_num = 0;
     for (size_t i = 0; i < config.vmlist_size; i++) {
@@ -21,5 +36,7 @@ int main() {
         printf("#define CONFIG_HYP_BASE_ADDR PLAT_BASE_ADDR\n");
     }
 
+    printf("#define CONFIG_REMIO_DEV_NUM %ld\n", remio_dev_num());
+
     return 0;
  }

src/core/inc/config_defs.h

@@ -11,6 +11,7 @@
 #define CONFIG_VCPU_NUM      1
 #define CONFIG_VM_NUM        1
 #define CONFIG_HYP_BASE_ADDR 0
+#define CONFIG_REMIO_DEV_NUM 0
 
 #else /* GENERATING_DEFS */
 

src/core/remio.c

@@ -142,11 +142,10 @@ static void remio_cpu_handler(uint32_t event, uint64_t data);
 CPU_MSG_HANDLER(remio_cpu_handler, REMIO_CPUMSG_ID)
 
 /** Object pool to allocate Remote I/O devices */
-OBJPOOL_ALLOC(remio_device_pool, struct remio_device, sizeof(struct remio_device));
+OBJPOOL_ALLOC(remio_device_pool, struct remio_device, CONFIG_REMIO_DEV_NUM);
 
 /** Object pool to allocate pending Remote I/O requests events */
-OBJPOOL_ALLOC(remio_request_event_pool, struct remio_request_event,
-    sizeof(struct remio_request_event));
+OBJPOOL_ALLOC(remio_request_event_pool, struct remio_request_event, REMIO_VCPU_NUM);
 
 /**
  * @brief Creates a new Remote I/O request based on the MMIO access information

src/core/vm.c

@@ -11,7 +11,7 @@
 #include <shmem.h>
 #include <objpool.h>
 
-OBJPOOL_ALLOC(emul_cache, struct emul_mem, sizeof(struct emul_mem));
+OBJPOOL_ALLOC(emul_cache, struct emul_mem, CONFIG_REMIO_DEV_NUM);
 
 static void vm_master_init(struct vm* vm, const struct vm_config* vm_config, vmid_t vm_id)
 {