d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "LinuxKPI: Allow spin_lock_irqsave to be called within a critical section"

Browse Source 
This change results in deadlocks on UP systems

This reverts commit 7dea0c9e6eba4dc127cd67667c81fa2c250f1024.

Requested by:	kib, hselasky
This commit is contained in:
Vladimir Kondratyev 2022-01-27 01:27:01 +03:00
parent 5a1a07f2a0
commit 11ef1d975f
1 changed files with 4 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
sys/compat/linuxkpi/common/include/linux/spinlock.h
View File

@ -37,7 +37,6 @@
#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/kdb.h>
#include <sys/proc.h>
#include <linux/compiler.h>
#include <linux/rwlock.h>
@ -118,32 +117,14 @@ typedef struct {
local_bh_disable(); \
} while (0)
#define __spin_trylock_nested(_l, _n) ({ \
int __ret; \
if (SPIN_SKIP()) { \
__ret = 1; \
} else { \
__ret = mtx_trylock_flags(&(_l)->m, MTX_DUPOK); \
if (likely(__ret != 0)) \
local_bh_disable(); \
} \
__ret; \
})
#define spin_lock_irqsave(_l, flags) do { \
(flags) = 0; \
if (unlikely(curthread->td_critnest != 0)) \
while (!spin_trylock(_l)) {} \
else \
spin_lock(_l); \
#define spin_lock_irqsave(_l, flags) do { \
(flags) = 0; \
spin_lock(_l); \
} while (0)
#define spin_lock_irqsave_nested(_l, flags, _n) do { \
(flags) = 0; \
if (unlikely(curthread->td_critnest != 0)) \
while (!__spin_trylock_nested(_l, _n)) {} \
else \
spin_lock_nested(_l, _n); \
spin_lock_nested(_l, _n); \
} while (0)
#define spin_unlock_irqrestore(_l, flags) do { \