ref(core/remio): add remio_find_dev_by_id function

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

Author: joaopeixoto13

src/core/remio.c

@@ -9,6 +9,7 @@
  */
 
 #include "inc/bao.h"
+#include "inc/types.h"
 #include <remio.h>
 #include <cpu.h>
 #include <vm.h>
@@ -285,6 +286,110 @@ static size_t remio_get_request_event_count(struct remio_device* device)
     return list_size(&device->request_event_list);
 }
 
+/**
+ * @brief Finds the Remote I/O device based on the Remote I/O device ID
+ * @param id Remote I/O device ID
+ * @return Returns the Remote I/O device or NULL if the device was not found
+ */
+static struct remio_device* remio_find_dev_by_id(remio_id_t id)
+{
+    struct remio_device* device = NULL;
+    list_foreach (remio_device_list, struct remio_device, io_device) {
+        if (id == io_device->id) {
+            device = io_device;
+            break;
+        }
+    }
+    return device;
+}
+
+/**
+ * @brief Finds the Remote I/O device associated with a VM based on the Remote I/O device ID
+ * @param vm Pointer to the VM structure
+ * @param id Remote I/O device ID
+ * @return Returns the Remote I/O device or NULL if the device was not found
+ */
+static struct remio_device* remio_find_vm_dev_by_id(struct vm* vm, unsigned long id)
+{
+    struct remio_dev* dev = NULL;
+    struct remio_device* device = NULL;
+
+    /** Find the Remote I/O device VM configuration based on the Remote I/O device ID */
+    for (size_t i = 0; i < vm->remio_dev_num; i++) {
+        dev = &vm->remio_devs[i];
+        if (dev->id == id) {
+            break;
+        }
+    }
+
+    if (dev == NULL) {
+        return NULL;
+    }
+
+    /** Find the Remote I/O device based on the Remote I/O device ID */
+    device = remio_find_dev_by_id(id);
+    if (device == NULL) {
+        return NULL;
+    }
+
+    /** Check if the Remote I/O device is associated with the VM */
+    if (dev->type == REMIO_DEV_BACKEND && vm->id == device->config.backend.vm_id) {
+        return device;
+    } else if (dev->type == REMIO_DEV_FRONTEND && vm->id == device->config.frontend.vm_id) {
+        return device;
+    } else {
+        return NULL;
+    }
+
+    return NULL;
+}
+
+/**
+ * @brief Finds the Remote I/O device associated with a VM based on the MMIO access address
+ * @param vm Pointer to the VM structure
+ * @param addr MMIO access address
+ * @return Returns the Remote I/O device or NULL if the device was not found
+ */
+static struct remio_device* remio_find_vm_dev_by_addr(struct vm* vm, unsigned long addr)
+{
+    struct remio_dev* dev = NULL;
+
+    for (size_t i = 0; i < vm->remio_dev_num; i++) {
+        dev = &vm->remio_devs[i];
+        if (in_range(addr, dev->va, dev->size)) {
+            break;
+        }
+    }
+
+    if (dev == NULL) {
+        return NULL;
+    }
+
+    return remio_find_vm_dev_by_id(vm, dev->id);
+}
+
+/**
+ * @brief Sends a Remote I/O CPU message to the target CPU
+ * @param event Message event (REMIO_CPU_MSG_*)
+ * @param target_cpu Target CPU ID
+ * @param id Remote I/O device ID
+ * @param cpu_id CPU ID of the frontend VM that issued the I/O request
+ * @param vcpu_id vCPU ID of the frontend VM that issued the I/O request
+ * @param interrupt Interrupt ID
+ */
+static void remio_cpu_send_msg(enum REMIO_CPU_MSG_EVENT event, unsigned long target_cpu,
+    unsigned long id, unsigned long cpu_id, unsigned long long vcpu_id, unsigned long interrupt)
+{
+    union remio_cpu_msg_data data = {
+        .id = (uint8_t)id,
+        .cpu_id = (uint8_t)cpu_id,
+        .vcpu_id = (uint8_t)vcpu_id,
+        .interrupt = (uint8_t)interrupt,
+    };
+    struct cpu_msg msg = { (uint32_t)REMIO_CPUMSG_ID, event, data.raw };
+    cpu_send_msg(target_cpu, &msg);
+}
+
 void remio_init(void)
 {
     size_t frontend_cnt = 0, backend_cnt = 0;
@@ -343,18 +448,15 @@ void remio_init(void)
         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];
