Re: What about MIPS support?

[William Cohen <wcohen at redhat dot com>]

On 10/15/2012 05:21 PM, Victor Kamensky wrote:
> Hi All,
> 
> It took us much much longer than originally expected. But it is better late than never. Here is our patches tarbal attached. Inside of tarbal (README file) and copied below I put short description of each patch. Some of patches are Cisco specific and may not be any interest for you. Some like MIPS support, cross compilation improvements, misc general fixes (i.e systemtap issue 6977), I think, could be quite useful to community. Since it is quilt patch series and patches may have patch apply order issues, we are publishing all of them, exactly as we use/apply them, regardless whether we consider them Cisco specific or not.
> 
> As it was discussed, for now, I am just dropping our patches as is. Latter as time permits, I can work on cleaning them up, moving to latest systemtap git and try to prepare them for commit into systemtap tree. It would be great if folks could take a look at patches and/or patches description and indicate priorities/interests for specific patches on which I could start working first.
> 
> Please advise if you would like me to post the same on different subject line on this mailing list (since it covers more than just mips support). I thought I just post it on original thread to get it proper closure.
> 
Hi All,

Last week I was on vacation, playing around with a MIPS base creator
board (http://www.elinux.org/MIPS_Creator_CI20), and seeing if I could
get systemtap running on it. After locally building the linux-3.0.8
kernel I was able to massage the systemtap-mips.patch from
https://sourceware.org/ml/systemtap/2012-q4/msg00084.html, so that
current systemtap is buildable and able to run a portion of the
testsuite on MIPS. Attached is the current modified patch. The tests hung in
the ./systemtap.base/limits.stp tests and a number of tests failed
because of issues with utrace functions not being found. The
systemtap.sum is also attached to this email.

-Will

> ==== systemtap-1.6-cisco-patches/README start =============================
> 
> This is patches series that Cisco did on top of systemtap-1.6. Some of them are Cisco specific and most likely are not interesting for community. We decided to
> provide them here anyway in order to avoid breakage in applying patches, because
> of patch application order issues.
> 
> Other like MIPS support, cross compilation improvements, misc general fixes may
> be some interest for SystemTap community.
> 
> Patch description follows order of patches in series file:
> 
> systemtap-configure_cross_compile.patch - change in configure logic to make it
>     more cross compilation environment friendly (in cross compile environment
>     one cannot test presence of /usr/include files; those are from host). We
>     don't use nss3 and avahi in our target so for now just introduce option
>     that could disable them. Most likely issue is fixed in latest tree.
> 
> systemtap-unwind-table-size.patch - IOS code is too big, we are hitting limit
>     on unwind symbol table size. Increase the limit for now. In future it would
>     be good code to adjust those values dynamically.
> 
> systemtap-fde_byte_order_fix.patch - Fix reading fde entry in case of cross
>     compilation where target and host have different byte order (i.e x86 host,
>     be mips is target).
> 
> systemtap-pointer-byte_size.patch - Fix related to ICC (intel compiler). There
>     is a difference how DW_AT_byte_size is stored between gcc and icc. Current
>     stap code tailored to gcc way. Need to go back and dig out more details
>     here.
> 
> systemtap-userland_caller.patch - Trying to introduce ucaller_addr and ucaller
>     systemtap function. Most likely this code does not work. But currently
>     patch is in our series file so keeping it for now.
> 
> systemtap-biendian.patch - Support ICC biendian feature. It is described at
>     http://software.intel.com/en-us/articles/dwarf-extensions-for-bi-endian-support/. Most
>     like this code has no interest to anyone except Cisco.
> 
> systemtap-old_compiler-task_finder.patch - Older gcc compiler (like gcc 3.4.x)
>     produce compilation warning here, incorrectly assuming that dentry may be
>     used uninitialized
> 
> systemtap-cross_compile_helper.patch - Cross compilation assist. Actually
>     include a lot of different small things. Here is the list of them (may not
>     be complete):
>     x) target system build may use difference 'gcc' and different 'make'.
>     Different values could be specified through SYSTEMTAP_TARGET_CC and
>     SYSTEMTAP_MAKE environment variable
>     x) -y option introduced. Once specified it will indicate that systemtap
>     compiler operates in cross compilation mode and value of option serves
>     sysroot path value. Stap compiler supports several such options (details
>     below)
>     x) if compiler in cross compilation mode it does not use PATH and
>     LD_LIBRARY_PATH to search for executables and libraries. Instead it uses
>     SYSTEMTAP_CROSS_PATH and SYSTEMTAP_CROSS_LD_LIBRARY_PATH environment
>     variables. PATH and LD_LIBRARY_PATH are usually different between host and
>     target. Note SYSTEMTAP_CROSS_PATH and SYSTEMTAP_CROSS_LD_LIBRARY_PATH could
>     be specified as relative of sysroot values, as well as host absolute
>     pathes
>     x) if stap compiler is in cross compilation mode it does not try to rebuild
>     uprobes. It assumes that uprobes.ko is already built and installed in
>     proper location in sysroot
>     x) find_executable function is replaced with special sysroot class that
>     handles different ways how file path needed during stap compilation (some
>     times it needs file path in host terms, sometimes it would need it as it
>     would be seen on target). Sysroot supports multiple sysroot. For example
>     like in openwrt case one may have target root file system and overlay file
>     system. Stap compiler in cross compilation mode can search both. Normally
>     look up happens as iteration over sysroots and for each sysroot we iterate
>     over list of directories specified in SYSTEMTAP_CROSS_PATH and
>     SYSTEMTAP_CROSS_LD_LIBRARY_PATH. Quite normal case when one sysroot is
>     specified so executables will be searched by adding sysroot value in front
>     of directories specified by SYSTEMTAP_CROSS_PATH and
>     SYSTEMTAP_CROSS_LD_LIBRARY_PATH.
> 
>     It is understood that above description may not be really sufficient to get
>     full understanding of this patch. If community is interested I can give
>     details explanation and see whether we can rework it. Above I just tried to
>     give a taste of what sort of issue we are dealing with when we work in
>     cross compiled environment
> 
> systemtap-data-in_another_cu.patch - Fix for issue
>     6977 http://sourceware.org/bugzilla/show_bug.cgi?id=6977. We found it is
>     very annoying and limiting for script writers, so we fixed it. It deals
>     with  situation of accessing global variables that are defined in *other*
>     compilation units.
> 
> systemtap-composed_rootfs_finder.patch - in embedded universe final root file
>     system may be composed as link farm to set of files system. Example is
>     Openwrt root file system and overlay. Systemtap runtime searches
>     executables by canonical name. It won't work for link farm case. For
>     link farm case ELF file name compiled into script is used as primary file
>     path to check for file in file system or as key in list of file systems
>     that participate in composition of final link farm. Outside of Cisco
>     patch may have interest to distros like OpenWrt.
> 
> systemtap-line_range_issue_fix.patch - memory leak and crash in
>     iterate_over_srcfile_lines in case of line ranges.
> 
> systemtap-icc_line_number.patch - deal with the way how ICC generates line
>     number information.
> 
> systemtap-data-in_library.patch - fix issues of accessing global data in
>     libraries (opposed to executables) Not sure whether it is applicable to
>     latest tree.
> 
> systemtap-mips-uprobes.patch - MIPS uprobes kernel module code.
> 
> systemtap-mips.patch - MIPS systemtap runtime and and tapset code.
> 
> systemtap-ppc32.patch - runtime fixes for powerpc 32bit case.
> 
> systemtap-smaller_buffer_size.patch - stap debugfs 1Mb buffer size is too big
>     for systems like  WRT54GL, where whole box has 16Mb or 32Mb of memory.
>     Change 'b' option handling, so smaller buffers could be specified (i.e in
>     Kbytes). Patch tries to be backward compatible with previous option usage
>     - if no size letter is specified, it is treated like Megabytes
> 
> systemtap-incorrect_kernel_buildid_hack.patch - there are idiosyncrasies in
>     Cisco build system when kernel rebuilt twice and buildid in target image
>     does not correspond to one we left to deal with on the host. This is hack
>     to deal with it. Should be ignored by everyone else.
> 
> systemtap-ios_keyword.patch - Cisco specific patch. Should be ignored by
>     everybody else. Introduces ios keyword (along with 'process' and 'kernel').
>     It deals with the fact that IOS process  canonical name changes depending
>     on IOS image feature key. 'ios' keyword allows us to have scripts reusable
>     across different target images. Real ios process name is passed with -i
>     option by higher level wrapper script.
> 
> systemtap-no_userland_prologue_search.patch - Add option '-U' that disables
>     function prologue  searches in user-land processes. Current -P affects only
>     kernel probes.
> 
> systemtap-kernel_source_tree.patch - Option -T allows to specify location of
>     kernel sources. Normally needed only in cross compilation environment.
> 
> systemtap-uprobes_in_kernel_as_module.patch - Fix for case when in cross
>     compilation environment we  may have uprobes built as module in kernel
>     build (opposite to built by systemtap). In this case, in order for
>     kernel_built_uprobes function to see unregister_uprobe symbol it has to be
>     added into kernel_exports even-though it comes from module (not uprobes)
> 
> systemtap-remote_hack.patch - allows remote_uris mechanism to work in cross
>     compilation environment, where target kernel release won't be the same as
>     host kernel release
> 
> systemtap-cross_testsuite.patch - Attempt to change testsuite to operate in
>     cross compilation environment where access to target happens either through
>     dejagnu remote target facilities or through stap --remote mechanism.
>     Massive patch, across bunch of test cases, not sure whether community has
>     any interest in it. It was used by us to validate systemtap operation on our
>     targets. In order to run, it requires stap board specific config (not
>     provided here), which would specify things like stap_board_args, and others.
> 
> systemtap-enable_vma_tracker.patch - cover corner cases where
>     _stp_umodule_relocate is used but vma_tracker is not enabled, while it
>     should be, becuase it uses stap_find_vma_map_info_user function.
> 
> Thanks,
> Victor


