From nobody Thu Oct 27 00:24:30 2022 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 4MyRJH0V1gz4gWMR; Thu, 27 Oct 2022 00:24:31 +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 4MyRJG6t4nz4Pb2; Thu, 27 Oct 2022 00:24:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666830271; 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=QlrqY0Zxv/2diEDoiKf4h2Ojj+/GkuIpW3v/jF0BBtQ=; b=J1+1r2DW+jOXdTrOAHQtlh2Ufjh/6U1kbJzmBKtf8/Znj3yYCHJC7xdN1N2meSZYS2Y2An LFXUEt0tmqlZIq3UgG4610/0Jo9StOBcwI2OdgF+mIolaMnQtS0xaKzldFvGqGd1fNKHM1 3coET9ZiXozOeBBT1Ob0DbXbDoWJN+6yAVJFSZ8hfkV7S8TqTG/xC5M0I4Rik+O0xu3knn JHlc4Dyu9BlbzG6bpUx3Ic8aUhBtGci+36+ZWvnvynRCOqJ6r2Ac8YaX7Cv6RCAkuVmzNC NqvmE3ogLC2tmlFIW3K+AXS9cUy1cIDnBkYwtXpQ/+db84htZs0nzw9MPzk/lA== 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 4MyRJG5gJVzcn5; Thu, 27 Oct 2022 00:24:30 +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 29R0OUAM033542; Thu, 27 Oct 2022 00:24:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29R0OUiR033541; Thu, 27 Oct 2022 00:24:30 GMT (envelope-from git) Date: Thu, 27 Oct 2022 00:24:30 GMT Message-Id: <202210270024.29R0OUiR033541@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: 706f15c5fa6b - main - Remove witness directives from crossmp locking VOPs 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: 706f15c5fa6b4b9e6845b8d65a3acf23a79b115e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666830271; 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=QlrqY0Zxv/2diEDoiKf4h2Ojj+/GkuIpW3v/jF0BBtQ=; b=yz/KgiOd5oxqYfEuCL31QB/OvBJ38NGqXIpYkjqO0WRMi8zlTV1iMDij+zfgIgJCR1OsWL 9oFFbinOp80tnUiUjeJsWym8N0QdOgyMO+MEfJDBag0EmtfC1/4lL6T0UfNgBptZvbwFWW dvg94i720FHx1AP1720E+bD5O1rwWDq/RRTu9DWCKOSjBzSOB+tOjWL8g1aFXvYcWl5xvE Py5ygn7e/fG0KUmUTkkj3HOmPY3jaYH4SveeSmI2acPir/mqhyRCek6B+U+unOo95PVtXU 7soRPRlQdxlF/IyNOlyVthk+tDKWAb/QcgyUzFYt75hrKNklpT1J35sypSWlng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666830271; a=rsa-sha256; cv=none; b=u8DKywOb4p+sWYBO/loktfx54B4r9NcvQRYYthMTpRoYHg0YYErcPF0u+u5MPHFwUoFV4d dMOkXSV6HkZ3d38TcLnufmkqDricH1ZWKSn8/rlLT4yl537usoAmGK17hbAVU+3yQCa3iY JKRXE/ad0MTbub7drMPJ9yI+aGlYvoP0ZAyzGFsnnftrps2rfijd3cXyWFbwltdY5Q1RT/ oB2v/mOxPkV3FKtdHqt3ReclATQ4uSFfXrJ1sy+rXC15MBLdXoXQvPYSUvrP4xdxhH9hQD tl6pZYxW8HLHITV0hmvEbG5sV0L+VNlD5omwnjw1kwvATUsDFHZjqY/APDu9fg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jah: URL: https://cgit.FreeBSD.org/src/commit/?id=706f15c5fa6b4b9e6845b8d65a3acf23a79b115e commit 706f15c5fa6b4b9e6845b8d65a3acf23a79b115e Author: Jason A. Harmening AuthorDate: 2022-08-05 05:39:04 +0000 Commit: Jason A. Harmening CommitDate: 2022-10-27 00:33:18 +0000 Remove witness directives from crossmp locking VOPs These are of limited use since the crossmp vnode locking ops have not actually used a lock since commit a2d35545429117e68fbcbc68e14ad55e84265d69. We in fact require that these operations are always issued with LK_SHARED. Additionally, these directives can produce a false positive in certain VV_CROSSLOCK cases which require upgrading of the covered vnode lock from shared to exclusive. While here, replace the runtime check of LK_SHARED with a KASSERT and expand the check to include LK_NOWAIT, which all callers pass. Reviewed by: kib Tested by: pho Differential Revision: https://reviews.freebsd.org/D35054 --- sys/kern/vfs_lookup.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c index 589decb14fc2..318dcf6fb72b 100644 --- a/sys/kern/vfs_lookup.c +++ b/sys/kern/vfs_lookup.c @@ -105,21 +105,15 @@ crossmp_vop_lock1(struct vop_lock1_args *ap) { struct vnode *vp; struct lock *lk __diagused; - const char *file __witness_used; - int flags, line __witness_used; + int flags; vp = ap->a_vp; lk = vp->v_vnlock; flags = ap->a_flags; - file = ap->a_file; - line = ap->a_line; - if ((flags & LK_SHARED) == 0) - panic("invalid lock request for crossmp"); + KASSERT((flags & (LK_SHARED | LK_NOWAIT)) == (LK_SHARED | LK_NOWAIT), + ("%s: invalid lock request 0x%x for crossmp", __func__, flags)); - WITNESS_CHECKORDER(&lk->lock_object, LOP_NEWORDER, file, line, - flags & LK_INTERLOCK ? &VI_MTX(vp)->lock_object : NULL); - WITNESS_LOCK(&lk->lock_object, 0, file, line); if ((flags & LK_INTERLOCK) != 0) VI_UNLOCK(vp); LOCK_LOG_LOCK("SLOCK", &lk->lock_object, 0, 0, ap->a_file, ap->a_line); @@ -135,7 +129,6 @@ crossmp_vop_unlock(struct vop_unlock_args *ap) vp = ap->a_vp; lk = vp->v_vnlock; - WITNESS_UNLOCK(&lk->lock_object, 0, LOCK_FILE, LOCK_LINE); LOCK_LOG_LOCK("SUNLOCK", &lk->lock_object, 0, 0, LOCK_FILE, LOCK_LINE); return (0);