From nobody Thu Jan 19 03:58:45 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ny84k0L3Mz2sw0R; Thu, 19 Jan 2023 03:58:46 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ny84j6qm5z3mjB; Thu, 19 Jan 2023 03:58:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674100726; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fgp013iOt5LF2YGvOKFySbrTIJIG20uFEYk7Yf/PjW0=; b=ZP38X5JYQCgAx2B7KKFgnEQEh2WjsmFDPB1tXtBYOKJ+HWX+8CJete3BbiN7a1u3qtm3NC IPX/tJAIs2SMSI6begnLUufuiRW2U/l3n/HxCoKbtsj1HAVTAyvzymz0ZAR8Ozl1PmNc/F L0kK1rQnyAdcLQQAKhP+JY4sYN5Jad099aqjpDXYrbivsqwtvZmEBeua4ImLObWYN4gg0/ 8jD+GAEA91q5ClrRtY0advY4W5lcdxzW3UWu3NSFDYh43MEhUyyHI9XzvHt7UNoikRbzHd EHsgZWA5NF2iIuZJtyuazCCsNLod1W6r9jmXBiVSb19ifnsCpKEcjv72xb/uRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674100726; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fgp013iOt5LF2YGvOKFySbrTIJIG20uFEYk7Yf/PjW0=; b=f9Y+EVf6zk9eFaYsP7shWOv8rTR7ec7KNvoxkB8v8II/4YMRpxM/H+rJSRShk2u4q4lTDT TZR9eafeXm4p4K5Jp2+1k/wWJ1LQJbLHDyW4car6ujg0+8lmQRqgbvyDjRtUaUXO8dMMaf Tr7mqEHJsSd1rL/TRjwYXlAB6vLxjmlNwt/Ul1mMmUhTGJ89YFGtVfaJ1KiwtwGZvoIhMs L7I6pq0BGo5jWtib8JchrA3gzuCES68sMshfeBC2qhSzz9rL2T/Jkuw6A6k+cu3CiDfG4Y 2lIFUndDMC+ejIhgkjtcws7nkXQ840ATivVfdrGCxM9P8dB3ZTJ6N+CNLgn8rQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674100726; a=rsa-sha256; cv=none; b=qI70tXQJCy5uVbarp/q1pgYoC57/ORzUY5SqcrjmDqIOhRsrgjfJNnY3FYnaHFh8YL78BA e8/+bzoueYsmxOebR6vT2TFmCW1Pj8q6Iio1HOO6bvPKGzw+g4nnZlr7jezZvzoeIDkhpT 2roqbrC9a8bfaRMgF7xiNHoy0hovdKNxI3j0nYxnyjGW4fiCHvPfcGlwgoYxUD+964dmGi iSgbPwW3e51FKX4iLv4IYtxlgn4IYMnmVMypooiWpYYelqDmZjJBfVd6rWNwyAjs5f0hzm BLOp2LPTN9Qdb3JleDSacrbzdbUQR9wfSG3g/JHx+A4/mnKM/khcr23AnmdwDA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ny84j5sqDzcg1; Thu, 19 Jan 2023 03:58:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30J3wjkI027821; Thu, 19 Jan 2023 03:58:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30J3wjwW027820; Thu, 19 Jan 2023 03:58:45 GMT (envelope-from git) Date: Thu, 19 Jan 2023 03:58:45 GMT Message-Id: <202301190358.30J3wjwW027820@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Jason A. Harmening" Subject: git: 5a4a83fd0e67 - main - Improve debuggability of VOP_* locking assertions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jah X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5a4a83fd0e67a0d7787d2f3e09ef0e5552a1ffb6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jah: URL: https://cgit.FreeBSD.org/src/commit/?id=5a4a83fd0e67a0d7787d2f3e09ef0e5552a1ffb6 commit 5a4a83fd0e67a0d7787d2f3e09ef0e5552a1ffb6 Author: Jason A. Harmening AuthorDate: 2023-01-16 20:07:19 +0000 Commit: Jason A. Harmening CommitDate: 2023-01-19 04:11:05 +0000 Improve debuggability of VOP_* locking assertions Include the phase and argument field to make it easier to determine at a glance where the failure originated. Reviewed by: kib, markj Differential Revision: https://reviews.freebsd.org/D38091 --- sys/tools/vnode_if.awk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/tools/vnode_if.awk b/sys/tools/vnode_if.awk index 486f0e6b2ce1..415c33c52420 100644 --- a/sys/tools/vnode_if.awk +++ b/sys/tools/vnode_if.awk @@ -73,14 +73,14 @@ function add_debug_code(name, arg, pos, ind) else star = ""; if (lockdata[name, arg, pos] && (lockdata[name, arg, pos] != "-")) { - printc(ind"ASSERT_VI_UNLOCKED("star"a->a_"arg", \""uname"\");"); + printc(ind"ASSERT_VI_UNLOCKED("star"a->a_"arg", \""uname" "pos" ("arg")\");"); # Add assertions for locking if (lockdata[name, arg, pos] == "L") - printc(ind"ASSERT_VOP_LOCKED(" star "a->a_"arg", \""uname"\");"); + printc(ind"ASSERT_VOP_LOCKED(" star "a->a_"arg", \""uname" "pos" ("arg")\");"); else if (lockdata[name, arg, pos] == "U") - printc(ind"ASSERT_VOP_UNLOCKED(" star "a->a_"arg", \""uname"\");"); + printc(ind"ASSERT_VOP_UNLOCKED(" star "a->a_"arg", \""uname" "pos" ("arg")\");"); else if (lockdata[name, arg, pos] == "E") - printc(ind"ASSERT_VOP_ELOCKED(" star "a->a_"arg", \""uname"\");"); + printc(ind"ASSERT_VOP_ELOCKED(" star "a->a_"arg", \""uname" "pos" ("arg")\");"); else if (0) { # XXX More checks! }