Replace Mutex use with -- -M <unique_id>

trailofbits · Feb 18, 2025 · 8df5b26 · 8df5b26
1 parent a77b2b7
commit 8df5b26
Show file tree

Hide file tree

Showing 11 changed files with 58 additions and 33 deletions.
diff --git a/cargo-test-fuzz/src/lib.rs b/cargo-test-fuzz/src/lib.rs
@@ -1163,12 +1163,13 @@ fn fuzz_command(
             &input_dir,
             "-o",
             &output_dir.to_string_lossy(),
-            "-M",
-            "default",
         ]
         .into_iter()
         .map(String::from),
     );
+    if opts.zzargs.iter().find(|&arg| arg == "-M").is_none() {
+        args.extend(["-M".to_owned(), "default".to_owned()]);
+    }
     if !config.sufficient_cpus {
         args.extend(["-V".to_owned(), opts.slice.to_string()]);
     } else if let Some(max_total_time) = opts.max_total_time {
@@ -1190,7 +1191,7 @@ fn fuzz_command(
     );
 
     let mut command = Command::new("cargo");
-    command.envs(envs).args(&args);
+    command.envs(envs).args(args);
     debug!("{:?}", command);
     command
 }

diff --git a/cargo-test-fuzz/tests/integration/auto_generate.rs b/cargo-test-fuzz/tests/integration/auto_generate.rs
@@ -2,7 +2,7 @@ use anyhow::ensure;
 use internal::dirs::corpus_directory_from_target;
 use predicates::prelude::*;
 use std::fs::{read_dir, remove_dir_all};
-use testing::{examples, retry, CommandExt};
+use testing::{examples, retry, unique_id, CommandExt};
 
 const MAX_TOTAL_TIME: &str = "60";
 
