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

Commit 7ca63ee1 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 Ingo Molnar:
 "This tree contains misc fixlets: a perf script python binding fix, a
  uprobes fix and a syscall tracing fix."

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf tools: Add missing files to build the python binding
  uprobes: Fix mmap_region()'s mm->mm_rb corruption if uprobe_mmap() fails
  tracing/syscalls: Fix perf syscall tracing when syscall_nr == -1
parents caf1aaf6 f5042d03

kernel/fork.c

+2 −2
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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