sim: fix regression from apache#14623

hujun260 · hujun260 · commit 18d33b6393ad · 2025-01-17T08:57:48.000+08:00
reason:
work_timer_expiry may be called in thread context

Signed-off-by: hujun5 &lt;hujun5@xiaomi.com&gt;
diff --git a/sched/wqueue/kwork_queue.c b/sched/wqueue/kwork_queue.c
@@ -68,9 +68,8 @@ static void work_timer_expiry(wdparm_t arg)
 {
   FAR struct work_s *work = (FAR struct work_s *)arg;
 
-  DEBUGASSERT(up_interrupt_context());
-
   irqstate_t flags = spin_lock_irqsave(&work->wq->lock);
+  sched_lock();
 
   /* We have being canceled */
 
@@ -80,6 +79,7 @@ static void work_timer_expiry(wdparm_t arg)
     }
 
   spin_unlock_irqrestore(&work->wq->lock, flags);
+  sched_unlock();
 }
 
 static bool work_is_canceling(FAR struct kworker_s *kworkers, int nthreads,

Original file line number	Diff line number	Diff line change
`@@ -68,9 +68,8 @@ static void work_timer_expiry(wdparm_t arg)`
`68`	`68`	`{`
`69`	`69`	`FAR struct work_s work = (FAR struct work_s )arg;`
`70`	`70`
`71`		`- DEBUGASSERT(up_interrupt_context());`
`72`		`-`
`73`	`71`	`irqstate_t flags = spin_lock_irqsave(&work->wq->lock);`
	`72`	`+ sched_lock();`
`74`	`73`
`75`	`74`	`/* We have being canceled */`
`76`	`75`
`@@ -80,6 +79,7 @@ static void work_timer_expiry(wdparm_t arg)`
`80`	`79`	`}`
`81`	`80`
`82`	`81`	`spin_unlock_irqrestore(&work->wq->lock, flags);`
	`82`	`+ sched_unlock();`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`static bool work_is_canceling(FAR struct kworker_s *kworkers, int nthreads,`