Don't terminate when a dwarfless kprobe fails

All of our other kprobe types will let the script continue after a
registration failure, as per PR6749.  The dwarfless kprobes should be
no exception.

Also, the way they were exiting was causing an unclean shutdown, so I
added tests to badkprobe.exp to make sure that cleanup is always allowed
to run.

2 files changed, 24 insertions, 17 deletions

diff --git a/tapsets.cxx b/tapsets.cxx
index d16ae487..511289df 100644
--- a/tapsets.cxx
+++ b/tapsets.cxx
@@ -8586,14 +8586,7 @@ kprobe_derived_probe_group::emit_module_init (systemtap_session& s)
   s.op->newline(-1) << "}";
   s.op->newline() << "if (rc) {"; // PR6749: tolerate a failed register_*probe.
   s.op->newline(1) << "sdp->registered_p = 0;";
-  s.op->newline() << "if (rc == -EINVAL)";
-  s.op->newline() << "{";
-  s.op->newline() << "  _stp_error (\"Error registering kprobe, possibly an incorrect name %s OR addr = %p, rc = %d \", sdp->symbol_string, sdp->address, rc);";
-  s.op->newline() << "  atomic_set (&session_state, STAP_SESSION_ERROR);";
-  s.op->newline() << "  goto out;";
-  s.op->newline() << "}";
-  s.op->newline() << "else";
-  s.op->newline() << "_stp_warn (\"probe %s for %s registration error (rc %d)\", probe_point, sdp->pp, rc);";
+  s.op->newline() << "_stp_warn (\"probe %s registration error (rc %d)\", probe_point, rc);";
   s.op->newline() << "rc = 0;"; // continue with other probes
   // XXX: shall we increment numskipped?
   s.op->newline(-1) << "}";
diff --git a/testsuite/systemtap.base/badkprobe.exp b/testsuite/systemtap.base/badkprobe.exp
index efc06695..c0815fbe 100644
--- a/testsuite/systemtap.base/badkprobe.exp
+++ b/testsuite/systemtap.base/badkprobe.exp
@@ -1,14 +1,28 @@
-set script "probe kernel.statement(-1).absolute {} probe timer.s(1) { exit() }"
 set test "bad kprobe registration"
+set script {
+    probe $1 {}
+    probe timer.s(1) { exit() }
+    probe end { println("cleanup ok") }
+}
 
 if {! [installtest_p]} { untested $test; return }
 
-spawn stap -g -w -e "$script"
-expect {
-    -timeout 60
-    -re "^WARNING: probe .*registration error.*" { pass $test }
-    eof { fail "$test (eof)" }
-    timeout { fail "$test (timeout)" }
+set bad_kprobes {
+    kernel.statement(-1).absolute
+    kprobe.statement(-1).absolute
+    kprobe.function("no_such_function")
+    kprobe.function("no_such_function").return
+}
+
+foreach bk $bad_kprobes {
+    set test "bad kprobe registration: $bk"
+    spawn stap -g -w -e "$script" "$bk"
+    expect {
+        -timeout 60
+        -re "^WARNING: probe .*registration error.*\r\ncleanup ok" { pass $test }
+        eof { fail "$test (eof)" }
+        timeout { fail "$test (timeout)" }
+    }
+    catch {close}
+    catch {wait}
 }
-catch {close}
-catch {wait}