@@ -30,8 +30,6 @@ fn auto_generate_empty() {
 #[cfg_attr(dylint_lib = "general", allow(non_thread_safe_call_in_test))]
 #[test]
 fn auto_generate_nonempty() {
-    let _lock = crate::ASSERT_MUTEX.lock();
-
     auto_generate("assert", "target", true, "Auto-generated", 1);
 }
 
@@ -43,13 +41,18 @@ fn auto_generate(krate: &str, target: &str, success: bool, pattern: &str, n: usi
     remove_dir_all(&corpus).unwrap_or_default();
 
     retry(3, || {
+        let id = unique_id();
+
         let assert = examples::test_fuzz(krate, target)
             .unwrap()
             .args([
                 "--no-ui",
                 "--run-until-crash",
                 "--max-total-time",
                 MAX_TOTAL_TIME,
+                "--",
+                "-M",
+                &id,
             ])
             .logged_assert();
 

diff --git a/cargo-test-fuzz/tests/integration/consolidate.rs b/cargo-test-fuzz/tests/integration/consolidate.rs
@@ -2,7 +2,7 @@ use anyhow::ensure;
 use internal::dirs::corpus_directory_from_target;
 use predicates::prelude::*;
 use std::fs::{read_dir, remove_dir_all};
-use testing::{examples, retry, CommandExt};
+use testing::{examples, retry, unique_id, CommandExt};
 
 const CRASH_MAX_TOTAL_TIME: &str = "60";
 
@@ -11,8 +11,6 @@ const HANG_MAX_TOTAL_TIME: &str = "120";
 #[cfg_attr(dylint_lib = "general", allow(non_thread_safe_call_in_test))]
 #[test]
 fn consolidate_crashes() {
-    let _lock = crate::ASSERT_MUTEX.lock();
-
     consolidate(
         "assert",
         "target",
@@ -28,8 +26,6 @@ fn consolidate_crashes() {
 #[cfg_attr(dylint_lib = "general", allow(non_thread_safe_call_in_test))]
 #[test]
 fn consolidate_hangs() {
-    let _lock = crate::PARSE_DURATION_MUTEX.lock();
-
     consolidate(
         "parse_duration",
         "parse",
@@ -53,7 +49,9 @@ fn consolidate(krate: &str, target: &str, fuzz_args: &[&str], pattern: &str) {
     assert_eq!(1, read_dir(&corpus).unwrap().count());
 
     retry(3, || {
-        let mut args = vec!["--no-ui"];
+        let id = unique_id();
+
+        let mut args = vec!["--no-ui", "--", "-M", &id];
         args.extend_from_slice(fuzz_args);
 
         examples::test_fuzz(krate, target)
@@ -64,7 +62,7 @@ fn consolidate(krate: &str, target: &str, fuzz_args: &[&str], pattern: &str) {
 
         examples::test_fuzz(krate, target)
             .unwrap()
-            .args(["--consolidate"])
+            .args(["--consolidate", "--", "-M", &id])
             .logged_assert()
             .success();
 

diff --git a/cargo-test-fuzz/tests/integration/fuzz.rs b/cargo-test-fuzz/tests/integration/fuzz.rs
@@ -1,15 +1,13 @@
 use internal::dirs::corpus_directory_from_target;
 use predicates::prelude::*;
 use std::fs::remove_dir_all;
-use testing::{examples, retry, CommandExt};
+use testing::{examples, retry, unique_id, CommandExt};
 
 const MAX_TOTAL_TIME: &str = "60";
 
 #[cfg_attr(dylint_lib = "general", allow(non_thread_safe_call_in_test))]
 #[test]
 fn fuzz_assert() {
-    let _lock = crate::ASSERT_MUTEX.lock();
-
     fuzz("assert", false);
 }
 
@@ -32,16 +30,18 @@ fn fuzz(krate: &str, persistent: bool) {
         .success();
 
     retry(3, || {
+        let id = unique_id();
+
         let mut command = examples::test_fuzz(krate, "target").unwrap();
 
         let mut args = vec!["--exit-code", "--run-until-crash"];
         if persistent {
             args.push("--persistent");
         }
-        args.extend_from_slice(&["--max-total-time", MAX_TOTAL_TIME]);
+        args.extend_from_slice(&["--max-total-time", MAX_TOTAL_TIME, "--", "-M", &id]);
 
         command
-            .args(&args)
+            .args(args)
             .logged_assert()
             .try_code(predicate::eq(1))
     })

diff --git a/cargo-test-fuzz/tests/integration/fuzz_cast.rs b/cargo-test-fuzz/tests/integration/fuzz_cast.rs
@@ -1,5 +1,5 @@
 use predicates::prelude::*;
-use testing::{examples, retry, CommandExt};
+use testing::{examples, retry, unique_id, CommandExt};
 
 const MAX_TOTAL_TIME: &str = "60";
 
@@ -11,6 +11,8 @@ fn fuzz_cast() {
         .success();
 
     for use_cast_checks in [false, true] {
+        let id = unique_id();
+
         let mut args = vec![
             "--exit-code",
             "--run-until-crash",
@@ -23,6 +25,7 @@ fn fuzz_cast() {
         } else {
             0
         };
+        args.extend(["--", "-M", &id]);
         retry(3, || {
             examples::test_fuzz("cast", "target")
                 .unwrap()
@@ -34,7 +37,13 @@ fn fuzz_cast() {
         if use_cast_checks {
             examples::test_fuzz("cast", "target")
                 .unwrap()
-                .args(["--replay=crashes", "--features=test-fuzz/cast_checks"])
+                .args([
+                    "--replay=crashes",
+                    "--features=test-fuzz/cast_checks",
+                    "--",
+                    "-M",
+                    &id,
+                ])
                 .logged_assert()
                 .success()
                 .stdout(predicate::str::contains("invalid cast"));

diff --git a/cargo-test-fuzz/tests/integration/fuzz_generic.rs b/cargo-test-fuzz/tests/integration/fuzz_generic.rs
@@ -1,7 +1,7 @@
 use internal::dirs::corpus_directory_from_target;
 use predicates::prelude::*;
 use std::{fs::remove_dir_all, sync::Mutex};
-use testing::{examples, retry, CommandExt};
+use testing::{examples, retry, unique_id, CommandExt};
 
 const MAX_TOTAL_TIME: &str = "60";
 
@@ -38,13 +38,18 @@ fn fuzz(test: &str, code: i32) {
     assert!(corpus.exists());
 
     retry(3, || {
+        let id = unique_id();
+
         examples::test_fuzz("generic", "struct_target")
             .unwrap()
             .args([
                 "--exit-code",
                 "--run-until-crash",
                 "--max-total-time",
                 MAX_TOTAL_TIME,
+                "--",
+                "-M",
+                &id,
             ])
             .logged_assert()
             .try_code(predicate::eq(code))

diff --git a/cargo-test-fuzz/tests/integration/fuzz_parallel.rs b/cargo-test-fuzz/tests/integration/fuzz_parallel.rs
@@ -1,14 +1,16 @@
 use internal::dirs::output_directory_from_target;
 use predicates::prelude::*;
 use std::{ffi::OsStr, fs::remove_dir_all};
-use testing::{examples, retry, CommandExt};
+use testing::{examples, retry, unique_id, CommandExt};
 
 const CPUS: &str = "2";
 const TIME_SLICE: &str = "30";
 
 #[cfg_attr(dylint_lib = "general", allow(non_thread_safe_call_in_test))]
 #[test]
 fn fuzz_parallel() {
+    let id = unique_id();
+
     for i in 0..6 {
         let output_dir = output_directory_from_target("parallel", &format!("target_{i}"));
         remove_dir_all(output_dir).unwrap_or_default();
@@ -29,6 +31,9 @@ fn fuzz_parallel() {
                 CPUS,
                 "--slice",
                 TIME_SLICE,
+                "--",
+                "-M",
+                &id,
             ])
             .logged_assert()
             .try_code(predicate::eq(1))

diff --git a/cargo-test-fuzz/tests/integration/main.rs b/cargo-test-fuzz/tests/integration/main.rs
@@ -1,5 +1,3 @@
-use std::sync::Mutex;
-
 mod auto_generate;
 mod build;
 mod consolidate;
@@ -10,6 +8,3 @@ mod fuzz_generic;
 mod fuzz_parallel;
 mod generic_args;
 mod replay;
-
-static ASSERT_MUTEX: Mutex<()> = Mutex::new(());
-static PARSE_DURATION_MUTEX: Mutex<()> = Mutex::new(());
diff --git a/cargo-test-fuzz/tests/integration/replay.rs b/cargo-test-fuzz/tests/integration/replay.rs
@@ -5,7 +5,7 @@ use internal::dirs::corpus_directory_from_target;
 use predicates::prelude::*;
 use rlimit::Resource;
 use std::fs::remove_dir_all;
-use testing::{examples, retry, CommandExt};
+use testing::{examples, retry, unique_id, CommandExt};
 
 // smoelius: MEMORY_LIMIT must be large enough for the build process to complete.
 const MEMORY_LIMIT: u64 = 1024 * 1024 * 1024;
@@ -39,8 +39,6 @@ fn replay_crashes() {
 #[allow(clippy::trivial_regex)]
 #[test]
 fn replay_hangs() {
-    let _lock = crate::PARSE_DURATION_MUTEX.lock();
-
     replay(
         "parse_duration",
         "parse",
@@ -51,6 +49,8 @@ fn replay_hangs() {
 }
 
 fn replay(krate: &str, target: &str, fuzz_args: &[&str], object: Object, re: &str) {
+    let id = unique_id();
+
     let corpus = corpus_directory_from_target(krate, target);
 
     // smoelius: `corpus` is distinct for all tests. So there is no race here.
@@ -64,12 +64,12 @@ fn replay(krate: &str, target: &str, fuzz_args: &[&str], object: Object, re: &st
 
     examples::test_fuzz(krate, target)
         .unwrap()
-        .args(["--reset"])
+        .args(["--reset", "--", "-M", &id])
         .logged_assert()
         .success();
 
     retry(3, || {
-        let mut args = vec!["--no-ui"];
+        let mut args = vec!["--no-ui", "--", "-M", &id];
         args.extend_from_slice(fuzz_args);
 
         examples::test_fuzz(krate, target)
@@ -88,6 +88,7 @@ fn replay(krate: &str, target: &str, fuzz_args: &[&str], object: Object, re: &st
                 Object::Crashes => "--replay=crashes",
                 Object::Hangs => "--replay=hangs",
             }])
+            .args(["--", "-M", &id])
             .logged_assert()
             .success()
             .try_stdout(predicate::str::is_match(re).unwrap())

diff --git a/testing/src/examples.rs b/testing/src/examples.rs
@@ -99,7 +99,7 @@ pub fn test_fuzz_all() -> Result<Command> {
     ];
 
     let mut command = Command::cargo_bin("cargo-test-fuzz")?;
-    command.args(&args);
+    command.args(args);
     Ok(command)
 }
 

diff --git a/testing/src/lib.rs b/testing/src/lib.rs
@@ -1,4 +1,6 @@
 mod command_ext;
+use std::sync::atomic::{AtomicU32, Ordering};
+
 pub use command_ext::CommandExt;
 
 pub mod examples;
@@ -10,3 +12,9 @@ pub use crate::retry::*;
 fn init() {
     env_logger::init();
 }
+
+static ID: AtomicU32 = AtomicU32::new(0);
+
+pub fn unique_id() -> String {
+    ID.fetch_add(1, Ordering::SeqCst).to_string()
+}