perf fixes

GIT PULL Ingo Molnar 1 participant 1 message Aug 23, 2012

Subsystems (7)

Memory management perf events MM core Tracing +3 more subsystems

lore

Share & tools

lore

Ingo Molnar

author

2012-08-23 10:59 UTC #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: f5042d037544215de530a375431c3fca60140823 Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent

This tree contains misc fixlets: a perf script python binding fix, a uprobes fix and a syscall tracing fix.

Thanks,

Ingo

------------------>
Arnaldo Carvalho de Melo (1):
perf tools: Add missing files to build the python binding

Oleg Nesterov (1):

      uprobes: Fix mmap_region()'s mm->mm_rb corruption if uprobe_mmap() fails

Will Deacon (1):

      tracing/syscalls: Fix perf syscall tracing when syscall_nr == -1

 kernel/fork.c                      | 4 ++--
 kernel/trace/trace_syscalls.c      | 4 ++++
 mm/mmap.c                          | 5 ++---
 tools/perf/util/python-ext-sources | 2 ++
 4 files changed, 10 insertions(+), 5 deletions(-)

kernel/fork.c +2 -2

index 3bd2280..2c8857e 100644
@@ -455,8 +455,8 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
 		if (retval)
 			goto out;
 
-		if (file && uprobe_mmap(tmp))
-			goto out;
+		if (file)
+			uprobe_mmap(tmp);
 	}
 	/* a new mm has just been created */
 	arch_dup_mmap(oldmm, mm);

kernel/trace/trace_syscalls.c +4 -0

index 60e4d78..6b245f64 100644
@@ -506,6 +506,8 @@ static void perf_syscall_enter(void *ignore, struct pt_regs *regs, long id)
 	int size;
 
 	syscall_nr = syscall_get_nr(current, regs);
+	if (syscall_nr < 0)
+		return;
 	if (!test_bit(syscall_nr, enabled_perf_enter_syscalls))
 		return;

@@ -580,6 +582,8 @@ static void perf_syscall_exit(void *ignore, struct pt_regs *regs, long ret)
 	int size;
 
 	syscall_nr = syscall_get_nr(current, regs);
+	if (syscall_nr < 0)
+		return;
 	if (!test_bit(syscall_nr, enabled_perf_exit_syscalls))
 		return;

mm/mmap.c +2 -3

index e3e8691..52e08fc 100644
@@ -1356,9 +1356,8 @@ out:
 	} else if ((flags & MAP_POPULATE) && !(flags & MAP_NONBLOCK))
 		make_pages_present(addr, addr + len);
 
-	if (file && uprobe_mmap(vma))
-		/* matching probes but cannot insert */
-		goto unmap_and_free_vma;
+	if (file)
+		uprobe_mmap(vma);
 
 	return addr;

tools/perf/util/python-ext-sources +2 -0

index 2884e67..2133628 100644
@@ -10,10 +10,12 @@ util/ctype.c
 util/evlist.c
 util/evsel.c
 util/cpumap.c
+util/hweight.c
 util/thread_map.c
 util/util.c
 util/xyarray.c
 util/cgroup.c
 util/debugfs.c
+util/rblist.c
 util/strlist.c
 ../../lib/rbtree.c