Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7140ad38 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull tracing updates from Steven Rostedt:

 - Restructure of lockdep and latency tracers

   This is the biggest change. Joel Fernandes restructured the hooks
   from irqs and preemption disabling and enabling. He got rid of a lot
   of the preprocessor #ifdef mess that they caused.

   He turned both lockdep and the latency tracers to use trace events
   inserted in the preempt/irqs disabling paths. But unfortunately,
   these started to cause issues in corner cases. Thus, parts of the
   code was reverted back to where lockdep and the latency tracers just
   get called directly (without using the trace events). But because the
   original change cleaned up the code very nicely we kept that, as well
   as the trace events for preempt and irqs disabling, but they are
   limited to not being called in NMIs.

 - Have trace events use SRCU for "rcu idle" calls. This was required
   for the preempt/irqs off trace events. But it also had to not allow
   them to be called in NMI context. Waiting till Paul makes an NMI safe
   SRCU API.

 - New notrace SRCU API to allow trace events to use SRCU.

 - Addition of mcount-nop option support

 - SPDX headers replacing GPL templates.

 - Various other fixes and clean ups.

 - Some fixes are marked for stable, but were not fully tested before
   the merge window opened.

* tag 'trace-v4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: (44 commits)
  tracing: Fix SPDX format headers to use C++ style comments
  tracing: Add SPDX License format tags to tracing files
  tracing: Add SPDX License format to bpf_trace.c
  blktrace: Add SPDX License format header
  s390/ftrace: Add -mfentry and -mnop-mcount support
  tracing: Add -mcount-nop option support
  tracing: Avoid calling cc-option -mrecord-mcount for every Makefile
  tracing: Handle CC_FLAGS_FTRACE more accurately
  Uprobe: Additional argument arch_uprobe to uprobe_write_opcode()
  Uprobes: Simplify uprobe_register() body
  tracepoints: Free early tracepoints after RCU is initialized
  uprobes: Use synchronize_rcu() not synchronize_sched()
  tracing: Fix synchronizing to event changes with tracepoint_synchronize_unregister()
  ftrace: Remove unused pointer ftrace_swapper_pid
  tracing: More reverting of "tracing: Centralize preemptirq tracepoints and unify their usage"
  tracing/irqsoff: Handle preempt_count for different configs
  tracing: Partial revert of "tracing: Centralize preemptirq tracepoints and unify their usage"
  tracing: irqsoff: Account for additional preempt_disable
  trace: Use rcu_dereference_raw for hooks from trace-event subsystem
  tracing/kprobes: Fix within_notrace_func() to check only notrace functions
  ...
parents 0a78ac4b bb730b58

Makefile

+20 −4
Original line number Diff line number Diff line
@@ -754,12 +754,28 @@ ifdef CONFIG_FUNCTION_TRACER 
ifndef CC_FLAGS_FTRACE

CC_FLAGS_FTRACE := -pg

endif

export CC_FLAGS_FTRACE

ifdef CONFIG_FTRACE_MCOUNT_RECORD

  # gcc 5 supports generating the mcount tables directly

  ifeq ($(call cc-option-yn,-mrecord-mcount),y)

    CC_FLAGS_FTRACE	+= -mrecord-mcount

    export CC_USING_RECORD_MCOUNT := 1

  endif

  ifdef CONFIG_HAVE_NOP_MCOUNT

    ifeq ($(call cc-option-yn, -mnop-mcount),y)

      CC_FLAGS_FTRACE	+= -mnop-mcount

      CC_FLAGS_USING	+= -DCC_USING_NOP_MCOUNT

    endif

  endif

endif

ifdef CONFIG_HAVE_FENTRY

CC_USING_FENTRY	:= $(call cc-option, -mfentry -DCC_USING_FENTRY)

  ifeq ($(call cc-option-yn, -mfentry),y)

    CC_FLAGS_FTRACE	+= -mfentry

    CC_FLAGS_USING	+= -DCC_USING_FENTRY

  endif

endif

KBUILD_CFLAGS	+= $(CC_FLAGS_FTRACE) $(CC_USING_FENTRY)

KBUILD_AFLAGS	+= $(CC_USING_FENTRY)

export CC_FLAGS_FTRACE

KBUILD_CFLAGS	+= $(CC_FLAGS_FTRACE) $(CC_FLAGS_USING)

KBUILD_AFLAGS	+= $(CC_FLAGS_USING)

ifdef CONFIG_DYNAMIC_FTRACE

	ifdef CONFIG_HAVE_C_RECORDMCOUNT

		BUILD_C_RECORDMCOUNT := y

arch/arm/probes/uprobes/core.c

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ bool is_swbp_insn(uprobe_opcode_t *insn) 
int set_swbp(struct arch_uprobe *auprobe, struct mm_struct *mm,

	     unsigned long vaddr)

{

	return uprobe_write_opcode(mm, vaddr,

	return uprobe_write_opcode(auprobe, mm, vaddr,

		   __opcode_to_mem_arm(auprobe->bpinsn));

}

arch/mips/kernel/uprobes.c

+1 −1
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ unsigned long arch_uretprobe_hijack_return_addr( 
int __weak set_swbp(struct arch_uprobe *auprobe, struct mm_struct *mm,

	unsigned long vaddr)

{

	return uprobe_write_opcode(mm, vaddr, UPROBE_SWBP_INSN);

	return uprobe_write_opcode(auprobe, mm, vaddr, UPROBE_SWBP_INSN);

}



void arch_uprobe_copy_ixol(struct page *page, unsigned long vaddr,

arch/s390/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -135,6 +135,7 @@ config S390 
	select HAVE_DYNAMIC_FTRACE

	select HAVE_DYNAMIC_FTRACE_WITH_REGS

	select HAVE_EFFICIENT_UNALIGNED_ACCESS

	select HAVE_FENTRY

	select HAVE_FTRACE_MCOUNT_RECORD

	select HAVE_FUNCTION_GRAPH_TRACER

	select HAVE_FUNCTION_TRACER
@@ -157,6 +158,7 @@ config S390 
	select HAVE_MEMBLOCK_NODE_MAP

	select HAVE_MEMBLOCK_PHYS_MAP

	select HAVE_MOD_ARCH_SPECIFIC

	select HAVE_NOP_MCOUNT

	select HAVE_OPROFILE

	select HAVE_PERF_EVENTS

	select HAVE_REGS_AND_STACK_ACCESS_API

arch/s390/Makefile

+9 −7
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ ifdef CONFIG_EXPOLINE 
endif



ifdef CONFIG_FUNCTION_TRACER

  ifeq ($(call cc-option-yn,-mfentry -mnop-mcount),n)

    # make use of hotpatch feature if the compiler supports it

    cc_hotpatch	:= -mhotpatch=0,3

    ifeq ($(call cc-option-yn,$(cc_hotpatch)),y)
@@ -104,6 +105,7 @@ KBUILD_AFLAGS += -DCC_USING_HOTPATCH 
      KBUILD_CFLAGS	+= -DCC_USING_HOTPATCH

    endif

  endif

endif



# Test CFI features of binutils

cfi := $(call as-instr,.cfi_startproc\n.cfi_val_offset 15$(comma)-160\n.cfi_endproc,-DCONFIG_AS_CFI_VAL_OFFSET=1)