Commit e5d505e3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'trace-v7.1-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace 

Pull tracing fixes from Steven Rostedt:

 - Add more functions to the remote allowed list

   randconfig found more functions that are allowed for the remote code
   for s390 and arm. Add them to the allowed list.

 - Fix remote_test error path

   If one of the simple ring buffers fails to load, the code is supposed
   to rollback its initialized buffers. Instead of rolling back the
   buffers for the failed load, it uses the global variable and rolls
   back all the successfully loaded buffers.

* tag 'trace-v7.1-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace:
  tracing: Fix desc in error path for the trace remote test module
  ring-buffer remote: Avoid unexpected symbol warnings (arm, s390)
parents 23e6a1ca 55a00055

kernel/trace/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -143,8 +143,8 @@ obj-$(CONFIG_TRACE_REMOTE_TEST) += remote_test.o 
targets += undefsyms_base.o

KASAN_SANITIZE_undefsyms_base.o := y



UNDEFINED_ALLOWLIST = __asan __gcov __kasan __kcsan __hwasan __sancov __sanitizer __tsan __ubsan __x86_indirect_thunk \

		      __msan simple_ring_buffer \

UNDEFINED_ALLOWLIST = __asan __gcov __kasan __kcsan __hwasan __sancov __sanitizer __tsan __ubsan __msan \

		      __aeabi_unwind_cpp __s390_indirect_jump __x86_indirect_thunk simple_ring_buffer \

		      $(shell $(NM) -u $(obj)/undefsyms_base.o 2>/dev/null | awk '{print $$2}')



quiet_cmd_check_undefined = NM      $<

kernel/trace/remote_test.c

+2 −2
Original line number Diff line number Diff line
@@ -110,9 +110,9 @@ static struct trace_buffer_desc *remote_test_load(unsigned long size, void *unus 
	return remote_test_buffer_desc;



err_unload:

	for_each_ring_buffer_desc(rb_desc, cpu, remote_test_buffer_desc)

	for_each_ring_buffer_desc(rb_desc, cpu, desc)

		remote_test_unload_simple_rb(rb_desc->cpu);

	trace_remote_free_buffer(remote_test_buffer_desc);

	trace_remote_free_buffer(desc);



err_free_desc:

	kfree(desc);