From owner-p4-projects  Sat Apr 13  8:27:26 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 94DC737B416; Sat, 13 Apr 2002 08:27:17 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id CE3E037B404
	for <perforce@freebsd.org>; Sat, 13 Apr 2002 08:27:16 -0700 (PDT)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g3DFRGW14275
	for perforce@freebsd.org; Sat, 13 Apr 2002 08:27:16 -0700 (PDT)
	(envelope-from tmm@freebsd.org)
Date: Sat, 13 Apr 2002 08:27:16 -0700 (PDT)
Message-Id: <200204131527.g3DFRGW14275@freefall.freebsd.org>
X-Authentication-Warning: freefall.freebsd.org: perforce set sender to tmm@freebsd.org using -f
From: Thomas Moestl <tmm@FreeBSD.org>
Subject: PERFORCE change 9657 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9657

Change 9657 by tmm@tmm_sparc64 on 2002/04/13 08:26:41

	Use pmap_extract() again for now to avoid the same problem that
	was also present in the pipe implementation.
	While being there, turn some diagnostic panics into KASSERT()s.

Affected files ...

... //depot/projects/sparc64/sys/sparc64/sparc64/vm_machdep.c#50 edit

Differences ...

==== //depot/projects/sparc64/sys/sparc64/sparc64/vm_machdep.c#50 (text+ko) ====

@@ -336,20 +336,15 @@
 void
 vmapbuf(struct buf *bp)
 {
-	vm_map_t map;
-	vm_map_entry_t me;
-	vm_object_t obj;
-	vm_pindex_t midx;
-	vm_prot_t prot, rprot;
-	boolean_t wired;
+	vm_prot_t prot;
 	caddr_t addr, kva;
 	int pidx;
 	struct vm_page *m;
+	vm_offset_t phys;
 
 	GIANT_REQUIRED;
 
-	if ((bp->b_flags & B_PHYS) == 0)
-		panic("vmapbuf");
+	KASSERT((bp->b_flags & B_PHYS) != 0, ("vmapbuf: not a B_PHYS buffer"));
 
 	/*
 	 * Use the d-cache color of b->b_data (the user space region) for the
@@ -373,19 +368,16 @@
 		 */
 		vm_fault_quick((addr >= (caddr_t)bp->b_saveaddr) ?
 		    addr : bp->b_saveaddr, prot);
-		map = &curproc->p_vmspace->vm_map;
-		if (vm_map_lookup(&map, (vm_offset_t)addr, prot, &me, &obj,
-		     &midx, &rprot, &wired) != KERN_SUCCESS ||
-		    (m = vm_page_lookup(obj, midx)) == NULL)
-			panic("vmapbuf: page not present");
-		vm_map_lookup_done(map, me);
+		phys = pmap_extract(&curproc->p_vmspace->vm_pmap,
+		    (vm_offset_t)addr);
+		KASSERT(phys != 0, ("vmapbuf: page not present"));
+		m = PHYS_TO_VM_PAGE(phys);
 		vm_page_hold(m);
 		bp->b_pages[pidx] = m;
 		pmap_enter(kernel_pmap, (vm_offset_t)kva, m,
 		    VM_PROT_READ | VM_PROT_WRITE, TRUE);
 	}
-	if (pidx > btoc(MAXPHYS))
-		panic("vmapbuf: mapped more than MAXPHYS");
+	KASSERT(pidx <= btoc(MAXPHYS), ("vmapbuf: mapped more than MAXPHYS"));
 
 	bp->b_npages = pidx;
 }
@@ -403,8 +395,8 @@
 
 	GIANT_REQUIRED;
 
-	if ((bp->b_flags & B_PHYS) == 0)
-		panic("vunmapbuf");
+	KASSERT((bp->b_flags & B_PHYS) != 0,
+	    ("vunmapbuf: not a B_PHYS buffer"));
 
 	npages = bp->b_npages;
 	kva = trunc_page((vm_offset_t)bp->b_data);

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message