From owner-svn-src-all@freebsd.org Thu Apr 2 20:47:59 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8B4E32646E1; Thu, 2 Apr 2020 20:47:59 +0000 (UTC) (envelope-from cem@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48tZrv1BzNz4cH3; Thu, 2 Apr 2020 20:47:59 +0000 (UTC) (envelope-from cem@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C05EC1FB69; Thu, 2 Apr 2020 20:47:51 +0000 (UTC) (envelope-from cem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 032Klpd1067657; Thu, 2 Apr 2020 20:47:51 GMT (envelope-from cem@FreeBSD.org) Received: (from cem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 032Klp4d067656; Thu, 2 Apr 2020 20:47:51 GMT (envelope-from cem@FreeBSD.org) Message-Id: <202004022047.032Klp4d067656@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cem set sender to cem@FreeBSD.org using -f From: Conrad Meyer Date: Thu, 2 Apr 2020 20:47:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r359581 - head/sys/kern X-SVN-Group: head X-SVN-Commit-Author: cem X-SVN-Commit-Paths: head/sys/kern X-SVN-Commit-Revision: 359581 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Apr 2020 20:48:00 -0000 Author: cem Date: Thu Apr 2 20:47:51 2020 New Revision: 359581 URL: https://svnweb.freebsd.org/changeset/base/359581 Log: ddb(4): show lockchain: Don't dereference LK_KERNPROC Also, print a little more information for otherwise unhandled inhibited states. Finally, improve the grammar of some prints. Some of the print statements missing verb. Sponsored by: Dell EMC Isilon Modified: head/sys/kern/subr_turnstile.c Modified: head/sys/kern/subr_turnstile.c ============================================================================== --- head/sys/kern/subr_turnstile.c Thu Apr 2 20:06:37 2020 (r359580) +++ head/sys/kern/subr_turnstile.c Thu Apr 2 20:47:51 2020 (r359581) @@ -1180,17 +1180,21 @@ print_lockchain(struct thread *td, const char *prefix) * blocked on a lock that has an owner. */ while (!db_pager_quit) { - db_printf("%sthread %d (pid %d, %s) ", prefix, td->td_tid, + if (td == (void *)LK_KERNPROC) { + db_printf("%sdisowned (LK_KERNPROC)\n", prefix); + return; + } + db_printf("%sthread %d (pid %d, %s) is ", prefix, td->td_tid, td->td_proc->p_pid, td->td_name); switch (td->td_state) { case TDS_INACTIVE: - db_printf("is inactive\n"); + db_printf("inactive\n"); return; case TDS_CAN_RUN: - db_printf("can run\n"); + db_printf("runnable\n"); return; case TDS_RUNQ: - db_printf("is on a run queue\n"); + db_printf("on a run queue\n"); return; case TDS_RUNNING: db_printf("running on CPU %d\n", td->td_oncpu); @@ -1218,7 +1222,7 @@ print_lockchain(struct thread *td, const char *prefix) td = owner; break; } - db_printf("inhibited\n"); + db_printf("inhibited: %s\n", KTDSTATE(td)); return; default: db_printf("??? (%#x)\n", td->td_state);