-            list_foreach (remio_device_list, struct remio_device, device) {
-                if (dev->id == device->id) {
-                    if (dev->type == REMIO_DEV_BACKEND) {
-                        device->config.backend.vm_id = vm_id;
-                        device->config.backend.interrupt = dev->interrupt;
-                        device->config.backend.cpu_id = (cpuid_t)-1;
-                    } else {
-                        device->config.frontend.vm_id = vm_id;
-                        device->config.frontend.interrupt = dev->interrupt;
-                        device->config.frontend.cpu_id = (cpuid_t)-1;
-                    }
-                }
+            struct remio_device* device = remio_find_dev_by_id(dev->id);
+            if (dev->type == REMIO_DEV_BACKEND) {
+                device->config.backend.vm_id = vm_id;
+                device->config.backend.interrupt = dev->interrupt;
+                device->config.backend.cpu_id = (cpuid_t)-1;
+            } else {
+                device->config.frontend.vm_id = vm_id;
+                device->config.frontend.interrupt = dev->interrupt;
+                device->config.frontend.cpu_id = (cpuid_t)-1;
             }
         }
     }
@@ -378,93 +480,6 @@ void remio_assign_vm_cpus(struct vm* vm)
     }
 }
 
-/**
- * @brief Finds the Remote I/O device associated with a VM based on the Remote I/O device ID
- * @param vm Pointer to the VM structure
- * @param id Remote I/O device ID
- * @return Returns the Remote I/O device or NULL if the device was not found
- */
-static struct remio_device* remio_find_vm_dev_by_id(struct vm* vm, unsigned long id)
-{
-    struct remio_dev* dev = NULL;
-    struct remio_device* device = NULL;
-
-    /** Find the Remote I/O device VM configuration based on the Remote I/O device ID */
-    for (size_t i = 0; i < vm->remio_dev_num; i++) {
-        dev = &vm->remio_devs[i];
-        if (dev->id == id) {
-            break;
-        }
-    }
-
-    if (dev == NULL) {
-        return NULL;
-    }
-
-    /** Find the Remote I/O device based on the Remote I/O device ID */
-    list_foreach (remio_device_list, struct remio_device, io_device) {
-        if (id == io_device->id) {
-            if (dev->type == REMIO_DEV_BACKEND && vm->id == io_device->config.backend.vm_id) {
-                device = io_device;
-                break;
-            } else if (dev->type == REMIO_DEV_FRONTEND &&
-                vm->id == io_device->config.frontend.vm_id) {
-                device = io_device;
-                break;
-            } else {
-                return NULL;
-            }
-        }
-    }
-    return device;
-}
-
-/**
- * @brief Finds the Remote I/O device associated with a VM based on the MMIO access address
- * @param vm Pointer to the VM structure
- * @param addr MMIO access address
- * @return Returns the Remote I/O device or NULL if the device was not found
- */
-static struct remio_device* remio_find_vm_dev_by_addr(struct vm* vm, unsigned long addr)
-{
-    struct remio_dev* dev = NULL;
-
-    for (size_t i = 0; i < vm->remio_dev_num; i++) {
-        dev = &vm->remio_devs[i];
-        if (in_range(addr, dev->va, dev->size)) {
-            break;
-        }
-    }
-
-    if (dev == NULL) {
-        return NULL;
-    }
-
-    return remio_find_vm_dev_by_id(vm, dev->id);
-}
-
-/**
- * @brief Sends a Remote I/O CPU message to the target CPU
- * @param event Message event (REMIO_CPU_MSG_*)
- * @param target_cpu Target CPU ID
- * @param id Remote I/O device ID
- * @param cpu_id CPU ID of the frontend VM that issued the I/O request
- * @param vcpu_id vCPU ID of the frontend VM that issued the I/O request
- * @param interrupt Interrupt ID
- */
-static void remio_cpu_send_msg(enum REMIO_CPU_MSG_EVENT event, unsigned long target_cpu,
-    unsigned long id, unsigned long cpu_id, unsigned long long vcpu_id, unsigned long interrupt)
-{
-    union remio_cpu_msg_data data = {
-        .id = (uint8_t)id,
-        .cpu_id = (uint8_t)cpu_id,
-        .vcpu_id = (uint8_t)vcpu_id,
-        .interrupt = (uint8_t)interrupt,
-    };
-    struct cpu_msg msg = { (uint32_t)REMIO_CPUMSG_ID, event, data.raw };
-    cpu_send_msg(target_cpu, &msg);
-}
-
 /**
  * @brief Handles the Remote I/O ask operation
  * @param addr Should always be zero (convention)