> 
> On Thu, 23 Aug 2012, Josh Stone wrote:
> 
>> On 08/22/2012 01:04 PM, Victor Kamensky wrote:
>>> Hi Per, Josh,
>>>
>>> We (Cisco) have pretty much full systemtap MIPS port.
>> [...]
>>> We always meant to publish all of it, but never get our hands on it. I
>>> hope this thread would be final push :). We will do it. Unfortunately, I
>>> cannot publish our patch series right away. I need to get permission from
>>> our company legal. It should not be a problem, but it may take two or
>>> three weeks.
>>
>> This is good news, and better that you're spurred now to share it. :)
>>
>>> Our latest series of patches is based on systemtap-1.6. I'll see whether I
>>> can find time and move them to latest git ... In worst case scenario we
>>> just publish what we have.
>>
>> IMO, it would be good to go ahead and post the 1.6 patches directly
>> after your legal clears it.  Then if you're willing and able to rebase
>> that onto the latest git, that's great, but we don't need to hold up
>> everything for that possibility.
>>
>> Thanks,
>> Josh
>>

>From a644485abb71047846c15a216fbcfc3b519c0afb Mon Sep 17 00:00:00 2001
From: Victor Kamensky <victor.kamensky@linaro.org>
Date: Wed, 5 Aug 2015 13:21:08 +0100
Subject: [PATCH] Add some support for MIPS processors

Signed-off-by: William Cohen <wcohen@redhat.com>
---
 runtime/linux/arith.c         |   29 ++++-
 runtime/linux/copy.c          |    2 +-
 runtime/linux/loc2c-runtime.h |  114 ++++++++++++++++-
 runtime/loc2c-runtime.h       |   26 ----
 runtime/regs.c                |  117 +++++++++++++++++
 runtime/regs.h                |    4 +
 runtime/stack.c               |    2 +
 runtime/syscall.h             |   49 ++++++++
 runtime/time.c                |   16 +++
 tapset/errno.stp              |    2 +
 tapset/linux/aux_syscalls.stp |    2 +-
 tapset/linux/scheduler.stp    |    2 +-
 tapset/linux/syscalls2.stp    |    8 ++
 tapset/mips/aux_syscalls.stp  |   44 +++++++
 tapset/mips/registers.stp     |  276 +++++++++++++++++++++++++++++++++++++++++
 tapsets.cxx                   |    1 +
 16 files changed, 662 insertions(+), 32 deletions(-)
 create mode 100644 tapset/mips/aux_syscalls.stp
 create mode 100644 tapset/mips/registers.stp

