From: Greg Kroah-Hartman Date: Mon, 28 Feb 2022 07:32:17 +0000 (+0100) Subject: drop tracing patch from trees it broke X-Git-Tag: v4.9.304~21 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e2fd3e78a4323df41b5ba52e0c46ae59789e7719;p=thirdparty%2Fkernel%2Fstable-queue.git drop tracing patch from trees it broke --- diff --git a/queue-4.14/series b/queue-4.14/series index 9a6d675bc3c..f6f709dc9c6 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -13,7 +13,6 @@ drm-edid-always-set-rgb444.patch net-mlx5e-fix-wrong-return-value-on-ioctl-eeprom-query-failure.patch configfs-fix-a-race-in-configfs_-un-register_subsyst.patch rdma-ib_srp-fix-a-deadlock.patch -tracing-dump-stacktrace-trigger-to-the-corresponding-instance.patch iio-adc-men_z188_adc-fix-a-resource-leak-in-an-error-handling-path.patch ata-pata_hpt37x-disable-primary-channel-on-hpt371.patch revert-usb-serial-ch341-add-new-product-id-for-ch341a.patch diff --git a/queue-4.14/tracing-dump-stacktrace-trigger-to-the-corresponding-instance.patch b/queue-4.14/tracing-dump-stacktrace-trigger-to-the-corresponding-instance.patch deleted file mode 100644 index f5e1ddfbe60..00000000000 --- a/queue-4.14/tracing-dump-stacktrace-trigger-to-the-corresponding-instance.patch +++ /dev/null @@ -1,45 +0,0 @@ -From ce33c845b030c9cf768370c951bc699470b09fa7 Mon Sep 17 00:00:00 2001 -From: Daniel Bristot de Oliveira -Date: Sun, 20 Feb 2022 23:49:57 +0100 -Subject: tracing: Dump stacktrace trigger to the corresponding instance - -From: Daniel Bristot de Oliveira - -commit ce33c845b030c9cf768370c951bc699470b09fa7 upstream. - -The stacktrace event trigger is not dumping the stacktrace to the instance -where it was enabled, but to the global "instance." - -Use the private_data, pointing to the trigger file, to figure out the -corresponding trace instance, and use it in the trigger action, like -snapshot_trigger does. - -Link: https://lkml.kernel.org/r/afbb0b4f18ba92c276865bc97204d438473f4ebc.1645396236.git.bristot@kernel.org - -Cc: stable@vger.kernel.org -Fixes: ae63b31e4d0e2 ("tracing: Separate out trace events from global variables") -Reviewed-by: Tom Zanussi -Tested-by: Tom Zanussi -Signed-off-by: Daniel Bristot de Oliveira -Signed-off-by: Steven Rostedt (Google) -Signed-off-by: Greg Kroah-Hartman ---- - kernel/trace/trace_events_trigger.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - ---- a/kernel/trace/trace_events_trigger.c -+++ b/kernel/trace/trace_events_trigger.c -@@ -1156,7 +1156,12 @@ static __init int register_trigger_snaps - static void - stacktrace_trigger(struct event_trigger_data *data, void *rec) - { -- trace_dump_stack(STACK_SKIP); -+ struct trace_event_file *file = data->private_data; -+ -+ if (file) -+ __trace_stack(file->tr, tracing_gen_ctx(), STACK_SKIP); -+ else -+ trace_dump_stack(STACK_SKIP); - } - - static void diff --git a/queue-4.19/series b/queue-4.19/series index 91090ebd948..cc5f9ad9181 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -13,7 +13,6 @@ drm-edid-always-set-rgb444.patch net-mlx5e-fix-wrong-return-value-on-ioctl-eeprom-query-failure.patch configfs-fix-a-race-in-configfs_-un-register_subsyst.patch rdma-ib_srp-fix-a-deadlock.patch -tracing-dump-stacktrace-trigger-to-the-corresponding-instance.patch tracing-have-traceon-and-traceoff-trigger-honor-the-instance.patch iio-adc-men_z188_adc-fix-a-resource-leak-in-an-error-handling-path.patch ata-pata_hpt37x-disable-primary-channel-on-hpt371.patch diff --git a/queue-4.19/tracing-dump-stacktrace-trigger-to-the-corresponding-instance.patch b/queue-4.19/tracing-dump-stacktrace-trigger-to-the-corresponding-instance.patch deleted file mode 100644 index 1636c4dc5e7..00000000000 --- a/queue-4.19/tracing-dump-stacktrace-trigger-to-the-corresponding-instance.patch +++ /dev/null @@ -1,45 +0,0 @@ -From ce33c845b030c9cf768370c951bc699470b09fa7 Mon Sep 17 00:00:00 2001 -From: Daniel Bristot de Oliveira -Date: Sun, 20 Feb 2022 23:49:57 +0100 -Subject: tracing: Dump stacktrace trigger to the corresponding instance - -From: Daniel Bristot de Oliveira - -commit ce33c845b030c9cf768370c951bc699470b09fa7 upstream. - -The stacktrace event trigger is not dumping the stacktrace to the instance -where it was enabled, but to the global "instance." - -Use the private_data, pointing to the trigger file, to figure out the -corresponding trace instance, and use it in the trigger action, like -snapshot_trigger does. - -Link: https://lkml.kernel.org/r/afbb0b4f18ba92c276865bc97204d438473f4ebc.1645396236.git.bristot@kernel.org - -Cc: stable@vger.kernel.org -Fixes: ae63b31e4d0e2 ("tracing: Separate out trace events from global variables") -Reviewed-by: Tom Zanussi -Tested-by: Tom Zanussi -Signed-off-by: Daniel Bristot de Oliveira -Signed-off-by: Steven Rostedt (Google) -Signed-off-by: Greg Kroah-Hartman ---- - kernel/trace/trace_events_trigger.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - ---- a/kernel/trace/trace_events_trigger.c -+++ b/kernel/trace/trace_events_trigger.c -@@ -1172,7 +1172,12 @@ static void - stacktrace_trigger(struct event_trigger_data *data, void *rec, - struct ring_buffer_event *event) - { -- trace_dump_stack(STACK_SKIP); -+ struct trace_event_file *file = data->private_data; -+ -+ if (file) -+ __trace_stack(file->tr, tracing_gen_ctx(), STACK_SKIP); -+ else -+ trace_dump_stack(STACK_SKIP); - } - - static void diff --git a/queue-4.9/series b/queue-4.9/series index 9ef15a75cff..6b35690f601 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -13,7 +13,6 @@ drm-edid-always-set-rgb444.patch net-mlx5e-fix-wrong-return-value-on-ioctl-eeprom-query-failure.patch configfs-fix-a-race-in-configfs_-un-register_subsyst.patch rdma-ib_srp-fix-a-deadlock.patch -tracing-dump-stacktrace-trigger-to-the-corresponding-instance.patch iio-adc-men_z188_adc-fix-a-resource-leak-in-an-error-handling-path.patch ata-pata_hpt37x-disable-primary-channel-on-hpt371.patch revert-usb-serial-ch341-add-new-product-id-for-ch341a.patch diff --git a/queue-4.9/tracing-dump-stacktrace-trigger-to-the-corresponding-instance.patch b/queue-4.9/tracing-dump-stacktrace-trigger-to-the-corresponding-instance.patch deleted file mode 100644 index fc6c550b6d9..00000000000 --- a/queue-4.9/tracing-dump-stacktrace-trigger-to-the-corresponding-instance.patch +++ /dev/null @@ -1,45 +0,0 @@ -From ce33c845b030c9cf768370c951bc699470b09fa7 Mon Sep 17 00:00:00 2001 -From: Daniel Bristot de Oliveira -Date: Sun, 20 Feb 2022 23:49:57 +0100 -Subject: tracing: Dump stacktrace trigger to the corresponding instance - -From: Daniel Bristot de Oliveira - -commit ce33c845b030c9cf768370c951bc699470b09fa7 upstream. - -The stacktrace event trigger is not dumping the stacktrace to the instance -where it was enabled, but to the global "instance." - -Use the private_data, pointing to the trigger file, to figure out the -corresponding trace instance, and use it in the trigger action, like -snapshot_trigger does. - -Link: https://lkml.kernel.org/r/afbb0b4f18ba92c276865bc97204d438473f4ebc.1645396236.git.bristot@kernel.org - -Cc: stable@vger.kernel.org -Fixes: ae63b31e4d0e2 ("tracing: Separate out trace events from global variables") -Reviewed-by: Tom Zanussi -Tested-by: Tom Zanussi -Signed-off-by: Daniel Bristot de Oliveira -Signed-off-by: Steven Rostedt (Google) -Signed-off-by: Greg Kroah-Hartman ---- - kernel/trace/trace_events_trigger.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - ---- a/kernel/trace/trace_events_trigger.c -+++ b/kernel/trace/trace_events_trigger.c -@@ -1149,7 +1149,12 @@ static __init int register_trigger_snaps - static void - stacktrace_trigger(struct event_trigger_data *data, void *rec) - { -- trace_dump_stack(STACK_SKIP); -+ struct trace_event_file *file = data->private_data; -+ -+ if (file) -+ __trace_stack(file->tr, tracing_gen_ctx(), STACK_SKIP); -+ else -+ trace_dump_stack(STACK_SKIP); - } - - static void diff --git a/queue-5.10/series b/queue-5.10/series index bb98446d72e..0a85ab07a21 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -49,7 +49,6 @@ rdma-rtrs-clt-kill-wait_for_inflight_permits.patch rdma-rtrs-clt-move-free_permit-from-free_clt-to-rtrs.patch configfs-fix-a-race-in-configfs_-un-register_subsyst.patch rdma-ib_srp-fix-a-deadlock.patch -tracing-dump-stacktrace-trigger-to-the-corresponding-instance.patch tracing-have-traceon-and-traceoff-trigger-honor-the-instance.patch iio-adc-men_z188_adc-fix-a-resource-leak-in-an-error-handling-path.patch iio-adc-ad7124-fix-mask-used-for-setting-ain_bufp-ain_bufm-bits.patch @@ -73,4 +72,3 @@ rdma-cma-do-not-change-route.addr.src_addr-outside-state-checks.patch thermal-int340x-fix-memory-leak-in-int3400_notify.patch riscv-fix-oops-caused-by-irqsoff-latency-tracer.patch tty-n_gsm-fix-encoding-of-control-signal-octet-bit-dv.patch -tps6598x-clear-int-mask-on-probe-failure.patch diff --git a/queue-5.10/tps6598x-clear-int-mask-on-probe-failure.patch b/queue-5.10/tps6598x-clear-int-mask-on-probe-failure.patch deleted file mode 100644 index e63dd5c2975..00000000000 --- a/queue-5.10/tps6598x-clear-int-mask-on-probe-failure.patch +++ /dev/null @@ -1,59 +0,0 @@ -From aba2081e0a9c977396124aa6df93b55ed5912b19 Mon Sep 17 00:00:00 2001 -From: Jens Axboe -Date: Tue, 15 Feb 2022 11:22:04 -0700 -Subject: tps6598x: clear int mask on probe failure - -From: Jens Axboe - -commit aba2081e0a9c977396124aa6df93b55ed5912b19 upstream. - -The interrupt mask is enabled before any potential failure points in -the driver, which can leave a failure path where we exit with -interrupts enabled but the device not live. This causes an infinite -stream of interrupts on an Apple M1 Pro laptop on USB-C. - -Add a failure label that's used post enabling interrupts, where we -mask them again before returning an error. - -Suggested-by: Sven Peter -Cc: stable -Reviewed-by: Heikki Krogerus -Signed-off-by: Jens Axboe -Link: https://lore.kernel.org/r/e6b80669-20f3-06e7-9ed5-8951a9c6db6f@kernel.dk -Signed-off-by: Greg Kroah-Hartman ---- - drivers/usb/typec/tipd/core.c | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/drivers/usb/typec/tipd/core.c b/drivers/usb/typec/tipd/core.c -index 6d27a5b5e3ca..7ffcda94d323 100644 ---- a/drivers/usb/typec/tipd/core.c -+++ b/drivers/usb/typec/tipd/core.c -@@ -761,12 +761,12 @@ static int tps6598x_probe(struct i2c_client *client) - - ret = tps6598x_read32(tps, TPS_REG_STATUS, &status); - if (ret < 0) -- return ret; -+ goto err_clear_mask; - trace_tps6598x_status(status); - - ret = tps6598x_read32(tps, TPS_REG_SYSTEM_CONF, &conf); - if (ret < 0) -- return ret; -+ goto err_clear_mask; - - /* - * This fwnode has a "compatible" property, but is never populated as a -@@ -855,7 +855,8 @@ static int tps6598x_probe(struct i2c_client *client) - usb_role_switch_put(tps->role_sw); - err_fwnode_put: - fwnode_handle_put(fwnode); -- -+err_clear_mask: -+ tps6598x_write64(tps, TPS_REG_INT_MASK1, 0); - return ret; - } - --- -2.35.1 - diff --git a/queue-5.10/tracing-dump-stacktrace-trigger-to-the-corresponding-instance.patch b/queue-5.10/tracing-dump-stacktrace-trigger-to-the-corresponding-instance.patch deleted file mode 100644 index db5d58931cd..00000000000 --- a/queue-5.10/tracing-dump-stacktrace-trigger-to-the-corresponding-instance.patch +++ /dev/null @@ -1,45 +0,0 @@ -From ce33c845b030c9cf768370c951bc699470b09fa7 Mon Sep 17 00:00:00 2001 -From: Daniel Bristot de Oliveira -Date: Sun, 20 Feb 2022 23:49:57 +0100 -Subject: tracing: Dump stacktrace trigger to the corresponding instance - -From: Daniel Bristot de Oliveira - -commit ce33c845b030c9cf768370c951bc699470b09fa7 upstream. - -The stacktrace event trigger is not dumping the stacktrace to the instance -where it was enabled, but to the global "instance." - -Use the private_data, pointing to the trigger file, to figure out the -corresponding trace instance, and use it in the trigger action, like -snapshot_trigger does. - -Link: https://lkml.kernel.org/r/afbb0b4f18ba92c276865bc97204d438473f4ebc.1645396236.git.bristot@kernel.org - -Cc: stable@vger.kernel.org -Fixes: ae63b31e4d0e2 ("tracing: Separate out trace events from global variables") -Reviewed-by: Tom Zanussi -Tested-by: Tom Zanussi -Signed-off-by: Daniel Bristot de Oliveira -Signed-off-by: Steven Rostedt (Google) -Signed-off-by: Greg Kroah-Hartman ---- - kernel/trace/trace_events_trigger.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - ---- a/kernel/trace/trace_events_trigger.c -+++ b/kernel/trace/trace_events_trigger.c -@@ -1179,7 +1179,12 @@ static void - stacktrace_trigger(struct event_trigger_data *data, void *rec, - struct ring_buffer_event *event) - { -- trace_dump_stack(STACK_SKIP); -+ struct trace_event_file *file = data->private_data; -+ -+ if (file) -+ __trace_stack(file->tr, tracing_gen_ctx(), STACK_SKIP); -+ else -+ trace_dump_stack(STACK_SKIP); - } - - static void diff --git a/queue-5.4/series b/queue-5.4/series index ab0848633f0..66fcf3403f4 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -29,7 +29,6 @@ net-mlx5-fix-wrong-limitation-of-metadata-match-on-ecpf.patch spi-spi-zynq-qspi-fix-a-null-pointer-dereference-in-.patch configfs-fix-a-race-in-configfs_-un-register_subsyst.patch rdma-ib_srp-fix-a-deadlock.patch -tracing-dump-stacktrace-trigger-to-the-corresponding-instance.patch tracing-have-traceon-and-traceoff-trigger-honor-the-instance.patch iio-adc-men_z188_adc-fix-a-resource-leak-in-an-error-handling-path.patch iio-adc-ad7124-fix-mask-used-for-setting-ain_bufp-ain_bufm-bits.patch @@ -46,4 +45,3 @@ usb-dwc3-gadget-let-the-interrupt-handler-disable-bottom-halves.patch xhci-re-initialize-the-hc-during-resume-if-hce-was-set.patch xhci-prevent-futile-urb-re-submissions-due-to-incorrect-return-value.patch tty-n_gsm-fix-encoding-of-control-signal-octet-bit-dv.patch -tps6598x-clear-int-mask-on-probe-failure.patch diff --git a/queue-5.4/tps6598x-clear-int-mask-on-probe-failure.patch b/queue-5.4/tps6598x-clear-int-mask-on-probe-failure.patch deleted file mode 100644 index e63dd5c2975..00000000000 --- a/queue-5.4/tps6598x-clear-int-mask-on-probe-failure.patch +++ /dev/null @@ -1,59 +0,0 @@ -From aba2081e0a9c977396124aa6df93b55ed5912b19 Mon Sep 17 00:00:00 2001 -From: Jens Axboe -Date: Tue, 15 Feb 2022 11:22:04 -0700 -Subject: tps6598x: clear int mask on probe failure - -From: Jens Axboe - -commit aba2081e0a9c977396124aa6df93b55ed5912b19 upstream. - -The interrupt mask is enabled before any potential failure points in -the driver, which can leave a failure path where we exit with -interrupts enabled but the device not live. This causes an infinite -stream of interrupts on an Apple M1 Pro laptop on USB-C. - -Add a failure label that's used post enabling interrupts, where we -mask them again before returning an error. - -Suggested-by: Sven Peter -Cc: stable -Reviewed-by: Heikki Krogerus -Signed-off-by: Jens Axboe -Link: https://lore.kernel.org/r/e6b80669-20f3-06e7-9ed5-8951a9c6db6f@kernel.dk -Signed-off-by: Greg Kroah-Hartman ---- - drivers/usb/typec/tipd/core.c | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/drivers/usb/typec/tipd/core.c b/drivers/usb/typec/tipd/core.c -index 6d27a5b5e3ca..7ffcda94d323 100644 ---- a/drivers/usb/typec/tipd/core.c -+++ b/drivers/usb/typec/tipd/core.c -@@ -761,12 +761,12 @@ static int tps6598x_probe(struct i2c_client *client) - - ret = tps6598x_read32(tps, TPS_REG_STATUS, &status); - if (ret < 0) -- return ret; -+ goto err_clear_mask; - trace_tps6598x_status(status); - - ret = tps6598x_read32(tps, TPS_REG_SYSTEM_CONF, &conf); - if (ret < 0) -- return ret; -+ goto err_clear_mask; - - /* - * This fwnode has a "compatible" property, but is never populated as a -@@ -855,7 +855,8 @@ static int tps6598x_probe(struct i2c_client *client) - usb_role_switch_put(tps->role_sw); - err_fwnode_put: - fwnode_handle_put(fwnode); -- -+err_clear_mask: -+ tps6598x_write64(tps, TPS_REG_INT_MASK1, 0); - return ret; - } - --- -2.35.1 - diff --git a/queue-5.4/tracing-dump-stacktrace-trigger-to-the-corresponding-instance.patch b/queue-5.4/tracing-dump-stacktrace-trigger-to-the-corresponding-instance.patch deleted file mode 100644 index db5d58931cd..00000000000 --- a/queue-5.4/tracing-dump-stacktrace-trigger-to-the-corresponding-instance.patch +++ /dev/null @@ -1,45 +0,0 @@ -From ce33c845b030c9cf768370c951bc699470b09fa7 Mon Sep 17 00:00:00 2001 -From: Daniel Bristot de Oliveira -Date: Sun, 20 Feb 2022 23:49:57 +0100 -Subject: tracing: Dump stacktrace trigger to the corresponding instance - -From: Daniel Bristot de Oliveira - -commit ce33c845b030c9cf768370c951bc699470b09fa7 upstream. - -The stacktrace event trigger is not dumping the stacktrace to the instance -where it was enabled, but to the global "instance." - -Use the private_data, pointing to the trigger file, to figure out the -corresponding trace instance, and use it in the trigger action, like -snapshot_trigger does. - -Link: https://lkml.kernel.org/r/afbb0b4f18ba92c276865bc97204d438473f4ebc.1645396236.git.bristot@kernel.org - -Cc: stable@vger.kernel.org -Fixes: ae63b31e4d0e2 ("tracing: Separate out trace events from global variables") -Reviewed-by: Tom Zanussi -Tested-by: Tom Zanussi -Signed-off-by: Daniel Bristot de Oliveira -Signed-off-by: Steven Rostedt (Google) -Signed-off-by: Greg Kroah-Hartman ---- - kernel/trace/trace_events_trigger.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - ---- a/kernel/trace/trace_events_trigger.c -+++ b/kernel/trace/trace_events_trigger.c -@@ -1179,7 +1179,12 @@ static void - stacktrace_trigger(struct event_trigger_data *data, void *rec, - struct ring_buffer_event *event) - { -- trace_dump_stack(STACK_SKIP); -+ struct trace_event_file *file = data->private_data; -+ -+ if (file) -+ __trace_stack(file->tr, tracing_gen_ctx(), STACK_SKIP); -+ else -+ trace_dump_stack(STACK_SKIP); - } - - static void