From 2aa80c0219c5b0ced68e8df0387995336929897b Mon Sep 17 00:00:00 2001 From: Axel Heider Date: Wed, 5 Apr 2023 12:19:45 +0200 Subject: [PATCH 1/2] vm_introspect: use vm_config Signed-off-by: Axel Heider --- apps/Arm/vm_introspect/src/init_dataport_ram.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/apps/Arm/vm_introspect/src/init_dataport_ram.c b/apps/Arm/vm_introspect/src/init_dataport_ram.c index 715f9daf..91ee41bd 100644 --- a/apps/Arm/vm_introspect/src/init_dataport_ram.c +++ b/apps/Arm/vm_introspect/src/init_dataport_ram.c @@ -12,23 +12,21 @@ #include #include -extern unsigned long linux_ram_base; -extern unsigned long linux_ram_size; - extern dataport_caps_handle_t memdev_handle; static vm_frame_t dataport_memory_iterator(uintptr_t addr, void *cookie) { cspacepath_t return_frame; vm_frame_t frame_result = { seL4_CapNull, seL4_NoRights, 0, 0 }; + const vm_config_t *vm_config = (const vm_config_t *)cookie; uintptr_t frame_start = ROUND_DOWN(addr, BIT(seL4_PageBits)); - if (frame_start < linux_ram_base || frame_start > linux_ram_base + linux_ram_size) { + if (frame_start < vm_config->ram.base || frame_start > vm_config->ram.base + vm_config->ram.size) { ZF_LOGE("Error: Not dataport ram region"); return frame_result; } - int page_idx = (frame_start - linux_ram_base) / BIT(seL4_PageBits); + int page_idx = (frame_start - vm_config->ram.base) / BIT(seL4_PageBits); frame_result.cptr = dataport_get_nth_frame_cap(&memdev_handle, page_idx); frame_result.rights = seL4_AllRights; frame_result.vaddr = frame_start; @@ -36,10 +34,15 @@ static vm_frame_t dataport_memory_iterator(uintptr_t addr, void *cookie) return frame_result; } +/* This overwrites the weak function in the VMM module init_ram */ void init_ram_module(vm_t *vm, void *cookie) { int err; - err = vm_ram_register_at_custom_iterator(vm, linux_ram_base, linux_ram_size, dataport_memory_iterator, NULL); + void *reg_cookie = (void *)&vm_config; + err = vm_ram_register_at_custom_iterator(vm, vm_config.ram.base, + vm_config.ram.size, + dataport_memory_iterator, + reg_cookie); assert(!err); } From 2ad690ae27b8f9d347998486548c70cc0967ff23 Mon Sep 17 00:00:00 2001 From: Axel Heider Date: Fri, 26 Jan 2024 15:30:26 +0100 Subject: [PATCH 2/2] vm_introspect: fix function type Signed-off-by: Axel Heider --- apps/Arm/vm_introspect/src/cross_vm_connection.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/Arm/vm_introspect/src/cross_vm_connection.c b/apps/Arm/vm_introspect/src/cross_vm_connection.c index a14b061f..35d1ce49 100644 --- a/apps/Arm/vm_introspect/src/cross_vm_connection.c +++ b/apps/Arm/vm_introspect/src/cross_vm_connection.c @@ -19,7 +19,7 @@ #endif //example going from linux to native component -static void sys_ipa_to_pa(void *cookie) +static void sys_ipa_to_pa(void) { printf("address from linux is %x\n", *(seL4_Word *)introspect_data);