diff --git a/runtime/linux/arith.c b/runtime/linux/arith.c
index b64984a..57f457f 100644
--- a/runtime/linux/arith.c
+++ b/runtime/linux/arith.c
@@ -21,7 +21,8 @@
 /* Other 32-bit cpus will need to modify this file. */
 
 #if defined (__i386__) || defined(__arm__) || \
-	(defined(__powerpc__) && !defined(__powerpc64__))
+	(defined(__powerpc__) && !defined(__powerpc64__)) || \
+	(defined(__mips__) && !defined(__mips64))
 static long long _div64 (long long u, long long v);
 static long long _mod64 (long long u, long long v);
 #endif
@@ -116,7 +117,8 @@ static int _stp_random_pm (unsigned n)
 
 
 #if defined (__i386__) || defined (__arm__) || \
-	(defined(__powerpc__) && !defined(__powerpc64__))
+	(defined(__powerpc__) && !defined(__powerpc64__)) || \
+	(defined(__mips__) && !defined(__mips64))
 
 /* 64-bit division functions extracted from libgcc */
 typedef long long DWtype;
@@ -248,6 +250,29 @@ typedef union
 	   : "r" ((USItype) (a)),					\
 	     "r" ((USItype) (b)) __CLOBBER_CC );}
 
+#elif defined (__mips__)
+
+#define umul_ppmm(w1, w0, m0, m1)                                       \
+    __asm__ ("multu %2,%3\n"						\
+	     "mflo %0\n"						\
+	     "mfhi %1\n"						\
+	     : "=d" ((USItype) (w0)),					\
+	       "=d" ((USItype) (w1))					\
+	     : "d" ((USItype) (m0)),					\
+	       "d" ((USItype) (m1))					\
+	     : "hi", "lo" )
+
+
+#if !defined (sub_ddmmss)
+#define sub_ddmmss(sh, sl, ah, al, bh, bl) \
+  do {									\
+    UWtype __x;								\
+    __x = (al) - (bl);							\
+    (sh) = (ah) - (bh) - (__x > (al));					\
+    (sl) = __x;								\
+  } while (0)
+#endif
+
 #endif
 
 #define __udiv_qrnnd_c(q, r, n1, n0, d) \
diff --git a/runtime/linux/copy.c b/runtime/linux/copy.c
index 4e802b6..362623f 100644
--- a/runtime/linux/copy.c
+++ b/runtime/linux/copy.c
@@ -91,7 +91,7 @@ do {									   \
 #elif defined (__s390__) || defined (__s390x__)|| defined (__aarch64__)
 #define __stp_strncpy_from_user(dst,src,count,res) \
 	do { res = strncpy_from_user(dst, src, count); } while(0)
-#elif defined (__ia64__)
+#elif defined (__ia64__) || defined (__mips__)
 #define __stp_strncpy_from_user(dst,src,count,res)		\
 	do { res = __strncpy_from_user(dst, src, count); } while(0)
 #endif
diff --git a/runtime/linux/loc2c-runtime.h b/runtime/linux/loc2c-runtime.h
index a3bec58..d863c37 100644
--- a/runtime/linux/loc2c-runtime.h
+++ b/runtime/linux/loc2c-runtime.h
@@ -829,7 +829,119 @@ extern void __store_deref_bad(void);
 	STORE_DEREF_FAULT(addr); \
   })
 
-#endif /* (s390) || (s390x) */
+#elif defined __mips__
+
+/* macros lifted from arch/mips/include/asm/uaccess.h and changed a bit */
+
+#define __stp_get_user_asm(val, insn, addr, err)			\
+{									\
+	__asm__ __volatile__(						\
+	"1:	" insn "	%1, %3				\n"	\
+	"2:							\n"	\
+	"	.section .fixup,\"ax\"				\n"	\
+	"3:	li	%0, %4					\n"	\
+	"	j	2b					\n"	\
+	"	.previous					\n"	\
+	"	.section __ex_table,\"a\"			\n"	\
+	"	"__UA_ADDR "\t1b, 3b				\n"	\
+	"	.previous					\n"	\
+	: "=r" (err), "=r" (val)					\
+	: "0" (0), "o" (__m(addr)), "i" (-EFAULT));			\
+}
+
+#define __stp_put_user_asm(val, insn, addr, err)			\
+{									\
+	__asm__ __volatile__(						\
+	"1:	" insn "	%z2, %3		# __put_user_asm\n"	\
+	"2:							\n"	\
+	"	.section	.fixup,\"ax\"			\n"	\
+	"3:	li	%0, %4					\n"	\
+	"	j	2b					\n"	\
+	"	.previous					\n"	\
+	"	.section	__ex_table,\"a\"		\n"	\
+	"	" __UA_ADDR "	1b, 3b				\n"	\
+	"	.previous					\n"	\
+	: "=r" (err)							\
+	: "0" (0), "Jr" (val), "o" (__m(addr)),				\
+	  "i" (-EFAULT));						\
+}
+
+#define _stp_deref(size, addr, seg)					\
+  ({									\
+     int _bad = 0;							\
+     intptr_t _v=0;							\
+     mm_segment_t _oldfs = get_fs();                                    \
+     set_fs(seg);                                                       \
+     pagefault_disable();                                               \
+     if (lookup_bad_addr((unsigned long)addr, size))			\
+       _bad = 1;							\
+     else								\
+       switch (size){							\
+       case 1: __stp_get_user_asm(_v, "lb", addr, _bad); break;		\
+       case 2: __stp_get_user_asm(_v, "lh", addr, _bad); break;		\
+       case 4: __stp_get_user_asm(_v, "lw", addr, _bad); break;		\
+       case 8: __stp_get_user_asm(_v, "ld", addr, _bad); break;		\
+       default: __get_user_unknown(); break;				\
+       }								\
+     pagefault_enable();                                                \
+     set_fs(_oldfs);                                                    \
+     if (_bad)								\
+	DEREF_FAULT(addr);						\
+     _v;								\
+   })
+
+/* TODO kamensky: need to run test; did not have test case for that so far */
+
+#define _stp_store_deref(size, addr, value,seg)				\
+  ({									\
+    int _bad=0;								\
+    mm_segment_t _oldfs = get_fs();                                     \
+    set_fs(seg);                                                        \
+    pagefault_disable();                                                \
+    if (lookup_bad_addr((unsigned long)addr, size))			\
+      _bad = 1;								\
+    else								\
+      switch (size){							\
+      case 1: __stp_put_user_asm(value, "sb", addr, _bad); break;	\
+      case 2: __stp_put_user_asm(value, "sh", addr, _bad); break;	\
+      case 4: __stp_put_user_asm(value, "sw", addr, _bad); break;	\
+      case 8: __stp_put_user_asm(value, "sd", addr, _bad); break;	\
+      default: __put_user_unknown(); break;				\
+      }									\
+    pagefault_enable();                                                 \
+    set_fs(_oldfs);                                                     \
+    if (_bad)								\
+	   STORE_DEREF_FAULT(addr);					\
+   })
+
+#endif
+
+
+#if STP_SKIP_BADVARS
+#define DEREF_FAULT(addr) ({0; })
+#define STORE_DEREF_FAULT(addr) ({0; })
+#define CATCH_DEREF_FAULT() ({0; })
+#else
+#define DEREF_FAULT(addr) ({						    \
+    snprintf(c->error_buffer, sizeof(c->error_buffer),			    \
+      STAP_MSG_LOC2C_01, (void *)(intptr_t)(addr), #addr);   \
+    c->last_error = c->error_buffer;					    \
+    goto deref_fault;							    \
+    })
+
+#define STORE_DEREF_FAULT(addr) ({					    \
+    snprintf(c->error_buffer, sizeof(c->error_buffer),			    \
+      STAP_MSG_LOC2C_02, (void *)(intptr_t)(addr), #addr);  \
+    c->last_error = c->error_buffer;					    \
+    goto deref_fault;							    \
+    })
+
+#define CATCH_DEREF_FAULT()				\
+  if (0) {						\
+deref_fault: ;						\
+  }
+
+#endif
 
 
 /* Map kderef/uderef to the generic segment-aware deref macros. */ 
