From owner-p4-projects@FreeBSD.ORG  Sun Oct 23 22:35:52 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0539B16A421; Sun, 23 Oct 2005 22:35:52 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id D3D6716A41F
	for <perforce@freebsd.org>; Sun, 23 Oct 2005 22:35:51 +0000 (GMT)
	(envelope-from alc@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9F67543D46
	for <perforce@freebsd.org>; Sun, 23 Oct 2005 22:35:51 +0000 (GMT)
	(envelope-from alc@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9NMZp4r042969
	for <perforce@freebsd.org>; Sun, 23 Oct 2005 22:35:51 GMT
	(envelope-from alc@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9NMZpot042966
	for perforce@freebsd.org; Sun, 23 Oct 2005 22:35:51 GMT
	(envelope-from alc@freebsd.org)
Date: Sun, 23 Oct 2005 22:35:51 GMT
Message-Id: <200510232235.j9NMZpot042966@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	alc@freebsd.org using -f
From: Alan Cox <alc@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 85756 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 23 Oct 2005 22:35:52 -0000

http://perforce.freebsd.org/chv.cgi?CH=85756

Change 85756 by alc@alc_home on 2005/10/23 22:35:04

	Assert that the object containing the reservation is locked in
	several functions.

Affected files ...

.. //depot/projects/superpages/src/sys/vm/vm_reserve.c#5 edit

Differences ...

==== //depot/projects/superpages/src/sys/vm/vm_reserve.c#5 (text+ko) ====

@@ -300,6 +300,7 @@
 {
 	int pos;
 
+	VM_OBJECT_LOCK_ASSERT(res->object, MA_OWNED);
 	KASSERT(!res->broken,("reserve_populate: reservation is broken"));
 	m->reserv = res;
 	for (;;) {
@@ -344,6 +345,7 @@
 	res = m->reserv;
 	KASSERT(res != NULL && !res->broken,
 	    ("reserve_unpopulate: no reservation or broken reservation"));
+	VM_OBJECT_LOCK_ASSERT(res->object, MA_OWNED);
 	for (sp = res;;) {
 		KASSERT(sp->popfrom != sp->popto && sp->refcnt > 0,
 		    ("reserve_unpopulate: sp not valid"));
@@ -570,6 +572,7 @@
 preempt_move(reservation_t sp, boolean_t to_tail)
 {
 
+	VM_OBJECT_LOCK_ASSERT(sp->object, MA_OWNED);
 	if (sp->rql != NO_RESQ) {
 		KASSERT(sp->rql >= -1 && sp->rql <= SP_LEVELS - 2 &&
 		    sp->rql < sp->level, ("preempt_move: sp->rql invalid"));