From owner-p4-projects@FreeBSD.ORG  Mon Feb 25 04:12:53 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A961D16A52D; Mon, 25 Feb 2008 04:12:53 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6AB5F16A525
	for <perforce@freebsd.org>; Mon, 25 Feb 2008 04:12:53 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 4776613C442
	for <perforce@freebsd.org>; Mon, 25 Feb 2008 04:12:53 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1P4Cr0p020087
	for <perforce@freebsd.org>; Mon, 25 Feb 2008 04:12:53 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1P4CqiO020084
	for perforce@freebsd.org; Mon, 25 Feb 2008 04:12:52 GMT
	(envelope-from kmacy@freebsd.org)
Date: Mon, 25 Feb 2008 04:12:52 GMT
Message-Id: <200802250412.m1P4CqiO020084@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy <kmacy@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 136141 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: Mon, 25 Feb 2008 04:12:54 -0000

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

Change 136141 by kmacy@pandemonium:kmacy:xen31 on 2008/02/25 04:12:29

	increase logging - log SIGSEGV as well

Affected files ...

.. //depot/projects/xen31/sys/i386/i386/trap.c#10 edit

Differences ...

==== //depot/projects/xen31/sys/i386/i386/trap.c#10 (text+ko) ====

@@ -745,7 +745,7 @@
 {
 	vm_offset_t va;
 	struct vmspace *vm = NULL;
-	vm_map_t map;
+	vm_map_t map = NULL;
 	int rv = 0;
 	vm_prot_t ftype = 0;
 	struct thread *td = curthread;
@@ -834,10 +834,30 @@
 		return (-1);
 	}
 #ifdef XEN
-	if (rv == KERN_PROTECTION_FAILURE)
-		log(LOG_ERR, "SIGBUS: p=%s va=0x%x ftype=0x%x eip=0x%x\n", p->p_comm, va, ftype, frame->tf_eip);
+	if (rv) {
+		pt_entry_t pteval = 0;
+
+		if (PTD[va >> PDRSHIFT])
+			pteval = *(vtopte(va));
+		if (rv == KERN_PROTECTION_FAILURE) {
+			
+			CTR5(KTR_PMAP, "SIGBUS: p=%s va=0x%08x ftype=0x%x eip=0x%08x tf_err=0x%x *pte=%08x",
+			    p->p_comm, va, ftype, frame->tf_eip, (u_long)(pteval & 0xffffffff));
+			CTR4(KTR_PMAP,"\t pte=0x%08x map=%p pmap=%p err=0x%x",
+			    vtopte(va), map, &p->p_vmspace->vm_pmap, frame->tf_err);
+			log(LOG_ERR, "SIGBUS: p=%s va=0x%x ftype=0x%x eip=0x%x err=%d *pte=0x%016jx\n",
+			    p->p_comm, va, ftype, frame->tf_eip, frame->tf_err, pteval);
+		} else {
+			CTR5(KTR_PMAP, "SIGSEGV: p=%s va=0x%08x ftype=0x%x eip=0x%08x tf_err=0x%x *pte=%08x",
+			    p->p_comm, va, ftype, frame->tf_eip, (u_long)(pteval & 0xffffffff));
+			CTR4(KTR_PMAP,"\t pte=0x%08x map=%p pmap=%p err=0x%x",
+			    vtopte(va), map, &p->p_vmspace->vm_pmap, frame->tf_err);
+			log(LOG_ERR, "SIGSEGV: p=%s va=0x%x ftype=0x%x eip=0x%x err=%d *pte=0x%016jx\n",
+			    p->p_comm, va, ftype, frame->tf_eip, frame->tf_err, pteval);
+		}
+		
+	}
 #endif
-	    
 	return((rv == KERN_PROTECTION_FAILURE) ? SIGBUS : SIGSEGV);
 }