svn commit: r332566 - in stable/11/sys: cddl/dev/dtrace/mips cddl/dev/fbt/mips mips/conf modules/dtrace modules/dtrace/dtraceall

[Kurt Lidl]

Author: lidl
Date: Mon Apr 16 14:39:04 2018
New Revision: 332566
URL: https://svnweb.freebsd.org/changeset/base/332566

Log:
  MFC r323206: Enable dtrace support for mips64 and the ERL kernel config
  
  Turn on the required options in the ERL config file, and ensure
  that the fbt module is listed as a dependency for mips in
  the modules/dtrace/dtraceall/dtraceall.c file.

Modified:
  stable/11/sys/cddl/dev/dtrace/mips/dtrace_asm.S
  stable/11/sys/cddl/dev/dtrace/mips/dtrace_subr.c
  stable/11/sys/cddl/dev/fbt/mips/fbt_isa.c
  stable/11/sys/mips/conf/ERL
  stable/11/sys/modules/dtrace/Makefile
  stable/11/sys/modules/dtrace/dtraceall/Makefile
  stable/11/sys/modules/dtrace/dtraceall/dtraceall.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/cddl/dev/dtrace/mips/dtrace_asm.S
==============================================================================
--- stable/11/sys/cddl/dev/dtrace/mips/dtrace_asm.S	Mon Apr 16 14:10:19 2018	(r332565)
+++ stable/11/sys/cddl/dev/dtrace/mips/dtrace_asm.S	Mon Apr 16 14:39:04 2018	(r332566)
@@ -37,8 +37,6 @@
 #include <machine/cpuregs.h>
 #include <machine/regnum.h>
 
