From owner-svn-src-user@FreeBSD.ORG Mon May 26 13:11:39 2014 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0B840A6D; Mon, 26 May 2014 13:11:39 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id ECED4213E; Mon, 26 May 2014 13:11:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4QDBcq6009144; Mon, 26 May 2014 13:11:38 GMT (envelope-from attilio@svn.freebsd.org) Received: (from attilio@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4QDBcq3009139; Mon, 26 May 2014 13:11:38 GMT (envelope-from attilio@svn.freebsd.org) Message-Id: <201405261311.s4QDBcq3009139@svn.freebsd.org> From: Attilio Rao Date: Mon, 26 May 2014 13:11:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r266688 - in user/attilio/rm_vmobj_cache/sys: kern 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.18 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: Mon, 26 May 2014 13:11:39 -0000 Author: attilio Date: Mon May 26 13:11:38 2014 New Revision: 266688 URL: http://svnweb.freebsd.org/changeset/base/266688 Log: Fixup 2 cases where we were allocating via vm_page_grab(). Modified: user/attilio/rm_vmobj_cache/sys/kern/kern_sharedpage.c user/attilio/rm_vmobj_cache/sys/vm/vm_object.c Modified: user/attilio/rm_vmobj_cache/sys/kern/kern_sharedpage.c ============================================================================== --- user/attilio/rm_vmobj_cache/sys/kern/kern_sharedpage.c Mon May 26 12:28:34 2014 (r266687) +++ user/attilio/rm_vmobj_cache/sys/kern/kern_sharedpage.c Mon May 26 13:11:38 2014 (r266688) @@ -108,7 +108,8 @@ shared_page_init(void *dummy __unused) shared_page_obj = vm_pager_allocate(OBJT_PHYS, 0, PAGE_SIZE, VM_PROT_DEFAULT, 0, NULL); VM_OBJECT_WLOCK(shared_page_obj); - m = vm_page_grab(shared_page_obj, 0, VM_ALLOC_NOBUSY | VM_ALLOC_ZERO); + m = vm_page_grab(shared_page_obj, 0, VM_ALLOC_NOBUSY | VM_ALLOC_ZERO | + VM_ALLOC_WIRED); m->valid = VM_PAGE_BITS_ALL; VM_OBJECT_WUNLOCK(shared_page_obj); addr = kva_alloc(PAGE_SIZE); Modified: user/attilio/rm_vmobj_cache/sys/vm/vm_object.c ============================================================================== --- user/attilio/rm_vmobj_cache/sys/vm/vm_object.c Mon May 26 12:28:34 2014 (r266687) +++ user/attilio/rm_vmobj_cache/sys/vm/vm_object.c Mon May 26 13:11:38 2014 (r266688) @@ -2044,8 +2044,12 @@ vm_object_populate(vm_object_t object, v int rv; VM_OBJECT_ASSERT_WLOCKED(object); + KASSERT((object->flags & OBJ_UNMANAGED) != 0, + ("vm_object_populate: object %p cannot contain unmanaged pages", + object)); for (pindex = start; pindex < end; pindex++) { - m = vm_page_grab(object, pindex, VM_ALLOC_NORMAL); + m = vm_page_grab(object, pindex, VM_ALLOC_NORMAL | + VM_ALLOC_WIRED); if (m->valid != VM_PAGE_BITS_ALL) { ma[0] = m; rv = vm_pager_get_pages(object, ma, 1, 0);