From: Greg Kroah-Hartman Date: Wed, 6 Apr 2022 12:01:43 +0000 (+0200) Subject: drop tracing-have-trace_define_enum-affect-trace-event-ty.patch X-Git-Tag: v5.17.2~14 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6b67ce268fb2a9474d3e65ce4f07d87992e25df7;p=thirdparty%2Fkernel%2Fstable-queue.git drop tracing-have-trace_define_enum-affect-trace-event-ty.patch from 4.14, 4.19, 5.4, and 5.10 as the fixup patch does not apply. --- diff --git a/queue-4.14/series b/queue-4.14/series index 8c0455bfdca..67f5425d7ac 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -179,7 +179,6 @@ arm-tegra-tamonten-fix-i2c3-pad-setting.patch arm-mmp-fix-failure-to-remove-sram-device.patch video-fbdev-sm712fb-fix-crash-in-smtcfb_write.patch media-hdpvr-initialize-dev-worker-at-hdpvr_register_.patch -tracing-have-trace_define_enum-affect-trace-event-ty.patch mmc-host-return-an-error-when-enable_sdio_irq-ops-is.patch powerpc-lib-sstep-fix-sthcx-instruction.patch powerpc-lib-sstep-fix-build-errors-with-newer-binutils.patch diff --git a/queue-4.14/tracing-have-trace_define_enum-affect-trace-event-ty.patch b/queue-4.14/tracing-have-trace_define_enum-affect-trace-event-ty.patch deleted file mode 100644 index 37a0040f3d7..00000000000 --- a/queue-4.14/tracing-have-trace_define_enum-affect-trace-event-ty.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 3b27e38b1185c521236786016fd8c4f67a587ded Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 10 Mar 2022 23:27:38 -0500 -Subject: tracing: Have TRACE_DEFINE_ENUM affect trace event types as well - -From: Steven Rostedt (Google) - -[ Upstream commit b3bc8547d3be60898818885f5bf22d0a62e2eb48 ] - -The macro TRACE_DEFINE_ENUM is used to convert enums in the kernel to -their actual value when they are exported to user space via the trace -event format file. - -Currently only the enums in the "print fmt" (TP_printk in the TRACE_EVENT -macro) have the enums converted. But the enums can be used to denote array -size: - - field:unsigned int fc_ineligible_rc[EXT4_FC_REASON_MAX]; offset:12; size:36; signed:0; - -The EXT4_FC_REASON_MAX has no meaning to userspace but it needs to know -that information to know how to parse the array. - -Have the array indexes also be parsed as well. - -Link: https://lore.kernel.org/all/cover.1646922487.git.riteshh@linux.ibm.com/ - -Reported-by: Ritesh Harjani -Tested-by: Ritesh Harjani -Signed-off-by: Steven Rostedt (Google) -Signed-off-by: Sasha Levin ---- - kernel/trace/trace_events.c | 28 ++++++++++++++++++++++++++++ - 1 file changed, 28 insertions(+) - -diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c -index 1285ef6e2d14..7c2d4ff7a51f 100644 ---- a/kernel/trace/trace_events.c -+++ b/kernel/trace/trace_events.c -@@ -2209,6 +2209,33 @@ static void update_event_printk(struct trace_event_call *call, - } - } - -+static void update_event_fields(struct trace_event_call *call, -+ struct trace_eval_map *map) -+{ -+ struct ftrace_event_field *field; -+ struct list_head *head; -+ char *ptr; -+ int len = strlen(map->eval_string); -+ -+ head = trace_get_fields(call); -+ list_for_each_entry(field, head, link) { -+ ptr = strchr(field->type, '['); -+ if (!ptr) -+ continue; -+ ptr++; -+ -+ if (!isalpha(*ptr) && *ptr != '_') -+ continue; -+ -+ if (strncmp(map->eval_string, ptr, len) != 0) -+ continue; -+ -+ ptr = eval_replace(ptr, map, len); -+ /* enum/sizeof string smaller than value */ -+ WARN_ON_ONCE(!ptr); -+ } -+} -+ - void trace_event_eval_update(struct trace_eval_map **map, int len) - { - struct trace_event_call *call, *p; -@@ -2244,6 +2271,7 @@ void trace_event_eval_update(struct trace_eval_map **map, int len) - first = false; - } - update_event_printk(call, map[i]); -+ update_event_fields(call, map[i]); - } - } - } --- -2.34.1 - diff --git a/queue-4.19/series b/queue-4.19/series index 42d2f154be8..4eb80a7de8a 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -216,7 +216,6 @@ arm-mmp-fix-failure-to-remove-sram-device.patch video-fbdev-sm712fb-fix-crash-in-smtcfb_write.patch media-revert-media-em28xx-add-missing-em28xx_close_e.patch media-hdpvr-initialize-dev-worker-at-hdpvr_register_.patch -tracing-have-trace_define_enum-affect-trace-event-ty.patch mmc-host-return-an-error-when-enable_sdio_irq-ops-is.patch powerpc-lib-sstep-fix-sthcx-instruction.patch powerpc-lib-sstep-fix-build-errors-with-newer-binutils.patch diff --git a/queue-4.19/tracing-have-trace_define_enum-affect-trace-event-ty.patch b/queue-4.19/tracing-have-trace_define_enum-affect-trace-event-ty.patch deleted file mode 100644 index d61892825ce..00000000000 --- a/queue-4.19/tracing-have-trace_define_enum-affect-trace-event-ty.patch +++ /dev/null @@ -1,83 +0,0 @@ -From aed9adaf373af46f22ddd885aea692a815e8d61a Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 10 Mar 2022 23:27:38 -0500 -Subject: tracing: Have TRACE_DEFINE_ENUM affect trace event types as well - -From: Steven Rostedt (Google) - -[ Upstream commit b3bc8547d3be60898818885f5bf22d0a62e2eb48 ] - -The macro TRACE_DEFINE_ENUM is used to convert enums in the kernel to -their actual value when they are exported to user space via the trace -event format file. - -Currently only the enums in the "print fmt" (TP_printk in the TRACE_EVENT -macro) have the enums converted. But the enums can be used to denote array -size: - - field:unsigned int fc_ineligible_rc[EXT4_FC_REASON_MAX]; offset:12; size:36; signed:0; - -The EXT4_FC_REASON_MAX has no meaning to userspace but it needs to know -that information to know how to parse the array. - -Have the array indexes also be parsed as well. - -Link: https://lore.kernel.org/all/cover.1646922487.git.riteshh@linux.ibm.com/ - -Reported-by: Ritesh Harjani -Tested-by: Ritesh Harjani -Signed-off-by: Steven Rostedt (Google) -Signed-off-by: Sasha Levin ---- - kernel/trace/trace_events.c | 28 ++++++++++++++++++++++++++++ - 1 file changed, 28 insertions(+) - -diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c -index 1ca64a9296d0..5d33bb804e03 100644 ---- a/kernel/trace/trace_events.c -+++ b/kernel/trace/trace_events.c -@@ -2210,6 +2210,33 @@ static void update_event_printk(struct trace_event_call *call, - } - } - -+static void update_event_fields(struct trace_event_call *call, -+ struct trace_eval_map *map) -+{ -+ struct ftrace_event_field *field; -+ struct list_head *head; -+ char *ptr; -+ int len = strlen(map->eval_string); -+ -+ head = trace_get_fields(call); -+ list_for_each_entry(field, head, link) { -+ ptr = strchr(field->type, '['); -+ if (!ptr) -+ continue; -+ ptr++; -+ -+ if (!isalpha(*ptr) && *ptr != '_') -+ continue; -+ -+ if (strncmp(map->eval_string, ptr, len) != 0) -+ continue; -+ -+ ptr = eval_replace(ptr, map, len); -+ /* enum/sizeof string smaller than value */ -+ WARN_ON_ONCE(!ptr); -+ } -+} -+ - void trace_event_eval_update(struct trace_eval_map **map, int len) - { - struct trace_event_call *call, *p; -@@ -2245,6 +2272,7 @@ void trace_event_eval_update(struct trace_eval_map **map, int len) - first = false; - } - update_event_printk(call, map[i]); -+ update_event_fields(call, map[i]); - } - } - } --- -2.34.1 - diff --git a/queue-5.10/series b/queue-5.10/series index a0fe9153f13..6ab30a52c50 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -504,7 +504,6 @@ arm-mmp-fix-failure-to-remove-sram-device.patch video-fbdev-sm712fb-fix-crash-in-smtcfb_write.patch media-revert-media-em28xx-add-missing-em28xx_close_e.patch media-hdpvr-initialize-dev-worker-at-hdpvr_register_.patch -tracing-have-trace_define_enum-affect-trace-event-ty.patch mmc-host-return-an-error-when-enable_sdio_irq-ops-is.patch media-atomisp-fix-bad-usage-at-error-handling-logic.patch alsa-hda-realtek-add-alc256-samsung-headphone-fixup.patch diff --git a/queue-5.10/tracing-have-trace_define_enum-affect-trace-event-ty.patch b/queue-5.10/tracing-have-trace_define_enum-affect-trace-event-ty.patch deleted file mode 100644 index 703fc5672cf..00000000000 --- a/queue-5.10/tracing-have-trace_define_enum-affect-trace-event-ty.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 743bda59c6da3f0bf8281dd120f6579ca2024b9e Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 10 Mar 2022 23:27:38 -0500 -Subject: tracing: Have TRACE_DEFINE_ENUM affect trace event types as well - -From: Steven Rostedt (Google) - -[ Upstream commit b3bc8547d3be60898818885f5bf22d0a62e2eb48 ] - -The macro TRACE_DEFINE_ENUM is used to convert enums in the kernel to -their actual value when they are exported to user space via the trace -event format file. - -Currently only the enums in the "print fmt" (TP_printk in the TRACE_EVENT -macro) have the enums converted. But the enums can be used to denote array -size: - - field:unsigned int fc_ineligible_rc[EXT4_FC_REASON_MAX]; offset:12; size:36; signed:0; - -The EXT4_FC_REASON_MAX has no meaning to userspace but it needs to know -that information to know how to parse the array. - -Have the array indexes also be parsed as well. - -Link: https://lore.kernel.org/all/cover.1646922487.git.riteshh@linux.ibm.com/ - -Reported-by: Ritesh Harjani -Tested-by: Ritesh Harjani -Signed-off-by: Steven Rostedt (Google) -Signed-off-by: Sasha Levin ---- - kernel/trace/trace_events.c | 28 ++++++++++++++++++++++++++++ - 1 file changed, 28 insertions(+) - -diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c -index 7cc5f0a77c3c..bbafea929008 100644 ---- a/kernel/trace/trace_events.c -+++ b/kernel/trace/trace_events.c -@@ -2417,6 +2417,33 @@ static void update_event_printk(struct trace_event_call *call, - } - } - -+static void update_event_fields(struct trace_event_call *call, -+ struct trace_eval_map *map) -+{ -+ struct ftrace_event_field *field; -+ struct list_head *head; -+ char *ptr; -+ int len = strlen(map->eval_string); -+ -+ head = trace_get_fields(call); -+ list_for_each_entry(field, head, link) { -+ ptr = strchr(field->type, '['); -+ if (!ptr) -+ continue; -+ ptr++; -+ -+ if (!isalpha(*ptr) && *ptr != '_') -+ continue; -+ -+ if (strncmp(map->eval_string, ptr, len) != 0) -+ continue; -+ -+ ptr = eval_replace(ptr, map, len); -+ /* enum/sizeof string smaller than value */ -+ WARN_ON_ONCE(!ptr); -+ } -+} -+ - void trace_event_eval_update(struct trace_eval_map **map, int len) - { - struct trace_event_call *call, *p; -@@ -2452,6 +2479,7 @@ void trace_event_eval_update(struct trace_eval_map **map, int len) - first = false; - } - update_event_printk(call, map[i]); -+ update_event_fields(call, map[i]); - } - } - } --- -2.34.1 - diff --git a/queue-5.4/series b/queue-5.4/series index 42834c4ac9b..15e1adcab4f 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -307,7 +307,6 @@ arm-mmp-fix-failure-to-remove-sram-device.patch video-fbdev-sm712fb-fix-crash-in-smtcfb_write.patch media-revert-media-em28xx-add-missing-em28xx_close_e.patch media-hdpvr-initialize-dev-worker-at-hdpvr_register_.patch -tracing-have-trace_define_enum-affect-trace-event-ty.patch mmc-host-return-an-error-when-enable_sdio_irq-ops-is.patch alsa-hda-realtek-add-alc256-samsung-headphone-fixup.patch powerpc-lib-sstep-fix-sthcx-instruction.patch diff --git a/queue-5.4/tracing-have-trace_define_enum-affect-trace-event-ty.patch b/queue-5.4/tracing-have-trace_define_enum-affect-trace-event-ty.patch deleted file mode 100644 index e440113fbc9..00000000000 --- a/queue-5.4/tracing-have-trace_define_enum-affect-trace-event-ty.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 05104d572f67024cc22041ad30ffbd521a97eec3 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 10 Mar 2022 23:27:38 -0500 -Subject: tracing: Have TRACE_DEFINE_ENUM affect trace event types as well - -From: Steven Rostedt (Google) - -[ Upstream commit b3bc8547d3be60898818885f5bf22d0a62e2eb48 ] - -The macro TRACE_DEFINE_ENUM is used to convert enums in the kernel to -their actual value when they are exported to user space via the trace -event format file. - -Currently only the enums in the "print fmt" (TP_printk in the TRACE_EVENT -macro) have the enums converted. But the enums can be used to denote array -size: - - field:unsigned int fc_ineligible_rc[EXT4_FC_REASON_MAX]; offset:12; size:36; signed:0; - -The EXT4_FC_REASON_MAX has no meaning to userspace but it needs to know -that information to know how to parse the array. - -Have the array indexes also be parsed as well. - -Link: https://lore.kernel.org/all/cover.1646922487.git.riteshh@linux.ibm.com/ - -Reported-by: Ritesh Harjani -Tested-by: Ritesh Harjani -Signed-off-by: Steven Rostedt (Google) -Signed-off-by: Sasha Levin ---- - kernel/trace/trace_events.c | 28 ++++++++++++++++++++++++++++ - 1 file changed, 28 insertions(+) - -diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c -index 4acc77e049e5..c1363f9d8d48 100644 ---- a/kernel/trace/trace_events.c -+++ b/kernel/trace/trace_events.c -@@ -2202,6 +2202,33 @@ static void update_event_printk(struct trace_event_call *call, - } - } - -+static void update_event_fields(struct trace_event_call *call, -+ struct trace_eval_map *map) -+{ -+ struct ftrace_event_field *field; -+ struct list_head *head; -+ char *ptr; -+ int len = strlen(map->eval_string); -+ -+ head = trace_get_fields(call); -+ list_for_each_entry(field, head, link) { -+ ptr = strchr(field->type, '['); -+ if (!ptr) -+ continue; -+ ptr++; -+ -+ if (!isalpha(*ptr) && *ptr != '_') -+ continue; -+ -+ if (strncmp(map->eval_string, ptr, len) != 0) -+ continue; -+ -+ ptr = eval_replace(ptr, map, len); -+ /* enum/sizeof string smaller than value */ -+ WARN_ON_ONCE(!ptr); -+ } -+} -+ - void trace_event_eval_update(struct trace_eval_map **map, int len) - { - struct trace_event_call *call, *p; -@@ -2237,6 +2264,7 @@ void trace_event_eval_update(struct trace_eval_map **map, int len) - first = false; - } - update_event_printk(call, map[i]); -+ update_event_fields(call, map[i]); - } - } - } --- -2.34.1 -