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

Commit c7f4f994 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-core-for-mingo-4.14-20170823' of... 

Merge tag 'perf-core-for-mingo-4.14-20170823' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

 into perf/core

Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:

- Expression parser enhancements for metrics (Andi Kleen)

- Fix buffer overflow while freeing events in 'perf stat' (Andi Kleen)

- Fix static linking with elfutils's libdf and with libunwind
  in Debian/Ubuntu (Konstantin Khlebnikov)

- Tighten detection of BPF events, avoiding matching some other PMU
  events such as 'cpu/uops_executed.core,cmask=1/' as a .c source
  file that ended up being considered a BPF event (Andi Kleen)

- Add Skylake server uncore JSON vendor events (Andi Kleen)

- Add support for printing new mem_info encodings, including
  'perf test' checks (Andi Kleen)

- Really install manpages via 'make install-man' (Konstantin Khlebnikov)

- Fix documentation for perf_event_paranoid and perf_event_mlock_kb
  sysctls (Konstantin Khlebnikov)

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 93da8b22 60913e00

Documentation/sysctl/kernel.txt

+12 −1
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ show up in /proc/sys/kernel: 
- perf_cpu_time_max_percent

- perf_event_paranoid

- perf_event_max_stack

- perf_event_mlock_kb

- perf_event_max_contexts_per_stack

- pid_max

- powersave-nap               [ PPC only ]
@@ -654,7 +655,9 @@ Controls use of the performance events system by unprivileged 
users (without CAP_SYS_ADMIN).  The default value is 2.



 -1: Allow use of (almost) all events by all users

>=0: Disallow raw tracepoint access by users without CAP_IOC_LOCK

     Ignore mlock limit after perf_event_mlock_kb without CAP_IPC_LOCK

>=0: Disallow ftrace function tracepoint by users without CAP_SYS_ADMIN

     Disallow raw tracepoint access by users without CAP_SYS_ADMIN

>=1: Disallow CPU event access by users without CAP_SYS_ADMIN

>=2: Disallow kernel profiling by users without CAP_SYS_ADMIN
@@ -673,6 +676,14 @@ The default value is 127. 


==============================================================



perf_event_mlock_kb:



Control size of per-cpu ring buffer not counted agains mlock limit.



The default value is 512 + 1 page



==============================================================



perf_event_max_contexts_per_stack:



Controls maximum number of stack frame context entries for

tools/include/uapi/linux/perf_event.h

+28 −2
Original line number Diff line number Diff line
@@ -954,14 +954,20 @@ union perf_mem_data_src { 
			mem_snoop:5,	/* snoop mode */

			mem_lock:2,	/* lock instr */

			mem_dtlb:7,	/* tlb access */

			mem_rsvd:31;

			mem_lvl_num:4,	/* memory hierarchy level number */

			mem_remote:1,   /* remote */

			mem_snoopx:2,	/* snoop mode, ext */

			mem_rsvd:24;

	};

};

#elif defined(__BIG_ENDIAN_BITFIELD)

union perf_mem_data_src {

	__u64 val;

	struct {

		__u64	mem_rsvd:31,

		__u64	mem_rsvd:24,

			mem_snoopx:2,	/* snoop mode, ext */

			mem_remote:1,   /* remote */

			mem_lvl_num:4,	/* memory hierarchy level number */

			mem_dtlb:7,	/* tlb access */

			mem_lock:2,	/* lock instr */

