Skip to contentSkip to conversation

perf fixes

GIT PULL Ingo Molnar 1 participant 1 message May 22, 2014

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: b69cf53640da2b86439596118cfa95233154ee76 perf: Fix a race between ring_buffer_detach() and ring_buffer_attach()

The biggest changes are fixes for races that kept triggering Trinity crashes, plus liblockdep build fixes and smaller misc fixes.

... liblockdep bits in perf/urgent are a pull mistake - they should have been in locking/urgent - but by the time I noticed other commits were added and testing was done :-/ Sorry about that.

Thanks,

Ingo

------------------>
Jiri Olsa (1):
perf: Prevent false warning in perf_swevent_add

Peter Zijlstra (4):
perf: Fix race in removing an event
perf: Fix perf_event_init_context()
perf: Limit perf_event_attr::sample_period to 63 bits
perf: Fix a race between ring_buffer_detach() and ring_buffer_attach()

S. Lockwood-Childs (1):
tools/liblockdep: Build liblockdep from tools/Makefile

Sasha Levin (1):
tools/liblockdep: Remove all build files when doing make clean

Yan, Zheng (1):
perf/x86/intel: Fix Silvermont's event constraints

 arch/x86/kernel/cpu/perf_event_intel.c |   1 -
 include/linux/perf_event.h             |   2 +
 kernel/events/core.c                   | 174 +++++++++++++++++----------------
 tools/Makefile                         |   6 ++
 tools/lib/lockdep/Makefile             |   5 +-
 5 files changed, 102 insertions(+), 86 deletions(-)
arch/x86/kernel/cpu/perf_event_intel.c +0 -1
index aa333d9..adb02aa 100644
@@ -169,7 +169,6 @@ static struct event_constraint intel_slm_event_constraints[] __read_mostly =
 {
 	FIXED_EVENT_CONSTRAINT(0x00c0, 0), /* INST_RETIRED.ANY */
 	FIXED_EVENT_CONSTRAINT(0x003c, 1), /* CPU_CLK_UNHALTED.CORE */
-	FIXED_EVENT_CONSTRAINT(0x013c, 2), /* CPU_CLK_UNHALTED.REF */
 	FIXED_EVENT_CONSTRAINT(0x0300, 2), /* pseudo CPU_CLK_UNHALTED.REF */
 	EVENT_CONSTRAINT_END
 };
include/linux/perf_event.h +2 -0
index 3356abc..3ef6ea1 100644
@@ -402,6 +402,8 @@ struct perf_event {
 
 	struct ring_buffer		*rb;
 	struct list_head		rb_entry;
+	unsigned long			rcu_batches;
+	int				rcu_pending;
 
 	/* poll related */
 	wait_queue_head_t		waitq;
kernel/events/core.c +92 -82

376 lines not on this page · raw message

tools/Makefile +6 -0
index bcae806..9a617ad 100644
@@ -44,6 +44,9 @@ cpupower: FORCE
 cgroup firewire hv guest usb virtio vm net: FORCE
 	$(call descend,$@)
 
+liblockdep: FORCE
+	$(call descend,lib/lockdep)
+
 libapikfs: FORCE
 	$(call descend,lib/api)
 
@@ -91,6 +94,9 @@ cpupower_clean:
 cgroup_clean hv_clean firewire_clean lguest_clean usb_clean virtio_clean vm_clean net_clean:
 	$(call descend,$(@:_clean=),clean)
 
+liblockdep_clean:
+	$(call descend,lib/lockdep,clean)
+
 libapikfs_clean:
 	$(call descend,lib/api,clean)
 
tools/lib/lockdep/Makefile +2 -3
index cb09d3f..bba2f52 100644
@@ -1,8 +1,7 @@
 # file format version
 FILE_VERSION = 1
 
-MAKEFLAGS += --no-print-directory
-LIBLOCKDEP_VERSION=$(shell make -sC ../../.. kernelversion)
+LIBLOCKDEP_VERSION=$(shell make --no-print-directory -sC ../../.. kernelversion)
 
 # Makefiles suck: This macro sets a default value of $(2) for the
 # variable named by $(1), unless the variable has been set by
@@ -231,7 +230,7 @@ install_lib: all_cmd
 install: install_lib
 
 clean:
-	$(RM) *.o *~ $(TARGETS) *.a *.so $(VERSION_FILES) .*.d
+	$(RM) *.o *~ $(TARGETS) *.a *liblockdep*.so* $(VERSION_FILES) .*.d
 	$(RM) tags TAGS
 
 endif # skip-makefile