This is a note to let you know that I've just added the patch titled
selftests/ftrace: Fix eprobe syntax test case to check filter support
to the 6.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
selftests-ftrace-fix-eprobe-syntax-test-case-to-check-filter-support.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From a457e944df92789ab31aaf35fae9db064e3c51c4 Mon Sep 17 00:00:00 2001
From: "Masami Hiramatsu (Google)" <mhiramat@xxxxxxxxxx>
Date: Tue, 21 Feb 2023 08:49:16 +0900
Subject: selftests/ftrace: Fix eprobe syntax test case to check filter support
From: Masami Hiramatsu (Google) <mhiramat@xxxxxxxxxx>
commit a457e944df92789ab31aaf35fae9db064e3c51c4 upstream.
Fix eprobe syntax test case to check whether the kernel supports the filter
on eprobe for filter syntax test command. Without this fix, this test case
will fail if the kernel supports eprobe but doesn't support the filter on
eprobe.
Link: https://lore.kernel.org/all/167309834742.640500.379128668288448035.stgit@devnote3/
Fixes: 9e14bae7d049 ("selftests/ftrace: Add eprobe syntax error testcase")
Cc: stable@xxxxxxxxxxxxxxx
Signed-off-by: Masami Hiramatsu (Google) <mhiramat@xxxxxxxxxx>
Reviewed-by: Steven Rostedt (Google) <rostedt@xxxxxxxxxxx>
Acked-by: Shuah Khan <skhan@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
.../selftests/ftrace/test.d/dynevent/eprobes_syntax_errors.tc | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tools/testing/selftests/ftrace/test.d/dynevent/eprobes_syntax_errors.tc b/tools/testing/selftests/ftrace/test.d/dynevent/eprobes_syntax_errors.tc
index fc1daac7f066..4f5e8c665156 100644
--- a/tools/testing/selftests/ftrace/test.d/dynevent/eprobes_syntax_errors.tc
+++ b/tools/testing/selftests/ftrace/test.d/dynevent/eprobes_syntax_errors.tc
@@ -22,6 +22,8 @@ check_error 'e:foo/^bar.1 syscalls/sys_enter_openat' # BAD_EVENT_NAME
check_error 'e:foo/bar syscalls/sys_enter_openat arg=^dfd' # BAD_FETCH_ARG
check_error 'e:foo/bar syscalls/sys_enter_openat ^arg=$foo' # BAD_ATTACH_ARG
-check_error 'e:foo/bar syscalls/sys_enter_openat if ^' # NO_EP_FILTER
+if grep -q '<attached-group>\.<attached-event>.*\[if <filter>\]' README; then
+ check_error 'e:foo/bar syscalls/sys_enter_openat if ^' # NO_EP_FILTER
+fi
exit 0
--
2.39.2
Patches currently in stable-queue which might be from mhiramat@xxxxxxxxxx are
queue-6.1/x86-kprobes-fix-arch_check_optimized_kprobe-check-within-optimized_kprobe-range.patch
queue-6.1/selftests-ftrace-fix-eprobe-syntax-test-case-to-check-filter-support.patch
queue-6.1/rcu-make-rcu_lockdep_warn-avoid-early-lockdep-checks.patch
queue-6.1/trace-blktrace-fix-memory-leak-with-using-debugfs_lo.patch
queue-6.1/acpi-don-t-build-acpica-with-os.patch
queue-6.1/selftests-ftrace-fix-bash-specific-operator.patch
queue-6.1/x86-kprobes-fix-__recover_optprobed_insn-check-optimizing-logic.patch
