Commit 32f6c5d0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull tracing fixes from Steven Rostedt:

 - Fixes to the RTLA tooling

 - A fix to a tp_printk overriding tp_printk_stop_on_boot on the
   command line

* tag 'trace-v5.17-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  tracing: Fix tp_printk option related with tp_printk_stop_on_boot
  MAINTAINERS: Add RTLA entry
  rtla: Fix segmentation fault when failing to enable -t
  rtla/trace: Error message fixup
  rtla/utils: Fix session duration parsing
  rtla: Follow kernel version
parents f1baf68e 3203ce39

MAINTAINERS

+8 −0
Original line number Diff line number Diff line
@@ -19595,6 +19595,14 @@ F: Documentation/trace/timerlat-tracer.rst 
F:	Documentation/trace/hwlat_detector.rst

F:	arch/*/kernel/trace.c









Real-time Linux Analysis (RTLA) tools









M:	Daniel Bristot de Oliveira <bristot@kernel.org>









M:	Steven Rostedt <rostedt@goodmis.org>









L:	linux-trace-devel@vger.kernel.org









S:	Maintained









F:	Documentation/tools/rtla/









F:	tools/tracing/rtla/

















TRADITIONAL CHINESE DOCUMENTATION









M:	Hu Haowen <src.res@email.cn>









L:	linux-doc-tw-discuss@lists.sourceforge.net

























kernel/trace/trace.c



+4
−0






























Original line number
Diff line number
Diff line







@@ -252,6 +252,10 @@ __setup("trace_clock=", set_trace_boot_clock);

















static int __init set_tracepoint_printk(char *str)









{









	/* Ignore the "tp_printk_stop_on_boot" param */









	if (*str == '_')









		return 0;



















	if ((strcmp(str, "=0") != 0 && strcmp(str, "=off") != 0))









		tracepoint_printk = 1;









	return 1;
































tools/tracing/rtla/Makefile



+3
−1






























Original line number
Diff line number
Diff line









NAME	:=	rtla









VERSION	:=	0.5









# Follow the kernel version









VERSION :=	$(shell cat VERSION 2> /dev/null || make -sC ../../.. kernelversion)



















# From libtracefs:









# Makefiles suck: This macro sets a default value of $(2) for the








@@ -85,6 +86,7 @@ clean: doc_clean

















tarball: clean









	rm -rf $(NAME)-$(VERSION) && mkdir $(NAME)-$(VERSION)









	echo $(VERSION) > $(NAME)-$(VERSION)/VERSION









	cp -r $(DIRS) $(FILES) $(NAME)-$(VERSION)









	mkdir $(NAME)-$(VERSION)/Documentation/









	cp -rp $(SRCTREE)/../../../Documentation/tools/rtla/* $(NAME)-$(VERSION)/Documentation/
































tools/tracing/rtla/src/osnoise.c



+3
−0






























Original line number
Diff line number
Diff line







@@ -750,6 +750,9 @@ void osnoise_put_context(struct osnoise_context *context)







 */









void osnoise_destroy_tool(struct osnoise_tool *top)









{









	if (!top)









		return;



















	trace_instance_destroy(&top->trace);



















	if (top->context)
































tools/tracing/rtla/src/osnoise_hist.c



+3
−4






























Original line number
Diff line number
Diff line







@@ -701,9 +701,9 @@ osnoise_hist_set_signals(struct osnoise_hist_params *params)







int osnoise_hist_main(int argc, char *argv[])









{









	struct osnoise_hist_params *params;









	struct osnoise_tool *record = NULL;









	struct osnoise_tool *tool = NULL;









	struct trace_instance *trace;









	struct osnoise_tool *record;









	struct osnoise_tool *tool;









	int return_value = 1;









	int retval;


















@@ -792,9 +792,8 @@ int osnoise_hist_main(int argc, char *argv[])







out_hist:









	osnoise_free_histogram(tool->data);









out_destroy:









	osnoise_destroy_tool(tool);









	if (params->trace_output)









	osnoise_destroy_tool(record);









	osnoise_destroy_tool(tool);









	free(params);









out_exit:









	exit(return_value);