From owner-p4-projects@FreeBSD.ORG  Sat Jul 29 21:47:56 2006
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 994B316A58D; Sat, 29 Jul 2006 21:47:56 +0000 (UTC)
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 59D7B16A589
	for <perforce@freebsd.org>; Sat, 29 Jul 2006 21:47:56 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 2287743D49
	for <perforce@freebsd.org>; Sat, 29 Jul 2006 21:47:56 +0000 (GMT)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6TLluRa059148
	for <perforce@freebsd.org>; Sat, 29 Jul 2006 21:47:56 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6TLlteV059145
	for perforce@freebsd.org; Sat, 29 Jul 2006 21:47:55 GMT
	(envelope-from jb@freebsd.org)
Date: Sat, 29 Jul 2006 21:47:55 GMT
Message-Id: <200607292147.k6TLlteV059145@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 102737 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: Sat, 29 Jul 2006 21:47:56 -0000

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

Change 102737 by jb@jb_freebsd2 on 2006/07/29 21:47:22

	Integrate (from kmacy_sun4v) the change to panic if the mmu_tsb_ctxnon0
	hypervisor trap returns an error.
	
	With hypervisor trap tracing enabled, the last sensible trap I'm seeing
	reported before a rogue CPU goes of into the weeds (and doesn't respond
	to IPIs) is mmu_tsb_ctxnon0. Perhaps the args to that trap aren't
	valid.

Affected files ...

.. //depot/projects/dtrace/src/sys/sun4v/sun4v/swtch.S#3 integrate

Differences ...

==== //depot/projects/dtrace/src/sys/sun4v/sun4v/swtch.S#3 (text+ko) ====

@@ -27,18 +27,13 @@
 #include <machine/asm.h>
 __FBSDID("$FreeBSD: src/sys/sparc64/sparc64/swtch.S,v 1.33 2004/05/26 12:06:52 tmm Exp $");
 
-#include "opt_cpu_snapshot.h"
-
 #include <machine/asi.h>
 #include <machine/asmacros.h>
 #include <machine/ktr.h>
 #include <machine/tstate.h>
+#include <machine/mmu.h>
 #include <machine/hypervisorvar.h>
 
-#ifdef CPU_SNAPSHOT
-#include <machine/cpu_snapshot.h>
-#endif
-
 #include "assym.s"
 
 	.register	%g2, #ignore
@@ -220,30 +215,19 @@
 	cmp	%g0, %o0
 	be	%xcc, 4f
 	  nop
-	MAGIC_TRAP_ON
-	MAGIC_EXIT
-	
+	call	pmap_set_ctx_panic
+	  mov	%i2, %o2
 4:	/*
 	 * install the new secondary context number in the cpu.
 	 */
-	
+	sethi	%hi(FLUSH_ADDR), %l2	
 	SET_MMU_CONTEXT(%l6, %l5)
-	membar #Sync
+	flush	%l2
 	/*
 	 * Done.  Return and load the new process's window from the stack.
 	 */
-5:
-#ifdef CPU_SNAPSHOT
-	restore
-
-#include "machine/cpu_snapshot_save.h"
-
-	retl
-	 nop
-#else
-	ret
+5:	ret
 	 restore
-#endif
 END(cpu_switch)
 
 ENTRY(savectx)