diff --git a/runtime/loc2c-runtime.h b/runtime/loc2c-runtime.h
index 69df205..52bdc7a 100644
--- a/runtime/loc2c-runtime.h
+++ b/runtime/loc2c-runtime.h
@@ -212,30 +212,4 @@
 
 #endif
 
-
-#if STP_SKIP_BADVARS
-#define DEREF_FAULT(addr) ({0; })
-#define STORE_DEREF_FAULT(addr) ({0; })
-#define CATCH_DEREF_FAULT() ({0; })
-#else
-#define DEREF_FAULT(addr) ({						    \
-    snprintf(c->error_buffer, sizeof(c->error_buffer),			    \
-      STAP_MSG_LOC2C_01, (void *)(intptr_t)(addr), #addr);   \
-    c->last_error = c->error_buffer;					    \
-    goto deref_fault;							    \
-    })
-
-#define STORE_DEREF_FAULT(addr) ({					    \
-    snprintf(c->error_buffer, sizeof(c->error_buffer),			    \
-      STAP_MSG_LOC2C_02, (void *)(intptr_t)(addr), #addr);  \
-    c->last_error = c->error_buffer;					    \
-    goto deref_fault;							    \
-    })
-
-#define CATCH_DEREF_FAULT()				\
-  if (0) {						\
-deref_fault: ;						\
-  }
-#endif
-
 #endif /* _LOC2C_RUNTIME_H_ */
diff --git a/runtime/regs.c b/runtime/regs.c
index ade3ad9..8a3f365 100644
--- a/runtime/regs.c
+++ b/runtime/regs.c
@@ -3,6 +3,7 @@
  * Copyright (C) 2005, 2007 Red Hat Inc.
  * Copyright (C) 2005 Intel Corporation.
  * Copyright (C) 2007 Quentin Barnes.
+ * Copyright (C) 2009 Sony Corporation.
  *
  * This file is part of systemtap, and is free software.  You can
  * redistribute it and/or modify it under the terms of the GNU General
@@ -23,6 +24,122 @@
 
 #include "dyninst/regs.c"
 
+#elif defined (__mips__)
+/*
+ * Only o32 application has 32bit registers. N32 and N64 both
+ * should use 64bit registers regardless of pointer size
+ */
+static int _stp_probing_app_with_32bit_regs(struct pt_regs *regs)
+{
+	if (!regs)
+		return 0;
+	return (user_mode(regs) &&
+                test_tsk_thread_flag(current, TIF_32BIT_REGS));
+}
+
+void _stp_print_regs(struct pt_regs * regs)
+{
+#ifdef MIPS_PRINT_REGS_SHOW_SYMBOLS
+        /* it is too much stack to do symbol translation by default */
+    	char symbol_name[KSYM_SYMBOL_LEN];
+#endif /* MIPS_PRINT_REGS_SHOW_SYMBOLS */
+	const int field = 2 * sizeof(unsigned long);
+	unsigned int cause = regs->cp0_cause;
+	int i;
+
+	_stp_printf("Cpu %d\n", smp_processor_id());
+
+	/*
+	 * Saved main processor registers
+	 */
+	for (i = 0; i < 32;) {
+		if ((i % 4) == 0)
+			_stp_printf("$%2d   :", i);
+		if (i == 0)
+			_stp_printf(" %0*lx", field, 0UL);
+		else if (i == 26 || i == 27)
+			_stp_printf(" %*s", field, "");
+		else
+			_stp_printf(" %0*lx", field, regs->regs[i]);
+
+		i++;
+		if ((i % 4) == 0)
+			_stp_printf("\n");
+	}
+
+	_stp_printf("Hi    : %0*lx\n", field, regs->hi);
+	_stp_printf("Lo    : %0*lx\n", field, regs->lo);
+
+	/*
+	 * Saved cp0 registers
+	 */
+	_stp_printf("epc   : %0*lx ", field, regs->cp0_epc);
+#ifdef MIPS_PRINT_REGS_SHOW_SYMBOLSx
+        sprint_symbol(symbol_name, regs->cp0_epc);
+	_stp_printf("%s ", symbol_name);
+#endif /* MIPS_PRINT_REGS_SHOW_SYMBOLS */
+
+	_stp_printf("ra    : %0*lx ", field, regs->regs[31]);
+#ifdef MIPS_PRINT_REGS_SHOW_SYMBOLS
+        sprint_symbol(symbol_name, regs->regs[31]);
+	_stp_printf("%s", symbol_name);
+#endif /* MIPS_PRINT_REGS_SHOW_SYMBOLS */
+	_stp_printf("\n");
+
+	_stp_printf("Status: %08x    ", (uint32_t) regs->cp0_status);
+
+	if (current_cpu_data.isa_level == MIPS_CPU_ISA_I) {
+		if (regs->cp0_status & ST0_KUO)
+			_stp_printf("KUo ");
+		if (regs->cp0_status & ST0_IEO)
+			_stp_printf("IEo ");
+		if (regs->cp0_status & ST0_KUP)
+			_stp_printf("KUp ");
+		if (regs->cp0_status & ST0_IEP)
+			_stp_printf("IEp ");
+		if (regs->cp0_status & ST0_KUC)
+			_stp_printf("KUc ");
+		if (regs->cp0_status & ST0_IEC)
+			_stp_printf("IEc ");
+	} else {
+		if (regs->cp0_status & ST0_KX)
+			_stp_printf("KX ");
+		if (regs->cp0_status & ST0_SX)
+			_stp_printf("SX ");
+		if (regs->cp0_status & ST0_UX)
+			_stp_printf("UX ");
+		switch (regs->cp0_status & ST0_KSU) {
+		case KSU_USER:
+			_stp_printf("USER ");
+			break;
+		case KSU_SUPERVISOR:
+			_stp_printf("SUPERVISOR ");
+			break;
+		case KSU_KERNEL:
+			_stp_printf("KERNEL ");
+			break;
+		default:
+			_stp_printf("BAD_MODE ");
+			break;
+		}
+		if (regs->cp0_status & ST0_ERL)
+			_stp_printf("ERL ");
+		if (regs->cp0_status & ST0_EXL)
+			_stp_printf("EXL ");
+		if (regs->cp0_status & ST0_IE)
+			_stp_printf("IE ");
+	}
+
+	_stp_printf("\n");
+
+	_stp_printf("Cause : %08x\n", cause);
+
+	cause = (((cause) & CAUSEF_EXCCODE) >> CAUSEB_EXCCODE);
+	if (1 <= cause && cause <= 5)
+		_stp_printf("BadVA : %0*lx\n", field, regs->cp0_badvaddr);
+
+	_stp_printf("PrId  : %08x\n", read_c0_prid());
+}
 #endif
 
 
