[WIP] Mimalloc Integration

resolve-cveassert/libresolve/CMakeLists.txt

@@ -3,6 +3,31 @@
 
 include(GNUInstallDirs)
 include(ExternalProject)
+include(FetchContent)
+
+#### Fetching and building mimalloc project 
+FetchContent_Declare(
+    mimalloc
+    GIT_REPOSITORY https://github.com/microsoft/mimalloc.git
+    GIT_TAG v3.3.2
+)
+
+## Force static build 
+set(MI_BUILD_SHARED OFF CACHE BOOL "" FORCE)
+set(MI_BUILD_STATIC ON CACHE BOOL "" FORCE)
+
+FetchContent_MakeAvailable(mimalloc)
+
+# Add the shim source to the mimalloc proj
+target_sources(mimalloc-static PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}/mi_shim.c
+)
+
+## mimalloc proj must be PIC to ensure compatibility with libresolve
+set_target_properties(mimalloc-static PROPERTIES
+    POSITION_INDEPENDENT_CODE ON
+    OUTPUT_NAME mimalloc
+)
 
 # Map CMake build type to Cargo flags
 if(CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "")
@@ -24,17 +49,24 @@ file(GLOB_RECURSE RUST_SOURCES CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/sr
 add_custom_command(
     OUTPUT ${RUST_LIB}
     COMMAND 
-        ${CMAKE_COMMAND} -E env CARGO_TARGET_DIR=${RUST_OUT_DIR} cargo build ${CARGO_FLAGS} 
+        ${CMAKE_COMMAND} -E env
+        CARGO_TARGET_DIR=${RUST_OUT_DIR}
+        MIMALLOC_LIB_DIR=$<TARGET_FILE_DIR:mimalloc-static>
+        cargo build ${CARGO_FLAGS} 
     WORKING_DIRECTORY ${RUST_CRATE_DIR}
     COMMENT "Building libresolve.so" VERBATIM
-    DEPENDS ${RUST_SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/Cargo.lock ${CMAKE_CURRENT_SOURCE_DIR}/Cargo.toml ${CMAKE_CURRENT_SOURCE_DIR}/rust-toolchain.toml
+    DEPENDS mimalloc-static ${RUST_SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/Cargo.lock ${CMAKE_CURRENT_SOURCE_DIR}/Cargo.toml ${CMAKE_CURRENT_SOURCE_DIR}/rust-toolchain.toml
 )
 
 add_custom_target(test-libresolve
-    COMMAND cargo test
+    COMMAND 
+        ${CMAKE_COMMAND} -E env
+        MIMALLOC_LIB_DIR=${MIMALLOC_LIB_DIR} # Note: Pass the static mimalloc loc so that build.rs does not panic
+        cargo test
     WORKING_DIRECTORY ${RUST_CRATE_DIR}
     COMMENT "Running regression tests for libresolve"
 )
 
 add_custom_target(libresolve ALL DEPENDS ${RUST_LIB})
+add_dependencies(libresolve mimalloc-static)
 install(FILES ${RUST_LIB} DESTINATION ${CMAKE_INSTALL_LIBDIR})

resolve-cveassert/libresolve/Cargo.toml

@@ -1,12 +1,14 @@
 [package]
 name = "resolve"
+build = "src/build.rs"
 version = "0.1.0"
 edition = "2024"
 
 [lib]
 crate-type = ["cdylib"]
 
 [dependencies]
+cc = "1.2.63"
 env_logger = "0.11.8"
 libc = "0.2.174"
 log = "0.4.29"

resolve-cveassert/libresolve/mi_shim.c

@@ -0,0 +1,106 @@
+// Copyright (c) 2025 Riverside Research.
+// LGPL-3; See LICENSE.txt in the repo root for details.
+
+#include "mimalloc.h"
+#include "mimalloc/internal.h"
+#include <stdarg.h>
+#include <stdint.h>
+#include <stdio.h>
+
+extern void* __resolve_malloc(size_t);
+extern void __resolve_free(void*);
+
+
+typedef struct {
+  void *base;
+  void *limit;
+  size_t size;
+} mi_alloc_bounds_t;
+
+
+mi_alloc_bounds_t mi_get_alloc_bounds(void* p) {
+  mi_alloc_bounds_t bounds;
+  mi_alloc_bounds_t empty = { .base = (void*) -1, .limit = (void*)-1, .size = 0 };
+
+  // Check if ptr is owned by mimalloc
+  if (!mi_is_in_heap_region(p)) {
+    return empty;
+  }
+
+  // Recover the page information for the pointer.
+  mi_page_t *page = _mi_ptr_page(p);
+
+  if (page == NULL) {
+    return empty;
+  }
+
+  // _mi_page_ptr_unalign recovers the corresponding 
+  // block for base and interior pointers 
+  mi_block_t *base = _mi_page_ptr_unalign(page, p);
+  if (!base) { return empty; }
+
+  bounds.base = (void *)base;
+  bounds.size = mi_usable_size(base);
+  bounds.limit = (void *)base + bounds.size;
+  return bounds;
+}
+
+bool mi_is_heap_owned(const void* p) {
+  return _mi_ptr_page(p) != NULL;
+}
+
+int __vasprintf(char **strp, const char *fmt, va_list ap)
+{
+  va_list ap_copy;
+  va_copy(ap_copy, ap);
+
+  int len = vsnprintf(NULL, 0, fmt, ap_copy);
+  va_end(ap_copy);
+
+  if (len < 0) { 
+    // to match glibc behavior
+    *strp = NULL;
+    return -1; 
+  }
+
+  char *buf = __resolve_malloc((size_t)len + 1);
+  if (!buf) { return -1; }
+
+  va_copy(ap_copy, ap);
+
+  int written = vsnprintf(buf, (size_t)len + 1, fmt, ap_copy);
+
+  va_end(ap_copy);
+
+  if (written < 0) {
+    __resolve_free(buf);
+    return -1;
+  }
+
+  *strp = buf;
+  return written;
+}
+
+/* debugging function to help check if a pointer the 
+  base address or an offset into the block 
+*/
+bool mi_is_block_start(void *p) {
+  if (p == NULL) { return false; }
+
+  // Recover page information
+  mi_page_t *page = _mi_ptr_page(p);
+
+  if (page == NULL) { return false; }
+
+  // Compute the block index
+  const size_t block_size = page->block_size;
+  uintptr_t page_start = (uintptr_t)page->page_start;
+  size_t block_index = ((uintptr_t)p - page_start) / block_size;
+
+  // Compute the canonical base.
+  uintptr_t base = page_start + block_index * block_size;
+
+  // Compare to pointer
+  return base == (uintptr_t)p;
+}
+

resolve-cveassert/libresolve/src/build.rs

@@ -0,0 +1,6 @@
+fn main() {
+    let dir = std::env::var("MIMALLOC_LIB_DIR").unwrap();
+    println!("cargo::warning=LINKING_MIMALLOC_ARCHIVE");
+    println!("cargo::rustc-link-search=native={}", dir);
+    println!("cargo::rustc-link-lib=static=mimalloc");
+}