History

locking/spinlock/debug: Fix data-race in do_raw_write_lock

KCSAN reports: BUG: KCSAN: data-race in do_raw_write_lock / do_raw_write_lock write (marked) to 0xffff800009cf504c of 4 bytes by task 1102 on cpu 1: do_raw_write_lock+0x120/0x204 _raw_write_lock_irq do_exit call_usermodehelper_exec_async ret_from_fork read to 0xffff800009cf504c of 4 bytes by task 1103 on cpu 0: do_raw_write_lock+0x88/0x204 _raw_write_lock_irq do_exit call_usermodehelper_exec_async ret_from_fork value changed: 0xffffffff -> 0x00000001 Reported by Kernel Concurrency Sanitizer on: CPU: 0 PID: 1103 Comm: kworker/u4:1 6.1.111 Commit 1a365e822372 ("locking/spinlock/debug: Fix various data races") has adressed most of these races, but seems to be not consistent/not complete. >From do_raw_write_lock() only debug_write_lock_after() part has been converted to WRITE_ONCE(), but not debug_write_lock_before() part. Do it now.

Alexander Sverdlin committed 1 year ago

Commit c14ecb51 parent 211ddde1 file · +2 −2Browse files

Unified · Split

kernel/locking/spinlock_debug.c+2−2
@@ -184,8 +184,8 @@ void do_raw_read_unlock(rwlock_t *lock) · 183 unmodified lines
184184 static inline void debug_write_lock_before(rwlock_t *lock)
185185 {
186186 RWLOCK_BUG_ON(lock->magic != RWLOCK_MAGIC, lock, "bad magic");
187− RWLOCK_BUG_ON(lock->owner == current, lock, "recursion");
188− RWLOCK_BUG_ON(lock->owner_cpu == raw_smp_processor_id(),
187+ RWLOCK_BUG_ON(READ_ONCE(lock->owner) == current, lock, "recursion");
188+ RWLOCK_BUG_ON(READ_ONCE(lock->owner_cpu) == raw_smp_processor_id(),
189189 lock, "cpu recursion");
190190 }
191191

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t