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

locking/rwsem: Make owner store task pointer of last owning reader 



Currently, when a reader acquires a lock, it only sets the
RWSEM_READER_OWNED bit in the owner field. The other bits are simply
not used. When debugging hanging cases involving rwsems and readers,
the owner value does not provide much useful information at all.

This patch modifies the current behavior to always store the task_struct
pointer of the last rwsem-acquiring reader in a reader-owned rwsem. This
may be useful in debugging rwsem hanging cases especially if only one
reader is involved. However, the task in the owner field may not the
real owner or one of the real owners at all when the owner value is
examined, for example, in a crash dump. So it is just an additional
hint about the past history.

If CONFIG_DEBUG_RWSEMS=y is enabled, the owner field will be checked at
unlock time too to make sure the task pointer value is valid. That does
have a slight performance cost and so is only enabled as part of that
debug option.

From the performance point of view, it is expected that the changes
shouldn't have any noticeable performance impact. A rwsem microbenchmark
(with 48 worker threads and 1:1 reader/writer ratio) was ran on a
2-socket 24-core 48-thread Haswell system.  The locking rates on a
4.19-rc1 based kernel were as follows:

  1) Unpatched kernel:				543.3 kops/s
  2) Patched kernel:				549.2 kops/s
  3) Patched kernel (CONFIG_DEBUG_RWSEMS on):	546.6 kops/s

There was actually a slight increase in performance (1.1%) in this
particular case. Maybe it was caused by the elimination of a branch or
just a testing noise. Turning on the CONFIG_DEBUG_RWSEMS option also
had less than the expected impact on performance.

The least significant 2 bits of the owner value are now used to designate
the rwsem is readers owned and the owners are anonymous.

Signed-off-by: default avatarWaiman Long <longman@redhat.com>
Acked-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Davidlohr Bueso <dave@stgolabs.net>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Will Deacon <will.deacon@arm.com>
Link: http://lkml.kernel.org/r/1536265114-10842-1-git-send-email-longman@redhat.com


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

include/linux/rwsem.h

+2 −2
Original line number Diff line number Diff line
@@ -45,10 +45,10 @@ struct rw_semaphore { 
};



/*

 * Setting bit 0 of the owner field with other non-zero bits will indicate

 * Setting bit 1 of the owner field but not bit 0 will indicate

 * that the rwsem is writer-owned with an unknown owner.

 */

#define RWSEM_OWNER_UNKNOWN	((struct task_struct *)-1L)

#define RWSEM_OWNER_UNKNOWN	((struct task_struct *)-2L)



extern struct rw_semaphore *rwsem_down_read_failed(struct rw_semaphore *sem);

extern struct rw_semaphore *rwsem_down_read_failed_killable(struct rw_semaphore *sem);

kernel/locking/rwsem-xadd.c

+1 −1
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ static void __rwsem_mark_wake(struct rw_semaphore *sem, 
		 * but it gives the spinners an early indication that the

		 * readers now have the lock.

		 */

		rwsem_set_reader_owned(sem);

		__rwsem_set_reader_owned(sem, waiter->task);

	}



	/*

kernel/locking/rwsem.c

+4 −3
Original line number Diff line number Diff line
@@ -117,8 +117,9 @@ EXPORT_SYMBOL(down_write_trylock); 
void up_read(struct rw_semaphore *sem)

{

	rwsem_release(&sem->dep_map, 1, _RET_IP_);

	DEBUG_RWSEMS_WARN_ON(sem->owner != RWSEM_READER_OWNED);

	DEBUG_RWSEMS_WARN_ON(!((unsigned long)sem->owner & RWSEM_READER_OWNED));



	rwsem_clear_reader_owned(sem);

	__up_read(sem);

}
@@ -181,7 +182,7 @@ void down_read_non_owner(struct rw_semaphore *sem) 
	might_sleep();



	__down_read(sem);

	rwsem_set_reader_owned(sem);

	__rwsem_set_reader_owned(sem, NULL);

}



EXPORT_SYMBOL(down_read_non_owner);
@@ -215,7 +216,7 @@ EXPORT_SYMBOL(down_write_killable_nested); 


void up_read_non_owner(struct rw_semaphore *sem)

{

	DEBUG_RWSEMS_WARN_ON(sem->owner != RWSEM_READER_OWNED);

	DEBUG_RWSEMS_WARN_ON(!((unsigned long)sem->owner & RWSEM_READER_OWNED));

	__up_read(sem);

}

kernel/locking/rwsem.h

+71 −24
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 * The owner field of the rw_semaphore structure will be set to

 * RWSEM_READER_OWNED when a reader grabs the lock. A writer will clear

 * the owner field when it unlocks. A reader, on the other hand, will

 * not touch the owner field when it unlocks.

 * The least significant 2 bits of the owner value has the following

 * meanings when set.

 *  - RWSEM_READER_OWNED (bit 0): The rwsem is owned by readers

 *  - RWSEM_ANONYMOUSLY_OWNED (bit 1): The rwsem is anonymously owned,

 *    i.e. the owner(s) cannot be readily determined. It can be reader

 *    owned or the owning writer is indeterminate.

 *

 * In essence, the owner field now has the following 4 states:

 *  1) 0

 *     - lock is free or the owner hasn't set the field yet

 *  2) RWSEM_READER_OWNED

 *     - lock is currently or previously owned by readers (lock is free

 *       or not set by owner yet)

 *  3) RWSEM_ANONYMOUSLY_OWNED bit set with some other bits set as well

 *     - lock is owned by an anonymous writer, so spinning on the lock

 *       owner should be disabled.

 *  4) Other non-zero value

 *     - a writer owns the lock and other writers can spin on the lock owner.

 * When a writer acquires a rwsem, it puts its task_struct pointer

 * into the owner field. It is cleared after an unlock.

 *

 * When a reader acquires a rwsem, it will also puts its task_struct

 * pointer into the owner field with both the RWSEM_READER_OWNED and

 * RWSEM_ANONYMOUSLY_OWNED bits set. On unlock, the owner field will

 * largely be left untouched. So for a free or reader-owned rwsem,

 * the owner value may contain information about the last reader that

 * acquires the rwsem. The anonymous bit is set because that particular

 * reader may or may not still own the lock.

 *

 * That information may be helpful in debugging cases where the system

 * seems to hang on a reader owned rwsem especially if only one reader

 * is involved. Ideally we would like to track all the readers that own

 * a rwsem, but the overhead is simply too big.

 */

