History

Merge tag 'trace-v5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace

Pull tracing updates from Steven Rostedt: "The majority of the changes are for fixes and clean ups. Notable changes: - Rework trace event triggers code to be easier to interact with. - Support for embedding bootconfig with the kernel (as suppose to having it embedded in initram). This is useful for embedded boards without initram disks. - Speed up boot by parallelizing the creation of tracefs files. - Allow absolute ring buffer timestamps handle timestamps that use more than 59 bits. - Added new tracing clock "TAI" (International Atomic Time) - Have weak functions show up in available_filter_function list as: __ftrace_invalid_address___<invalid-offset> instead of using the name of the function before it" * tag 'trace-v5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: (52 commits) ftrace: Add FTRACE_MCOUNT_MAX_OFFSET to avoid adding weak function tracing: Fix comments for event_trigger_separate_filter() x86/traceponit: Fix comment about irq vector tracepoints x86,tracing: Remove unused headers ftrace: Clean up hash direct_functions on register failures tracing: Fix comments of create_filter() tracing: Disable kcov on trace_preemptirq.c tracing: Initialize integer variable to prevent garbage return value ftrace: Fix typo in comment ftrace: Remove return value of ftrace_arch_modify_*() tracing: Cleanup code by removing init "char *name" tracing: Change "char *" string form to "char []" tracing/timerlat: Do not wakeup the thread if the trace stops at the IRQ tracing/timerlat: Print stacktrace in the IRQ handler if needed tracing/timerlat: Notify IRQ new max latency only if stop tracing is set kprobes: Fix build errors with CONFIG_KRETPROBES=n tracing: Fix return value of trace_pid_write() tracing: Fix potential double free in create_var_ref() tracing: Use strim() to remove whitespace instead of doing it manually ftrace: Deal with error return code of the ftrace_process_locs() function ...

Linus Torvalds committed 4 years ago

Commit 76bfd3d2 parents 09f73a1 b39181f40 files · +822 −646Browse files

Showing the changes to include (3 of 40 files). Show all

Unified · Split

3 files
  1. include/linux/bootconfig.h +10 −0
  2. include/linux/ftrace.h +2 −2
  3. include/linux/kprobes.h +1 −1
include/linux/bootconfig.h+10−0
@@ -289,4 +289,14 @@ int __init xbc_get_info(int *node_size, size_t *data_size); · 288 unmodified lines
289289 /* XBC cleanup data structures */
290290 void __init xbc_exit(void);
291291
292+/* XBC embedded bootconfig data in kernel */
293+#ifdef CONFIG_BOOT_CONFIG_EMBED
294+const char * __init xbc_get_embedded_bootconfig(size_t *size);
295+#else
296+static inline const char *xbc_get_embedded_bootconfig(size_t *size)
297+{
298+ return NULL;
299+}
300+#endif
301+
292302 #endif
include/linux/ftrace.h+2−2
@@ -452,8 +452,8 @@ static inline void stack_tracer_enable(void) { } · 451 unmodified lines
452452
453453 #ifdef CONFIG_DYNAMIC_FTRACE
454454
455−int ftrace_arch_code_modify_prepare(void);
456−int ftrace_arch_code_modify_post_process(void);
455+void ftrace_arch_code_modify_prepare(void);
456+void ftrace_arch_code_modify_post_process(void);
457457
458458 enum ftrace_bug_type {
459459 FTRACE_BUG_UNKNOWN,
include/linux/kprobes.h+1−1
@@ -424,7 +424,7 @@ void unregister_kretprobe(struct kretprobe *rp); · 423 unmodified lines
424424 int register_kretprobes(struct kretprobe **rps, int num);
425425 void unregister_kretprobes(struct kretprobe **rps, int num);
426426
427−#ifdef CONFIG_KRETPROBE_ON_RETHOOK
427+#if defined(CONFIG_KRETPROBE_ON_RETHOOK) || !defined(CONFIG_KRETPROBES)
428428 #define kprobe_flush_task(tk) do {} while (0)
429429 #else
430430 void kprobe_flush_task(struct task_struct *tk);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t