lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[SPARC64]: Make debugging spinlocks usable again.

Browse Source 
When the spinlock routines were moved out of line into
kernel/spinlock.c this made it so that the debugging
spinlocks record lock acquisition program counts in the
kernel/spinlock.c functions not in their callers.
This makes the debugging info kind of useless.

So record the correct caller's program counter and
now this feature is useful once more.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller
2005-08-29 12:46:07 -07:00
parent ca7c8d2c1e
commit 442464a500
3 changed files with 37 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
arch/sparc64/kernel/sparc64_ksyms.c
View File

@ -99,17 +99,6 @@ extern int __ashrdi3(int, int);
extern void dump_thread(struct pt_regs *, struct user *);
extern int dump_fpu (struct pt_regs * regs, elf_fpregset_t * fpregs);
#if defined(CONFIG_SMP) && defined(CONFIG_DEBUG_SPINLOCK)
extern void _do_spin_lock (spinlock_t *lock, char *str);
extern void _do_spin_unlock (spinlock_t *lock);
extern int _spin_trylock (spinlock_t *lock);
extern void _do_read_lock(rwlock_t *rw, char *str);
extern void _do_read_unlock(rwlock_t *rw, char *str);
extern void _do_write_lock(rwlock_t *rw, char *str);
extern void _do_write_unlock(rwlock_t *rw);
extern int _do_write_trylock(rwlock_t *rw, char *str);
#endif
extern unsigned long phys_base;
extern unsigned long pfn_base;
@ -152,18 +141,6 @@ EXPORT_SYMBOL(_mcount);
EXPORT_SYMBOL(cpu_online_map);
EXPORT_SYMBOL(phys_cpu_present_map);
/* Spinlock debugging library, optional. */
#ifdef CONFIG_DEBUG_SPINLOCK
EXPORT_SYMBOL(_do_spin_lock);
EXPORT_SYMBOL(_do_spin_unlock);
EXPORT_SYMBOL(_spin_trylock);
EXPORT_SYMBOL(_do_read_lock);
EXPORT_SYMBOL(_do_read_unlock);
EXPORT_SYMBOL(_do_write_lock);
EXPORT_SYMBOL(_do_write_unlock);
EXPORT_SYMBOL(_do_write_trylock);
#endif
EXPORT_SYMBOL(smp_call_function);
#endif /* CONFIG_SMP */

40
arch/sparc64/lib/debuglocks.c
View File

@ -12,8 +12,6 @@
#ifdef CONFIG_SMP
#define GET_CALLER(PC) __asm__ __volatile__("mov %%i7, %0" : "=r" (PC))
static inline void show (char *str, spinlock_t *lock, unsigned long caller)
{
int cpu = smp_processor_id();
@ -51,14 +49,13 @@ static inline void show_write (char *str, rwlock_t *lock, unsigned long caller)
#undef INIT_STUCK
#define INIT_STUCK 100000000
void _do_spin_lock(spinlock_t *lock, char *str)
void _do_spin_lock(spinlock_t *lock, char *str, unsigned long caller)
{
unsigned long caller, val;
unsigned long val;
int stuck = INIT_STUCK;
int cpu = get_cpu();
int shown = 0;
GET_CALLER(caller);
again:
__asm__ __volatile__("ldstub [%1], %0"
: "=r" (val)
@ -84,12 +81,11 @@ again:
put_cpu();
}
int _do_spin_trylock(spinlock_t *lock)
int _do_spin_trylock(spinlock_t *lock, unsigned long caller)
{
unsigned long val, caller;
unsigned long val;
int cpu = get_cpu();
GET_CALLER(caller);
__asm__ __volatile__("ldstub [%1], %0"
: "=r" (val)
: "r" (&(lock->lock))
@ -118,14 +114,13 @@ void _do_spin_unlock(spinlock_t *lock)
/* Keep INIT_STUCK the same... */
void _do_read_lock (rwlock_t *rw, char *str)
void _do_read_lock(rwlock_t *rw, char *str, unsigned long caller)
{
unsigned long caller, val;
unsigned long val;
int stuck = INIT_STUCK;
int cpu = get_cpu();
int shown = 0;
GET_CALLER(caller);
wlock_again:
/* Wait for any writer to go away. */
while (((long)(rw->lock)) < 0) {
@ -157,15 +152,13 @@ wlock_again:
put_cpu();
}
void _do_read_unlock (rwlock_t *rw, char *str)
void _do_read_unlock(rwlock_t *rw, char *str, unsigned long caller)
{
unsigned long caller, val;
unsigned long val;
int stuck = INIT_STUCK;
int cpu = get_cpu();
int shown = 0;
GET_CALLER(caller);
/* Drop our identity _first_. */
rw->reader_pc[cpu] = 0;
current->thread.smp_lock_count--;
@ -193,14 +186,13 @@ runlock_again:
put_cpu();
}
void _do_write_lock (rwlock_t *rw, char *str)
void _do_write_lock(rwlock_t *rw, char *str, unsigned long caller)
{
unsigned long caller, val;
unsigned long val;
int stuck = INIT_STUCK;
int cpu = get_cpu();
int shown = 0;
GET_CALLER(caller);
wlock_again:
/* Spin while there is another writer. */
while (((long)rw->lock) < 0) {
@ -278,14 +270,12 @@ wlock_again:
put_cpu();
}
void _do_write_unlock(rwlock_t *rw)
void _do_write_unlock(rwlock_t *rw, unsigned long caller)
{
unsigned long caller, val;
unsigned long val;
int stuck = INIT_STUCK;
int shown = 0;
GET_CALLER(caller);
/* Drop our identity _first_ */
rw->writer_pc = 0;
rw->writer_cpu = NO_PROC_ID;
@ -313,13 +303,11 @@ wlock_again:
}
}
int _do_write_trylock (rwlock_t *rw, char *str)
int _do_write_trylock(rwlock_t *rw, char *str, unsigned long caller)
{
unsigned long caller, val;
unsigned long val;
int cpu = get_cpu();
GET_CALLER(caller);
/* Try to acuire the write bit. */
__asm__ __volatile__(
" mov 1, %%g3\n"