smpcall: we directly call the function to handle local smpcall

reason: some arch do not support issuing interrupts to the local CPU. This commit fixes the regression from #14663 Signed-off-by: hujun5 <[email protected]>
apache · Nov 6, 2024 · 08a23bf · 08a23bf
1 parent 904b6ff
commit 08a23bf
Showing 1 changed file with 15 additions and 0 deletions.
diff --git a/sched/sched/sched_smp.c b/sched/sched/sched_smp.c
@@ -232,14 +232,18 @@ int nxsched_smp_call(cpu_set_t cpuset, nxsched_smp_call_t func,
   nxsem_init(&cookie.sem, 0, 0);
 
   data.cookie = &cookie;
+  sched_lock();
   ret = nxsched_smp_call_async(cpuset, &data);
 
   if (ret < 0)
     {
+      sched_unlock();
       nxsem_destroy(&cookie.sem);
       return ret;
     }
 
+  CPU_CLR(this_cpu(), &cpuset);
+  sched_unlock();
   cpucnt = CPU_COUNT(&cpuset);
   for (i = 0; i < cpucnt; i++)
     {
@@ -314,6 +318,17 @@ int nxsched_smp_call_async(cpu_set_t cpuset,
       sched_lock();
     }
 
+  if (CPU_ISSET(this_cpu(), &cpuset))
+    {
+      ret = data->func(data->arg);
+      if (ret < 0)
+        {
+          goto out;
+        }
+
+      CPU_CLR(this_cpu(), &cpuset);
+    }
+
   cpucnt = CPU_COUNT(&cpuset);
   if (cpucnt == 0)
     {