Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

vm_introspect: fix build breaker and warning #39

Merged
merged 2 commits into from
Jan 27, 2024
Merged

vm_introspect: fix build breaker and warning #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2aa80c0
vm_introspect: use vm_config
Apr 5, 2023
2ad690a
vm_introspect: fix function type
axel-h Jan 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/Arm/vm_introspect/src/cross_vm_connection.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
15 changes: 9 additions & 6 deletions apps/Arm/vm_introspect/src/init_dataport_ram.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,34 +12,37 @@
#include <sel4vmmplatsupport/guest_memory_util.h>
#include <vmlinux.h>

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;
frame_result.size_bits = seL4_PageBits;
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);
}
Loading