Avoid lifecycle_lock traffic in call_on_rust_stack. (close #3270)

2 files changed, 13 insertions, 10 deletions

diff --git a/src/rt/rust_task.cpp b/src/rt/rust_task.cpp
index 791c6a6551f..8bcf1b06133 100644
--- a/src/rt/rust_task.cpp
+++ b/src/rt/rust_task.cpp
@@ -248,6 +248,13 @@ MUST_CHECK bool rust_task::yield() {
 
     // This check is largely superfluous; it's the one after the context swap
     // that really matters. This one allows us to assert a useful invariant.
+
+    // NB: This takes lifecycle_lock three times, and I believe that none of
+    // them are actually necessary, as per #3213. Removing the locks here may
+    // cause *harmless* races with a killer... but I didn't observe any
+    // substantial performance improvement from removing them, even with
+    // msgsend-ring-pipes, and also it's my last day, so I'm not about to
+    // remove them.  -- bblum
     if (must_fail_from_being_killed()) {
         {
             scoped_lock with(lifecycle_lock);
diff --git a/src/rt/rust_task.h b/src/rt/rust_task.h
index 369d84dd065..a09cbcb70d8 100644
--- a/src/rt/rust_task.h
+++ b/src/rt/rust_task.h
@@ -431,12 +431,11 @@ rust_task::call_on_rust_stack(void *args, void *fn_ptr) {
     assert(get_sp_limit() != 0 && "Stack must be configured");
     assert(next_rust_sp);
 
-    bool had_reentered_rust_stack;
-    {
-        scoped_lock with(lifecycle_lock);
-        had_reentered_rust_stack = reentered_rust_stack;
-        reentered_rust_stack = true;
-    }
+    // Unlocked access. Might "race" a killer, but harmlessly. This code is
+    // only run by the task itself, so cannot race itself. See the comment
+    // above inhibit_kill (or #3213) in rust_task.cpp for justification.
+    bool had_reentered_rust_stack = reentered_rust_stack;
+    reentered_rust_stack = true;
 
     uintptr_t prev_c_sp = next_c_sp;
     next_c_sp = get_sp();
@@ -448,10 +447,7 @@ rust_task::call_on_rust_stack(void *args, void *fn_ptr) {
     __morestack(args, fn_ptr, sp);
 
     next_c_sp = prev_c_sp;
-    {
-        scoped_lock with(lifecycle_lock);
-        reentered_rust_stack = had_reentered_rust_stack;
-    }
+    reentered_rust_stack = had_reentered_rust_stack;
 
     record_sp_limit(0);
 }