From owner-svn-src-head@freebsd.org Mon May 27 06:22:45 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D241615BAF8B; Mon, 27 May 2019 06:22:44 +0000 (UTC) (envelope-from mckusick@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 6FB3F8640A; Mon, 27 May 2019 06:22:44 +0000 (UTC) (envelope-from mckusick@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 603A22702B; Mon, 27 May 2019 06:22:44 +0000 (UTC) (envelope-from mckusick@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x4R6MinV047707; Mon, 27 May 2019 06:22:44 GMT (envelope-from mckusick@FreeBSD.org) Received: (from mckusick@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x4R6MiP3047706; Mon, 27 May 2019 06:22:44 GMT (envelope-from mckusick@FreeBSD.org) Message-Id: <201905270622.x4R6MiP3047706@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mckusick set sender to mckusick@FreeBSD.org using -f From: Kirk McKusick Date: Mon, 27 May 2019 06:22:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r348300 - head/sys/ufs/ffs X-SVN-Group: head X-SVN-Commit-Author: mckusick X-SVN-Commit-Paths: head/sys/ufs/ffs X-SVN-Commit-Revision: 348300 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 6FB3F8640A X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.96)[-0.957,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 May 2019 06:22:45 -0000 Author: mckusick Date: Mon May 27 06:22:43 2019 New Revision: 348300 URL: https://svnweb.freebsd.org/changeset/base/348300 Log: Add function name and line number debugging information to softupdates worklist structures to help track their movement between work lists. No functional change to the operation of soft updates intended. Modified: head/sys/ufs/ffs/ffs_softdep.c head/sys/ufs/ffs/softdep.h Modified: head/sys/ufs/ffs/ffs_softdep.c ============================================================================== --- head/sys/ufs/ffs/ffs_softdep.c Mon May 27 04:20:31 2019 (r348299) +++ head/sys/ufs/ffs/ffs_softdep.c Mon May 27 06:22:43 2019 (r348300) @@ -1011,42 +1011,59 @@ MTX_SYSINIT(softdep_lock, &lk, "Global Softdep Lock", #define WORKLIST_REMOVE_UNLOCKED WORKLIST_REMOVE #else /* DEBUG */ -static void worklist_insert(struct workhead *, struct worklist *, int); -static void worklist_remove(struct worklist *, int); +static void worklist_insert(struct workhead *, struct worklist *, int, + const char *, int); +static void worklist_remove(struct worklist *, int, const char *, int); -#define WORKLIST_INSERT(head, item) worklist_insert(head, item, 1) -#define WORKLIST_INSERT_UNLOCKED(head, item) worklist_insert(head, item, 0) -#define WORKLIST_REMOVE(item) worklist_remove(item, 1) -#define WORKLIST_REMOVE_UNLOCKED(item) worklist_remove(item, 0) +#define WORKLIST_INSERT(head, item) \ + worklist_insert(head, item, 1, __func__, __LINE__) +#define WORKLIST_INSERT_UNLOCKED(head, item)\ + worklist_insert(head, item, 0, __func__, __LINE__) +#define WORKLIST_REMOVE(item)\ + worklist_remove(item, 1, __func__, __LINE__) +#define WORKLIST_REMOVE_UNLOCKED(item)\ + worklist_remove(item, 0, __func__, __LINE__) static void -worklist_insert(head, item, locked) +worklist_insert(head, item, locked, func, line) struct workhead *head; struct worklist *item; int locked; + const char *func; + int line; { if (locked) LOCK_OWNED(VFSTOUFS(item->wk_mp)); if (item->wk_state & ONWORKLIST) - panic("worklist_insert: %p %s(0x%X) already on list", - item, TYPENAME(item->wk_type), item->wk_state); + panic("worklist_insert: %p %s(0x%X) already on list, " + "added in function %s at line %d", + item, TYPENAME(item->wk_type), item->wk_state, + item->wk_func, item->wk_line); item->wk_state |= ONWORKLIST; + item->wk_func = func; + item->wk_line = line; LIST_INSERT_HEAD(head, item, wk_list); } static void -worklist_remove(item, locked) +worklist_remove(item, locked, func, line) struct worklist *item; int locked; + const char *func; + int line; { if (locked) LOCK_OWNED(VFSTOUFS(item->wk_mp)); if ((item->wk_state & ONWORKLIST) == 0) - panic("worklist_remove: %p %s(0x%X) not on list", - item, TYPENAME(item->wk_type), item->wk_state); + panic("worklist_remove: %p %s(0x%X) not on list, " + "removed in function %s at line %d", + item, TYPENAME(item->wk_type), item->wk_state, + item->wk_func, item->wk_line); item->wk_state &= ~ONWORKLIST; + item->wk_func = func; + item->wk_line = line; LIST_REMOVE(item, wk_list); } #endif /* DEBUG */ @@ -1172,8 +1189,10 @@ workitem_free(item, type) #ifdef DEBUG if (item->wk_state & ONWORKLIST) - panic("workitem_free: %s(0x%X) still on list", - TYPENAME(item->wk_type), item->wk_state); + panic("workitem_free: %s(0x%X) still on list, " + "added in function %s at line %d", + TYPENAME(item->wk_type), item->wk_state, + item->wk_func, item->wk_line); if (item->wk_type != type && type != D_NEWBLK) panic("workitem_free: type mismatch %s != %s", TYPENAME(item->wk_type), TYPENAME(type)); Modified: head/sys/ufs/ffs/softdep.h ============================================================================== --- head/sys/ufs/ffs/softdep.h Mon May 27 04:20:31 2019 (r348299) +++ head/sys/ufs/ffs/softdep.h Mon May 27 06:22:43 2019 (r348300) @@ -213,6 +213,10 @@ struct worklist { struct mount *wk_mp; /* Mount we live in */ unsigned int wk_type:8, /* type of request */ wk_state:24; /* state flags */ +#ifdef DEBUG + const char *wk_func; /* func where added / removed */ + int wk_line; /* line where added / removed */ +#endif }; #define WK_DATA(wk) ((void *)(wk)) #define WK_PAGEDEP(wk) ((struct pagedep *)(wk))