PR442528 (PR6028): register dummy kprobes on ia64 for fixing bsp offset.

diff --git a/ChangeLog b/ChangeLog
index 96920e66a0021b9c0488c5b7f2053cf345f14411..747c6eb8c42f3b1be393b829a774c8d8ea9e4f5b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-07-18  Masami Hiramatsu  <mhiramat@redhat.com>
+
+       BZ 442528 (PR6028)
+       * tapsets.cxx (emit_module_decls): Add dummy kprobe on ia64.
+       (emit_module_init): register dummy kprobes for fixing bsp offset on
+       ia64.
+       (emit_module_exit): unregister dummy kprobes on ia64.
+
 2008-07-18  Frank Ch. Eigler  <fche@elastic.org>
 
        BZ 442528, From Masami Hiramatsu <mhiramat@redhat.com>

diff --git a/tapsets.cxx b/tapsets.cxx
index 5cd6f8a26c4ce819bf3b8acd5840346b3d2d6321..8c2bafb1ef9a3d4646b97c2285abe09891ed148e 100644 (file)
--- a/tapsets.cxx
+++ b/tapsets.cxx
@@ -4581,6 +4581,9 @@ dwarf_derived_probe_group::emit_module_decls (systemtap_session& s)
   // hundreds of bytes of padding per stap_dwarf_probe.  (PR5673)
   s.op->newline() << "struct stap_dwarf_kprobe {";
   s.op->newline(1) << "union { struct kprobe kp; struct kretprobe krp; } u;";
+  s.op->newline() << "#ifdef __ia64__";
+  s.op->newline() << "struct kprobe dummy;";
+  s.op->newline() << "#endif";
   s.op->newline(-1) << "} stap_dwarf_kprobes[" << probes_by_module.size() << "];";
   // NB: bss!
 
@@ -4719,11 +4722,35 @@ dwarf_derived_probe_group::emit_module_init (systemtap_session& s)
   s.op->newline(1) << "kp->u.krp.maxactive = max(10, 4*NR_CPUS);";
   s.op->newline(-1) << "}";
   s.op->newline() << "kp->u.krp.handler = &enter_kretprobe_probe;";
+  // to ensure safeness of bspcache, always use aggr_kprobe on ia64
+  s.op->newline() << "#ifdef __ia64__";
+  s.op->newline() << "kp->dummy.addr = kp->u.krp.kp.addr;";
+  s.op->newline() << "kp->dummy.pre_handler = NULL;";
+  s.op->newline() << "rc = register_kprobe (& kp->dummy);";
+  s.op->newline() << "if (rc == 0) {";
+  s.op->newline(1) << "rc = register_kretprobe (& kp->u.krp);";
+  s.op->newline() << "if (rc != 0)";
+  s.op->newline(1) << "unregister_kprobe (& kp->dummy);";
+  s.op->newline(-2) << "}";
+  s.op->newline() << "#else";
   s.op->newline() << "rc = register_kretprobe (& kp->u.krp);";
+  s.op->newline() << "#endif";
   s.op->newline(-1) << "} else {";
+  // to ensure safeness of bspcache, always use aggr_kprobe on ia64
   s.op->newline(1) << "kp->u.kp.addr = (void *) relocated_addr;";
   s.op->newline() << "kp->u.kp.pre_handler = &enter_kprobe_probe;";
+  s.op->newline() << "#ifdef __ia64__";
+  s.op->newline() << "kp->dummy.addr = kp->u.kp.addr;";
+  s.op->newline() << "kp->dummy.pre_handler = NULL;";
+  s.op->newline() << "rc = register_kprobe (& kp->dummy);";
+  s.op->newline() << "if (rc == 0) {";
+  s.op->newline(1) << "rc = register_kprobe (& kp->u.kp);";
+  s.op->newline() << "if (rc != 0)";
+  s.op->newline(1) << "unregister_kprobe (& kp->dummy);";
+  s.op->newline(-2) << "}";
+  s.op->newline() << "#else";
   s.op->newline() << "rc = register_kprobe (& kp->u.kp);";
+  s.op->newline() << "#endif";
   s.op->newline(-1) << "}";
   s.op->newline() << "if (rc) {";
   s.op->newline(1) << "for (j=i-1; j>=0; j--) {"; // partial rollback
@@ -4731,6 +4758,9 @@ dwarf_derived_probe_group::emit_module_init (systemtap_session& s)
   s.op->newline() << "struct stap_dwarf_kprobe *kp2 = & stap_dwarf_kprobes[j];";
   s.op->newline() << "if (sdp2->return_p) unregister_kretprobe (&kp2->u.krp);";
   s.op->newline() << "else unregister_kprobe (&kp2->u.kp);";
+  s.op->newline() << "#ifdef __ia64__";
+  s.op->newline() << "unregister_kprobe (&kp2->dummy);";
+  s.op->newline() << "#endif";
   // NB: we don't have to clear sdp2->registered_p, since the module_exit code is
   // not run for this early-abort case.
   s.op->newline(-1) << "}";
@@ -4764,6 +4794,16 @@ dwarf_derived_probe_group::emit_module_exit (systemtap_session& s)
   s.op->newline(1) << "stap_unreg_kprobes[j++] = &kp->u.krp;";
   s.op->newline(-2) << "}";
   s.op->newline() << "unregister_kretprobes((struct kretprobe **)stap_unreg_kprobes, j);";
+  s.op->newline() << "#ifdef __ia64__";
+  s.op->newline() << "j = 0;";
+  s.op->newline() << "for (i=0; i<" << probes_by_module.size() << "; i++) {";
+  s.op->newline(1) << "struct stap_dwarf_probe *sdp = & stap_dwarf_probes[i];";
+  s.op->newline() << "struct stap_dwarf_kprobe *kp = & stap_dwarf_kprobes[i];";
+  s.op->newline() << "if (! sdp->registered_p) continue;";
+  s.op->newline() << "stap_unreg_kprobes[j++] = &kp->dummy;";
+  s.op->newline(-1) << "}";
+  s.op->newline() << "unregister_kprobes((struct kprobe **)stap_unreg_kprobes, j);";
+  s.op->newline() << "#endif";
   s.op->newline() << "#endif";
 
   s.op->newline() << "for (i=0; i<" << probes_by_module.size() << "; i++) {";
@@ -4782,6 +4822,9 @@ dwarf_derived_probe_group::emit_module_exit (systemtap_session& s)
   s.op->newline() << "#endif";
   s.op->newline() << "atomic_add (kp->u.kp.nmissed, & skipped_count);";
   s.op->newline(-1) << "}";
+  s.op->newline() << "#if !defined(STAPCONF_UNREGISTER_KPROBES) && defined(__ia64__)";
+  s.op->newline() << "unregister_kprobe (&kp->dummy);";
+  s.op->newline() << "#endif";
   s.op->newline() << "sdp->registered_p = 0;";
   s.op->newline(-1) << "}";
 }