fix: Remove extra memory barriers

3 years ago · ce132b7bcc
parent 132401177c
commit ce132b7bcc
2 changed files with 2 additions and 6 deletions
--- a/runtime/include/sandbox_set_as_running_sys.h
+++ b/runtime/include/sandbox_set_as_running_sys.h
@ -15,11 +15,9 @@ sandbox_set_as_running_sys(struct sandbox *sandbox, sandbox_state_t last_state)
 {
 	assert(sandbox);

-	/* WARNING: All code before this barrier is preemptable if transitioning from RUNNING_USER */
-	barrier();
+	/* WARNING: All code before this assignment is preemptable if transitioning from RUNNING_USER */
 	sandbox->state = SANDBOX_RUNNING_SYS;
 	barrier();
-	/* WARNING: All code after this barrier is non-preemptable */

 	uint64_t now = __getcycles();

--- a/runtime/include/sandbox_set_as_running_user.h
+++ b/runtime/include/sandbox_set_as_running_user.h
@ -42,11 +42,9 @@ sandbox_set_as_running_user(struct sandbox *sandbox, sandbox_state_t last_state)
 	runtime_sandbox_total_increment(SANDBOX_RUNNING_USER);
 	runtime_sandbox_total_decrement(last_state);

-	/* WARNING: All code before this barrier is non-preemptable */
 	barrier();
 	sandbox->state = SANDBOX_RUNNING_USER;
-	barrier();
-	/* WARNING: All code after this barrier is preemptable */
+	/* WARNING: All code after this assignment is preemptable */

 	/* Now that we are preemptable, we can replay deferred sigalrms */
 	software_interrupt_deferred_sigalrm_replay();