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

Commit f7d71f20 authored by Waiman Long's avatar Waiman Long Committed by Ingo Molnar
Browse files

locking/qrwlock: Rename functions to queued_*() 



To sync up with the naming convention used in qspinlock, all the
qrwlock functions were renamed to started with "queued" instead of
"queue".

Signed-off-by: default avatarWaiman Long <Waiman.Long@hp.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Douglas Hatch <doug.hatch@hp.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Scott J Norton <scott.norton@hp.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Will Deacon <will.deacon@arm.com>
Link: http://lkml.kernel.org/r/1434729002-57724-2-git-send-email-Waiman.Long@hp.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 1c4c7159

arch/x86/include/asm/qrwlock.h

+2 −2
Original line number Diff line number Diff line
@@ -4,8 +4,8 @@ 
#include <asm-generic/qrwlock_types.h>



#ifndef CONFIG_X86_PPRO_FENCE

#define queue_write_unlock queue_write_unlock

static inline void queue_write_unlock(struct qrwlock *lock)

#define queued_write_unlock queued_write_unlock

static inline void queued_write_unlock(struct qrwlock *lock)

{

        barrier();

        ACCESS_ONCE(*(u8 *)&lock->cnts) = 0;

include/asm-generic/qrwlock.h

+29 −29
Original line number Diff line number Diff line
@@ -36,33 +36,33 @@ 
/*

 * External function declarations

 */

extern void queue_read_lock_slowpath(struct qrwlock *lock);

extern void queue_write_lock_slowpath(struct qrwlock *lock);

extern void queued_read_lock_slowpath(struct qrwlock *lock);

extern void queued_write_lock_slowpath(struct qrwlock *lock);



/**

 * queue_read_can_lock- would read_trylock() succeed?

 * queued_read_can_lock- would read_trylock() succeed?

 * @lock: Pointer to queue rwlock structure

 */

static inline int queue_read_can_lock(struct qrwlock *lock)

static inline int queued_read_can_lock(struct qrwlock *lock)

{

	return !(atomic_read(&lock->cnts) & _QW_WMASK);

}



/**

 * queue_write_can_lock- would write_trylock() succeed?

 * queued_write_can_lock- would write_trylock() succeed?

 * @lock: Pointer to queue rwlock structure

 */

static inline int queue_write_can_lock(struct qrwlock *lock)

static inline int queued_write_can_lock(struct qrwlock *lock)

{

	return !atomic_read(&lock->cnts);

}



/**

 * queue_read_trylock - try to acquire read lock of a queue rwlock

 * queued_read_trylock - try to acquire read lock of a queue rwlock

 * @lock : Pointer to queue rwlock structure

 * Return: 1 if lock acquired, 0 if failed

 */

static inline int queue_read_trylock(struct qrwlock *lock)

static inline int queued_read_trylock(struct qrwlock *lock)

{

	u32 cnts;
@@ -77,11 +77,11 @@ static inline int queue_read_trylock(struct qrwlock *lock) 
}



/**

 * queue_write_trylock - try to acquire write lock of a queue rwlock

 * queued_write_trylock - try to acquire write lock of a queue rwlock

 * @lock : Pointer to queue rwlock structure

 * Return: 1 if lock acquired, 0 if failed

 */

static inline int queue_write_trylock(struct qrwlock *lock)

static inline int queued_write_trylock(struct qrwlock *lock)

{

	u32 cnts;
@@ -93,10 +93,10 @@ static inline int queue_write_trylock(struct qrwlock *lock) 
				     cnts, cnts | _QW_LOCKED) == cnts);

}

/**

 * queue_read_lock - acquire read lock of a queue rwlock

 * queued_read_lock - acquire read lock of a queue rwlock

 * @lock: Pointer to queue rwlock structure

 */

static inline void queue_read_lock(struct qrwlock *lock)

static inline void queued_read_lock(struct qrwlock *lock)

{

	u32 cnts;
@@ -105,27 +105,27 @@ static inline void queue_read_lock(struct qrwlock *lock) 
		return;



	/* The slowpath will decrement the reader count, if necessary. */

	queue_read_lock_slowpath(lock);

	queued_read_lock_slowpath(lock);

}



/**

 * queue_write_lock - acquire write lock of a queue rwlock

 * queued_write_lock - acquire write lock of a queue rwlock

 * @lock : Pointer to queue rwlock structure

 */

