From owner-svn-src-head@freebsd.org Sun Jan 5 01:00:12 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 400E01ECB38; Sun, 5 Jan 2020 01:00:12 +0000 (UTC) (envelope-from mjg@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47r0g00pXxz4rSw; Sun, 5 Jan 2020 01:00:12 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 170431D8E1; Sun, 5 Jan 2020 01:00:12 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 00510BWQ031471; Sun, 5 Jan 2020 01:00:11 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00510B4i031470; Sun, 5 Jan 2020 01:00:11 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202001050100.00510B4i031470@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Sun, 5 Jan 2020 01:00:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r356364 - head/sys/kern X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/kern X-SVN-Commit-Revision: 356364 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Jan 2020 01:00:12 -0000 Author: mjg Date: Sun Jan 5 01:00:11 2020 New Revision: 356364 URL: https://svnweb.freebsd.org/changeset/base/356364 Log: vfs: factor out avoidable branches in _vn_lock Modified: head/sys/kern/vfs_vnops.c Modified: head/sys/kern/vfs_vnops.c ============================================================================== --- head/sys/kern/vfs_vnops.c Sun Jan 5 00:59:47 2020 (r356363) +++ head/sys/kern/vfs_vnops.c Sun Jan 5 01:00:11 2020 (r356364) @@ -1564,28 +1564,53 @@ vn_poll(struct file *fp, int events, struct ucred *act * Acquire the requested lock and then check for validity. LK_RETRY * permits vn_lock to return doomed vnodes. */ -int -_vn_lock(struct vnode *vp, int flags, char *file, int line) +static int __noinline +_vn_lock_fallback(struct vnode *vp, int flags, char *file, int line, int error) { - int error; - VNASSERT((flags & LK_TYPE_MASK) != 0, vp, - ("vn_lock: no locktype")); - VNASSERT(vp->v_holdcnt != 0, vp, ("vn_lock: zero hold count")); -retry: - error = VOP_LOCK1(vp, flags, file, line); - flags &= ~LK_INTERLOCK; /* Interlock is always dropped. */ KASSERT((flags & LK_RETRY) == 0 || error == 0, ("vn_lock: error %d incompatible with flags %#x", error, flags)); + if (error == 0) + VNASSERT(VN_IS_DOOMED(vp), vp, ("vnode not doomed")); + if ((flags & LK_RETRY) == 0) { - if (error == 0 && VN_IS_DOOMED(vp)) { + if (error == 0) { VOP_UNLOCK(vp); error = ENOENT; } - } else if (error != 0) - goto retry; - return (error); + return (error); + } + + /* + * LK_RETRY case. + * + * Nothing to do if we got the lock. + */ + if (error == 0) + return (0); + + /* + * Interlock was dropped by the call in _vn_lock. + */ + flags &= ~LK_INTERLOCK; + do { + error = VOP_LOCK1(vp, flags, file, line); + } while (error != 0); + return (0); +} + +int +_vn_lock(struct vnode *vp, int flags, char *file, int line) +{ + int error; + + VNASSERT((flags & LK_TYPE_MASK) != 0, vp, ("vn_lock: no locktype")); + VNASSERT(vp->v_holdcnt != 0, vp, ("vn_lock: zero hold count")); + error = VOP_LOCK1(vp, flags, file, line); + if (__predict_false(error != 0 || VN_IS_DOOMED(vp))) + return (_vn_lock_fallback(vp, flags, file, line, error)); + return (0); } /*