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

Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull perf fixes from Thomas Gleixner:
 "Three fixes for the perf user space side:

   - Fix the probing of precise_ip level, which got broken recently for
     x86.

   - Unbreak the ARCH=x86_64 build

   - Report module before trying to unwind into the module code, which
     avoids broken stack frames displayed"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf unwind: Report module before querying isactivation in dwfl unwind
  perf tools: Fix build with ARCH=x86_64
  perf evsel: Fix probing of precise_ip level for default cycles event
parents 2277ba7c 531c221d

tools/perf/Makefile.config

+19 −19
Original line number Diff line number Diff line
@@ -19,18 +19,18 @@ CFLAGS := $(EXTRA_CFLAGS) $(EXTRA_WARNINGS) 


include $(srctree)/tools/scripts/Makefile.arch



$(call detected_var,ARCH)

$(call detected_var,SRCARCH)



NO_PERF_REGS := 1



# Additional ARCH settings for ppc

ifeq ($(ARCH),powerpc)

ifeq ($(SRCARCH),powerpc)

  NO_PERF_REGS := 0

  LIBUNWIND_LIBS := -lunwind -lunwind-ppc64

endif



# Additional ARCH settings for x86

ifeq ($(ARCH),x86)

ifeq ($(SRCARCH),x86)

  $(call detected,CONFIG_X86)

  ifeq (${IS_64_BIT}, 1)

    CFLAGS += -DHAVE_ARCH_X86_64_SUPPORT -DHAVE_SYSCALL_TABLE -I$(OUTPUT)arch/x86/include/generated
@@ -43,12 +43,12 @@ ifeq ($(ARCH),x86) 
  NO_PERF_REGS := 0

endif



ifeq ($(ARCH),arm)

ifeq ($(SRCARCH),arm)

  NO_PERF_REGS := 0

  LIBUNWIND_LIBS = -lunwind -lunwind-arm

endif



ifeq ($(ARCH),arm64)

ifeq ($(SRCARCH),arm64)

  NO_PERF_REGS := 0

  LIBUNWIND_LIBS = -lunwind -lunwind-aarch64

endif
@@ -61,7 +61,7 @@ endif 
# Disable it on all other architectures in case libdw unwind

# support is detected in system. Add supported architectures

# to the check.

ifneq ($(ARCH),$(filter $(ARCH),x86 arm))

ifneq ($(SRCARCH),$(filter $(SRCARCH),x86 arm))

  NO_LIBDW_DWARF_UNWIND := 1

endif
@@ -115,9 +115,9 @@ endif 
FEATURE_CHECK_CFLAGS-libbabeltrace := $(LIBBABELTRACE_CFLAGS)

FEATURE_CHECK_LDFLAGS-libbabeltrace := $(LIBBABELTRACE_LDFLAGS) -lbabeltrace-ctf



FEATURE_CHECK_CFLAGS-bpf = -I. -I$(srctree)/tools/include -I$(srctree)/tools/arch/$(ARCH)/include/uapi -I$(srctree)/tools/include/uapi

FEATURE_CHECK_CFLAGS-bpf = -I. -I$(srctree)/tools/include -I$(srctree)/tools/arch/$(SRCARCH)/include/uapi -I$(srctree)/tools/include/uapi

# include ARCH specific config

-include $(src-perf)/arch/$(ARCH)/Makefile

-include $(src-perf)/arch/$(SRCARCH)/Makefile



ifdef PERF_HAVE_ARCH_REGS_QUERY_REGISTER_OFFSET

  CFLAGS += -DHAVE_ARCH_REGS_QUERY_REGISTER_OFFSET
@@ -228,12 +228,12 @@ ifeq ($(DEBUG),0) 
endif



INC_FLAGS += -I$(src-perf)/util/include

INC_FLAGS += -I$(src-perf)/arch/$(ARCH)/include

INC_FLAGS += -I$(src-perf)/arch/$(SRCARCH)/include

INC_FLAGS += -I$(srctree)/tools/include/uapi

INC_FLAGS += -I$(srctree)/tools/include/

INC_FLAGS += -I$(srctree)/tools/arch/$(ARCH)/include/uapi

INC_FLAGS += -I$(srctree)/tools/arch/$(ARCH)/include/

INC_FLAGS += -I$(srctree)/tools/arch/$(ARCH)/

INC_FLAGS += -I$(srctree)/tools/arch/$(SRCARCH)/include/uapi

INC_FLAGS += -I$(srctree)/tools/arch/$(SRCARCH)/include/

INC_FLAGS += -I$(srctree)/tools/arch/$(SRCARCH)/



# $(obj-perf)      for generated common-cmds.h

# $(obj-perf)/util for generated bison/flex headers
@@ -355,7 +355,7 @@ ifndef NO_LIBELF 


  ifndef NO_DWARF

    ifeq ($(origin PERF_HAVE_DWARF_REGS), undefined)

      msg := $(warning DWARF register mappings have not been defined for architecture $(ARCH), DWARF support disabled);

      msg := $(warning DWARF register mappings have not been defined for architecture $(SRCARCH), DWARF support disabled);

      NO_DWARF := 1

    else

      CFLAGS += -DHAVE_DWARF_SUPPORT $(LIBDW_CFLAGS)
