Merge branch 'main' into set-ar-program

Author: BusyJay

.github/workflows/main.yml

@@ -16,6 +16,11 @@ jobs:
     strategy:
       matrix:
         include:
+          - name: aarch64-unknown-linux-gnu
+            target: aarch64-unknown-linux-gnu
+            nobgt: 0
+            no_tests: 1
+            tag: ubuntu-24.04-arm
           - name: x86_64-apple-darwin
             target: x86_64-apple-darwin
             nobgt: 0

CHANGELOG.md

@@ -1,3 +1,14 @@
+# 0.6.1 - 2025-10-15
+
+- Fix compiler and clippy warnings (#105)
+- Add feature `disable_cache_oblivious` to jemallocator re-exports (#104)
+- Document `JEMALLOC_OVERRIDE` (#107)
+- Harden `strerror_r` function detection (#117)
+- Respect jobserver set by Cargo (#120)
+- Make unprefixed consistently override the system allocator (#109)
+  - Adds new Cargo feature `override_allocator_on_supported_platforms`.
+- `cat` the entire `config.log` (#142)
+
 # 0.6.0 - 2024-07-14
 
 - Fix build on riscv64gc-unknown-linux-musl (#67) (#75)

Cargo.toml

@@ -1,2 +1,8 @@
 [workspace]
-members = ["jemallocator", "jemallocator-global", "jemalloc-ctl", "jemalloc-sys"]
+members = [
+    "jemallocator",
+    "jemallocator-global",
+    "jemalloc-ctl",
+    "jemalloc-sys",
+    "test-dylib",
+]

ci/run.sh

@@ -32,7 +32,7 @@ cargo test --target "${TARGET}" --features stats
 cargo test --target "${TARGET}" --features 'debug profiling'
 
 cargo test --target "${TARGET}" \
-    --features unprefixed_malloc_on_supported_platforms
+    --features override_allocator_on_supported_platforms
 cargo test --target "${TARGET}" --no-default-features
 cargo test --target "${TARGET}" --no-default-features \
     --features background_threads_runtime_support
@@ -48,7 +48,7 @@ cargo test --target "${TARGET}" --release
 cargo test --target "${TARGET}" --manifest-path jemalloc-sys/Cargo.toml
 cargo test --target "${TARGET}" \
              --manifest-path jemalloc-sys/Cargo.toml \
-             --features unprefixed_malloc_on_supported_platforms
+             --features override_allocator_on_supported_platforms
 
 # FIXME: jemalloc-ctl fails in the following targets
 case "${TARGET}" in
@@ -77,3 +77,14 @@ cargo test --target "${TARGET}" \
 #     # The Alloc trait is unstable:
 #     ${CARGO_CMD} test --target "${TARGET}" --features alloc_trait
 # fi
+
+# Test that overriding works in dylibs.
+case "$TARGET" in
+    "i686-unknown-linux-musl") ;;
+    "x86_64-unknown-linux-musl") ;;
+    *)
+        cargo run --target "${TARGET}" \
+            -p test-dylib \
+            --features override_allocator_on_supported_platforms
+        ;;
+esac

jemalloc-ctl/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tikv-jemalloc-ctl"
-version = "0.6.0"
+version = "0.6.1"
 authors = [
     "Steven Fackler <sfackler@gmail.com>",
     "Gonzalo Brito Gadeschi <gonzalobg88@gmail.com>",
@@ -26,12 +26,12 @@ is-it-maintained-open-issues = { repository = "tikv/jemallocator" }
 maintenance = { status = "actively-developed" }
 
 [dependencies]
-tikv-jemalloc-sys = { path = "../jemalloc-sys", version = "0.6.0" }
+tikv-jemalloc-sys = { path = "../jemalloc-sys", version = "0.6.1" }
 libc = { version = "0.2", default-features = false }
 paste = "1"
 
 [dev-dependencies]
-tikv-jemallocator = { path = "../jemallocator", version = "0.6.0" }
+tikv-jemallocator = { path = "../jemallocator", version = "0.6.1" }
 
 [features]
 default = []

jemalloc-sys/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tikv-jemalloc-sys"
-version = "0.6.0+5.3.0-1-ge13ca993e8ccb9ba9847cc330696e02839f328f7"
+version = "0.6.1+5.3.0-1-ge13ca993e8ccb9ba9847cc330696e02839f328f7"
 authors = [
     "Alex Crichton <alex@alexcrichton.com>",
     "Gonzalo Brito Gadeschi <gonzalobg88@gmail.com>",
@@ -46,6 +46,7 @@ background_threads_runtime_support = []
 background_threads = [ "background_threads_runtime_support" ]
 stats = []
 unprefixed_malloc_on_supported_platforms = []
+override_allocator_on_supported_platforms = [ "unprefixed_malloc_on_supported_platforms" ]
 disable_initial_exec_tls = []
 disable_cache_oblivious = []
 

jemalloc-sys/README.md

@@ -48,11 +48,11 @@ This crate provides following cargo feature flags:
 * `stats` (configure `jemalloc` with `--enable-stats`): Enable statistics
   gathering functionality. See the `jemalloc`'s "`opt.stats_print`" option
   documentation for usage details.
-  
+
 * `debug` (configure `jemalloc` with `--enable-debug`): Enable assertions and
   validation code. This incurs a substantial performance hit, but is very useful
   during application development.
-  
+
 * `background_threads_runtime_support` (enabled by default): enables
   background-threads run-time support when building `jemalloc-sys` on some POSIX
   targets supported by `jemalloc`. Background threads are disabled at run-time
@@ -72,16 +72,33 @@ This crate provides following cargo feature flags:
 * `unprefixed_malloc_on_supported_platforms`: when disabled, configure
   `jemalloc` with `--with-jemalloc-prefix=_rjem_`. Enabling this causes symbols
   like `malloc` to be emitted without a prefix, overriding the ones defined by
-  libc. This usually causes C and C++ code linked in the same program to use
-  `jemalloc` as well. On some platforms prefixes are always used because
-  unprefixing is known to cause segfaults due to allocator mismatches.
-  
+  libc. This usually causes C, Objective-C and C++ code linked in the same
+  program to use `jemalloc` as well. On some platforms prefixes are always used
+  because unprefixing is known to cause segfaults due to allocator mismatches.
+
+* `override_allocator_on_supported_platforms`: override the system allocator,
+  even outside Rust code.
+
+  This enables the `unprefixed_malloc_on_supported_platforms` feature, with the
+  addition that it forces overriding the allocator even if `malloc` and `free`
+  would not usually have been seen by the linker. It also overrides the
+  allocator on Apple platforms.
+
+  Note that to use this, the `jemalloc-sys` crate must actually be visible to
+  `rustc` (it is not enough to only declare it in `Cargo.toml`). This can be
+  done by adding:
+  ```rust
+  use jemalloc_sys as _;
+  ```
+
+  In your `main.rs`.
+
 * `disable_initial_exec_tls` (disabled by default): when enabled, jemalloc is
-  built with the `--disable-initial-exec-tls` option. It disables the 
-  initial-exec TLS model for jemalloc's internal thread-local storage (on those 
-  platforms that support explicit settings). This can allow jemalloc to be 
+  built with the `--disable-initial-exec-tls` option. It disables the
+  initial-exec TLS model for jemalloc's internal thread-local storage (on those
+  platforms that support explicit settings). This can allow jemalloc to be
   dynamically loaded after program startup (e.g. using dlopen). If you encounter
-  the error `yourlib.so: cannot allocate memory in static TLS block`, you'll 
+  the error `yourlib.so: cannot allocate memory in static TLS block`, you'll
   likely want to enable this.
 
 * `disable_cache_oblivious` (disabled by default): when enabled, jemalloc is
@@ -104,7 +121,7 @@ hyphens `-` are replaced with underscores `_`(see
   variable, the `/etc/malloc.conf` symlink, and the `MALLOC_CONF` environment
   variable (note: this variable might be prefixed as `_RJEM_MALLOC_CONF`). For
   example, to change the default decay time for dirty pages to 30 seconds:
-  
+
   ```
   JEMALLOC_SYS_WITH_MALLOC_CONF=dirty_decay_ms:30000
   ```
@@ -115,17 +132,17 @@ hyphens `-` are replaced with underscores `_`(see
   allocator page size equal to the system page size, so this option need not be
   specified unless the system page size may change between configuration and
   execution, e.g. when cross compiling.
-  
+
 * `JEMALLOC_SYS_WITH_LG_HUGEPAGE=<lg-hugepage>`: Specify the base 2 log of the
   system huge page size. This option is useful when cross compiling, or when
   overriding the default for systems that do not explicitly support huge pages.
-  
-  
+
+
 * `JEMALLOC_SYS_WITH_LG_QUANTUM=<lg-quantum>`: Specify the base 2 log of the
   minimum allocation alignment. jemalloc needs to know the minimum alignment
   that meets the following C standard requirement (quoted from the April 12,
   2011 draft of the C11 standard):
-  
+
   > The pointer returned if the allocation succeeds is suitably aligned so that
   > it may be assigned to a pointer to any type of object with a fundamental
   > alignment requirement and then used to access such an object or an array of

jemalloc-sys/build.rs

@@ -111,10 +111,16 @@ fn main() {
             .iter()
             .any(|i| target.contains(i))
     {
-        warning!(
-            "Unprefixed `malloc` requested on unsupported platform `{}` => using prefixed `malloc`",
-            target
-        );
+        // Apple targets don't support unprefixed, but they do support
+        // overriding (if you do the `zone_register` trick), so no need to
+        // warn there.
+        let override_ = env::var("CARGO_FEATURE_OVERRIDE_ALLOCATOR_ON_SUPPORTED_PLATFORMS").is_ok();
+        if !target.contains("apple") || !override_ {
+            warning!(
+                "Unprefixed `malloc` requested on unsupported platform `{}` => using prefixed `malloc`",
+                target
+            );
+        }
         use_prefix = true;
     }
 
@@ -326,6 +332,9 @@ fn main() {
         .arg("install_lib_static")
         .arg("install_include"));
 
+    // Try to remove the build directory to avoid it wasting disk space in the target directory
+    let _ = fs::remove_dir_all(build_dir);
+
     println!("cargo:root={}", out_dir.display());
 
     // Linkage directives to pull in jemalloc and its dependencies.
@@ -340,7 +349,7 @@ fn main() {
     } else {
         println!("cargo:rustc-link-lib=static=jemalloc_pic");
     }
-    println!("cargo:rustc-link-search=native={}/lib", build_dir.display());
+    println!("cargo:rustc-link-search=native={}/lib", out_dir.display());
     if target.contains("android") {
         println!("cargo:rustc-link-lib=gcc");
     } else if !target.contains("windows") {
@@ -370,7 +379,10 @@ fn make_command(make_cmd: &str, build_dir: &Path, num_jobs: &str) -> Command {
 
     if let Ok(makeflags) = std::env::var("CARGO_MAKEFLAGS") {
         let makeflags = if let Ok(orig_makeflags) = std::env::var("MAKEFLAGS") {
-            format!("{orig_makeflags} {makeflags}")
+            // Prepend Cargo makeflags before externally configured makeflags
+            // Adding Cargo makeflags at the end was causing issues, see
+            // https://github.com/tikv/jemallocator/issues/92#issuecomment-3536269176.
+            format!("{makeflags} {orig_makeflags}")
         } else {
             makeflags
         };
@@ -383,7 +395,14 @@ fn make_command(make_cmd: &str, build_dir: &Path, num_jobs: &str) -> Command {
 
 fn run_and_log(cmd: &mut Command, log_file: &Path) {
     execute(cmd, || {
-        run(Command::new("tail").arg("-n").arg("100").arg(log_file));
+        // In CI systems print the whole log since it can be difficult to get to
+        // a log file after the build fails. Otherwise print the last 100 lines
+        // to keep the output concise.
+        if env::var_os("CI").is_some() {
+            run(Command::new("cat").arg(log_file));
+        } else {
+            run(Command::new("tail").arg("-n").arg("100").arg(log_file));
+        }
     })
 }
 
@@ -411,10 +430,13 @@ fn gnu_target(target: &str) -> String {
     match target {
         "i686-pc-windows-msvc" => "i686-pc-win32".to_string(),
         "x86_64-pc-windows-msvc" => "x86_64-pc-win32".to_string(),
-        "i686-pc-windows-gnu" => "i686-w64-mingw32".to_string(),
-        "x86_64-pc-windows-gnu" => "x86_64-w64-mingw32".to_string(),
+        "i686-pc-windows-gnu" | "i686-pc-windows-gnullvm" => "i686-w64-mingw32".to_string(),
+        "x86_64-pc-windows-gnu" | "x86_64-pc-windows-gnullvm" => "x86_64-w64-mingw32".to_string(),
+        "aarch64-pc-windows-gnullvm" => "aarch64-w64-mingw32".to_string(),
         "armv7-linux-androideabi" => "arm-linux-androideabi".to_string(),
-        "riscv64gc-unknown-linux-gnu" => "riscv64-linux-gnu".to_string(),
+        "riscv64gc-unknown-linux-gnu" | "riscv64a23-unknown-linux-gnu" => {
+            "riscv64-linux-gnu".to_string()
+        }
         "riscv64gc-unknown-linux-musl" => "riscv64-linux-musl".to_string(),
         s => s.to_string(),
     }

jemalloc-sys/src/env.rs

@@ -21,4 +21,4 @@ pub static NO_BG_THREAD_TARGETS: &[&str] = &["musl"];
 // https://github.com/rust-lang/rust/commit/e3b414d8612314e74e2b0ebde1ed5c6997d28e8d
 // https://github.com/rust-lang/rust/commit/9f3de647326fbe50e0e283b9018ab7c41abccde3
 // https://github.com/rust-lang/rust/commit/ed015456a114ae907a36af80c06f81ea93182a24
-pub static NO_UNPREFIXED_MALLOC_TARGETS: &[&str] = &["android", "dragonfly", "darwin"];
+pub static NO_UNPREFIXED_MALLOC_TARGETS: &[&str] = &["android", "dragonfly", "apple"];

jemalloc-sys/src/lib.rs

@@ -890,3 +890,86 @@ pub type extent_merge_t = unsafe extern "C" fn(
 mod env;
 
 pub use env::*;
+
+// When using the `"override_allocator_on_supported_platforms"` feature flag,
+// the user wants us to globally override the system allocator.
+//
+// However, since we build `jemalloc` as a static library (an archive), the
+// linker may decide to not care about our overrides if it can't directly see
+// references to the symbols, see the following link for details:
+// <https://maskray.me/blog/2021-06-20-symbol-processing#archive-processing>
+//
+// This is problematic if `jemalloc_sys` is used from a library that by itself
+// doesn't allocate, while invoking other shared libraries that do.
+//
+// Another especially problematic case would be something like the following:
+//
+// ```
+// // Call `malloc` whose symbol is looked up statically.
+// let ptr = libc::malloc(42);
+//
+// // But use a dynamically looked up `free`.
+// let free = libc::dlsym(null_mut(), c"free".as_ptr());
+// let free = transmute::<*mut c_void, unsafe extern "C" fn(*mut c_void)>(free);
+// free(ptr);
+// ```
+//
+// Since if the `malloc` and `free` provided by `jemalloc` end up in different
+// object files in the archive (NOTE: In practice, this is unlikely to be an
+// issue, since `jemalloc.c` contains all the implementations and is compiled
+// as a single object file), the linker would think that only `malloc` was
+// used, and would never load the `free` that we also want (and hence we'd end
+// up executing jemalloc's `malloc` and the system's `free`, which is UB).
+//
+// To avoid this problem, we make sure that all the allocator functions are
+// visible to the linker, such that it will always override all of them.
+//
+// We do this by referencing these symbols in `#[used]` statics, which makes
+// them known to `rustc`, which will reference them in a `symbols.o` stub file
+// that is later passed to the linker. See the following link for details on
+// how this works:
+// <https://github.com/rust-lang/rust/pull/95604>
+
+#[cfg(all(
+    feature = "override_allocator_on_supported_platforms",
+    not(target_vendor = "apple")
+))]
+mod set_up_statics {
+    use super::*;
+
+    #[used]
+    static USED_MALLOC: unsafe extern "C" fn(usize) -> *mut c_void = malloc;
+    #[used]
+    static USED_CALLOC: unsafe extern "C" fn(usize, usize) -> *mut c_void = calloc;
+    #[used]
+    static USED_POSIX_MEMALIGN: unsafe extern "C" fn(*mut *mut c_void, usize, usize) -> c_int =
+        posix_memalign;
+    #[used]
+    static USED_ALIGNED_ALLOC: unsafe extern "C" fn(usize, usize) -> *mut c_void = aligned_alloc;
+    #[used]
+    static USED_REALLOC: unsafe extern "C" fn(*mut c_void, usize) -> *mut c_void = realloc;
+    #[used]
+    static USED_FREE: unsafe extern "C" fn(*mut c_void) = free;
+}
+
+// On macOS, jemalloc doesn't directly override malloc/free, but instead
+// registers itself with the allocator's zone APIs in a ctor (`zone_register`
+// is marked with `__attribute__((constructor))`).
+//
+// Similarly to above though, for the Mach-O linker to actually consider ctors
+// as "used" when defined in an archive member in a static library, so we need
+// to explicitly reference the function via. Rust's `#[used]`.
+
+#[cfg(all(
+    feature = "override_allocator_on_supported_platforms",
+    target_vendor = "apple"
+))]
+#[used]
+static USED_ZONE_REGISTER: unsafe extern "C" fn() = {
+    extern "C" {
+        #[cfg_attr(prefixed, link_name = "_rjem_je_zone_register")]
+        #[cfg_attr(not(prefixed), link_name = "je_zone_register")]
+        fn zone_register();
+    }
+    zone_register
+};