RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-03-04 02:19:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUG/MEDIUM: tasks: Make sure we modify global_tasks_mask with the rq_lock.

Browse Source 
When modifying global_tasks_mask, make sure we hold the rq_lock, or we might
remove the bit while it has been re-set by somebody else, and we make not
be waked when needed.
This commit is contained in:
Olivier Houchard 2019-04-17 19:10:22 +02:00 committed by Olivier Houchard
parent b038007ae8
commit de82aeaa26
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/task.c
View File

@ -77,7 +77,7 @@ void __task_wakeup(struct task *t, struct eb_root *root)
_HA_ATOMIC_ADD(&tasks_run_queue, 1);
#ifdef USE_THREAD
if (root == &rqueue) {
_HA_ATOMIC_OR(&global_tasks_mask, t->thread_mask);
global_tasks_mask |= t->thread_mask;
__ha_barrier_atomic_store();
}
#endif
@ -302,8 +302,8 @@ void process_runnable_tasks()
if (unlikely(!grq)) {
grq = eb32sc_first(&rqueue, tid_bit);
if (!grq) {
global_tasks_mask &= ~tid_bit;
HA_SPIN_UNLOCK(TASK_RQ_LOCK, &rq_lock);
_HA_ATOMIC_AND(&global_tasks_mask, ~tid_bit);
}
}
#endif
@ -335,8 +335,8 @@ void process_runnable_tasks()
if (unlikely(!grq)) {
grq = eb32sc_first(&rqueue, tid_bit);
if (!grq) {
global_tasks_mask &= ~tid_bit;
HA_SPIN_UNLOCK(TASK_RQ_LOCK, &rq_lock);
_HA_ATOMIC_AND(&global_tasks_mask, ~tid_bit);
}
}
}