From owner-svn-src-all@freebsd.org Sun Aug 25 13:26:07 2019 Return-Path: Delivered-To: svn-src-all@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 72608DFC44; Sun, 25 Aug 2019 13:26:07 +0000 (UTC) (envelope-from kib@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 46GbW32DrQz3xkB; Sun, 25 Aug 2019 13:26:07 +0000 (UTC) (envelope-from kib@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 2E8D51E2C4; Sun, 25 Aug 2019 13:26:07 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x7PDQ6HG007921; Sun, 25 Aug 2019 13:26:06 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x7PDQ63D007919; Sun, 25 Aug 2019 13:26:06 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201908251326.x7PDQ63D007919@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Sun, 25 Aug 2019 13:26:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r351478 - head/sys/vm X-SVN-Group: head X-SVN-Commit-Author: kib X-SVN-Commit-Paths: head/sys/vm X-SVN-Commit-Revision: 351478 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Aug 2019 13:26:07 -0000 Author: kib Date: Sun Aug 25 13:26:06 2019 New Revision: 351478 URL: https://svnweb.freebsd.org/changeset/base/351478 Log: Move OBJT_VNODE specific code from vm_object_terminate() to vnode_destroy_vobject(). Reviewed by: alc, jeff (previous version), markj Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D21357 Modified: head/sys/vm/vm_object.c head/sys/vm/vnode_pager.c Modified: head/sys/vm/vm_object.c ============================================================================== --- head/sys/vm/vm_object.c Sun Aug 25 07:50:44 2019 (r351477) +++ head/sys/vm/vm_object.c Sun Aug 25 13:26:06 2019 (r351478) @@ -653,9 +653,10 @@ doterm: * recursion due to the terminate having to sync data * to disk. */ - if ((object->flags & OBJ_DEAD) == 0) + if ((object->flags & OBJ_DEAD) == 0) { + vm_object_set_flag(object, OBJ_DEAD); vm_object_terminate(object); - else + } else VM_OBJECT_WUNLOCK(object); object = temp; } @@ -746,35 +747,9 @@ vm_object_terminate_pages(vm_object_t object) void vm_object_terminate(vm_object_t object) { - VM_OBJECT_ASSERT_WLOCKED(object); - - /* - * Make sure no one uses us. - */ - vm_object_set_flag(object, OBJ_DEAD); - - /* - * Clean and free the pages, as appropriate. All references to the - * object are gone, so we don't need to lock it. - */ - if (object->type == OBJT_VNODE) { - struct vnode *vp = (struct vnode *)object->handle; - - /* - * Clean pages and flush buffers. - */ - vm_object_page_clean(object, 0, 0, OBJPC_SYNC); - VM_OBJECT_WUNLOCK(object); - - vinvalbuf(vp, V_SAVE, 0, 0); - - BO_LOCK(&vp->v_bufobj); - vp->v_bufobj.bo_flag |= BO_DEAD; - BO_UNLOCK(&vp->v_bufobj); - - VM_OBJECT_WLOCK(object); - } + KASSERT((object->flags & OBJ_DEAD) != 0, + ("terminating non-dead obj %p", object)); /* * wait for the pageout daemon to be done with the object Modified: head/sys/vm/vnode_pager.c ============================================================================== --- head/sys/vm/vnode_pager.c Sun Aug 25 07:50:44 2019 (r351477) +++ head/sys/vm/vnode_pager.c Sun Aug 25 13:26:06 2019 (r351478) @@ -200,6 +200,21 @@ vnode_destroy_vobject(struct vnode *vp) * don't double-terminate the object */ if ((obj->flags & OBJ_DEAD) == 0) { + vm_object_set_flag(obj, OBJ_DEAD); + + /* + * Clean pages and flush buffers. + */ + vm_object_page_clean(obj, 0, 0, OBJPC_SYNC); + VM_OBJECT_WUNLOCK(obj); + + vinvalbuf(vp, V_SAVE, 0, 0); + + BO_LOCK(&vp->v_bufobj); + vp->v_bufobj.bo_flag |= BO_DEAD; + BO_UNLOCK(&vp->v_bufobj); + + VM_OBJECT_WLOCK(obj); vm_object_terminate(obj); } else { /*