From nobody Sun Apr 16 10:57:40 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 4PznFw46hbz457g3; Sun, 16 Apr 2023 10:57:40 +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 4PznFw3Qnhz3qLg; Sun, 16 Apr 2023 10:57:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681642660; 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=TjDxOvUp4f9Z/sF2tLat6cv2EIM0cdwDodDxU598VVU=; b=WZyyrSR8BSPt3CJZzu0YlJNf3XPMmVVs1+UHWiONOuEpPyXtlRpPdWXgKvWTYWtin6l71P Um6HolADwixg83r3s5feWbF9P1HSadqwMcyrtkCfbMHQX5e3300OR0gYs0+BGZHYASVDVI VY0TdiuQypqsrMWUO/bdrJjiTVZ1deEcA7WJXBEbkjHinuBagLndvaCN5LIERXdqIQHQ9m WQEZvk7tQjEX+1jDizosxutjkMmhyHr808WrOch8HlrVjoS4WaEWw/RlAd1GDMyyV9yrXl 2vq5SXI3R2LADbv1O0jrvINNslfinJPQFf2MspOKG620GjdFM24cIppMbOikWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681642660; 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=TjDxOvUp4f9Z/sF2tLat6cv2EIM0cdwDodDxU598VVU=; b=OI+oCour8qymq0dvCW4lhgkBBFoWDaXQnJGcXJro29PJ9IUjLRSerKfcMjaM9HSYxMHwT1 EYXMkc7Oy2i9cPb8uBf0YPr+TFewv9EpBW1MiIjAahAFKHodKS2Fs6Ir5H51n+VgAPJl1F JW6h+LU+mn0pZvLbQmvkOrTEk7aiGMazi2+Ryev5Jx/bPJlTUTnFgJ5xqQsXfOQzGOqiiy Y0n66TsBPdsNEi6syfpir0lju/1pLrAARknznTe46TYZb64NViS6uyoJzHZ6esDJCioqWS Jz3t2NV/oxy44C1a9piRTzIVPcb+dgr4+FAiPfcfUqEeIq8xrRPVMOhZCGU+mw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681642660; a=rsa-sha256; cv=none; b=FjhZOcCb+Jm2CUgK/ct8SwhcWtFqFTtAqZF0lF3spo+PGgyjg8kLDiQFRLix58eohACnBD tgb9PcY0Jn5CttCc/aHsXirGrcsvml7Zqupx47QPeRv3M2qvjQ6GBFlzgj015KqYWQFXe7 L3tEmNBn1em5+djStSdDicRBazDrVFKm9TNjrMUOmyl6V1btq5cMX/nTnELyN+GqLn4f4p 4yKcHVPqSR7DUqEe+nyhR4t+GpYrrsRjCTCCirX3K7v7hksqkZzJc4SRzv70n7pWdS8Vta nxcks87xUNc4llOY5yXdErCyj9SWLxKmMbPBtuTvbaFTLf2+fXYzc9c4AQE7GQ== 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 4PznFw2D4DzktK; Sun, 16 Apr 2023 10:57:40 +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 33GAveSj021511; Sun, 16 Apr 2023 10:57:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33GAvenn021510; Sun, 16 Apr 2023 10:57:40 GMT (envelope-from git) Date: Sun, 16 Apr 2023 10:57:40 GMT Message-Id: <202304161057.33GAvenn021510@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: 074babfb2812 - stable/13 - DEBUG_VFS_LOCKS: use witness if available 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: 074babfb2812c12caf99e3286f0a6c688ecf45bf Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=074babfb2812c12caf99e3286f0a6c688ecf45bf commit 074babfb2812c12caf99e3286f0a6c688ecf45bf Author: Konstantin Belousov AuthorDate: 2023-04-08 06:15:00 +0000 Commit: Konstantin Belousov CommitDate: 2023-04-16 10:45:58 +0000 DEBUG_VFS_LOCKS: use witness if available (cherry picked from commit 7b6fe2428a97921e8df882d0a24b87094c37b468) --- sys/kern/vfs_lookup.c | 1 + sys/kern/vfs_subr.c | 16 +++++++++++++--- sys/sys/vnode.h | 1 + 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c index 3ded2180ac82..b7ce93f3702d 100644 --- a/sys/kern/vfs_lookup.c +++ b/sys/kern/vfs_lookup.c @@ -161,6 +161,7 @@ nameiinit(void *dummy __unused) UMA_ALIGN_PTR, 0); vfs_vector_op_register(&crossmp_vnodeops); getnewvnode("crossmp", NULL, &crossmp_vnodeops, &vp_crossmp); + vp_crossmp->v_irflag |= VIRF_CROSSMP; } SYSINIT(vfs, SI_SUB_VFS, SI_ORDER_SECOND, nameiinit, NULL); diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 67f707dd9edb..c4d8ceac7e2b 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -5526,14 +5526,18 @@ assert_vi_unlocked(struct vnode *vp, const char *str) void assert_vop_locked(struct vnode *vp, const char *str) { - int locked; - if (KERNEL_PANICKED() || vp == NULL) return; - locked = VOP_ISLOCKED(vp); +#ifdef WITNESS + if ((vp->v_irflag & VIRF_CROSSMP) == 0) + witness_assert(&vp->v_vnlock->lock_object, LA_LOCKED, + __FILE__, __LINE__); +#else + int locked = VOP_ISLOCKED(vp); if (locked == 0 || locked == LK_EXCLOTHER) vfs_badlock("is not locked but should be", str, vp); +#endif } void @@ -5542,8 +5546,14 @@ assert_vop_unlocked(struct vnode *vp, const char *str) if (KERNEL_PANICKED() || vp == NULL) return; +#ifdef WITNESS + if ((vp->v_irflag & VIRF_CROSSMP) == 0) + witness_assert(&vp->v_vnlock->lock_object, LA_UNLOCKED, + __FILE__, __LINE__); +#else if (VOP_ISLOCKED(vp) == LK_EXCLUSIVE) vfs_badlock("is locked but should not be", str, vp); +#endif } void diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h index 2011f429141c..37cafdb0d5ae 100644 --- a/sys/sys/vnode.h +++ b/sys/sys/vnode.h @@ -248,6 +248,7 @@ struct xvnode { #define VIRF_PGREAD 0x0002 /* Direct reads from the page cache are permitted, never cleared once set */ #define VIRF_MOUNTPOINT 0x0004 /* This vnode is mounted on */ +#define VIRF_CROSSMP 0x0010 /* Cross-mp vnode, no locking */ #define VI_TEXT_REF 0x0001 /* Text ref grabbed use ref */ #define VI_MOUNT 0x0002 /* Mount in progress */