mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-11-24 20:31:00 +01:00
Code Issues Projects Releases Wiki Activity

BUG/MEDIUM: pollers: clear the sleeping bit after waking up, not before

Browse Source 
A bug was introduced in 2.1-dev2 by commit 305d5ab46 ("MAJOR: fd: Get
rid of the fd cache."). Pollers "poll" and "evport" had the sleeping
bit accidentally removed before the syscall instead of after. This
results in them not being woken up by inter-thread wakeups, which is
particularly visible with the multi-queue accept() and with queues.

As a work-around, when these pollers are used, "nbthread 1" should
be used.

The fact that it has remained broken for 2 years is a great indication
that threads are definitely not enabled outside of epoll and kqueue,
hence why this patch is only tagged medium.

This must be backported as far as 2.2.
This commit is contained in:
Willy Tarreau 2021-07-30 10:57:09 +02:00
parent 6ed242ece6
commit c37ccd70b4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ev_evports.c
View File

@ -152,8 +152,6 @@ static void _do_poll(struct poller *p, int exp, int wake)
} }
thread_harmless_now(); thread_harmless_now();
if (sleeping_thread_mask & tid_bit)
_HA_ATOMIC_AND(&sleeping_thread_mask, ~tid_bit);
/* /*
* Determine how long to wait for events to materialise on the port. * Determine how long to wait for events to materialise on the port.
@ -206,6 +204,8 @@ static void _do_poll(struct poller *p, int exp, int wake)
tv_leaving_poll(wait_time, nevlist); tv_leaving_poll(wait_time, nevlist);
thread_harmless_end(); thread_harmless_end();
if (sleeping_thread_mask & tid_bit)
_HA_ATOMIC_AND(&sleeping_thread_mask, ~tid_bit);
if (nevlist > 0) if (nevlist > 0)
activity[tid].poll_io++; activity[tid].poll_io++;

4
src/ev_poll.c
View File

@ -165,8 +165,6 @@ static void _do_poll(struct poller *p, int exp, int wake)
} while (!_HA_ATOMIC_CAS(&maxfd, &old_maxfd, new_maxfd)); } while (!_HA_ATOMIC_CAS(&maxfd, &old_maxfd, new_maxfd));
thread_harmless_now(); thread_harmless_now();
if (sleeping_thread_mask & tid_bit)
_HA_ATOMIC_AND(&sleeping_thread_mask, ~tid_bit);
fd_nbupdt = 0; fd_nbupdt = 0;
@ -210,6 +208,8 @@ static void _do_poll(struct poller *p, int exp, int wake)
tv_leaving_poll(wait_time, status); tv_leaving_poll(wait_time, status);
thread_harmless_end(); thread_harmless_end();
if (sleeping_thread_mask & tid_bit)
_HA_ATOMIC_AND(&sleeping_thread_mask, ~tid_bit);
if (status > 0) if (status > 0)
activity[tid].poll_io++; activity[tid].poll_io++;