@@ -380,7 +380,7 @@ ifndef NO_LIBELF 
        CFLAGS += -DHAVE_BPF_PROLOGUE

        $(call detected,CONFIG_BPF_PROLOGUE)

      else

        msg := $(warning BPF prologue is not supported by architecture $(ARCH), missing regs_query_register_offset());

        msg := $(warning BPF prologue is not supported by architecture $(SRCARCH), missing regs_query_register_offset());

      endif

    else

      msg := $(warning DWARF support is off, BPF prologue is disabled);
@@ -406,7 +406,7 @@ ifdef PERF_HAVE_JITDUMP 
  endif

endif



ifeq ($(ARCH),powerpc)

ifeq ($(SRCARCH),powerpc)

  ifndef NO_DWARF

    CFLAGS += -DHAVE_SKIP_CALLCHAIN_IDX

  endif
@@ -487,7 +487,7 @@ else 
endif



ifndef NO_LOCAL_LIBUNWIND

  ifeq ($(ARCH),$(filter $(ARCH),arm arm64))

  ifeq ($(SRCARCH),$(filter $(SRCARCH),arm arm64))

    $(call feature_check,libunwind-debug-frame)

    ifneq ($(feature-libunwind-debug-frame), 1)

      msg := $(warning No debug_frame support found in libunwind);
@@ -740,7 +740,7 @@ ifeq (${IS_64_BIT}, 1) 
      NO_PERF_READ_VDSO32 := 1

    endif

  endif

  ifneq ($(ARCH), x86)

  ifneq ($(SRCARCH), x86)

    NO_PERF_READ_VDSOX32 := 1

  endif

  ifndef NO_PERF_READ_VDSOX32
@@ -769,7 +769,7 @@ ifdef LIBBABELTRACE 
endif



ifndef NO_AUXTRACE

  ifeq ($(ARCH),x86)

  ifeq ($(SRCARCH),x86)

    ifeq ($(feature-get_cpuid), 0)

      msg := $(warning Your gcc lacks the __get_cpuid() builtin, disables support for auxtrace/Intel PT, please install a newer gcc);

      NO_AUXTRACE := 1
@@ -872,7 +872,7 @@ sysconfdir = $(prefix)/etc 
ETC_PERFCONFIG = etc/perfconfig

endif

ifndef lib

ifeq ($(ARCH)$(IS_64_BIT), x861)

ifeq ($(SRCARCH)$(IS_64_BIT), x861)

lib = lib64

else

lib = lib

tools/perf/Makefile.perf

+1 −1
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ endif 


ifeq ($(config),0)

include $(srctree)/tools/scripts/Makefile.arch

-include arch/$(ARCH)/Makefile

-include arch/$(SRCARCH)/Makefile

endif



# The FEATURE_DUMP_EXPORT holds location of the actual

tools/perf/arch/Build

+1 −1
Original line number Diff line number Diff line 
libperf-y += common.o

libperf-y += $(ARCH)/
 
libperf-y += $(SRCARCH)/

tools/perf/pmu-events/Build

+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ hostprogs := jevents 


jevents-y	+= json.o jsmn.o jevents.o

pmu-events-y	+= pmu-events.o

JDIR		=  pmu-events/arch/$(ARCH)

JDIR		=  pmu-events/arch/$(SRCARCH)

JSON		=  $(shell [ -d $(JDIR) ] &&				\

			find $(JDIR) -name '*.json' -o -name 'mapfile.csv')

#
@@ -10,4 +10,4 @@ JSON = $(shell [ -d $(JDIR) ] && \ 
# directory and create tables in pmu-events.c.

#

$(OUTPUT)pmu-events/pmu-events.c: $(JSON) $(JEVENTS)

	$(Q)$(call echo-cmd,gen)$(JEVENTS) $(ARCH) pmu-events/arch $(OUTPUT)pmu-events/pmu-events.c $(V)
 
	$(Q)$(call echo-cmd,gen)$(JEVENTS) $(SRCARCH) pmu-events/arch $(OUTPUT)pmu-events/pmu-events.c $(V)

tools/perf/tests/Build

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ $(OUTPUT)tests/llvm-src-relocation.c: tests/bpf-script-test-relocation.c tests/B 
	$(Q)sed -e 's/"/\\"/g' -e 's/\(.*\)/"\1\\n"/g' $< >> $@

	$(Q)echo ';' >> $@



ifeq ($(ARCH),$(filter $(ARCH),x86 arm arm64 powerpc))

ifeq ($(SRCARCH),$(filter $(SRCARCH),x86 arm arm64 powerpc))

perf-$(CONFIG_DWARF_UNWIND) += dwarf-unwind.o

endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE