From owner-svn-src-user@FreeBSD.ORG Tue May 21 15:48:38 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 0D122946; Tue, 21 May 2013 15:48:38 +0000 (UTC) (envelope-from attilio@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id F2358A8D; Tue, 21 May 2013 15:48:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4LFmbPc046768; Tue, 21 May 2013 15:48:37 GMT (envelope-from attilio@svn.freebsd.org) Received: (from attilio@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4LFmZZQ046757; Tue, 21 May 2013 15:48:35 GMT (envelope-from attilio@svn.freebsd.org) Message-Id: <201305211548.r4LFmZZQ046757@svn.freebsd.org> From: Attilio Rao Date: Tue, 21 May 2013 15:48:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r250857 - in user/attilio/vmobj-readlock/sys: amd64/amd64 arm/arm i386/i386 i386/xen ia64/ia64 mips/mips powerpc/aim powerpc/booke sparc64/sparc64 X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 May 2013 15:48:38 -0000 Author: attilio Date: Tue May 21 15:48:35 2013 New Revision: 250857 URL: http://svnweb.freebsd.org/changeset/base/250857 Log: Relax and complete object assert for pmap_enter_object(). Sponsored by: EMC / Isilon storage division Modified: user/attilio/vmobj-readlock/sys/amd64/amd64/pmap.c user/attilio/vmobj-readlock/sys/arm/arm/pmap-v6.c user/attilio/vmobj-readlock/sys/arm/arm/pmap.c user/attilio/vmobj-readlock/sys/i386/i386/pmap.c user/attilio/vmobj-readlock/sys/i386/xen/pmap.c user/attilio/vmobj-readlock/sys/ia64/ia64/pmap.c user/attilio/vmobj-readlock/sys/mips/mips/pmap.c user/attilio/vmobj-readlock/sys/powerpc/aim/mmu_oea.c user/attilio/vmobj-readlock/sys/powerpc/aim/mmu_oea64.c user/attilio/vmobj-readlock/sys/powerpc/booke/pmap.c user/attilio/vmobj-readlock/sys/sparc64/sparc64/pmap.c Modified: user/attilio/vmobj-readlock/sys/amd64/amd64/pmap.c ============================================================================== --- user/attilio/vmobj-readlock/sys/amd64/amd64/pmap.c Tue May 21 14:28:05 2013 (r250856) +++ user/attilio/vmobj-readlock/sys/amd64/amd64/pmap.c Tue May 21 15:48:35 2013 (r250857) @@ -3722,7 +3722,8 @@ pmap_enter_object(pmap_t pmap, vm_offset vm_page_t m, mpte; vm_pindex_t diff, psize; - VM_OBJECT_ASSERT_WLOCKED(m_start->object); + VM_OBJECT_ASSERT_LOCKED(m_start->object); + psize = atop(end - start); mpte = NULL; m = m_start; Modified: user/attilio/vmobj-readlock/sys/arm/arm/pmap-v6.c ============================================================================== --- user/attilio/vmobj-readlock/sys/arm/arm/pmap-v6.c Tue May 21 14:28:05 2013 (r250856) +++ user/attilio/vmobj-readlock/sys/arm/arm/pmap-v6.c Tue May 21 15:48:35 2013 (r250857) @@ -2931,6 +2931,8 @@ pmap_enter_object(pmap_t pmap, vm_offset vm_page_t m; vm_pindex_t diff, psize; + VM_OBJECT_ASSERT_LOCKED(m_start->object); + psize = atop(end - start); m = m_start; rw_wlock(&pvh_global_lock); Modified: user/attilio/vmobj-readlock/sys/arm/arm/pmap.c ============================================================================== --- user/attilio/vmobj-readlock/sys/arm/arm/pmap.c Tue May 21 14:28:05 2013 (r250856) +++ user/attilio/vmobj-readlock/sys/arm/arm/pmap.c Tue May 21 15:48:35 2013 (r250857) @@ -3587,6 +3587,8 @@ pmap_enter_object(pmap_t pmap, vm_offset vm_page_t m; vm_pindex_t diff, psize; + VM_OBJECT_ASSERT_LOCKED(m_start->object); + psize = atop(end - start); m = m_start; rw_wlock(&pvh_global_lock); Modified: user/attilio/vmobj-readlock/sys/i386/i386/pmap.c ============================================================================== --- user/attilio/vmobj-readlock/sys/i386/i386/pmap.c Tue May 21 14:28:05 2013 (r250856) +++ user/attilio/vmobj-readlock/sys/i386/i386/pmap.c Tue May 21 15:48:35 2013 (r250857) @@ -3677,7 +3677,8 @@ pmap_enter_object(pmap_t pmap, vm_offset vm_page_t m, mpte; vm_pindex_t diff, psize; - VM_OBJECT_ASSERT_WLOCKED(m_start->object); + VM_OBJECT_ASSERT_LOCKED(m_start->object); + psize = atop(end - start); mpte = NULL; m = m_start; Modified: user/attilio/vmobj-readlock/sys/i386/xen/pmap.c ============================================================================== --- user/attilio/vmobj-readlock/sys/i386/xen/pmap.c Tue May 21 14:28:05 2013 (r250856) +++ user/attilio/vmobj-readlock/sys/i386/xen/pmap.c Tue May 21 15:48:35 2013 (r250857) @@ -2871,7 +2871,8 @@ pmap_enter_object(pmap_t pmap, vm_offset multicall_entry_t *mclp = mcl; int error, count = 0; - VM_OBJECT_ASSERT_WLOCKED(m_start->object); + VM_OBJECT_ASSERT_LOCKED(m_start->object); + psize = atop(end - start); mpte = NULL; m = m_start; Modified: user/attilio/vmobj-readlock/sys/ia64/ia64/pmap.c ============================================================================== --- user/attilio/vmobj-readlock/sys/ia64/ia64/pmap.c Tue May 21 14:28:05 2013 (r250856) +++ user/attilio/vmobj-readlock/sys/ia64/ia64/pmap.c Tue May 21 15:48:35 2013 (r250857) @@ -1802,7 +1802,8 @@ pmap_enter_object(pmap_t pmap, vm_offset vm_page_t m; vm_pindex_t diff, psize; - VM_OBJECT_ASSERT_WLOCKED(m_start->object); + VM_OBJECT_ASSERT_LOCKED(m_start->object); + psize = atop(end - start); m = m_start; rw_wlock(&pvh_global_lock); Modified: user/attilio/vmobj-readlock/sys/mips/mips/pmap.c ============================================================================== --- user/attilio/vmobj-readlock/sys/mips/mips/pmap.c Tue May 21 14:28:05 2013 (r250856) +++ user/attilio/vmobj-readlock/sys/mips/mips/pmap.c Tue May 21 15:48:35 2013 (r250857) @@ -2399,7 +2399,8 @@ pmap_enter_object(pmap_t pmap, vm_offset vm_page_t m, mpte; vm_pindex_t diff, psize; - VM_OBJECT_ASSERT_WLOCKED(m_start->object); + VM_OBJECT_ASSERT_LOCKED(m_start->object); + psize = atop(end - start); mpte = NULL; m = m_start; Modified: user/attilio/vmobj-readlock/sys/powerpc/aim/mmu_oea.c ============================================================================== --- user/attilio/vmobj-readlock/sys/powerpc/aim/mmu_oea.c Tue May 21 14:28:05 2013 (r250856) +++ user/attilio/vmobj-readlock/sys/powerpc/aim/mmu_oea.c Tue May 21 15:48:35 2013 (r250857) @@ -1220,6 +1220,8 @@ moea_enter_object(mmu_t mmu, pmap_t pm, vm_page_t m; vm_pindex_t diff, psize; + VM_OBJECT_ASSERT_LOCKED(m_start->object); + psize = atop(end - start); m = m_start; rw_wlock(&pvh_global_lock); Modified: user/attilio/vmobj-readlock/sys/powerpc/aim/mmu_oea64.c ============================================================================== --- user/attilio/vmobj-readlock/sys/powerpc/aim/mmu_oea64.c Tue May 21 14:28:05 2013 (r250856) +++ user/attilio/vmobj-readlock/sys/powerpc/aim/mmu_oea64.c Tue May 21 15:48:35 2013 (r250857) @@ -1363,6 +1363,8 @@ moea64_enter_object(mmu_t mmu, pmap_t pm vm_page_t m; vm_pindex_t diff, psize; + VM_OBJECT_ASSERT_LOCKED(m_start->object); + psize = atop(end - start); m = m_start; while (m != NULL && (diff = m->pindex - m_start->pindex) < psize) { Modified: user/attilio/vmobj-readlock/sys/powerpc/booke/pmap.c ============================================================================== --- user/attilio/vmobj-readlock/sys/powerpc/booke/pmap.c Tue May 21 14:28:05 2013 (r250856) +++ user/attilio/vmobj-readlock/sys/powerpc/booke/pmap.c Tue May 21 15:48:35 2013 (r250857) @@ -1716,6 +1716,8 @@ mmu_booke_enter_object(mmu_t mmu, pmap_t vm_page_t m; vm_pindex_t diff, psize; + VM_OBJECT_ASSERT_LOCKED(m_start->object); + psize = atop(end - start); m = m_start; rw_wlock(&pvh_global_lock); Modified: user/attilio/vmobj-readlock/sys/sparc64/sparc64/pmap.c ============================================================================== --- user/attilio/vmobj-readlock/sys/sparc64/sparc64/pmap.c Tue May 21 14:28:05 2013 (r250856) +++ user/attilio/vmobj-readlock/sys/sparc64/sparc64/pmap.c Tue May 21 15:48:35 2013 (r250857) @@ -1632,6 +1632,8 @@ pmap_enter_object(pmap_t pm, vm_offset_t vm_page_t m; vm_pindex_t diff, psize; + VM_OBJECT_ASSERT_LOCKED(m_start->object); + psize = atop(end - start); m = m_start; rw_wlock(&tte_list_global_lock);