Replace volatiles with atomic for SMP tests

Signed-off-by: Indan Zupancic <[email protected]>

Author: Indanz

apps/sel4test-tests/src/tests/multicore.c

@@ -14,7 +14,7 @@
 
 #include "../helpers.h"
 
-static int counter_func(volatile seL4_Word *counter)
+static int counter_func(_Atomic seL4_Word *counter)
 {
     while (1) {
         (*counter)++;
@@ -25,7 +25,7 @@ static int counter_func(volatile seL4_Word *counter)
 int smp_test_tcb_resume(env_t env)
 {
     helper_thread_t t1;
-    volatile seL4_Word counter;
+    _Atomic seL4_Word counter;
     ZF_LOGD("smp_test_tcb_resume\n");
     create_helper_thread(env, &t1);
 
@@ -85,7 +85,7 @@ DEFINE_TEST(MULTICORE0001, "Test suspending and resuming a thread on different c
 int smp_test_tcb_move(env_t env)
 {
     helper_thread_t t1;
-    volatile seL4_Word counter;
+    _Atomic seL4_Word counter;
     ZF_LOGD("smp_test_tcb_move\n");
     create_helper_thread(env, &t1);
 
@@ -125,7 +125,7 @@ DEFINE_TEST(MULTICORE0002, "Test thread is runnable on all available cores (0 +
 int smp_test_tcb_delete(env_t env)
 {
     helper_thread_t t1;
-    volatile seL4_Word counter;
+    _Atomic seL4_Word counter;
     ZF_LOGD("smp_test_tcb_delete\n");
     create_helper_thread(env, &t1);
 
@@ -185,7 +185,7 @@ faulter_func(volatile seL4_Word shared_mem)
     return 0;
 }
 
-static int handler_func(seL4_CPtr fault_ep, volatile seL4_Word *pf)
+static int handler_func(seL4_CPtr fault_ep, _Atomic seL4_Word *pf)
 {
     seL4_MessageInfo_t tag;
     seL4_Word sender_badge = 0;
@@ -199,7 +199,7 @@ static int handler_func(seL4_CPtr fault_ep, volatile seL4_Word *pf)
 static int smp_test_tlb_instance(env_t env, bool inter_as)
 {
     int error;
-    volatile seL4_Word tag;
+    _Atomic seL4_Word tag;
     volatile seL4_Word shared_mem = 0;
     ZF_LOGD("smp_test_tlb\n");
 

apps/sel4test-tests/src/tests/schedcontext.c

@@ -732,13 +732,20 @@ test_revoke_sched_context_on_call_chain(env_t env)
 DEFINE_TEST(SCHED_CONTEXT_0013, "Test revoking a scheduling context on a call chain",
             test_revoke_sched_context_on_call_chain, config_set(CONFIG_KERNEL_MCS) &&config_set(CONFIG_HAVE_TIMER))
 
+void sched_context_0014_helper_fn(_Atomic seL4_Word *counter)
+{
+    while (1) {
+        (*counter)++;
+    }
+}
+
 /* Try to recreate race situation of issue 633 */
 int test_smp_delete_sched_context(env_t env)
 {
     seL4_Error error;
     helper_thread_t helper;
-    volatile int state = 0;
-    int prev_state = state;
+    _Atomic seL4_Word counter = 0;
+    seL4_Word prev_counter = counter;
 
     create_helper_thread(env, &helper);
     set_helper_priority(env, &helper, env->priority - 1);
@@ -747,10 +754,10 @@ int test_smp_delete_sched_context(env_t env)
                                      helper.thread.sched_context.cptr, MIN_BUDGET_US, 10 * US_IN_MS, 0, 0);
     test_eq(error, seL4_NoError);
 
-    start_helper(env, &helper, (helper_fn_t)sched_context_0005_helper_fn, (seL4_Word)&state, 0, 0, 0);
+    start_helper(env, &helper, (helper_fn_t)sched_context_0014_helper_fn, (seL4_Word)&counter, 0, 0, 0);
 
     /* Wait till helper runs */
-    while (state == prev_state);
+    while (counter == prev_counter);
 
     vka_free_object(&env->vka, &helper.thread.sched_context);