diff --git a/runtime/regs.h b/runtime/regs.h
index 2f027ad..a4e13d2 100644
--- a/runtime/regs.h
+++ b/runtime/regs.h
@@ -54,6 +54,10 @@
 #define REG_SP(regs) regs->ARM_sp
 #define REG_LINK(regs) regs->ARM_lr
 
+#elif defined (__mips__)
+#define REG_IP(regs) regs->cp0_epc
+#define REG_SP(regs) regs->regs[29]
+
 #elif defined (__s390__) || defined (__s390x__)
 
 #ifndef __s390x__
diff --git a/runtime/stack.c b/runtime/stack.c
index a7d03db..b216e6e 100644
--- a/runtime/stack.c
+++ b/runtime/stack.c
@@ -78,6 +78,8 @@ static int _stp_valid_pc_addr(unsigned long addr, struct task_struct *tsk)
 #include "stack-ia64.c"
 #elif defined (__arm__)
 #include "stack-arm.c"
+#elif defined (__mips__)
+#include "stack-mips.c"
 #elif defined (__s390__)
 #include "stack-s390.c"
 #else
diff --git a/runtime/syscall.h b/runtime/syscall.h
index b959d46..7b50274 100644
--- a/runtime/syscall.h
+++ b/runtime/syscall.h
@@ -77,6 +77,55 @@
 #define MREMAP_SYSCALL_NO(tsk)		1156
 #endif
 
+#if defined(__mips__)
+/* n64 values: scall64-64.S */
+#define MMAP_SYSCALL_NO_MIPS_N64	5009
+#define MMAP2_SYSCALL_NO_MIPS_N64	((unsigned long)-1) /* does not exits */
+#define MPROTECT_SYSCALL_NO_MIPS_N64	5010
+#define MUNMAP_SYSCALL_NO_MIPS_N64	5011
+#define MREMAP_SYSCALL_NO_MIPS_N64	5024
+
+/* n32 values: scall64-n32.S */
+#define MMAP_SYSCALL_NO_MIPS_N32	6009
+#define MMAP2_SYSCALL_NO_MIPS_N32	((unsigned long)-1) /* does not exits */
+#define MPROTECT_SYSCALL_NO_MIPS_N32	6010
+#define MUNMAP_SYSCALL_NO_MIPS_N32	6011
+#define MREMAP_SYSCALL_NO_MIPS_N32	6024
+
+/* o32 values: scall32-o32.S */
+#define MMAP_SYSCALL_NO_MIPS_O32	4090
+#define MMAP2_SYSCALL_NO_MIPS_O32	4210
+#define MPROTECT_SYSCALL_NO_MIPS_O32	4125
+#define MUNMAP_SYSCALL_NO_MIPS_O32	4091
+#define MREMAP_SYSCALL_NO_MIPS_O32	4167
+
+#define MMAP_SYSCALL_NO(tsk) ((test_tsk_thread_flag((tsk), TIF_32BIT_ADDR)) ?	   \
+			      ((test_tsk_thread_flag((tsk), TIF_32BIT_REGS)) ?	   \
+			       (MMAP_SYSCALL_NO_MIPS_O32) :			   \
+			       (MMAP_SYSCALL_NO_MIPS_N32)) :			   \
+			      (MMAP_SYSCALL_NO_MIPS_N64))
+#define MMAP2_SYSCALL_NO(tsk) ((test_tsk_thread_flag((tsk), TIF_32BIT_ADDR)) ?	   \
+			      ((test_tsk_thread_flag((tsk), TIF_32BIT_REGS)) ?	   \
+			       (MMAP2_SYSCALL_NO_MIPS_O32) :			   \
+			       (MMAP2_SYSCALL_NO_MIPS_N32)) :			   \
+			      (MMAP2_SYSCALL_NO_MIPS_N64))
+#define MPROTECT_SYSCALL_NO(tsk) ((test_tsk_thread_flag((tsk), TIF_32BIT_ADDR)) ?  \
+			      ((test_tsk_thread_flag((tsk), TIF_32BIT_REGS)) ?	   \
+			       (MPROTECT_SYSCALL_NO_MIPS_O32) :			   \
+			       (MPROTECT_SYSCALL_NO_MIPS_N32)) :		   \
+			      (MPROTECT_SYSCALL_NO_MIPS_N64))
+#define MUNMAP_SYSCALL_NO(tsk) ((test_tsk_thread_flag((tsk), TIF_32BIT_ADDR)) ?	   \
+			      ((test_tsk_thread_flag((tsk), TIF_32BIT_REGS)) ?	   \
+			       (MUNMAP_SYSCALL_NO_MIPS_O32) :			   \
+			       (MUNMAP_SYSCALL_NO_MIPS_N32)) :			   \
+			      (MUNMAP_SYSCALL_NO_MIPS_N64))
+#define MREMAP_SYSCALL_NO(tsk) ((test_tsk_thread_flag((tsk), TIF_32BIT_ADDR)) ?	   \
+			      ((test_tsk_thread_flag((tsk), TIF_32BIT_REGS)) ?	   \
+			       (MREMAP_SYSCALL_NO_MIPS_O32) :			   \
+			       (MREMAP_SYSCALL_NO_MIPS_N32)) :			   \
+			      (MREMAP_SYSCALL_NO_MIPS_N64))
+#endif
+
 #if defined(__s390__) || defined(__s390x__)
 #define MMAP_SYSCALL_NO(tsk)		90
 #define MMAP2_SYSCALL_NO(tsk)		192
