From nobody Sun Apr 16 10:57:42 2023 X-Original-To: dev-commits-src-branches@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 4PznFz0jNRz457lC; Sun, 16 Apr 2023 10:57:43 +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 4PznFy5KPLz3q7r; Sun, 16 Apr 2023 10:57:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681642662; 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=7OnZXK0Ehd0KMwz6zvEDibDt68n1rN2GVP5QOpMJvUc=; b=mpqMLM0hq5FDRHElmUD2oXRB4E65yVxtLOOR2ORLwCXYXOImn7gG7sprs98i5skdmsAiKZ troWvLxnI2iH4FwYQvO4kvHgK/kNPXSVBoHQ/aJHKka9koW/N8VsjqglC5rpB5Z+hYg91i lblnblKuAtQRdQV2MGizu1prdj79TIbfcTjLhgsNZHzdCCSmjgeCXJur90qa7q4XjHSr0u V2ozzM6tWJyZbhpHqcfvB0n+r+coicW+RjB3rDP6MzL4sgaS0/4SXhskKZqtET1bFO/51W keeimkKJ315ZTz8zoQNddnon8jFOnsjiUslp41MovZhttSz0FsPe4MGr44FiYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681642662; 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=7OnZXK0Ehd0KMwz6zvEDibDt68n1rN2GVP5QOpMJvUc=; b=XdCy4M0rckoD65Tc16jQ6LsxAKh/N+lRD2xglVlHv7KXIggT7Ctib2sw+3xGnkLvzKn2Kz FaXFDcZ3DRw75rs2SuI7AbT8M/J6EaLpVBX2mFbGfr4KFEhBFkQWo52ITxZSn4BVTyIMI/ rJGT2xyNgJK9wE2dVb0jFPHVVGDwfvdyt1SRKtVt0a77kHpjo3oOwS42Oi0ws0ycDKQIIT X54sq8TZ+mQOLkckc0+wCRTACAzEu9UFHxEx2+znDfPgyPuZJx8HlQV+jI4yfxZqHHqNqA iDcvD7dMGGGr9AuX+cXISUnDqcNraT8/tirzH8w7ifF0JTf78/q+0Q2JHeqDYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681642662; a=rsa-sha256; cv=none; b=HsaU1K5wFKGBXbIKS306EQNMcjSqJL5D5MoV8AQrHR00uoO9TXHiubiEVOAKgkMX1ckwYd Af6QR3eiA9e5nvStEIH//0BxXINwrTuvvW3JLS7BQCaEx9LvOMDL7YsnqNZpLk2jQCp2KD lg+qLNlOQ6vHuED38kMtkcItf5Fstv7yZ1Vzzw6alUyxiN+UtJGquDnno5URa8ZLmx20BD qM/sZkKecSm/gyc5qR+zeieXJIM8EwRueLmdlVRkKFLXxotq1VOm38h+S4TCaKfyIAXWhR KXAFQKT1VIXoOwdeQPu1FtrXu/saNEVbcA68fcq/c4paHdo7n/GSeQ4h/4by8g== 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 4PznFy43Whzl7G; Sun, 16 Apr 2023 10:57:42 +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 33GAvgX9021555; Sun, 16 Apr 2023 10:57:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33GAvg7B021554; Sun, 16 Apr 2023 10:57:42 GMT (envelope-from git) Date: Sun, 16 Apr 2023 10:57:42 GMT Message-Id: <202304161057.33GAvg7B021554@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 99da9d65a5e0 - stable/13 - DEBUG_VFS_LOCKS: restore diagnostic for the witness use case List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 99da9d65a5e0db8f6563fee7fc576c1de4f84363 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=99da9d65a5e0db8f6563fee7fc576c1de4f84363 commit 99da9d65a5e0db8f6563fee7fc576c1de4f84363 Author: Konstantin Belousov AuthorDate: 2023-04-10 08:52:43 +0000 Commit: Konstantin Belousov CommitDate: 2023-04-16 10:45:58 +0000 DEBUG_VFS_LOCKS: restore diagnostic for the witness use case (cherry picked from commit c53e990b8d0444b5ad59ddb18742a71434e30ee2) --- sys/kern/vfs_subr.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index c4d8ceac7e2b..7ebd63447caa 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -5530,14 +5530,13 @@ assert_vop_locked(struct vnode *vp, const char *str) return; #ifdef WITNESS - if ((vp->v_irflag & VIRF_CROSSMP) == 0) - witness_assert(&vp->v_vnlock->lock_object, LA_LOCKED, - __FILE__, __LINE__); + if ((vp->v_irflag & VIRF_CROSSMP) == 0 && + witness_is_owned(&vp->v_vnlock->lock_object) == -1) #else int locked = VOP_ISLOCKED(vp); if (locked == 0 || locked == LK_EXCLOTHER) - vfs_badlock("is not locked but should be", str, vp); #endif + vfs_badlock("is not locked but should be", str, vp); } void @@ -5547,13 +5546,12 @@ assert_vop_unlocked(struct vnode *vp, const char *str) return; #ifdef WITNESS - if ((vp->v_irflag & VIRF_CROSSMP) == 0) - witness_assert(&vp->v_vnlock->lock_object, LA_UNLOCKED, - __FILE__, __LINE__); + if ((vp->v_irflag & VIRF_CROSSMP) == 0 && + witness_is_owned(&vp->v_vnlock->lock_object) == 1) #else if (VOP_ISLOCKED(vp) == LK_EXCLUSIVE) - vfs_badlock("is locked but should not be", str, vp); #endif + vfs_badlock("is locked but should not be", str, vp); } void