stm class/intel_th: Updates for v5.10
Subsystems (6)
Alexander Shishkin
maintainercover stm class/intel_th: Updates for v5.10
Hi Greg,
Apologies for the late posting. These are the updates that I have for the next merge window if that's still doable.
Six patches add support for exporting more of ftrace via STM, 3 of them get into ftrace territory, but Steven reviewed all of them and there should be no conflicts.
Two patches add new PCI IDs to the Intel TH driver, which would normally go in a "fixes" patchset, but this late in the cycle that doesn't make much sense, so they are included in the same series.
Alexander Shishkin (2):
intel_th: pci: Add Alder Lake-S support
intel_th: pci: Add Alder Lake CPU support
Tingwei Zhang (6):
stm class: ftrace: Change dependency to TRACING
tracing: Add flag to control different traces
tracing: Add trace_export support for event trace
tracing: Add trace_export support for trace_marker stm class: ftrace: Enable supported trace export flag stm class: ftrace: Use different channel accroding to CPU
drivers/hwtracing/intel_th/pci.c | 10 ++ drivers/hwtracing/stm/Kconfig | 2 +- drivers/hwtracing/stm/ftrace.c | 7 +- include/linux/trace.h | 7 + kernel/trace/trace.c | 270 +++++++++++++++++-------------- 5 files changed, 169 insertions(+), 127 deletions(-)
Signature · 1 line
2.28.0
Alexander Shishkin
maintainerPATCH 1/8 stm class: ftrace: Change dependency to TRACING
From: Tingwei Zhang <[email protected]>
We will support copying event trace to STM. Change STM_SOURCE_FTRACE to depend on TRACING since we will support multiple tracers.
--- drivers/hwtracing/stm/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/hwtracing/stm/Kconfig +1 -1
@@ -71,7 +71,7 @@ config STM_SOURCE_HEARTBEAT config STM_SOURCE_FTRACE tristate "Copy the output from kernel Ftrace to STM engine" - depends on FUNCTION_TRACER + depends on TRACING help This option can be used to copy the output from kernel Ftrace to STM engine. Enabling this option will introduce a slight
Signature · 1 line
2.28.0
Alexander Shishkin
maintainerPATCH 2/8 tracing: Add flag to control different traces
In reply to Alexander ShishkinFrom: Tingwei Zhang <[email protected]>
More traces like event trace or trace marker will be supported. Add flag for difference traces, so that they can be controlled separately. Move current function trace to it's own flag instead of global ftrace enable flag.
--- include/linux/trace.h | 5 +++++ kernel/trace/trace.c | 36 +++++++++++++++++++----------------- 2 files changed, 24 insertions(+), 17 deletions(-)
include/linux/trace.h +5 -0
@@ -3,6 +3,9 @@#define _LINUX_TRACE_H#ifdef CONFIG_TRACING + +#define TRACE_EXPORT_FUNCTION BIT(0) +/* * The trace export - an export of Ftrace output. The trace_export * can process traces and export them to a registered destination as
@@ -15,10 +18,12 @@* next - pointer to the next trace_export * write - copy traces which have been delt with ->commit() to * the destination +* flags - which ftrace to be exported */ struct trace_export {struct trace_export __rcu *next;void (*write)(struct trace_export *,const void *,unsigned int ); +int flags; };int register_ftrace_export (struct trace_export *export);
kernel/trace/trace.c +19 -17
@@ -2744,33 +2744,37 @@ trace_buffer_unlock_commit_nostack(struct trace_buffer *buffer,static void trace_process_export (struct trace_export *export, -struct ring_buffer_event *event) +struct ring_buffer_event *event,int flag) {struct trace_entry *entry;unsigned int size =0 ; - entry =ring_buffer_event_data (event); - size =ring_buffer_event_length (event); - export->write (export, entry, size); +if (export->flags & flag) { + entry =ring_buffer_event_data (event); + size =ring_buffer_event_length (event); + export->write (export, entry, size); + } }static DEFINE_MUTEX (ftrace_export_lock);static struct trace_export __rcu *ftrace_exports_list__read_mostly ; -static DEFINE_STATIC_KEY_FALSE (ftrace_exports_enabled); +static DEFINE_STATIC_KEY_FALSE (trace_function_exports_enabled); -static inline void ftrace_exports_enable (void ) +static inline void ftrace_exports_enable (struct trace_export *export) { -static_branch_enable (&ftrace_exports_enabled); +if (export->flags &TRACE_EXPORT_FUNCTION ) +static_branch_inc (&trace_function_exports_enabled); } -static inline void ftrace_exports_disable (void ) +static inline void ftrace_exports_disable (struct trace_export *export) { -static_branch_disable (&ftrace_exports_enabled); +if (export->flags &TRACE_EXPORT_FUNCTION ) +static_branch_dec (&trace_function_exports_enabled); } -static void ftrace_exports (struct ring_buffer_event *event) +static void ftrace_exports (struct ring_buffer_event *event,int flag) {struct trace_export *export;
@@ -2778,7 +2782,7 @@ static void ftrace_exports(struct ring_buffer_event *event) export =rcu_dereference_raw_check (ftrace_exports_list);while (export) { -trace_process_export (export, event); +trace_process_export (export, event, flag); export =rcu_dereference_raw_check (export->next); }
@@ -2818,8 +2822,7 @@ rm_trace_export(struct trace_export **list, struct trace_export *export)static inline void add_ftrace_export (struct trace_export **list,struct trace_export *export) { -if (*list ==NULL ) -ftrace_exports_enable (); +ftrace_exports_enable (export);add_trace_export (list, export); }
@@ -2830,8 +2833,7 @@ rm_ftrace_export(struct trace_export **list, struct trace_export *export)int ret; ret =rm_trace_export (list, export); -if (*list ==NULL ) -ftrace_exports_disable (); +ftrace_exports_disable (export);return ret; }
@@ -2884,8 +2886,8 @@ trace_function(struct trace_array *tr, entry->parent_ip = parent_ip;if (!call_filter_check_discard (call, entry, buffer, event)) { -if (static_branch_unlikely (&ftrace_exports_enabled)) -ftrace_exports (event); +if (static_branch_unlikely (&trace_function_exports_enabled)) +ftrace_exports (event,TRACE_EXPORT_FUNCTION );__buffer_unlock_commit (buffer, event); } }
Signature · 1 line
2.28.0
Alexander Shishkin
maintainerPATCH 3/8 tracing: Add trace_export support for event trace
In reply to Alexander ShishkinFrom: Tingwei Zhang <[email protected]>
Only function traces can be exported to other destinations currently. This patch exports event trace as well. Move trace export related function to the beginning of file so other trace can call trace_process_export() to export.
--- include/linux/trace.h | 1 + kernel/trace/trace.c | 259 ++++++++++++++++++++++-------------------- 2 files changed, 135 insertions(+), 125 deletions(-)
include/linux/trace.h +1 -0
@@ -5,6 +5,7 @@#ifdef CONFIG_TRACING #define TRACE_EXPORT_FUNCTION BIT(0) +#define TRACE_EXPORT_EVENT BIT(1)/* * The trace export - an export of Ftrace output. The trace_export
kernel/trace/trace.c +134 -125
277 lines not on this page · raw message
Signature · 1 line
2.28.0
Alexander Shishkin
maintainerPATCH 4/8 tracing: Add trace_export support for trace_marker
In reply to Alexander ShishkinFrom: Tingwei Zhang <[email protected]>
Add the support to route trace_marker buffer to other destination via trace_export.
--- include/linux/trace.h | 1 + kernel/trace/trace.c | 9 +++++++++ 2 files changed, 10 insertions(+)
include/linux/trace.h +1 -0
@@ -6,6 +6,7 @@#define TRACE_EXPORT_FUNCTION BIT(0)#define TRACE_EXPORT_EVENT BIT(1) +#define TRACE_EXPORT_MARKER BIT(2)/* * The trace export - an export of Ftrace output. The trace_export
kernel/trace/trace.c +9 -0
@@ -271,6 +271,7 @@ static struct trace_export __rcu *ftrace_exports_list __read_mostly;static DEFINE_STATIC_KEY_FALSE (trace_function_exports_enabled);static DEFINE_STATIC_KEY_FALSE (trace_event_exports_enabled); +static DEFINE_STATIC_KEY_FALSE (trace_marker_exports_enabled);static inline void ftrace_exports_enable (struct trace_export *export) {
@@ -279,6 +280,9 @@ static inline void ftrace_exports_enable(struct trace_export *export)if (export->flags &TRACE_EXPORT_EVENT )static_branch_inc (&trace_event_exports_enabled); + +if (export->flags &TRACE_EXPORT_MARKER ) +static_branch_inc (&trace_marker_exports_enabled); }static inline void ftrace_exports_disable (struct trace_export *export)
@@ -288,6 +292,9 @@ static inline void ftrace_exports_disable(struct trace_export *export)if (export->flags &TRACE_EXPORT_EVENT )static_branch_dec (&trace_event_exports_enabled); + +if (export->flags &TRACE_EXPORT_MARKER ) +static_branch_dec (&trace_marker_exports_enabled); }static void ftrace_exports (struct ring_buffer_event *event,int flag)
@@ -6687,6 +6694,8 @@ tracing_mark_write(struct file *filp, const char __user *ubuf, }else entry->buf[cnt] ='\0' ; +if (static_branch_unlikely (&trace_marker_exports_enabled)) +ftrace_exports (event,TRACE_EXPORT_MARKER );__buffer_unlock_commit (buffer, event);if (tt)
Signature · 1 line
2.28.0
Alexander Shishkin
maintainerPATCH 5/8 stm class: ftrace: Enable supported trace export flag
In reply to Alexander ShishkinFrom: Tingwei Zhang <[email protected]>
Set flags for trace_export. Export function trace, event trace and trace marker to stm.
--- drivers/hwtracing/stm/ftrace.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/hwtracing/stm/ftrace.c +2 -0
@@ -46,6 +46,8 @@ static int stm_ftrace_link(struct stm_source_data *data) struct stm_ftrace *sf = container_of(data, struct stm_ftrace, data); sf->ftrace.write = stm_ftrace_write; + sf->ftrace.flags =TRACE_EXPORT_FUNCTION |TRACE_EXPORT_EVENT + |TRACE_EXPORT_MARKER ;return register_ftrace_export (&sf->ftrace); }
Signature · 1 line
2.28.0
Alexander Shishkin
maintainerPATCH 6/8 stm class: ftrace: Use different channel accroding to CPU
In reply to Alexander ShishkinFrom: Tingwei Zhang <[email protected]>
To avoid mixup of packets from differnt ftrace packets simultaneously, use different channel for packets from different CPU.
--- drivers/hwtracing/stm/ftrace.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/hwtracing/stm/ftrace.c +4 -1
@@ -37,8 +37,10 @@ static void notrace stm_ftrace_write(struct trace_export *export, const void *buf, unsigned int len) { struct stm_ftrace *stm = container_of(export, struct stm_ftrace, ftrace); +/* This is called from trace system with preemption disabled */ +unsigned int cpu =smp_processor_id (); -stm_source_write (&stm->data,STM_FTRACE_CHAN , buf, len); +stm_source_write (&stm->data,STM_FTRACE_CHAN + cpu, buf, len); }static int stm_ftrace_link (struct stm_source_data *data)
@@ -63,6 +65,7 @@ static int __init stm_ftrace_init(void) {int ret; + stm_ftrace.data.nr_chans =roundup_pow_of_two (num_possible_cpus ()); ret =stm_source_register_device (NULL , &stm_ftrace.data);if (ret)pr_err ("Failed to register stm_source - ftrace.\n" );
Signature · 1 line
2.28.0
Alexander Shishkin
maintainerPATCH 7/8 intel_th: pci: Add Alder Lake-S support
In reply to Alexander ShishkinThis adds support for the Trace Hub in Alder Lake-S.
--- drivers/hwtracing/intel_th/pci.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/hwtracing/intel_th/pci.c +5 -0
@@ -263,6 +263,11 @@ static const struct pci_device_id intel_th_pci_id_table[] = { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x1bcc), .driver_data = (kernel_ulong_t)&intel_th_2x, }, + { +/* Alder Lake */ + PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x7aa6), + .driver_data = (kernel_ulong_t)&intel_th_2x, + }, { 0 }, };
Signature · 1 line
2.28.0
Alexander Shishkin
maintainerPATCH 8/8 intel_th: pci: Add Alder Lake CPU support
In reply to Alexander ShishkinThis adds support for the Trace Hub in Alder Lake CPU.
--- drivers/hwtracing/intel_th/pci.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/hwtracing/intel_th/pci.c +5 -0
@@ -268,6 +268,11 @@ static const struct pci_device_id intel_th_pci_id_table[] = { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x7aa6), .driver_data = (kernel_ulong_t)&intel_th_2x, }, + { +/* Alder Lake CPU */ + PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x466f), + .driver_data = (kernel_ulong_t)&intel_th_2x, + }, { 0 }, };
Signature · 1 line
2.28.0