diff --git a/runtime/time.c b/runtime/time.c
index 10bb2aa..9cffc6f 100644
--- a/runtime/time.c
+++ b/runtime/time.c
@@ -40,6 +40,22 @@ static int __stp_cpufreq_notifier_registered = 0;
                                 STP_TIME_SYNC_INTERVAL_NOCPUFREQ)
 #endif
 
+#ifdef CONFIG_CPU_CAVIUM_OCTEON
+/* Octeon supports a 64 bit cycle counter we might as well use it */
+static inline cycles_t octeon_get_cycles(void)
+{
+    cycles_t result;
+    asm volatile ("rdhwr %0,$31\n"
+#ifndef CONFIG_64BIT
+                  "sll %0,0\n"
+#endif
+                  : "=r" (result));
+    return result;
+}
+#define get_cycles octeon_get_cycles
+#endif /* CONFIG_CPU_CAVIUM_OCTEON */
+
+
 #ifndef NSEC_PER_MSEC
 #define NSEC_PER_MSEC	1000000L
 #endif
diff --git a/tapset/errno.stp b/tapset/errno.stp
index df1ccbd..7e1d2f4 100644
--- a/tapset/errno.stp
+++ b/tapset/errno.stp
@@ -390,6 +390,8 @@ static long _stp_returnval(struct pt_regs *regs) {
 		return regs->regs[0];
 #elif defined (__arm__)
 		return regs->ARM_r0;
+#elif defined (__mips__)
+		return regs->regs[2];
 #else
 		_stp_error("returnval() not defined for this architecture");
 		return 0;
diff --git a/tapset/linux/aux_syscalls.stp b/tapset/linux/aux_syscalls.stp
index 6c1ead2..9fd9cf7 100644
--- a/tapset/linux/aux_syscalls.stp
+++ b/tapset/linux/aux_syscalls.stp
@@ -3355,7 +3355,7 @@ static void _stp_sigaction_str(struct sigaction *act, char *ptr, int len)
       strlcat (ptr, ", ", len);
       _stp_lookup_or_str(_stp_sa_flags_list, act->sa_flags, ptr, len);
       strlcat (ptr, ", ", len);
-#if !defined (__ia64__)
+#if !defined (__ia64__) && !defined (__mips__)
       slen = strlen(ptr);
       _stp_snprintf(ptr + slen, len - slen,
 		    "0x%lx, ", (long)act->sa_restorer);
diff --git a/tapset/linux/scheduler.stp b/tapset/linux/scheduler.stp
index 579b4c2..6f5c0cc 100644
--- a/tapset/linux/scheduler.stp
+++ b/tapset/linux/scheduler.stp
@@ -117,7 +117,7 @@ probe scheduler.balance = kernel.function("idle_balance") ?
  */
 
 probe scheduler.ctxswitch = kernel.trace("sched_switch") !,
-%( arch != "x86_64" && arch != "ia64" && arch != "arm" %?
+%( arch != "x86_64" && arch != "ia64" && arch != "arm"  && arch != "mips" %?
 	kernel.function("__switch_to")
 %:
 	kernel.function("context_switch")
diff --git a/tapset/linux/syscalls2.stp b/tapset/linux/syscalls2.stp
index b39f17d..8579c84 100644
--- a/tapset/linux/syscalls2.stp
+++ b/tapset/linux/syscalls2.stp
@@ -1867,7 +1867,11 @@ probe syscall.rt_sigreturn.return =
 	kernel.function("sys32_rt_sigreturn").return ?
 {
 	name = "rt_sigreturn"
+%( arch == "mips" %?
+	retstr = "void"
+%:
 	retstr = return_str(1, $return)
+%)
 }
 
 # rt_sigsuspend ______________________________________________
@@ -3878,7 +3882,11 @@ probe syscall.sigreturn.return = kernel.function("sys_sigreturn").return ?,
                                  kernel.function("sys32_sigreturn").return ?
 {
 	name = "sigreturn"
+%( arch == "mips" %?
+	retstr = "void"
+%:
 	retstr = return_str(1, $return)
+%)
 }
 
 # sigsuspend _________________________________________________
diff --git a/tapset/mips/aux_syscalls.stp b/tapset/mips/aux_syscalls.stp
new file mode 100644
index 0000000..5de5485
--- /dev/null
+++ b/tapset/mips/aux_syscalls.stp
@@ -0,0 +1,44 @@
+# arch-specific requests of ptrace ___________________________
+#
+function _arch_ptrace_argstr(request, pid, addr, data)
+{
+	if (request == %{ PTRACE_GETREGS %})
+		// TODO: Retrieve *data in .return
+		return sprintf ("PTRACE_GETREGS, %d, data=%p", pid, data)
+	if (request == %{ PTRACE_SETREGS %})
+		// TODO: Retrieve *data here
+		return sprintf ("PTRACE_SETREGS, %d, data=%p", pid, data)
+	if (request == %{ PTRACE_GETFPREGS %})
+		// TODO: Retrieve *data in .return
+		return sprintf ("PTRACE_GETFPREGS, %d, data=%p", pid, data)
+	if (request == %{ PTRACE_SETFPREGS %})
+		// TODO: Retrieve *data here
+		return sprintf ("PTRACE_SETFPREGS, %d, data=%p", pid, data)
+	if (request == %{ PTRACE_PEEKTEXT_3264 %})
+		// TODO: Retrieve *data in .return
+		return sprintf ("PTRACE_PEEKTEXT_3264, %d, *addr=%p, data=%p", pid, user_long(addr), data)
+	if (request == %{ PTRACE_PEEKDATA_3264 %})
+		// TODO: Retrieve *data in .return
+		return sprintf ("PTRACE_PEEKDATA_3264, %d, *addr=%p, data=%p", pid, user_long(addr), data)
+	if (request == %{ PTRACE_POKETEXT_3264 %})
+		return sprintf ("PTRACE_POKETEXT_3264, %d, *addr=%p, data=%p", pid, user_long(addr), data)
+	if (request == %{ PTRACE_POKEDATA_3264 %})
+		return sprintf ("PTRACE_POKEDATA_3264, %d, *addr=%p, data=%p", pid, user_long(addr), data)
+	if (request == %{ PTRACE_GET_THREAD_AREA %})
+		// TODO: Retrieve *data in .return
+		return sprintf ("PTRACE_GET_THREAD_AREA, %d, index=%d, data=%p", pid, addr, data)
+	if (request == %{ PTRACE_GET_THREAD_AREA_3264 %})
+		// TODO: Retrieve *data in .return
+		return sprintf ("PTRACE_GET_THREAD_AREA_3264, %d, index=%d, data=%p", pid, addr, data)
+	if (request == %{ PTRACE_GET_WATCH_REGS %})
+		// TODO: Retrieve *data in .return
+		return sprintf ("PTRACE_GET_WATCH_REGS, %d, data=%p", pid, data)
+	if (request == %{ PTRACE_SET_WATCH_REGS %})
+		// TODO: Retrieve *data here
+		return sprintf ("PTRACE_SET_WATCH_REGS, %d, data=%p", pid, data)
+}
+
+function _ptrace_return_arch_prctl_addr:long(request:long, addr:long, data:long)
+{
+	return 0
+}
diff --git a/tapset/mips/registers.stp b/tapset/mips/registers.stp
new file mode 100644
index 0000000..be50f76
--- /dev/null
+++ b/tapset/mips/registers.stp
@@ -0,0 +1,276 @@
+/* Dwarfless register access for mips */
+
+global _reg_offsets, _stp_regs_registered
+
+function _stp_register_regs() {
+%( CONFIG_64BIT == "y" %?
+        /* n32/n64 registers naming scheme */
+	/* Same order as struct pt_regs */
+	_reg_offsets["zero"] = 0
+	_reg_offsets["at"] = 8
+	_reg_offsets["v0"] = 16
+	_reg_offsets["v1"] = 24
+	_reg_offsets["a0"] = 32
+	_reg_offsets["a1"] = 40
+	_reg_offsets["a2"] = 48
+	_reg_offsets["a3"] = 56
+	_reg_offsets["a4"] = 64
+	_reg_offsets["a5"] = 72
+	_reg_offsets["a6"] = 80
+	_reg_offsets["a7"] = 88
+	_reg_offsets["t0"] = 96
+	_reg_offsets["t1"] = 104
+	_reg_offsets["t2"] = 112
+	_reg_offsets["t3"] = 120
+	_reg_offsets["s0"] = 128
+	_reg_offsets["s1"] = 136
+	_reg_offsets["s2"] = 144
+	_reg_offsets["s3"] = 152
+	_reg_offsets["s4"] = 160
+	_reg_offsets["s5"] = 168
+	_reg_offsets["s6"] = 176
+	_reg_offsets["s7"] = 184
+	_reg_offsets["t8"] = 192
+	_reg_offsets["t9"] = 200
+	_reg_offsets["k0"] = 208
+	_reg_offsets["k1"] = 216
+	_reg_offsets["gp"] = 224
+	_reg_offsets["sp"] = 232
+	_reg_offsets["s8"] = 240       _reg_offsets["fp"] = 240
+	_reg_offsets["ra"] = 248
+
+	_reg_offsets["status"] = 256
+	_reg_offsets["hi"] = 264
+	_reg_offsets["lo"] = 272
+
+        /*
+         * no CONFIG_CPU_HAS_SMARTMIPS support for now, if it is
+         * enabled below values will be wrong
+         */
+
+	_reg_offsets["badvaddr"] = 280
+	_reg_offsets["cause"] = 288
+	_reg_offsets["epc"] = 296
+
+        /* no cp0_tcstatus register for now */
+        /* no mpl and mtp registers for now */
+%:
+        /* o32 registers naming scheme */
+	/* Same order as struct pt_regs */
+	_reg_offsets["zero"] = 24
+	_reg_offsets["at"] = 28
+	_reg_offsets["v0"] = 32
+	_reg_offsets["v1"] = 36
+	_reg_offsets["a0"] = 40
+	_reg_offsets["a1"] = 44
+	_reg_offsets["a2"] = 48
+	_reg_offsets["a3"] = 52
+	_reg_offsets["t0"] = 56
+	_reg_offsets["t1"] = 60
+	_reg_offsets["t2"] = 64
+	_reg_offsets["t3"] = 68
+	_reg_offsets["t4"] = 72
+	_reg_offsets["t5"] = 76
+	_reg_offsets["t6"] = 80
+	_reg_offsets["t7"] = 84
+	_reg_offsets["s0"] = 88
+	_reg_offsets["s1"] = 92
+	_reg_offsets["s2"] = 96
+	_reg_offsets["s3"] = 100
+	_reg_offsets["s4"] = 104
+	_reg_offsets["s5"] = 108
+	_reg_offsets["s6"] = 112
+	_reg_offsets["s7"] = 116
+	_reg_offsets["t8"] = 120
+	_reg_offsets["t9"] = 124
+	_reg_offsets["k0"] = 128
+	_reg_offsets["k1"] = 132
+	_reg_offsets["gp"] = 136
+	_reg_offsets["sp"] = 140
+	_reg_offsets["s8"] = 144     _reg_offsets["fp"] = 144
+	_reg_offsets["ra"] = 148
+
+	_reg_offsets["status"] = 152
+	_reg_offsets["hi"] = 156
+	_reg_offsets["lo"] = 160
+
+        /*
+         * no CONFIG_CPU_HAS_SMARTMIPS support for now, if it is
+         * enabled below values will be wrong
+         */
+	_reg_offsets["badvaddr"] = 164
+	_reg_offsets["cause"] = 168
+	_reg_offsets["epc"] = 172
+
+        /* no cp0_tcstatus register for now */
+        /* no mpl and mtp registers for now */
+%)
+	_stp_regs_registered = 1
+}
+
+function probing_app_with_32bit_regs() %{ /* pure */
+        THIS->__retvalue = _stp_probing_app_with_32bit_regs(CONTEXT->regs);
+%}
+
+function _stp_get_register_by_offset:long (offset:long) %{ /* pure */
+	long value;
+	if (!CONTEXT->regs) {
+		CONTEXT->last_error = "No registers available in this context";
+		return;
+	}
+	if (THIS->offset < 0 || THIS->offset > sizeof(struct pt_regs) - sizeof(long)) {
+		snprintf(CONTEXT->error_buffer, sizeof(CONTEXT->error_buffer),
+				"Bad register offset: %lld",
+				(long long)THIS->offset);
+		CONTEXT->last_error = CONTEXT->error_buffer;
+		return;
+	}
+	memcpy(&value, ((char *)CONTEXT->regs) + THIS->offset, sizeof(value));
+	THIS->__retvalue = value;
+%}
+
+function _stp_sign_extend32:long (value:long) {
+	if (value & 0x80000000)
+		value |= (0xffffffff << 32)
+	return value
+}
+
+function _stp_register:long (name:string, sign_extend:long) {
+	if (!registers_valid()) {
+		error("cannot access CPU registers in this context")
+		return 0
+	}
+	if (!_stp_regs_registered)
+		_stp_register_regs()
+	offset = _reg_offsets[name]
+	if (offset == 0 && !(name in _reg_offsets)) {
+		error("Unknown register: " . name)
+		return 0
+	}
+	value = _stp_get_register_by_offset(offset)
+%( CONFIG_64BIT == "y" %?
+	if (probing_app_with_32bit_regs()) {
+%)
+		if (sign_extend)
+			value = _stp_sign_extend32(value)
+		else
+			value &= 0xffffffff
+%( CONFIG_64BIT == "y" %?
+	}
+%)
+	return value
+}
+
+/* Return the named register value as a signed value. */
+function register:long (name:string) {
+	return _stp_register(name, 1)
+}
+
+/*
+ * Return the named register value as an unsigned value.  Specifically,
+ * don't sign-extend the register value when promoting it to 64 bits.
+ */
+function u_register:long (name:string) {
+	return _stp_register(name, 0)
+}
+
+/*
+ * Return the value of function arg #argnum (1=first arg).
+ * If truncate=1, mask off the top 32 bits.
+ * If sign_extend=1 and (truncate=1 or the probepoint we've hit is in a
+ * 32-bit app), sign-extend the 32-bit value.
+ */
+function _stp_arg:long (argnum:long, sign_extend:long, truncate:long) {
+	val = 0
+	if (argnum < 1 || argnum > 8) {
+		error(sprintf("Cannot access arg(%d)", argnum))
+		return 0
+	}
+
+	if (argnum == 1)
+		val = u_register("a0")
+	else if (argnum == 2)
+		val = u_register("a1")
+	else if (argnum == 3)
+		val = u_register("a2")
+	else if (argnum == 4)
+		val = u_register("a3")
+	else if (argnum == 5)
+		val = u_register("a4")
+	else if (argnum == 6)
+		val = u_register("a5")
+	else if (argnum == 7)
+		val = u_register("a6")
+	else if (argnum == 8)
+		val = u_register("a7")
+
+	if (truncate) {
+		if (sign_extend)
+			val = _stp_sign_extend32(val)
+		else
+			/* High bits may be garbage. */
+			val = (val & 0xffffffff);
+	}
+	return val;
+}
+
+/* Return the value of function arg #argnum (1=first arg) as a signed int. */
+function int_arg:long (argnum:long) {
+	return _stp_arg(argnum, 1, 1)
+}
+
+/* Return the value of function arg #argnum (1=first arg) as an unsigned int. */
+function uint_arg:long (argnum:long) {
+	return _stp_arg(argnum, 0, 1)
+}
+
+function long_arg:long (argnum:long) {
+	return _stp_arg(argnum, 1, 0)
+}
+
+function ulong_arg:long (argnum:long) {
+	return _stp_arg(argnum, 0, 0)
+}
+
+function longlong_arg:long (argnum:long) {
+	if (probing_app_with_32bit_regs()) {
+		lowbits = _stp_arg(argnum, 0, 1)
+		highbits = _stp_arg(argnum+1, 0, 1)
+		return ((highbits << 32) | lowbits)
+	} else
+		return _stp_arg(argnum, 0, 0)
+}
+
+function ulonglong_arg:long (argnum:long) {
+	return longlong_arg(argnum)
+}
+
+function pointer_arg:long (argnum:long) {
+	return _stp_arg(argnum, 0, 0)
+}
+
+function s32_arg:long (argnum:long) {
+	return int_arg(argnum)
+}
+
+function u32_arg:long (argnum:long) {
+	return uint_arg(argnum)
+}
+
+function s64_arg:long (argnum:long) {
+	return longlong_arg(argnum)
+}
+
+function u64_arg:long (argnum:long) {
+	return ulonglong_arg(argnum)
+}
+
+function asmlinkage() %{ /* pure */ %}
+
+function fastcall() %{ /* pure */ %}
+
+function regparm() %{
+	snprintf(CONTEXT->error_buffer, sizeof(CONTEXT->error_buffer),
+		"regparm is invalid on mips.");
+	CONTEXT->last_error = CONTEXT->error_buffer;
+%}
diff --git a/tapsets.cxx b/tapsets.cxx
index 2a50fbd..dd80185 100644
--- a/tapsets.cxx
+++ b/tapsets.cxx
@@ -2397,6 +2397,7 @@ validate_module_elf (Dwfl_Module *mod, const char *name,  base_query *q)
     case EM_IA_64: expect_machine = "ia64"; break;
     case EM_ARM: expect_machine = "arm*"; break;
     case EM_AARCH64: expect_machine = "arm64"; break;
+    case EM_MIPS: expect_machine = "mips"; break;
       // XXX: fill in some more of these
     default: expect_machine = "?"; break;
     }
-- 
1.7.10.4

Attachment: systemtap.sum
Description: Text document