From owner-p4-projects@FreeBSD.ORG Fri Feb 29 19:48:19 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0F5001065A3B; Fri, 29 Feb 2008 19:48:17 +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 93697106570C for ; Fri, 29 Feb 2008 19:48:14 +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 8488A8FC23 for ; Fri, 29 Feb 2008 19:48:14 +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 m1TJmEaF092551 for ; Fri, 29 Feb 2008 19:48:14 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1TJmECG092549 for perforce@freebsd.org; Fri, 29 Feb 2008 19:48:14 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 29 Feb 2008 19:48:14 GMT Message-Id: <200802291948.m1TJmECG092549@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 136465 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Feb 2008 19:48:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=136465 Change 136465 by kmacy@pandemonium:kmacy:xen31 on 2008/02/28 22:50:33 augment logging at time of SIGBUS Affected files ... .. //depot/projects/xen31/sys/i386/i386/trap.c#11 edit Differences ... ==== //depot/projects/xen31/sys/i386/i386/trap.c#11 (text+ko) ==== @@ -841,19 +841,21 @@ 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); + CTR6(KTR_PMAP, "SIGBUS: pmap=%p p=%s va=0x%08x eip=0x%08x *pde=0x%x *pte=%08x", + &p->p_vmspace->vm_pmap, p->p_comm, va, frame->tf_eip,(u_long)PTD[va >> PDRSHIFT], + (u_long)(pteval & 0xffffffff)); + CTR4(KTR_PMAP,"\t pte=0x%08x map=%p pmap=%p err=0x%x ftype=0x%x", + vtopte(va), map, frame->tf_err, ftype); + log(LOG_ERR, "SIGBUS: pmap=%p, p=%s va=0x%x ftype=0x%x eip=0x%x err=%d *pte=0x%016jx\n", + &p->p_vmspace->vm_pmap, 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); + CTR6(KTR_PMAP, "SIGSEGV: pmap=%p, p=%s va=0x%08x eip=0x%08x *pde=0x%08x *pte=%08x", + &p->p_vmspace->vm_pmap, p->p_comm, va, frame->tf_eip, (u_long)PTD[va >> PDRSHIFT], + (u_long)(pteval & 0xffffffff)); + CTR4(KTR_PMAP,"\t pte=0x%08x map=%p err=0x%x ftype=0x%x", + vtopte(va), map, frame->tf_err, ftype); + log(LOG_ERR, "SIGSEGV: pmap=%p p=%s va=0x%x ftype=0x%x eip=0x%x err=%d *pte=0x%016jx\n", + &p->p_vmspace->vm_pmap, p->p_comm, va, ftype, frame->tf_eip, frame->tf_err, pteval); } }