static inline void queue_write_lock(struct qrwlock *lock)

static inline void queued_write_lock(struct qrwlock *lock)

{

	/* Optimize for the unfair lock case where the fair flag is 0. */

	if (atomic_cmpxchg(&lock->cnts, 0, _QW_LOCKED) == 0)

		return;



	queue_write_lock_slowpath(lock);

	queued_write_lock_slowpath(lock);

}



/**

 * queue_read_unlock - release read lock of a queue rwlock

 * queued_read_unlock - release read lock of a queue rwlock

 * @lock : Pointer to queue rwlock structure

 */

static inline void queue_read_unlock(struct qrwlock *lock)

static inline void queued_read_unlock(struct qrwlock *lock)

{

	/*

	 * Atomically decrement the reader count
@@ -134,12 +134,12 @@ static inline void queue_read_unlock(struct qrwlock *lock) 
	atomic_sub(_QR_BIAS, &lock->cnts);

}



#ifndef queue_write_unlock

#ifndef queued_write_unlock

/**

 * queue_write_unlock - release write lock of a queue rwlock

 * queued_write_unlock - release write lock of a queue rwlock

 * @lock : Pointer to queue rwlock structure

 */

static inline void queue_write_unlock(struct qrwlock *lock)

static inline void queued_write_unlock(struct qrwlock *lock)

{

	/*

	 * If the writer field is atomic, it can be cleared directly.
@@ -154,13 +154,13 @@ static inline void queue_write_unlock(struct qrwlock *lock) 
 * Remapping rwlock architecture specific functions to the corresponding

 * queue rwlock functions.

 */

#define arch_read_can_lock(l)	queue_read_can_lock(l)

#define arch_write_can_lock(l)	queue_write_can_lock(l)

#define arch_read_lock(l)	queue_read_lock(l)

#define arch_write_lock(l)	queue_write_lock(l)

#define arch_read_trylock(l)	queue_read_trylock(l)

#define arch_write_trylock(l)	queue_write_trylock(l)

#define arch_read_unlock(l)	queue_read_unlock(l)

#define arch_write_unlock(l)	queue_write_unlock(l)

#define arch_read_can_lock(l)	queued_read_can_lock(l)

#define arch_write_can_lock(l)	queued_write_can_lock(l)

#define arch_read_lock(l)	queued_read_lock(l)

#define arch_write_lock(l)	queued_write_lock(l)

#define arch_read_trylock(l)	queued_read_trylock(l)

#define arch_write_trylock(l)	queued_write_trylock(l)

#define arch_read_unlock(l)	queued_read_unlock(l)

#define arch_write_unlock(l)	queued_write_unlock(l)



#endif /* __ASM_GENERIC_QRWLOCK_H */

kernel/locking/qrwlock.c

+6 −6
Original line number Diff line number Diff line
@@ -60,10 +60,10 @@ rspin_until_writer_unlock(struct qrwlock *lock, u32 cnts) 
}



/**

 * queue_read_lock_slowpath - acquire read lock of a queue rwlock

 * queued_read_lock_slowpath - acquire read lock of a queue rwlock

 * @lock: Pointer to queue rwlock structure

 */

void queue_read_lock_slowpath(struct qrwlock *lock)

void queued_read_lock_slowpath(struct qrwlock *lock)

{

	u32 cnts;
@@ -104,13 +104,13 @@ void queue_read_lock_slowpath(struct qrwlock *lock) 
	 */

	arch_spin_unlock(&lock->lock);

}

EXPORT_SYMBOL(queue_read_lock_slowpath);

EXPORT_SYMBOL(queued_read_lock_slowpath);



/**

 * queue_write_lock_slowpath - acquire write lock of a queue rwlock

 * queued_write_lock_slowpath - acquire write lock of a queue rwlock

 * @lock : Pointer to queue rwlock structure

 */

void queue_write_lock_slowpath(struct qrwlock *lock)

void queued_write_lock_slowpath(struct qrwlock *lock)

{

	u32 cnts;
@@ -149,4 +149,4 @@ void queue_write_lock_slowpath(struct qrwlock *lock) 
unlock:

	arch_spin_unlock(&lock->lock);

}

EXPORT_SYMBOL(queue_write_lock_slowpath);
 
EXPORT_SYMBOL(queued_write_lock_slowpath);