			mem_snoop:5,	/* snoop mode */
@@ -998,6 +1004,22 @@ union perf_mem_data_src { 
#define PERF_MEM_LVL_UNC	0x2000 /* Uncached memory */

#define PERF_MEM_LVL_SHIFT	5



#define PERF_MEM_REMOTE_REMOTE	0x01  /* Remote */

#define PERF_MEM_REMOTE_SHIFT	37



#define PERF_MEM_LVLNUM_L1	0x01 /* L1 */

#define PERF_MEM_LVLNUM_L2	0x02 /* L2 */

#define PERF_MEM_LVLNUM_L3	0x03 /* L3 */

#define PERF_MEM_LVLNUM_L4	0x04 /* L4 */

/* 5-0xa available */

#define PERF_MEM_LVLNUM_ANY_CACHE 0x0b /* Any cache */

#define PERF_MEM_LVLNUM_LFB	0x0c /* LFB */

#define PERF_MEM_LVLNUM_RAM	0x0d /* RAM */

#define PERF_MEM_LVLNUM_PMEM	0x0e /* PMEM */

#define PERF_MEM_LVLNUM_NA	0x0f /* N/A */



#define PERF_MEM_LVLNUM_SHIFT	33



/* snoop mode */

#define PERF_MEM_SNOOP_NA	0x01 /* not available */

#define PERF_MEM_SNOOP_NONE	0x02 /* no snoop */
@@ -1006,6 +1028,10 @@ union perf_mem_data_src { 
#define PERF_MEM_SNOOP_HITM	0x10 /* snoop hit modified */

#define PERF_MEM_SNOOP_SHIFT	19



#define PERF_MEM_SNOOPX_FWD	0x01 /* forward */

/* 1 free */

#define PERF_MEM_SNOOPX_SHIFT	37



/* locked instruction */

#define PERF_MEM_LOCK_NA	0x01 /* not available */

#define PERF_MEM_LOCK_LOCKED	0x02 /* locked transaction */

tools/perf/Documentation/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ do-install-man: man 
#		$(INSTALL) -m 644 $(DOC_MAN5) $(DESTDIR)$(man5dir); \

#		$(INSTALL) -m 644 $(DOC_MAN7) $(DESTDIR)$(man7dir)



install-man: check-man-tools man

install-man: check-man-tools man do-install-man



ifdef missing_tools

  DO_INSTALL_MAN = $(warning Please install $(missing_tools) to have the man pages installed)

tools/perf/Makefile.config

+10 −6
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ ifeq ($(SRCARCH),x86) 
  ifeq (${IS_64_BIT}, 1)

    CFLAGS += -DHAVE_ARCH_X86_64_SUPPORT -DHAVE_SYSCALL_TABLE -I$(OUTPUT)arch/x86/include/generated

    ARCH_INCLUDE = ../../arch/x86/lib/memcpy_64.S ../../arch/x86/lib/memset_64.S

    LIBUNWIND_LIBS = -lunwind -lunwind-x86_64

    LIBUNWIND_LIBS = -lunwind-x86_64 -lunwind -llzma

    $(call detected,CONFIG_X86_64)

  else

    LIBUNWIND_LIBS = -lunwind-x86 -llzma -lunwind
@@ -103,8 +103,12 @@ ifdef LIBDW_DIR 
  LIBDW_CFLAGS  := -I$(LIBDW_DIR)/include

  LIBDW_LDFLAGS := -L$(LIBDW_DIR)/lib

endif

DWARFLIBS := -ldw

ifeq ($(findstring -static,${LDFLAGS}),-static)

  DWARFLIBS += -lelf -lebl -ldl -lz -llzma -lbz2

endif

FEATURE_CHECK_CFLAGS-libdw-dwarf-unwind := $(LIBDW_CFLAGS)

FEATURE_CHECK_LDFLAGS-libdw-dwarf-unwind := $(LIBDW_LDFLAGS) -ldw

FEATURE_CHECK_LDFLAGS-libdw-dwarf-unwind := $(LIBDW_LDFLAGS) $(DWARFLIBS)



# for linking with debug library, run like:

# make DEBUG=1 LIBBABELTRACE_DIR=/opt/libbabeltrace/
@@ -365,10 +369,6 @@ ifndef NO_LIBELF 
    else

      CFLAGS += -DHAVE_DWARF_SUPPORT $(LIBDW_CFLAGS)

      LDFLAGS += $(LIBDW_LDFLAGS)

      DWARFLIBS := -ldw

      ifeq ($(findstring -static,${LDFLAGS}),-static)

	DWARFLIBS += -lelf -lebl -lz -llzma -lbz2

      endif

      EXTLIBS += ${DWARFLIBS}

      $(call detected,CONFIG_DWARF)

    endif # PERF_HAVE_DWARF_REGS
@@ -505,6 +505,10 @@ ifndef NO_LOCAL_LIBUNWIND 
  EXTLIBS += $(LIBUNWIND_LIBS)

  LDFLAGS += $(LIBUNWIND_LIBS)

endif

ifeq ($(findstring -static,${LDFLAGS}),-static)

  # gcc -static links libgcc_eh which contans piece of libunwind

  LIBUNWIND_LDFLAGS += -Wl,--allow-multiple-definition

endif



ifndef NO_LIBUNWIND

  CFLAGS  += -DHAVE_LIBUNWIND_SUPPORT

tools/perf/pmu-events/arch/x86/mapfile.csv

+1 −0
Original line number Diff line number Diff line
@@ -34,3 +34,4 @@ GenuineIntel-6-2C,v2,westmereep-dp,core 
GenuineIntel-6-2C,v2,westmereep-dp,core

GenuineIntel-6-25,v2,westmereep-sp,core

GenuineIntel-6-2F,v2,westmereex,core

GenuineIntel-6-55,v1,skylakex,core