leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix raw_spinlock_t vs lockdep

Browse Source 
Use the lockdep infrastructure to track lock contention and other lock
statistics.

It tracks lock contention events, and the first four unique call-sites that
encountered contention.

It also measures lock wait-time and hold-time in nanoseconds. The minimum and
maximum times are tracked, as well as a total (which together with the number
of event can give the avg).

All statistics are done per lock class, per write (exclusive state) and per read
(shared state).

The statistics are collected per-cpu, so that the collection overhead is
minimized via having no global cachemisses.

This new lock statistics feature is independent of the lock dependency checking
traditionally done by lockdep; it just shares the lock tracking code. It is
also possible to enable both and runtime disabled either component - thereby
avoiding the O(n^2) lock chain walks for instance.

This patch:

raw_spinlock_t should not use lockdep (and doesn't) since lockdep itself
relies on it.

Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Acked-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Peter Zijlstra 2007-07-19 01:48:53 -07:00 committed by Linus Torvalds
parent 5b7f13bd26
commit 21f8ca3bf6
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/linux/spinlock_types.h
View File

@ -9,14 +9,14 @@
* Released under the General Public License (GPL). * Released under the General Public License (GPL).
*/ */
#include <linux/lockdep.h>
#if defined(CONFIG_SMP) #if defined(CONFIG_SMP)
# include <asm/spinlock_types.h> # include <asm/spinlock_types.h>
#else #else
# include <linux/spinlock_types_up.h> # include <linux/spinlock_types_up.h>
#endif #endif
#include <linux/lockdep.h>
typedef struct { typedef struct {
raw_spinlock_t raw_lock; raw_spinlock_t raw_lock;
#if defined(CONFIG_PREEMPT) && defined(CONFIG_SMP) #if defined(CONFIG_PREEMPT) && defined(CONFIG_SMP)

9
include/linux/spinlock_types_up.h
View File

@ -12,14 +12,10 @@
* Released under the General Public License (GPL). * Released under the General Public License (GPL).
*/ */
#if defined(CONFIG_DEBUG_SPINLOCK) || \ #ifdef CONFIG_DEBUG_SPINLOCK
defined(CONFIG_DEBUG_LOCK_ALLOC)
typedef struct { typedef struct {
volatile unsigned int slock; volatile unsigned int slock;
#ifdef CONFIG_DEBUG_LOCK_ALLOC
struct lockdep_map dep_map;
#endif
} raw_spinlock_t; } raw_spinlock_t;
#define __RAW_SPIN_LOCK_UNLOCKED { 1 } #define __RAW_SPIN_LOCK_UNLOCKED { 1 }
@ -34,9 +30,6 @@ typedef struct { } raw_spinlock_t;
typedef struct { typedef struct {
/* no debug version on UP */ /* no debug version on UP */
#ifdef CONFIG_DEBUG_LOCK_ALLOC
struct lockdep_map dep_map;
#endif
} raw_rwlock_t; } raw_rwlock_t;
#define __RAW_RW_LOCK_UNLOCKED { } #define __RAW_RW_LOCK_UNLOCKED { }