From owner-svn-src-user@FreeBSD.ORG Sun May 19 00:04:25 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 51368F69; Sun, 19 May 2013 00:04:25 +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 28B2CA76; Sun, 19 May 2013 00:04:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4J04PT1092646; Sun, 19 May 2013 00:04:25 GMT (envelope-from attilio@svn.freebsd.org) Received: (from attilio@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4J04PvA092645; Sun, 19 May 2013 00:04:25 GMT (envelope-from attilio@svn.freebsd.org) Message-Id: <201305190004.r4J04PvA092645@svn.freebsd.org> From: Attilio Rao Date: Sun, 19 May 2013 00:04:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r250794 - user/attilio/vmobj-readlock/sys/vm 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: Sun, 19 May 2013 00:04:25 -0000 Author: attilio Date: Sun May 19 00:04:24 2013 New Revision: 250794 URL: http://svnweb.freebsd.org/changeset/base/250794 Log: Revert previous patch and do what r250793 asks. Sponsored by: EMC / Isilon storage division Modified: user/attilio/vmobj-readlock/sys/vm/swap_pager.c Modified: user/attilio/vmobj-readlock/sys/vm/swap_pager.c ============================================================================== --- user/attilio/vmobj-readlock/sys/vm/swap_pager.c Sat May 18 23:49:45 2013 (r250793) +++ user/attilio/vmobj-readlock/sys/vm/swap_pager.c Sun May 19 00:04:24 2013 (r250794) @@ -128,21 +128,6 @@ __FBSDID("$FreeBSD$"); #endif /* - * Per-object swp_bcount must be protected by a write lock on the object - * itself or a read lock in combination with swhash_mtx held at the same time. - */ -#ifdef INVARIANTS -#define VM_OBJECT_BCOUNT_ASSERT_LOCKED(object) do { \ - if (mtx_owned(&swhash_mtx)) \ - VM_OBJECT_ASSERT_LOCKED(object); \ - else \ - VM_OBJECT_ASSERT_WLOCKED(object); \ -} while (0) -#else -#define VM_OBJECT_BCOUNT_ASSERT_LOCKED(object) -#endif - -/* * The swblock structure maps an object and a small, fixed-size range * of page indices to disk addresses within a swap area. * The collection of these mappings is implemented as a hash table. @@ -842,7 +827,6 @@ void swap_pager_freespace(vm_object_t object, vm_pindex_t start, vm_size_t size) { - VM_OBJECT_BCOUNT_ASSERT_LOCKED(object); swp_pager_meta_free(object, start, size); } @@ -1014,7 +998,7 @@ swap_pager_haspage(vm_object_t object, v { daddr_t blk0; - VM_OBJECT_BCOUNT_ASSERT_LOCKED(object) + VM_OBJECT_ASSERT_LOCKED(object); /* * do we have good backing store at the requested index ? */ @@ -1085,7 +1069,6 @@ static void swap_pager_unswapped(vm_page_t m) { - VM_OBJECT_BCOUNT_ASSERT_LOCKED(m->object); swp_pager_meta_ctl(m->object, m->pindex, SWM_FREE); } @@ -1939,7 +1922,7 @@ static void swp_pager_meta_free(vm_object_t object, vm_pindex_t index, daddr_t count) { - VM_OBJECT_BCOUNT_ASSERT_LOCKED(object); + VM_OBJECT_ASSERT_LOCKED(object); if (object->type != OBJT_SWAP) return; @@ -1985,7 +1968,7 @@ swp_pager_meta_free_all(vm_object_t obje { daddr_t index = 0; - VM_OBJECT_BCOUNT_ASSERT_LOCKED(object); + VM_OBJECT_ASSERT_WLOCKED(object); if (object->type != OBJT_SWAP) return; @@ -2044,7 +2027,7 @@ swp_pager_meta_ctl(vm_object_t object, v daddr_t r1; int idx; - VM_OBJECT_BCOUNT_ASSERT_LOCKED(object); + VM_OBJECT_ASSERT_LOCKED(object); /* * The meta data only exists of the object is OBJT_SWAP * and even then might not be allocated yet.