Merge branch 'master' of ssh://sources.redhat.com/git/systemtap

1 files changed, 118 insertions, 51 deletions

diff --git a/tapsets.cxx b/tapsets.cxx
index 449d7cc0..1b55684b 100644
--- a/tapsets.cxx
+++ b/tapsets.cxx
@@ -6230,6 +6230,27 @@ module_info::~module_info()
     delete sym_table;
 }
 
+// Helper function to emit vma tracker callback _stp_tf_vm_cb.
+static void
+emit_vma_callback_probe_decl (systemtap_session& s,
+			      string path,
+			      int64_t pid)
+{
+  s.op->newline() << "{";
+  if (pid == 0)
+    {
+      s.op->line() << " .pathname=\"" << path << "\",";
+      s.op->line() << " .pid=0,";
+    }
+  else
+    {
+      s.op->line() << " .pathname=NULL,";
+      s.op->line() << " .pid=" << pid << ",";
+    }
+  s.op->line() << " .callback=NULL,";
+  s.op->line() << " .vm_callback=&_stp_tf_vm_cb,";
+  s.op->line() << " },";
+}
 
 
 // ------------------------------------------------------------------------
@@ -6433,7 +6454,6 @@ itrace_derived_probe_group::emit_module_decls (systemtap_session& s)
 
   s.op->newline();
   s.op->newline() << "/* ---- itrace probes ---- */";
-  s.op->newline() << "#include \"task_finder.c\"";
   s.op->newline() << "struct stap_itrace_probe {";
   s.op->indent(1);
   s.op->newline() << "struct stap_task_finder_target tgt;";
@@ -6475,6 +6495,25 @@ itrace_derived_probe_group::emit_module_decls (systemtap_session& s)
   s.op->newline(-1) << "return rc;";
   s.op->newline(-1) << "}";
 
+  // Emit vma callbacks.
+  s.op->newline() << "#ifdef STP_NEED_VMA_TRACKER";
+  s.op->newline() << "static struct stap_task_finder_target stap_itrace_vmcbs[] = {";
+  s.op->indent(1);
+  if (! probes_by_path.empty())
+    {
+      for (p_b_path_iterator it = probes_by_path.begin();
+           it != probes_by_path.end(); it++)
+        emit_vma_callback_probe_decl (s, it->first, (int64_t)0);
+    }
+  if (! probes_by_pid.empty())
+    {
+      for (p_b_pid_iterator it = probes_by_pid.begin();
+           it != probes_by_pid.end(); it++)
+        emit_vma_callback_probe_decl (s, "", it->first);
+    }
+  s.op->newline(-1) << "};";
+  s.op->newline() << "#endif";
+
   s.op->newline() << "static struct stap_itrace_probe stap_itrace_probes[] = {";
   s.op->indent(1);
 
@@ -6516,11 +6555,37 @@ itrace_derived_probe_group::emit_module_init (systemtap_session& s)
     return;
 
   s.op->newline();
+  s.op->newline() << "#ifdef STP_NEED_VMA_TRACKER";
+  s.op->newline() << "/* ---- itrace vma callbacks ---- */";
+  s.op->newline() << "for (i=0; i<ARRAY_SIZE(stap_itrace_vmcbs); i++) {";
+  s.op->indent(1);
+  s.op->newline() << "struct stap_task_finder_target *r = &stap_itrace_vmcbs[i];";
+  s.op->newline() << "rc = stap_register_task_finder_target(r);";
+  s.op->newline(-1) << "}";
+  s.op->newline() << "#endif";
+
+  s.op->newline();
   s.op->newline() << "/* ---- itrace probes ---- */";
 
   s.op->newline() << "for (i=0; i<" << num_probes << "; i++) {";
   s.op->indent(1);
   s.op->newline() << "struct stap_itrace_probe *p = &stap_itrace_probes[i];";
+
+  // 'arch_has_single_step' needs to be defined for either single step mode
+  // or branch mode.
+  s.op->newline() << "if (!arch_has_single_step()) {";
+  s.op->indent(1);
+  s.op->newline() << "_stp_error (\"insn probe init: arch does not support step mode\");";
+  s.op->newline() << "rc = -EPERM;";
+  s.op->newline() << "break;";
+  s.op->newline(-1) << "}";
+  s.op->newline() << "if (!p->single_step && !arch_has_block_step()) {";
+  s.op->indent(1);
+  s.op->newline() << "_stp_error (\"insn probe init: arch does not support block step mode\");";
+  s.op->newline() << "rc = -EPERM;";
+  s.op->newline() << "break;";
+  s.op->newline(-1) << "}";
+
   s.op->newline() << "rc = stap_register_task_finder_target(&p->tgt);";
   s.op->newline(-1) << "}";
 }
