Index: sys/ddb/db_command.c =================================================================== RCS file: /cvsroot/src/sys/ddb/db_command.c,v retrieving revision 1.145 diff -p -u -r1.145 db_command.c --- sys/ddb/db_command.c 21 May 2015 08:23:22 -0000 1.145 +++ sys/ddb/db_command.c 25 Mar 2016 03:02:15 -0000 @@ -1199,9 +1199,7 @@ db_lock_print_cmd(db_expr_t addr, bool h db_expr_t count, const char *modif) { -#ifdef _KERNEL /* XXX CRASH(8) */ lockdebug_lock_print((void *)(uintptr_t)addr, db_printf); -#endif } /* Index: sys/ddb/db_lockdebug.c =================================================================== RCS file: sys/ddb/db_lockdebug.c diff -N sys/ddb/db_lockdebug.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ sys/ddb/db_lockdebug.c 25 Mar 2016 03:02:15 -0000 @@ -0,0 +1,134 @@ +/* $NetBSD$ */ + +/*- + * Copyright (c) 2014 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Taylor R. Campbell. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#include +__KERNEL_RCSID(0, "$NetBSD$"); + +#include +#include +#include +#ifdef _KERNEL +#include +#endif + +#include + +/* *(LOC) = *(PTR), with LOC local and PTR kernel, with type check. */ +#define DB_FETCH(LOC, PTR) \ + db_read_bytes((db_addr_t)(PTR), sizeof(*((LOC) + ((PTR) - (LOC)))), \ + (char *)__UNVOLATILE(LOC)) + +static void +lockdebug_dump(lockdebug_t *ld, void (*pr)(const char *, ...) + __printflike(1, 2)) +{ + int sleeper = (ld->ld_flags & LD_SLEEPER); + int type; + + (*pr)( + "lock address : %#018lx type : %18s\n" + "initialized : %#018lx", + (long)ld->ld_lock, (sleeper ? "sleep/adaptive" : "spin"), + (long)ld->ld_initaddr); + + DB_FETCH(&type, &ld->ld_lockops->lo_type); + if (type == LOCKOPS_CV) { + (*pr)(" interlock: %#018lx\n", (long)ld->ld_locked); + } else { + (*pr)("\n" + "shared holds : %18u exclusive: %18u\n" + "shares wanted: %18u exclusive: %18u\n" + "current cpu : %18u last held: %18u\n" + "current lwp : %#018lx last held: %#018lx\n" + "last locked%c : %#018lx unlocked%c: %#018lx\n", + (unsigned)ld->ld_shares, ((ld->ld_flags & LD_LOCKED) != 0), + (unsigned)ld->ld_shwant, (unsigned)ld->ld_exwant, +#ifdef _KERNEL + (unsigned)cpu_index(curcpu()), +#else + (unsigned)0, +#endif + (unsigned)ld->ld_cpu, +#ifdef _KERNEL + (long)curlwp, +#else + (long)0, +#endif + (long)ld->ld_lwp, + ((ld->ld_flags & LD_LOCKED) ? '*' : ' '), + (long)ld->ld_locked, + ((ld->ld_flags & LD_LOCKED) ? ' ' : '*'), + (long)ld->ld_unlocked); + } + +#ifdef _KERNEL + if (ld->ld_lockops->lo_dump != NULL) + (*ld->ld_lockops->lo_dump)(ld->ld_lock); + + if (sleeper) { + (*pr)("\n"); +#ifdef LOCKDEBUG + turnstile_print(ld->ld_lock, pr); +#endif + } +#endif +} + +void +lockdebug_lock_print(void *addr, void (*pr)(const char *, ...)) +{ + db_expr_t ld_all_addr; + lockdebuglist_t *ld_all_ptr; + lockdebug_t *ld, ld_copy; + volatile void *lock; + + if (!db_value_of_name("ld_all", &ld_all_addr)) + (*pr)("Sorry, kernel not built with the LOCKDEBUG option.\n"); + ld_all_ptr = (lockdebuglist_t *)(uintptr_t)ld_all_addr; + __CTASSERT(TAILQ_END(ld_all_ptr) == NULL); + for (DB_FETCH(&ld, &TAILQ_FIRST(ld_all_ptr)); + ld != NULL; /* XXX TAILQ_END */ + DB_FETCH(&ld, &TAILQ_NEXT(ld, ld_achain))) { + DB_FETCH(&lock, &ld->ld_lock); + if (lock == NULL) + continue; + if (addr == NULL || lock == addr) { + DB_FETCH(&ld_copy, ld); + lockdebug_dump(&ld_copy, pr); + if (addr != NULL) + return; + } + } + if (addr != NULL) { + (*pr)("Sorry, no record of a lock with address %p found.\n", + addr); + } +} Index: sys/ddb/files.ddb =================================================================== RCS file: /cvsroot/src/sys/ddb/files.ddb,v retrieving revision 1.10 diff -p -u -r1.10 files.ddb --- sys/ddb/files.ddb 16 Nov 2014 05:46:27 -0000 1.10 +++ sys/ddb/files.ddb 25 Mar 2016 03:02:15 -0000 @@ -18,6 +18,7 @@ file ddb/db_expr.c ddb file ddb/db_input.c ddb file ddb/db_kernel.c ddb file ddb/db_lex.c ddb +file ddb/db_lockdebug.c ddb file ddb/db_lwp.c ddb file ddb/db_output.c ddb file ddb/db_panic.c ddb Index: sys/kern/subr_lockdebug.c =================================================================== RCS file: /cvsroot/src/sys/kern/subr_lockdebug.c,v retrieving revision 1.54 diff -p -u -r1.54 subr_lockdebug.c --- sys/kern/subr_lockdebug.c 29 Sep 2015 01:44:57 -0000 1.54 +++ sys/kern/subr_lockdebug.c 25 Mar 2016 03:02:16 -0000 @@ -64,32 +64,8 @@ unsigned int ld_panic; #define LD_MAX_LOCKS 1048576 #define LD_SLOP 16 -#define LD_LOCKED 0x01 -#define LD_SLEEPER 0x02 - #define LD_WRITE_LOCK 0x80000000 -typedef struct lockdebug { - struct rb_node ld_rb_node; - __cpu_simple_lock_t ld_spinlock; - _TAILQ_ENTRY(struct lockdebug, volatile) ld_chain; - _TAILQ_ENTRY(struct lockdebug, volatile) ld_achain; - volatile void *ld_lock; - lockops_t *ld_lockops; - struct lwp *ld_lwp; - uintptr_t ld_locked; - uintptr_t ld_unlocked; - uintptr_t ld_initaddr; - uint16_t ld_shares; - uint16_t ld_cpu; - uint8_t ld_flags; - uint8_t ld_shwant; /* advisory */ - uint8_t ld_exwant; /* advisory */ - uint8_t ld_unused; -} volatile lockdebug_t; - -typedef _TAILQ_HEAD(lockdebuglist, struct lockdebug, volatile) lockdebuglist_t; - __cpu_simple_lock_t ld_mod_lk; lockdebuglist_t ld_free = TAILQ_HEAD_INITIALIZER(ld_free); lockdebuglist_t ld_all = TAILQ_HEAD_INITIALIZER(ld_all); @@ -796,37 +772,6 @@ lockdebug_abort1(lockdebug_t *ld, int s, #endif /* LOCKDEBUG */ /* - * lockdebug_lock_print: - * - * Handle the DDB 'show lock' command. - */ -#ifdef DDB -void -lockdebug_lock_print(void *addr, void (*pr)(const char *, ...)) -{ -#ifdef LOCKDEBUG - lockdebug_t *ld; - - TAILQ_FOREACH(ld, &ld_all, ld_achain) { - if (ld->ld_lock == NULL) - continue; - if (addr == NULL || ld->ld_lock == addr) { - lockdebug_dump(ld, pr); - if (addr != NULL) - return; - } - } - if (addr != NULL) { - (*pr)("Sorry, no record of a lock with address %p found.\n", - addr); - } -#else - (*pr)("Sorry, kernel not built with the LOCKDEBUG option.\n"); -#endif /* LOCKDEBUG */ -} -#endif /* DDB */ - -/* * lockdebug_abort: * * An error has been trapped - dump lock info and call panic(). Index: sys/sys/lockdebug.h =================================================================== RCS file: /cvsroot/src/sys/sys/lockdebug.h,v retrieving revision 1.14 diff -p -u -r1.14 lockdebug.h --- sys/sys/lockdebug.h 27 Apr 2013 08:12:34 -0000 1.14 +++ sys/sys/lockdebug.h 25 Mar 2016 03:02:18 -0000 @@ -40,6 +40,9 @@ #error "Sorry, nothing of interest to user level programs here." #endif +#include +#include + #define LOCKOPS_SLEEP 0 #define LOCKOPS_SPIN 1 #define LOCKOPS_CV 2 @@ -50,6 +53,30 @@ typedef struct lockops { void (*lo_dump)(volatile void *); } lockops_t; +#define LD_LOCKED 0x01 +#define LD_SLEEPER 0x02 + +typedef struct lockdebug { + struct rb_node ld_rb_node; + __cpu_simple_lock_t ld_spinlock; + _TAILQ_ENTRY(struct lockdebug, volatile) ld_chain; + _TAILQ_ENTRY(struct lockdebug, volatile) ld_achain; + volatile void *ld_lock; + lockops_t *ld_lockops; + struct lwp *ld_lwp; + uintptr_t ld_locked; + uintptr_t ld_unlocked; + uintptr_t ld_initaddr; + uint16_t ld_shares; + uint16_t ld_cpu; + uint8_t ld_flags; + uint8_t ld_shwant; /* advisory */ + uint8_t ld_exwant; /* advisory */ + uint8_t ld_unused; +} volatile lockdebug_t; + +typedef _TAILQ_HEAD(lockdebuglist, struct lockdebug, volatile) lockdebuglist_t; + #define LOCKDEBUG_ABORT(l, o, f, m) lockdebug_abort(l, o, f, m) void lockdebug_abort(volatile void *, lockops_t *, Index: usr.sbin/crash/Makefile =================================================================== RCS file: /cvsroot/src/usr.sbin/crash/Makefile,v retrieving revision 1.31 diff -p -u -r1.31 Makefile --- usr.sbin/crash/Makefile 16 Jun 2015 23:48:20 -0000 1.31 +++ usr.sbin/crash/Makefile 25 Mar 2016 03:02:19 -0000 @@ -40,7 +40,7 @@ CPPFLAGS+= -UDB_MACHINE_COMMANDS .PATH: $S/ddb SRCS+= db_command.c db_lwp.c db_proc.c db_xxx.c db_cpu.c SRCS+= db_access.c db_elf.c db_examine.c -SRCS+= db_expr.c db_lex.c db_output.c db_print.c +SRCS+= db_expr.c db_lex.c db_lockdebug.c db_output.c db_print.c SRCS+= db_sym.c db_variables.c db_write_cmd.c .PATH: ${S}/arch/${MACHINE}/${MACHINE}