Commit f4267b36 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Pull tracing fixes from Steven Rostedt:
 "Masami had a couple more fixes to the synthetic events. One was a
  proper error return value, and the other is for the self tests"

* tag 'trace-v4.19-rc8-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  selftests/ftrace: Fix synthetic event test to delete event correctly
  tracing: Return -ENOENT if there is no target synthetic event
parents 5b4c0d87 0d0352d8
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -1063,8 +1063,10 @@ static int create_synth_event(int argc, char **argv)
		event = NULL;
		ret = -EEXIST;
		goto out;
	} else if (delete_event)
	} else if (delete_event) {
		ret = -ENOENT;
		goto out;
	}

	if (argc < 2) {
		ret = -EINVAL;
+6 −6
Original line number Diff line number Diff line
@@ -25,18 +25,18 @@ fi

reset_trigger

echo "Test create synthetic event with an error"
echo 'wakeup_latency  u64 lat pid_t pid char' > synthetic_events > /dev/null
echo "Test remove synthetic event"
echo '!wakeup_latency  u64 lat pid_t pid char comm[16]' >> synthetic_events
if [ -d events/synthetic/wakeup_latency ]; then
    fail "Created wakeup_latency synthetic event with an invalid format"
    fail "Failed to delete wakeup_latency synthetic event"
fi

reset_trigger

echo "Test remove synthetic event"
echo '!wakeup_latency  u64 lat pid_t pid char comm[16]' > synthetic_events
echo "Test create synthetic event with an error"
echo 'wakeup_latency  u64 lat pid_t pid char' > synthetic_events > /dev/null
if [ -d events/synthetic/wakeup_latency ]; then
    fail "Failed to delete wakeup_latency synthetic event"
    fail "Created wakeup_latency synthetic event with an invalid format"
fi

exit 0