Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 113948d8 authored by Thomas Graf's avatar Thomas Graf Committed by David S. Miller
Browse files

spinlock: Add spin_lock_bh_nested() 



Signed-off-by: default avatarThomas Graf <tgraf@suug.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 897362e4

include/linux/spinlock.h

+8 −0
Original line number Diff line number Diff line
@@ -190,6 +190,8 @@ static inline void do_raw_spin_unlock(raw_spinlock_t *lock) __releases(lock) 
#ifdef CONFIG_DEBUG_LOCK_ALLOC

# define raw_spin_lock_nested(lock, subclass) \

	_raw_spin_lock_nested(lock, subclass)

# define raw_spin_lock_bh_nested(lock, subclass) \

	_raw_spin_lock_bh_nested(lock, subclass)



# define raw_spin_lock_nest_lock(lock, nest_lock)			\

	 do {								\
@@ -205,6 +207,7 @@ static inline void do_raw_spin_unlock(raw_spinlock_t *lock) __releases(lock) 
# define raw_spin_lock_nested(lock, subclass)		\

	_raw_spin_lock(((void)(subclass), (lock)))

# define raw_spin_lock_nest_lock(lock, nest_lock)	_raw_spin_lock(lock)

# define raw_spin_lock_bh_nested(lock, subclass)	_raw_spin_lock_bh(lock)

#endif



#if defined(CONFIG_SMP) || defined(CONFIG_DEBUG_SPINLOCK)
@@ -324,6 +327,11 @@ do { \ 
	raw_spin_lock_nested(spinlock_check(lock), subclass);	\

} while (0)



#define spin_lock_bh_nested(lock, subclass)			\

do {								\

	raw_spin_lock_bh_nested(spinlock_check(lock), subclass);\

} while (0)



#define spin_lock_nest_lock(lock, nest_lock)				\

do {									\

	raw_spin_lock_nest_lock(spinlock_check(lock), nest_lock);	\

include/linux/spinlock_api_smp.h

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ int in_lock_functions(unsigned long addr); 
void __lockfunc _raw_spin_lock(raw_spinlock_t *lock)		__acquires(lock);

void __lockfunc _raw_spin_lock_nested(raw_spinlock_t *lock, int subclass)

								__acquires(lock);

void __lockfunc _raw_spin_lock_bh_nested(raw_spinlock_t *lock, int subclass)

								__acquires(lock);

void __lockfunc

_raw_spin_lock_nest_lock(raw_spinlock_t *lock, struct lockdep_map *map)

								__acquires(lock);

include/linux/spinlock_api_up.h

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ 


#define _raw_spin_lock(lock)			__LOCK(lock)

#define _raw_spin_lock_nested(lock, subclass)	__LOCK(lock)

#define _raw_spin_lock_bh_nested(lock, subclass) __LOCK(lock)

#define _raw_read_lock(lock)			__LOCK(lock)

#define _raw_write_lock(lock)			__LOCK(lock)

#define _raw_spin_lock_bh(lock)			__LOCK_BH(lock)

kernel/locking/spinlock.c

+8 −0
Original line number Diff line number Diff line
@@ -363,6 +363,14 @@ void __lockfunc _raw_spin_lock_nested(raw_spinlock_t *lock, int subclass) 
}

EXPORT_SYMBOL(_raw_spin_lock_nested);



void __lockfunc _raw_spin_lock_bh_nested(raw_spinlock_t *lock, int subclass)

{

	__local_bh_disable_ip(_RET_IP_, SOFTIRQ_LOCK_OFFSET);

	spin_acquire(&lock->dep_map, subclass, 0, _RET_IP_);

	LOCK_CONTENDED(lock, do_raw_spin_trylock, do_raw_spin_lock);

}

EXPORT_SYMBOL(_raw_spin_lock_bh_nested);



unsigned long __lockfunc _raw_spin_lock_irqsave_nested(raw_spinlock_t *lock,

						   int subclass)

{