From owner-svn-src-stable-10@FreeBSD.ORG Sun May 4 07:19:37 2014
Return-Path: <owner-svn-src-stable-10@FreeBSD.ORG>
Delivered-To: svn-src-stable-10@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id D38419E8;
Sun, 4 May 2014 07:19:37 +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 A69CC172F;
Sun, 4 May 2014 07:19:37 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s447JbVC034013;
Sun, 4 May 2014 07:19:37 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
by svn.freebsd.org (8.14.8/8.14.8/Submit) id s447JbOK034012;
Sun, 4 May 2014 07:19:37 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <201405040719.s447JbOK034012@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Sun, 4 May 2014 07:19:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r265311 - stable/10/sys/vm
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
<svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>,
<mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>,
<mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 04 May 2014 07:19:37 -0000
Author: kib
Date: Sun May 4 07:19:37 2014
New Revision: 265311
URL: http://svnweb.freebsd.org/changeset/base/265311
Log:
MFC r265002:
Fix vm_fault_copy_entry() operation on upgrade; allow it to find the
pages in the shadowed objects.
Modified:
stable/10/sys/vm/vm_fault.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/vm/vm_fault.c
==============================================================================
--- stable/10/sys/vm/vm_fault.c Sun May 4 04:01:26 2014 (r265310)
+++ stable/10/sys/vm/vm_fault.c Sun May 4 07:19:37 2014 (r265311)
@@ -1229,7 +1229,7 @@ vm_fault_copy_entry(vm_map_t dst_map, vm
vm_offset_t vaddr;
vm_page_t dst_m;
vm_page_t src_m;
- boolean_t src_readonly, upgrade;
+ boolean_t upgrade;
#ifdef lint
src_map++;
@@ -1239,7 +1239,6 @@ vm_fault_copy_entry(vm_map_t dst_map, vm
src_object = src_entry->object.vm_object;
src_pindex = OFF_TO_IDX(src_entry->offset);
- src_readonly = (src_entry->protection & VM_PROT_WRITE) == 0;
/*
* Create the top-level object for the destination entry. (Doesn't
@@ -1310,25 +1309,33 @@ vm_fault_copy_entry(vm_map_t dst_map, vm
/*
* Find the page in the source object, and copy it in.
- * (Because the source is wired down, the page will be in
- * memory.)
+ * Because the source is wired down, the page will be
+ * in memory.
*/
VM_OBJECT_RLOCK(src_object);
object = src_object;
pindex = src_pindex + dst_pindex;
while ((src_m = vm_page_lookup(object, pindex)) == NULL &&
- src_readonly &&
(backing_object = object->backing_object) != NULL) {
/*
- * Allow fallback to backing objects if we are reading.
+ * Unless the source mapping is read-only or
+ * it is presently being upgraded from
+ * read-only, the first object in the shadow
+ * chain should provide all of the pages. In
+ * other words, this loop body should never be
+ * executed when the source mapping is already
+ * read/write.
*/
+ KASSERT((src_entry->protection & VM_PROT_WRITE) == 0 ||
+ upgrade,
+ ("vm_fault_copy_entry: main object missing page"));
+
VM_OBJECT_RLOCK(backing_object);
pindex += OFF_TO_IDX(object->backing_object_offset);
VM_OBJECT_RUNLOCK(object);
object = backing_object;
}
- if (src_m == NULL)
- panic("vm_fault_copy_wired: page missing");
+ KASSERT(src_m != NULL, ("vm_fault_copy_entry: page missing"));
pmap_copy_page(src_m, dst_m);
VM_OBJECT_RUNLOCK(object);
dst_m->valid = VM_PAGE_BITS_ALL;