Merge pull request #90 from chp-io/demo-vms-linux

[demo] vms: Add Linux kernel with debug facilities
Bareflank · Nov 2, 2021 · 4e9aebb · 4e9aebb
2 parents 9de8f29 + 3a176a9
commit 4e9aebb
Show file tree

Hide file tree

Showing 4 changed files with 1,366 additions and 4 deletions.
diff --git a/shim/linux/src/platform.c b/shim/linux/src/platform.c
@@ -285,7 +285,7 @@ platform_mlock(void *const pmut_ptr, uint64_t const num, uintptr_t *pmut_os_info
 {
     struct page **pages = NULL;
     int rc = 0;
-    uint64_t page_count = (num >> HYPERVISOR_PAGE_SHIFT) + 1;
+    uint64_t page_count = (num >> HYPERVISOR_PAGE_SHIFT);
 
     platform_expects(((void *)0) != pmut_ptr);
     platform_expects(((uint64_t)0) != num);
@@ -341,7 +341,7 @@ NODISCARD int64_t
 platform_munlock(void *const pmut_ptr, uint64_t const num, uintptr_t const os_info) NOEXCEPT
 {
     struct page **pages = (struct page **)os_info;
-    uint64_t page_count = (num >> HYPERVISOR_PAGE_SHIFT) + 1;
+    uint64_t page_count = (num >> HYPERVISOR_PAGE_SHIFT);
 
     platform_expects(((void *)0) != pmut_ptr);
     platform_expects(((uint64_t)0) != num);

diff --git a/utils/linux/qemu_strace.sh b/utils/linux/qemu_strace.sh
@@ -22,7 +22,7 @@ if [ -z ${BUILD_DIR+x} ]; then
 fi
 
 if [ -z ${KERNEL_PATH+x} ]; then
-  KERNEL_PATH="$(pwd)/vm_cross_compile/bin/bzImage-release"
+  KERNEL_PATH="$(pwd)/vm_cross_compile/bin/bzImage-debug"
 fi
 
 if [ -z ${INITRD_PATH+x} ]; then

diff --git a/vms/linux/CMakeLists.txt b/vms/linux/CMakeLists.txt
@@ -36,7 +36,6 @@ macro(add_vmlinux NAME)
         COMMAND sync
         VERBATIM
     )
-    # install(TARGETS ${NAME} DESTINATION bin)
 endmacro(add_vmlinux)
 
 macro(add_userspace NAME)
@@ -45,6 +44,7 @@ macro(add_userspace NAME)
 endmacro(add_userspace)
 
 add_vmlinux(release)
+add_vmlinux(debug)
 
 add_userspace(init init.cpp)