-#include "assym.s"
-
         .set    noreorder               # Noreorder is default style!
 
 /*

Modified: stable/11/sys/cddl/dev/dtrace/mips/dtrace_subr.c
==============================================================================
--- stable/11/sys/cddl/dev/dtrace/mips/dtrace_subr.c	Mon Apr 16 14:10:19 2018	(r332565)
+++ stable/11/sys/cddl/dev/dtrace/mips/dtrace_subr.c	Mon Apr 16 14:39:04 2018	(r332566)
@@ -50,6 +50,8 @@ extern int (*dtrace_invop_jump_addr)(struct trapframe 
 extern dtrace_id_t	dtrace_probeid_error;
 
 int dtrace_invop(uintptr_t, struct trapframe *, uintptr_t);
+void dtrace_invop_init(void);
+void dtrace_invop_uninit(void);
 
 typedef struct dtrace_invop_hdlr {
 	int (*dtih_func)(uintptr_t, struct trapframe *, uintptr_t);

Modified: stable/11/sys/cddl/dev/fbt/mips/fbt_isa.c
==============================================================================
--- stable/11/sys/cddl/dev/fbt/mips/fbt_isa.c	Mon Apr 16 14:10:19 2018	(r332565)
+++ stable/11/sys/cddl/dev/fbt/mips/fbt_isa.c	Mon Apr 16 14:39:04 2018	(r332566)
@@ -82,7 +82,6 @@ fbt_provide_module_function(linker_file_t lf, int symi
     linker_symval_t *symval, void *opaque)
 {
 	fbt_probe_t *fbt, *retfbt;
-	uint32_t *target, *start;
 	uint32_t *instr, *limit;
 	const char *name;
 	char *modname;

Modified: stable/11/sys/mips/conf/ERL
==============================================================================
--- stable/11/sys/mips/conf/ERL	Mon Apr 16 14:10:19 2018	(r332565)
+++ stable/11/sys/mips/conf/ERL	Mon Apr 16 14:39:04 2018	(r332566)
@@ -85,15 +85,16 @@ options 	PRINTF_BUFR_SIZE=128	# Prevent printf output 
 options 	HWPMC_HOOKS		# Necessary kernel hooks for hwpmc(4)
 options 	AUDIT			# Security event auditing
 options 	MAC			# TrustedBSD MAC Framework
-#options 	KDTRACE_FRAME		# Ensure frames are compiled in
-#options 	KDTRACE_HOOKS		# Kernel DTrace hooks
-options 	INCLUDE_CONFIG_FILE     # Include this file in kernel
+options 	KDTRACE_FRAME		# Ensure frames are compiled in
+options 	KDTRACE_HOOKS		# Kernel DTrace hooks
+options 	DDB_CTF			# Kernel ELF linker loads CTF data
+options 	INCLUDE_CONFIG_FILE	# Include this file in kernel
 options 	NO_SWAPPING		# Disable support for paging
 options		TMPFS			# Temporary file system
 
 # Debugging for use in -current
 #options 	KDB			# Enable kernel debugger support.
-#options 	DDB			# Support DDB.
+options 	DDB			# Support DDB.
 #options 	GDB			# Support remote GDB.
 #options 	DEADLKRES		# Enable the deadlock resolver
 #options 	INVARIANTS		# Enable calls of extra sanity checking

Modified: stable/11/sys/modules/dtrace/Makefile
==============================================================================
--- stable/11/sys/modules/dtrace/Makefile	Mon Apr 16 14:10:19 2018	(r332565)
+++ stable/11/sys/modules/dtrace/Makefile	Mon Apr 16 14:39:04 2018	(r332566)
@@ -21,10 +21,14 @@ SUBDIR+=	systrace_linux32
 .if ${MACHINE_CPUARCH} == "powerpc"
 SUBDIR+=	fbt fasttrap
 .endif
-.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_ARCH} == "powerpc64"
+.if ${MACHINE_CPUARCH} == "amd64" || \
+    ${MACHINE_ARCH} == "mips64" || \
+    ${MACHINE_ARCH} == "powerpc64"
 SUBDIR+=	systrace_freebsd32
 .endif
-.if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "arm"
+.if ${MACHINE_CPUARCH} == "aarch64" || \
+    ${MACHINE_CPUARCH} == "arm" || \
+    ${MACHINE_CPUARCH} == "mips"
 SUBDIR+=	fbt
 .endif
 .include <bsd.subdir.mk>

Modified: stable/11/sys/modules/dtrace/dtraceall/Makefile
==============================================================================
--- stable/11/sys/modules/dtrace/dtraceall/Makefile	Mon Apr 16 14:10:19 2018	(r332565)
+++ stable/11/sys/modules/dtrace/dtraceall/Makefile	Mon Apr 16 14:39:04 2018	(r332566)
@@ -8,7 +8,7 @@ SRCS=		dtraceall.c opt_compat.h opt_nfs.h
 CFLAGS+=	-I${SYSDIR}
 
 .if !defined(KERNBUILDDIR)
-.if ${MACHINE_ARCH} == "amd64"
+.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "mips64"
 opt_compat.h:
 	echo "#define COMPAT_FREEBSD32 1" >> ${.TARGET}
 .endif

Modified: stable/11/sys/modules/dtrace/dtraceall/dtraceall.c
==============================================================================
--- stable/11/sys/modules/dtrace/dtraceall/dtraceall.c	Mon Apr 16 14:10:19 2018	(r332565)
+++ stable/11/sys/modules/dtrace/dtraceall/dtraceall.c	Mon Apr 16 14:39:04 2018	(r332566)
@@ -70,7 +70,8 @@ MODULE_DEPEND(dtraceall, dtmalloc, 1, 1, 1);
 MODULE_DEPEND(dtraceall, dtnfscl, 1, 1, 1);
 #endif
 #if defined(__aarch64__) || defined(__amd64__) || defined(__arm__) || \
-    defined(__i386__) || defined(__powerpc__)
+    defined(__i386__) || defined(__mips__) || \
+    defined(__powerpc__)
 MODULE_DEPEND(dtraceall, fbt, 1, 1, 1);
 #endif
 #if defined(__amd64__) || defined(__i386__)