From owner-svn-src-head@freebsd.org Wed Sep 30 17:08:34 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 DFC9A42BE68; Wed, 30 Sep 2020 17:08:34 +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) 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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4C1jQB5hTDz4Wjj; Wed, 30 Sep 2020 17:08:34 +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 A6E2523068; Wed, 30 Sep 2020 17:08:34 +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 08UH8Ys2050810; Wed, 30 Sep 2020 17:08:34 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08UH8YRG050809; Wed, 30 Sep 2020 17:08:34 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009301708.08UH8YRG050809@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Wed, 30 Sep 2020 17:08:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r366293 - head/sys/kern X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/kern X-SVN-Commit-Revision: 366293 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.33 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: Wed, 30 Sep 2020 17:08:34 -0000 Author: mjg Date: Wed Sep 30 17:08:34 2020 New Revision: 366293 URL: https://svnweb.freebsd.org/changeset/base/366293 Log: cache: push the lock into cache_purge_impl Modified: head/sys/kern/vfs_cache.c Modified: head/sys/kern/vfs_cache.c ============================================================================== --- head/sys/kern/vfs_cache.c Wed Sep 30 16:11:37 2020 (r366292) +++ head/sys/kern/vfs_cache.c Wed Sep 30 17:08:34 2020 (r366293) @@ -2173,7 +2173,7 @@ cache_purge_impl(struct vnode *vp) TAILQ_INIT(&ncps); vlp = VP2VNODELOCK(vp); vlp2 = NULL; - mtx_assert(vlp, MA_OWNED); + mtx_lock(vlp); retry: while (!LIST_EMPTY(&vp->v_cache_src)) { ncp = LIST_FIRST(&vp->v_cache_src); @@ -2220,13 +2220,10 @@ cache_has_entries(struct vnode *vp) void cache_purge(struct vnode *vp) { - struct mtx *vlp; SDT_PROBE1(vfs, namecache, purge, done, vp); if (!cache_has_entries(vp)) return; - vlp = VP2VNODELOCK(vp); - mtx_lock(vlp); cache_purge_impl(vp); } @@ -2239,22 +2236,18 @@ cache_purge_vgone(struct vnode *vp) struct mtx *vlp; VNPASS(VN_IS_DOOMED(vp), vp); - vlp = VP2VNODELOCK(vp); if (cache_has_entries(vp)) { - mtx_lock(vlp); cache_purge_impl(vp); - mtx_assert(vlp, MA_NOTOWNED); return; } /* * Serialize against a potential thread doing cache_purge. */ + vlp = VP2VNODELOCK(vp); mtx_wait_unlocked(vlp); if (cache_has_entries(vp)) { - mtx_lock(vlp); cache_purge_impl(vp); - mtx_assert(vlp, MA_NOTOWNED); return; } return;