Skip to content

sched/wqueue: restore -ENOENT from work_cancel() for unqueued work #20112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xiaoxiang781216 merged 1 commit into from
Sep 13, 2026
Merged

sched/wqueue: restore -ENOENT from work_cancel() for unqueued work #20112

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion sched/wqueue/kwork_cancel.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ static int work_qcancel(FAR struct kwork_wqueue_s *wqueue, bool sync,
{
irqstate_t flags;
pid_t self = sync ? nxsched_gettid() : INVALID_PROCESS_ID;
int ret = -ENOENT;

if (wqueue == NULL || work == NULL)
{
Expand Down Expand Up @@ -83,8 +84,18 @@ static int work_qcancel(FAR struct kwork_wqueue_s *wqueue, bool sync,
{
work_timer_reset(wqueue);
}

ret = OK;
}

/* Otherwise the work is not queued: either it was never queued or a
* worker has already dequeued it and may be executing its callback
* right now. Only the scan below can tell. Report -ENOENT if the
* work is neither queued nor running, so that callers (e.g.
* aio_cancel()) do not free resources that the callback is still
* using.
*/

if (sync)
{
for (wndx = 0; wndx < wqueue->nthreads; wndx++)
Expand All @@ -93,6 +104,7 @@ static int work_qcancel(FAR struct kwork_wqueue_s *wqueue, bool sync,
{
worker[wndx].wait_count++;
sync_wait = &worker[wndx].wait;
ret = OK;
break;
}
}
Expand All @@ -102,7 +114,7 @@ static int work_qcancel(FAR struct kwork_wqueue_s *wqueue, bool sync,

if (sync_wait == NULL)
{
return OK;
return ret;
}

nxsem_wait_uninterruptible(sync_wait);
Expand Down Expand Up @@ -130,6 +142,8 @@ static int work_qcancel(FAR struct kwork_wqueue_s *wqueue, bool sync,
* Zero on success, a negated errno on failure
*
* -EINVAL - An invalid work queue was specified
* -ENOENT - The work is not queued (and, for the sync variant, not
* running either)
*
****************************************************************************/

Expand Down
Loading