tracing/kprobe: Integrate test warnings into WARN_ONCE

Cleanup the redundant WARN_ON_ONCE(cond) + pr_warn(msg) into
WARN_ONCE(cond, msg). Also add some WARN_ONCE() for hitcount check.
These WARN_ONCE() errors makes it easy to handle errors from ktest.

Link: https://lore.kernel.org/all/171811264685.85078.8068819097047430463.stgit@devnote2/
Suggested-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
Reviewed-by: Steven Rostedt (Google) <rostedt@goodmis.org>

diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
index 16383247bdbf1cb620511c3c81c3abf888a69832..8c5816c04bd2b31403f743b75dc924a6133ad8ea 100644 (file)
--- a/kernel/trace/trace_kprobe.c
+++ b/kernel/trace/trace_kprobe.c
@@ -2023,19 +2023,16 @@ static __init int kprobe_trace_self_tests_init(void)
        pr_info("Testing kprobe tracing: ");
 
        ret = create_or_delete_trace_kprobe("p:testprobe kprobe_trace_selftest_target $stack $stack0 +0($stack)");
-       if (WARN_ON_ONCE(ret)) {
-               pr_warn("error on probing function entry.\n");
+       if (WARN_ONCE(ret, "error on probing function entry.")) {
                warn++;
        } else {
                /* Enable trace point */
                tk = find_trace_kprobe("testprobe", KPROBE_EVENT_SYSTEM);
-               if (WARN_ON_ONCE(tk == NULL)) {
-                       pr_warn("error on getting new probe.\n");
+               if (WARN_ONCE(tk == NULL, "error on probing function entry.")) {
                        warn++;
                } else {
                        file = find_trace_probe_file(tk, top_trace_array());
-                       if (WARN_ON_ONCE(file == NULL)) {
-                               pr_warn("error on getting probe file.\n");
+                       if (WARN_ONCE(file == NULL, "error on getting probe file.")) {
                                warn++;
                        } else
                                enable_trace_kprobe(
@@ -2044,19 +2041,16 @@ static __init int kprobe_trace_self_tests_init(void)
        }
 
        ret = create_or_delete_trace_kprobe("r:testprobe2 kprobe_trace_selftest_target $retval");
-       if (WARN_ON_ONCE(ret)) {
-               pr_warn("error on probing function return.\n");
+       if (WARN_ONCE(ret, "error on probing function return.")) {
                warn++;
        } else {
                /* Enable trace point */
                tk = find_trace_kprobe("testprobe2", KPROBE_EVENT_SYSTEM);
-               if (WARN_ON_ONCE(tk == NULL)) {
-                       pr_warn("error on getting 2nd new probe.\n");
+               if (WARN_ONCE(tk == NULL, "error on getting 2nd new probe.")) {
                        warn++;
                } else {
                        file = find_trace_probe_file(tk, top_trace_array());
-                       if (WARN_ON_ONCE(file == NULL)) {
-                               pr_warn("error on getting probe file.\n");
+                       if (WARN_ONCE(file == NULL, "error on getting probe file.")) {
                                warn++;
                        } else
                                enable_trace_kprobe(
@@ -2079,18 +2073,15 @@ static __init int kprobe_trace_self_tests_init(void)
 
        /* Disable trace points before removing it */
        tk = find_trace_kprobe("testprobe", KPROBE_EVENT_SYSTEM);
-       if (WARN_ON_ONCE(tk == NULL)) {
-               pr_warn("error on getting test probe.\n");
+       if (WARN_ONCE(tk == NULL, "error on getting test probe.")) {
                warn++;
        } else {
-               if (trace_kprobe_nhit(tk) != 1) {
-                       pr_warn("incorrect number of testprobe hits\n");
+               if (WARN_ONCE(trace_kprobe_nhit(tk) != 1,
+                                "incorrect number of testprobe hits."))
                        warn++;
-               }
 
                file = find_trace_probe_file(tk, top_trace_array());
-               if (WARN_ON_ONCE(file == NULL)) {
-                       pr_warn("error on getting probe file.\n");
+               if (WARN_ONCE(file == NULL, "error on getting probe file.")) {
                        warn++;
                } else
                        disable_trace_kprobe(
@@ -2098,18 +2089,15 @@ static __init int kprobe_trace_self_tests_init(void)
        }
 
        tk = find_trace_kprobe("testprobe2", KPROBE_EVENT_SYSTEM);
-       if (WARN_ON_ONCE(tk == NULL)) {
-               pr_warn("error on getting 2nd test probe.\n");
+       if (WARN_ONCE(tk == NULL, "error on getting 2nd test probe.")) {
                warn++;
        } else {
-               if (trace_kprobe_nhit(tk) != 1) {
-                       pr_warn("incorrect number of testprobe2 hits\n");
+               if (WARN_ONCE(trace_kprobe_nhit(tk) != 1,
+                                "incorrect number of testprobe2 hits."))
                        warn++;
-               }
 
                file = find_trace_probe_file(tk, top_trace_array());
-               if (WARN_ON_ONCE(file == NULL)) {
-                       pr_warn("error on getting probe file.\n");
+               if (WARN_ONCE(file == NULL, "error on getting probe file.")) {
                        warn++;
                } else
                        disable_trace_kprobe(
@@ -2117,23 +2105,19 @@ static __init int kprobe_trace_self_tests_init(void)
        }
 
        ret = create_or_delete_trace_kprobe("-:testprobe");
-       if (WARN_ON_ONCE(ret)) {
-               pr_warn("error on deleting a probe.\n");
+       if (WARN_ONCE(ret, "error on deleting a probe."))
                warn++;
-       }
 
        ret = create_or_delete_trace_kprobe("-:testprobe2");
-       if (WARN_ON_ONCE(ret)) {
-               pr_warn("error on deleting a probe.\n");
+       if (WARN_ONCE(ret, "error on deleting a probe."))
                warn++;
-       }
+
 
 end:
        ret = dyn_events_release_all(&trace_kprobe_ops);
-       if (WARN_ON_ONCE(ret)) {
-               pr_warn("error on cleaning up probes.\n");
+       if (WARN_ONCE(ret, "error on cleaning up probes."))
                warn++;
-       }
+
        /*
         * Wait for the optimizer work to finish. Otherwise it might fiddle
         * with probes in already freed __init text.