ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

fix: dev: Fix a bug in isc_rwlock_trylock()

Browse Source 
When isc_rwlock_trylock() fails to get a read lock because another
writer was faster, it should wake up other waiting writers in case
there are no other readers, but the current code forgets about
the currently active writer when evaluating 'cntflag'.

Unset the WRITER_ACTIVE bit in 'cntflag' before checking to see if
there are other readers, otherwise the waiting writers, if they exist,
might not wake up.

Closes #5121

Merge branch 'aram/isc_rwlock_trylock-bugfix-9.18' into 'bind-9.18'

See merge request isc-projects/bind9!9937
This commit is contained in:
Arаm Sаrgsyаn
2025-01-08 10:29:14 +00:00
parent 333834e764 73b6d9e9e5
commit f68e60b3dc
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/isc/rwlock.c
View File

@@ -472,7 +472,8 @@ isc_rwlock_trylock(isc_rwlock_t *rwl, isc_rwlocktype_t type) {
* request.
*/
cntflag = atomic_fetch_sub_release(&rwl->cnt_and_flag,
READER_INCR);
READER_INCR) &
~WRITER_ACTIVE;
/*
* If no other readers are waiting and we've suspended
* new writers in this short period, wake them up.