@@ -6581,9 +6646,6 @@ private:
   bool flags_seen[UDPF_NFLAGS];
 
   void emit_probe_decl (systemtap_session& s, utrace_derived_probe *p);
-  void emit_vm_callback_probe_decl (systemtap_session& s, bool has_path,
-				    string path, int64_t pid,
-				    string vm_callback);
 
 public:
   utrace_derived_probe_group(): num_probes(0), flags_seen() { }
@@ -6965,40 +7027,6 @@ utrace_derived_probe_group::emit_probe_decl (systemtap_session& s,
 
 
 void
-utrace_derived_probe_group::emit_vm_callback_probe_decl (systemtap_session& s,
-							 bool has_path,
-							 string path,
-							 int64_t pid,
-							 string vm_callback)
-{
-  s.op->newline() << "{";
-  s.op->line() << " .tgt={";
-
-  if (has_path)
-    {
-      s.op->line() << " .pathname=\"" << path << "\",";
-      s.op->line() << " .pid=0,";
-    }
-  else
-    {
-      s.op->line() << " .pathname=NULL,";
-      s.op->line() << " .pid=" << pid << ",";
-    }
-
-  s.op->line() << " .callback=NULL,";
-  s.op->line() << " .vm_callback=&" << vm_callback << ",";
-  s.op->line() << " },";
-  s.op->line() << " .pp=\"internal\",";
-  s.op->line() << " .ph=NULL,";
-  s.op->line() << " .flags=(UDPF_NONE),";
-  s.op->line() << " .ops={ NULL },";
-  s.op->line() << " .events=0,";
-  s.op->line() << " .engine_attached=0,";
-  s.op->line() << " },";
-}
-
-
-void
 utrace_derived_probe_group::emit_module_decls (systemtap_session& s)
 {
   if (probes_by_path.empty() && probes_by_pid.empty())
@@ -7006,7 +7034,6 @@ utrace_derived_probe_group::emit_module_decls (systemtap_session& s)
 
   s.op->newline();
   s.op->newline() << "/* ---- utrace probes ---- */";
-  s.op->newline() << "#include \"task_finder.c\"";
 
   s.op->newline() << "enum utrace_derived_probe_flags {";
   s.op->indent(1);
@@ -7214,6 +7241,25 @@ utrace_derived_probe_group::emit_module_decls (systemtap_session& s)
   s.op->newline() << "return rc;";
   s.op->newline(-1) << "}";
 
+  // Emit vma callbacks.
+  s.op->newline() << "#ifdef STP_NEED_VMA_TRACKER";
+  s.op->newline() << "static struct stap_task_finder_target stap_utrace_vmcbs[] = {";
+  s.op->indent(1);
+  if (! probes_by_path.empty())
+    {
+      for (p_b_path_iterator it = probes_by_path.begin();
+           it != probes_by_path.end(); it++)
+	emit_vma_callback_probe_decl (s, it->first, (int64_t)0);
+    }
+  if (! probes_by_pid.empty())
+    {
+      for (p_b_pid_iterator it = probes_by_pid.begin();
+	   it != probes_by_pid.end(); it++)
+	emit_vma_callback_probe_decl (s, "", it->first);
+    }
+  s.op->newline(-1) << "};";
+  s.op->newline() << "#endif";
+
   s.op->newline() << "static struct stap_utrace_probe stap_utrace_probes[] = {";
   s.op->indent(1);
 
@@ -7223,12 +7269,6 @@ utrace_derived_probe_group::emit_module_decls (systemtap_session& s)
       for (p_b_path_iterator it = probes_by_path.begin();
 	   it != probes_by_path.end(); it++)
         {
-	  // Emit a "fake" probe decl that is really a hook for to get
-	  // our vm_callback called.
-	  string path = it->first;
-	  emit_vm_callback_probe_decl (s, true, path, (int64_t)0,
-				       "__stp_tf_vm_cb");
-
 	  for (unsigned i = 0; i < it->second.size(); i++)
 	    {
 	      utrace_derived_probe *p = it->second[i];
@@ -7243,11 +7283,6 @@ utrace_derived_probe_group::emit_module_decls (systemtap_session& s)
       for (p_b_pid_iterator it = probes_by_pid.begin();
 	   it != probes_by_pid.end(); it++)
         {
-	  // Emit a "fake" probe decl that is really a hook for to get
-	  // our vm_callback called.
-	  emit_vm_callback_probe_decl (s, false, "", it->first,
-				       "__stp_tf_vm_cb");
-
 	  for (unsigned i = 0; i < it->second.size(); i++)
 	    {
 	      utrace_derived_probe *p = it->second[i];
@@ -7266,6 +7301,15 @@ utrace_derived_probe_group::emit_module_init (systemtap_session& s)
     return;
 
   s.op->newline();
+  s.op->newline() << "#ifdef STP_NEED_VMA_TRACKER";
+  s.op->newline() << "/* ---- utrace vma callbacks ---- */";
+  s.op->newline() << "for (i=0; i<ARRAY_SIZE(stap_utrace_vmcbs); i++) {";
+  s.op->indent(1);
+  s.op->newline() << "struct stap_task_finder_target *r = &stap_utrace_vmcbs[i];";
+  s.op->newline() << "rc = stap_register_task_finder_target(r);";
+  s.op->newline(-1) << "}";
+  s.op->newline() << "#endif";
+
   s.op->newline() << "/* ---- utrace probes ---- */";
   s.op->newline() << "for (i=0; i<ARRAY_SIZE(stap_utrace_probes); i++) {";
   s.op->indent(1);
@@ -7495,7 +7539,6 @@ uprobe_derived_probe_group::emit_module_decls (systemtap_session& s)
   s.op->newline() << "#else";
   s.op->newline() << "#include \"uprobes/uprobes.h\"";
   s.op->newline() << "#endif";
-  s.op->newline() << "#include \"task_finder.c\"";
 
   s.op->newline() << "#ifndef MULTIPLE_UPROBES";
   s.op->newline() << "#define MULTIPLE_UPROBES 256"; // maximum possible armed uprobes per process() probe point
@@ -7513,6 +7556,21 @@ uprobe_derived_probe_group::emit_module_decls (systemtap_session& s)
   s.op->newline(-1) << "} stap_uprobes [MAXUPROBES];";
   s.op->newline() << "DEFINE_MUTEX(stap_uprobes_lock);"; // protects against concurrent registration/unregistration
 
+  // Emit vma callbacks.
+  s.op->newline() << "#ifdef STP_NEED_VMA_TRACKER";
+  s.op->newline() << "static struct stap_task_finder_target stap_uprobe_vmcbs[] = {";
+  s.op->indent(1);
+  for (unsigned i = 0; i < probes.size(); i++)
+    {
+      uprobe_derived_probe* p = probes[i];
+      if (p->pid != 0)
+	emit_vma_callback_probe_decl (s, "", p->pid);
+      else
+	emit_vma_callback_probe_decl (s, p->module, (int64_t)0);
+    }
+  s.op->newline(-1) << "};";
+  s.op->newline() << "#endif";
+
   s.op->newline() << "static struct stap_uprobe_spec {";
   s.op->newline(1) << "struct stap_task_finder_target finder;";
   s.op->newline() << "unsigned long address;";
@@ -7713,6 +7771,15 @@ void
 uprobe_derived_probe_group::emit_module_init (systemtap_session& s)
 {
   if (probes.empty()) return;
+  s.op->newline() << "#ifdef STP_NEED_VMA_TRACKER";
+  s.op->newline() << "/* ---- uprobe vma callbacks ---- */";
+  s.op->newline() << "for (i=0; i<ARRAY_SIZE(stap_uprobe_vmcbs); i++) {";
+  s.op->indent(1);
+  s.op->newline() << "struct stap_task_finder_target *r = &stap_uprobe_vmcbs[i];";
+  s.op->newline() << "rc = stap_register_task_finder_target(r);";
+  s.op->newline(-1) << "}";
+  s.op->newline() << "#endif";
+
   s.op->newline() << "/* ---- user probes ---- */";
 
   s.op->newline() << "for (j=0; j<MAXUPROBES; j++) {";