Skip to contentSkip to conversation

perf fixes

GIT PULL Ingo Molnar 1 participant 1 message May 15, 2015

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

Linus,

Please pull the latest perf-urgent-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf-urgent-for-linus

# HEAD: 60d5ddeabdda2d6453280efcf172d2429da10eac Merge branch 'liblockdep-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sashal/linux into perf/urgent

Mostly tooling fixes, but also a lockdep annotation fix, a PMU event list fix and a new model addition.

Thanks,

Ingo

------------------>
Andi Kleen (1):
tools: Fix tools/vm build

Eunbong Song (2):
tools/liblockdep: Fix linker error in case of cross compile tools/liblockdep: Fix compilation error

Kan Liang (1):
perf/x86/intel: Fix SLM cache event list

Peter Zijlstra (1):

      perf: Annotate inherited event ctx->mutex recursion

Stephane Eranian (1):
perf/x86/rapl: Enable Broadwell-U RAPL support

Will Deacon (1):
perf tools: Use getconf to determine number of online CPUs

 arch/x86/kernel/cpu/perf_event_intel.c      |  7 +++--
 arch/x86/kernel/cpu/perf_event_intel_rapl.c |  1 +
 kernel/events/core.c                        | 41 +++++++++++++++++++++++------
 tools/lib/lockdep/Makefile                  |  3 ++-
 tools/lib/lockdep/uinclude/linux/kernel.h   |  3 +++
 tools/perf/Makefile                         |  2 +-
 tools/vm/Makefile                           |  2 +-
 7 files changed, 44 insertions(+), 15 deletions(-)
arch/x86/kernel/cpu/perf_event_intel.c +3 -4
index 960e85de13fb..3998131d1a68 100644
@@ -1134,7 +1134,7 @@ static __initconst const u64 slm_hw_cache_extra_regs
  [ C(LL  ) ] = {
 	[ C(OP_READ) ] = {
 		[ C(RESULT_ACCESS) ] = SLM_DMND_READ|SLM_LLC_ACCESS,
-		[ C(RESULT_MISS)   ] = SLM_DMND_READ|SLM_LLC_MISS,
+		[ C(RESULT_MISS)   ] = 0,
 	},
 	[ C(OP_WRITE) ] = {
 		[ C(RESULT_ACCESS) ] = SLM_DMND_WRITE|SLM_LLC_ACCESS,
@@ -1184,8 +1184,7 @@ static __initconst const u64 slm_hw_cache_event_ids
 	[ C(OP_READ) ] = {
 		/* OFFCORE_RESPONSE.ANY_DATA.LOCAL_CACHE */
 		[ C(RESULT_ACCESS) ] = 0x01b7,
-		/* OFFCORE_RESPONSE.ANY_DATA.ANY_LLC_MISS */
-		[ C(RESULT_MISS)   ] = 0x01b7,
+		[ C(RESULT_MISS)   ] = 0,
 	},
 	[ C(OP_WRITE) ] = {
 		/* OFFCORE_RESPONSE.ANY_RFO.LOCAL_CACHE */
@@ -1217,7 +1216,7 @@ static __initconst const u64 slm_hw_cache_event_ids
  [ C(ITLB) ] = {
 	[ C(OP_READ) ] = {
 		[ C(RESULT_ACCESS) ] = 0x00c0, /* INST_RETIRED.ANY_P */
-		[ C(RESULT_MISS)   ] = 0x0282, /* ITLB.MISSES */
+		[ C(RESULT_MISS)   ] = 0x40205, /* PAGE_WALKS.I_SIDE_WALKS */
 	},
 	[ C(OP_WRITE) ] = {
 		[ C(RESULT_ACCESS) ] = -1,
arch/x86/kernel/cpu/perf_event_intel_rapl.c +1 -0
index 999289b94025..358c54ad20d4 100644
@@ -722,6 +722,7 @@ static int __init rapl_pmu_init(void)
 		break;
 	case 60: /* Haswell */
 	case 69: /* Haswell-Celeron */
+	case 61: /* Broadwell */
 		rapl_cntr_mask = RAPL_IDX_HSW;
 		rapl_pmu_events_group.attrs = rapl_events_hsw_attr;
 		break;
kernel/events/core.c +33 -8

65 lines not on this page · raw message

tools/lib/lockdep/Makefile +2 -1
index 0c356fb65022..18ffccf00426 100644
@@ -14,9 +14,10 @@ define allow-override
     $(eval $(1) = $(2)))
 endef
 
-# Allow setting CC and AR, or setting CROSS_COMPILE as a prefix.
+# Allow setting CC and AR and LD, or setting CROSS_COMPILE as a prefix.
 $(call allow-override,CC,$(CROSS_COMPILE)gcc)
 $(call allow-override,AR,$(CROSS_COMPILE)ar)
+$(call allow-override,LD,$(CROSS_COMPILE)ld)
 
 INSTALL = install
 
tools/lib/lockdep/uinclude/linux/kernel.h +3 -0
index a11e3c357be7..cd2cc59a5da7 100644
@@ -28,6 +28,9 @@
 #define __init
 #define noinline
 #define list_add_tail_rcu list_add_tail
+#define list_for_each_entry_rcu list_for_each_entry
+#define barrier() 
+#define synchronize_sched()
 
 #ifndef CALLER_ADDR0
 #define CALLER_ADDR0 ((unsigned long)__builtin_return_address(0))
tools/perf/Makefile +1 -1
index c699dc35eef9..d31a7bbd7cee 100644
@@ -24,7 +24,7 @@ unexport MAKEFLAGS
 # (To override it, run 'make JOBS=1' and similar.)
 #
 ifeq ($(JOBS),)
-  JOBS := $(shell egrep -c '^processor|^CPU' /proc/cpuinfo 2>/dev/null)
+  JOBS := $(shell (getconf _NPROCESSORS_ONLN || egrep -c '^processor|^CPU[0-9]' /proc/cpuinfo) 2>/dev/null)
   ifeq ($(JOBS),0)
     JOBS := 1
   endif
tools/vm/Makefile +1 -1
index ac884b65a072..93aadaf7ff63 100644
@@ -3,7 +3,7 @@
 TARGETS=page-types slabinfo page_owner_sort
 
 LIB_DIR = ../lib/api
-LIBS = $(LIB_DIR)/libapikfs.a
+LIBS = $(LIB_DIR)/libapi.a
 
 CC = $(CROSS_COMPILE)gcc
 CFLAGS = -Wall -Wextra -I../lib/