d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DEBUG_VFS_LOCKS: use witness if available

Browse Source 
The assert_vop_locked messages are ignored, and file/line information
is not too useful. Fixing this without changing both witness and VFS
asserts KPIs is not possible.

Reviewed by:	markj (previous version)
Tested by:	pho
Sponsored by:	The FreeBSD Foundation
MFC after:	1 week
Differential revision:	https://reviews.freebsd.org/D39464
This commit is contained in:
Konstantin Belousov 2023-04-08 09:15:00 +03:00
parent cc3793b1c5
commit 7b6fe2428a
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sys/kern/vfs_lookup.c
View File

@ -162,6 +162,7 @@ nameiinit(void *dummy __unused)
vfs_vector_op_register(&crossmp_vnodeops);
getnewvnode("crossmp", NULL, &crossmp_vnodeops, &vp_crossmp);
vp_crossmp->v_state = VSTATE_CONSTRUCTED;
vp_crossmp->v_irflag |= VIRF_CROSSMP;
}
SYSINIT(vfs, SI_SUB_VFS, SI_ORDER_SECOND, nameiinit, NULL);

16
sys/kern/vfs_subr.c
View File

@ -5452,14 +5452,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
@ -5468,8 +5472,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

1
sys/sys/vnode.h
View File

@ -228,6 +228,7 @@ _Static_assert(sizeof(struct vnode) <= 448, "vnode size crosses 448 bytes");
never cleared once set */
#define VIRF_MOUNTPOINT 0x0004 /* This vnode is mounted on */
#define VIRF_TEXT_REF 0x0008 /* Executable mappings ref the vnode */
#define VIRF_CROSSMP 0x0010 /* Cross-mp vnode, no locking */
#define VI_UNUSED0 0x0001 /* unused */
#define VI_MOUNT 0x0002 /* Mount in progress */