sinjuginas/haproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MEDIUM: fd: refine the fd_takeover() migration lock

Browse Source 
When haproxy is compiled without double-word CAS, we use a migration lock
in fd_takeover(). This lock was covering the atomic OR on the running_mask
before checking its value, while it is not needed since this atomic op
already returns the result. Let's just refine the code to avoid grabbing
the lock in the event another thread has already stolen the FD, this may
reduce contention in high reuse rate scenarios.
This commit is contained in:
Willy Tarreau 2020-06-18 07:28:09 +02:00
parent 7af4fa9a48
commit c460c91633
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/fd.c
View File

@ -344,20 +344,18 @@ __decl_thread(__decl_rwlock(fd_mig_lock));
int fd_takeover(int fd, void *expected_owner) int fd_takeover(int fd, void *expected_owner)
{ {
#ifndef HA_HAVE_CAS_DW #ifndef HA_HAVE_CAS_DW
int ret; int ret = -1;
HA_RWLOCK_WRLOCK(OTHER_LOCK, &fd_mig_lock); if (_HA_ATOMIC_OR(&fdtab[fd].running_mask, tid_bit) == tid_bit) {
_HA_ATOMIC_OR(&fdtab[fd].running_mask, tid_bit); HA_RWLOCK_WRLOCK(OTHER_LOCK, &fd_mig_lock);
if (fdtab[fd].running_mask != tid_bit || fdtab[fd].owner != expected_owner) { if (fdtab[fd].owner == expected_owner) {
ret = -1; fdtab[fd].thread_mask = tid_bit;
_HA_ATOMIC_AND(&fdtab[fd].running_mask, ~tid_bit); ret = 0;
goto end; }
HA_RWLOCK_WRUNLOCK(OTHER_LOCK, &fd_mig_lock);
} }
fdtab[fd].thread_mask = tid_bit;
_HA_ATOMIC_AND(&fdtab[fd].running_mask, ~tid_bit); _HA_ATOMIC_AND(&fdtab[fd].running_mask, ~tid_bit);
ret = 0;
end:
HA_RWLOCK_WRUNLOCK(OTHER_LOCK, &fd_mig_lock);
/* Make sure the FD doesn't have the active bit. It is possible that /* Make sure the FD doesn't have the active bit. It is possible that
* the fd is polled by the thread that used to own it, the new thread * the fd is polled by the thread that used to own it, the new thread
* is supposed to call subscribe() later, to activate polling. * is supposed to call subscribe() later, to activate polling.