Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 29 Jul 2006 21:47:55 GMT
From:      John Birrell <jb@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 102737 for review
Message-ID:  <200607292147.k6TLlteV059145@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
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)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200607292147.k6TLlteV059145>