From 9a0374aaaafefa07b80e761f97f0fcd7688dabf4 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Mon, 30 Nov 2020 14:52:11 +0100 Subject: [PATCH] MINOR: task: remove __tasklet_remove_from_tasklet_list() This function is only used at a single place directly within the scheduler in run_tasks_from_lists() and it really ought not be called by anything else, regardless of what its comment says. Let's delete it, move the two lines directly into the call place, and take this opportunity to factor the atomic decrement on tasks_run_queue. A comment was added on the remaining one tasklet_remove_from_tasklet_list() to mention the risks in using it. (cherry picked from commit 2da4c316c2cb7b01f54ed1959e91d1799d13959c) Signed-off-by: Christopher Faulet --- include/haproxy/task.h | 13 ++----------- src/task.c | 6 ++++-- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/include/haproxy/task.h b/include/haproxy/task.h index 41885c2..57ddea8 100644 --- a/include/haproxy/task.h +++ b/include/haproxy/task.h @@ -378,18 +378,9 @@ static inline void tasklet_insert_into_tasklet_list(struct list *list, struct ta LIST_ADDQ(list, &tl->list); } -/* Remove the tasklet from the tasklet list. The tasklet MUST already be there. - * If unsure, use tasklet_remove_from_tasklet_list() instead. If used with a - * plain task, the caller must update the task_list_size. - * This should only be used by the thread that owns the tasklet, any other - * thread should use tasklet_cancel(). +/* Try to remove a tasklet from the list. This call is inherently racy and may + * only be performed on the thread that was supposed to dequeue this tasklet. */ -static inline void __tasklet_remove_from_tasklet_list(struct tasklet *t) -{ - LIST_DEL_INIT(&t->list); - _HA_ATOMIC_SUB(&tasks_run_queue, 1); -} - static inline void tasklet_remove_from_tasklet_list(struct tasklet *t) { if (MT_LIST_DEL((struct mt_list *)&t->list)) diff --git a/src/task.c b/src/task.c index 325fd2e..2c9df72 100644 --- a/src/task.c +++ b/src/task.c @@ -458,10 +458,12 @@ unsigned int run_tasks_from_lists(unsigned int budgets[]) t->calls++; sched->current = t; + _HA_ATOMIC_SUB(&tasks_run_queue, 1); + if (TASK_IS_TASKLET(t)) { state = _HA_ATOMIC_XCHG(&t->state, state); __ha_barrier_atomic_store(); - __tasklet_remove_from_tasklet_list((struct tasklet *)t); + LIST_DEL_INIT(&((struct tasklet *)t)->list); process(t, ctx, state); done++; sched->current = NULL; @@ -471,7 +473,7 @@ unsigned int run_tasks_from_lists(unsigned int budgets[]) state = _HA_ATOMIC_XCHG(&t->state, state | TASK_RUNNING); __ha_barrier_atomic_store(); - __tasklet_remove_from_tasklet_list((struct tasklet *)t); + LIST_DEL_INIT(&((struct tasklet *)t)->list); /* OK then this is a regular task */ -- 1.7.10.4