From c63e9ab453e0916756ebbd488109634f82713feb Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 15 Jun 2020 15:52:27 +0200 Subject: [PATCH] drop queue-4.4/perf-probe-accept-the-instance-number-of-kretprobe-e.patch queue-4.9/perf-probe-accept-the-instance-number-of-kretprobe-e.patch --- ...t-the-instance-number-of-kretprobe-e.patch | 70 ------------------- queue-4.4/series | 1 - ...t-the-instance-number-of-kretprobe-e.patch | 70 ------------------- queue-4.9/series | 1 - 4 files changed, 142 deletions(-) delete mode 100644 queue-4.4/perf-probe-accept-the-instance-number-of-kretprobe-e.patch delete mode 100644 queue-4.9/perf-probe-accept-the-instance-number-of-kretprobe-e.patch diff --git a/queue-4.4/perf-probe-accept-the-instance-number-of-kretprobe-e.patch b/queue-4.4/perf-probe-accept-the-instance-number-of-kretprobe-e.patch deleted file mode 100644 index 0e48d5771a7..00000000000 --- a/queue-4.4/perf-probe-accept-the-instance-number-of-kretprobe-e.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 9b745e66449e099c73c43270a332ea493fd2dbb6 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 6 May 2020 23:29:12 +0900 -Subject: perf probe: Accept the instance number of kretprobe event - -From: Masami Hiramatsu - -[ Upstream commit c6aab66a728b6518772c74bd9dff66e1a1c652fd ] - -Since the commit 6a13a0d7b4d1 ("ftrace/kprobe: Show the maxactive number -on kprobe_events") introduced to show the instance number of kretprobe -events, the length of the 1st format of the kprobe event will not 1, but -it can be longer. This caused a parser error in perf-probe. - -Skip the length check the 1st format of the kprobe event to accept this -instance number. - -Without this fix: - - # perf probe -a vfs_read%return - Added new event: - probe:vfs_read__return (on vfs_read%return) - - You can now use it in all perf tools, such as: - - perf record -e probe:vfs_read__return -aR sleep 1 - - # perf probe -l - Semantic error :Failed to parse event name: r16:probe/vfs_read__return - Error: Failed to show event list. - -And with this fixes: - - # perf probe -a vfs_read%return - ... - # perf probe -l - probe:vfs_read__return (on vfs_read%return) - -Fixes: 6a13a0d7b4d1 ("ftrace/kprobe: Show the maxactive number on kprobe_events") -Reported-by: Yuxuan Shui -Signed-off-by: Masami Hiramatsu -Tested-by: Yuxuan Shui -Cc: Jiri Olsa -Cc: Namhyung Kim -Cc: stable@vger.kernel.org -Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=207587 -Link: http://lore.kernel.org/lkml/158877535215.26469.1113127926699134067.stgit@devnote2 -Signed-off-by: Arnaldo Carvalho de Melo -Signed-off-by: Sasha Levin ---- - tools/perf/util/probe-event.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c -index 0195b7e8c54a..209164fd16c2 100644 ---- a/tools/perf/util/probe-event.c -+++ b/tools/perf/util/probe-event.c -@@ -1527,8 +1527,7 @@ int parse_probe_trace_command(const char *cmd, struct probe_trace_event *tev) - fmt1_str = strtok_r(argv0_str, ":", &fmt); - fmt2_str = strtok_r(NULL, "/", &fmt); - fmt3_str = strtok_r(NULL, " \t", &fmt); -- if (fmt1_str == NULL || strlen(fmt1_str) != 1 || fmt2_str == NULL -- || fmt3_str == NULL) { -+ if (fmt1_str == NULL || fmt2_str == NULL || fmt3_str == NULL) { - semantic_error("Failed to parse event name: %s\n", argv[0]); - ret = -EINVAL; - goto out; --- -2.25.1 - diff --git a/queue-4.4/series b/queue-4.4/series index 41020c5a9bc..23b03875b78 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -7,6 +7,5 @@ igb-improve-handling-of-disconnected-adapters.patch arm-8977-1-ptrace-fix-mask-for-thumb-breakpoint-hook.patch sched-fair-don-t-numa-balance-for-kthreads.patch ath9k_htc-silence-undersized-packet-warnings.patch -perf-probe-accept-the-instance-number-of-kretprobe-e.patch x86_64-fix-jiffies-odr-violation.patch x86-speculation-prevent-rogue-cross-process-ssbd-shutdown.patch diff --git a/queue-4.9/perf-probe-accept-the-instance-number-of-kretprobe-e.patch b/queue-4.9/perf-probe-accept-the-instance-number-of-kretprobe-e.patch deleted file mode 100644 index 4ab276792c4..00000000000 --- a/queue-4.9/perf-probe-accept-the-instance-number-of-kretprobe-e.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 817ab21bb1f7abe0073d6430927764581227533d Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 6 May 2020 23:29:12 +0900 -Subject: perf probe: Accept the instance number of kretprobe event - -From: Masami Hiramatsu - -[ Upstream commit c6aab66a728b6518772c74bd9dff66e1a1c652fd ] - -Since the commit 6a13a0d7b4d1 ("ftrace/kprobe: Show the maxactive number -on kprobe_events") introduced to show the instance number of kretprobe -events, the length of the 1st format of the kprobe event will not 1, but -it can be longer. This caused a parser error in perf-probe. - -Skip the length check the 1st format of the kprobe event to accept this -instance number. - -Without this fix: - - # perf probe -a vfs_read%return - Added new event: - probe:vfs_read__return (on vfs_read%return) - - You can now use it in all perf tools, such as: - - perf record -e probe:vfs_read__return -aR sleep 1 - - # perf probe -l - Semantic error :Failed to parse event name: r16:probe/vfs_read__return - Error: Failed to show event list. - -And with this fixes: - - # perf probe -a vfs_read%return - ... - # perf probe -l - probe:vfs_read__return (on vfs_read%return) - -Fixes: 6a13a0d7b4d1 ("ftrace/kprobe: Show the maxactive number on kprobe_events") -Reported-by: Yuxuan Shui -Signed-off-by: Masami Hiramatsu -Tested-by: Yuxuan Shui -Cc: Jiri Olsa -Cc: Namhyung Kim -Cc: stable@vger.kernel.org -Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=207587 -Link: http://lore.kernel.org/lkml/158877535215.26469.1113127926699134067.stgit@devnote2 -Signed-off-by: Arnaldo Carvalho de Melo -Signed-off-by: Sasha Levin ---- - tools/perf/util/probe-event.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c -index a7452fd3b6ee..9a430c958dd9 100644 ---- a/tools/perf/util/probe-event.c -+++ b/tools/perf/util/probe-event.c -@@ -1744,8 +1744,7 @@ int parse_probe_trace_command(const char *cmd, struct probe_trace_event *tev) - fmt1_str = strtok_r(argv0_str, ":", &fmt); - fmt2_str = strtok_r(NULL, "/", &fmt); - fmt3_str = strtok_r(NULL, " \t", &fmt); -- if (fmt1_str == NULL || strlen(fmt1_str) != 1 || fmt2_str == NULL -- || fmt3_str == NULL) { -+ if (fmt1_str == NULL || fmt2_str == NULL || fmt3_str == NULL) { - semantic_error("Failed to parse event name: %s\n", argv[0]); - ret = -EINVAL; - goto out; --- -2.25.1 - diff --git a/queue-4.9/series b/queue-4.9/series index d5b2f095ab8..3cba0706051 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -6,7 +6,6 @@ arm-8977-1-ptrace-fix-mask-for-thumb-breakpoint-hook.patch sched-fair-don-t-numa-balance-for-kthreads.patch drivers-net-ibmvnic-update-vnic-protocol-version-rep.patch ath9k_htc-silence-undersized-packet-warnings.patch -perf-probe-accept-the-instance-number-of-kretprobe-e.patch x86_64-fix-jiffies-odr-violation.patch x86-pci-mark-intel-c620-mroms-as-having-non-compliant-bars.patch x86-speculation-prevent-rogue-cross-process-ssbd-shutdown.patch -- 2.47.3