#define RWSEM_ANONYMOUSLY_OWNED	(1UL << 0)

#define RWSEM_READER_OWNED	((struct task_struct *)RWSEM_ANONYMOUSLY_OWNED)

#define RWSEM_READER_OWNED	(1UL << 0)

#define RWSEM_ANONYMOUSLY_OWNED	(1UL << 1)



#ifdef CONFIG_DEBUG_RWSEMS

# define DEBUG_RWSEMS_WARN_ON(c)	DEBUG_LOCKS_WARN_ON(c)
@@ -44,15 +50,26 @@ static inline void rwsem_clear_owner(struct rw_semaphore *sem) 
	WRITE_ONCE(sem->owner, NULL);

}



static inline void rwsem_set_reader_owned(struct rw_semaphore *sem)

{

/*

	 * We check the owner value first to make sure that we will only

	 * do a write to the rwsem cacheline when it is really necessary

	 * to minimize cacheline contention.

 * The task_struct pointer of the last owning reader will be left in

 * the owner field.

 *

 * Note that the owner value just indicates the task has owned the rwsem

 * previously, it may not be the real owner or one of the real owners

 * anymore when that field is examined, so take it with a grain of salt.

 */

	if (READ_ONCE(sem->owner) != RWSEM_READER_OWNED)

		WRITE_ONCE(sem->owner, RWSEM_READER_OWNED);

static inline void __rwsem_set_reader_owned(struct rw_semaphore *sem,

					    struct task_struct *owner)

{

	unsigned long val = (unsigned long)owner | RWSEM_READER_OWNED

						 | RWSEM_ANONYMOUSLY_OWNED;



	WRITE_ONCE(sem->owner, (struct task_struct *)val);

}



static inline void rwsem_set_reader_owned(struct rw_semaphore *sem)

{

	__rwsem_set_reader_owned(sem, current);

}



/*
@@ -72,6 +89,25 @@ static inline bool rwsem_has_anonymous_owner(struct task_struct *owner) 
{

	return (unsigned long)owner & RWSEM_ANONYMOUSLY_OWNED;

}



#ifdef CONFIG_DEBUG_RWSEMS

/*

 * With CONFIG_DEBUG_RWSEMS configured, it will make sure that if there

 * is a task pointer in owner of a reader-owned rwsem, it will be the

 * real owner or one of the real owners. The only exception is when the

 * unlock is done by up_read_non_owner().

 */

#define rwsem_clear_reader_owned rwsem_clear_reader_owned

static inline void rwsem_clear_reader_owned(struct rw_semaphore *sem)

{

	unsigned long val = (unsigned long)current | RWSEM_READER_OWNED

						   | RWSEM_ANONYMOUSLY_OWNED;

	if (READ_ONCE(sem->owner) == (struct task_struct *)val)

		cmpxchg_relaxed((unsigned long *)&sem->owner, val,

				RWSEM_READER_OWNED | RWSEM_ANONYMOUSLY_OWNED);

}

#endif



#else

static inline void rwsem_set_owner(struct rw_semaphore *sem)

{
@@ -81,7 +117,18 @@ static inline void rwsem_clear_owner(struct rw_semaphore *sem) 
{

}



static inline void __rwsem_set_reader_owned(struct rw_semaphore *sem,

					   struct task_struct *owner)

{

}



static inline void rwsem_set_reader_owned(struct rw_semaphore *sem)

{

}

#endif



#ifndef rwsem_clear_reader_owned

static inline void rwsem_clear_reader_owned(struct rw_semaphore *sem)

{

}

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE