Commit 8e02ae57 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'uprobes/core' of... 

Merge branch 'uprobes/core' of git://git.kernel.org/pub/scm/linux/kernel/git/oleg/misc

 into perf/uprobes

Pull uprobes updates from Oleg Nesterov:

  "This hopefully completes the previous 'fix the handling of relative
   jmp/call's' series, all changes except the last 3 unrelated fixes try
   to address TODO's mentioned in the changelogs."

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 3617660e 13f59c5e

arch/x86/include/asm/uprobes.h

+8 −5
Original line number Diff line number Diff line
@@ -41,18 +41,21 @@ struct arch_uprobe { 
		u8			ixol[MAX_UINSN_BYTES];

	};



	u16				fixups;

	const struct uprobe_xol_ops	*ops;



	union {

#ifdef CONFIG_X86_64

		unsigned long			rip_rela_target_address;

#endif

		struct {

			s32	offs;

			u8	ilen;

			u8	opc1;

		}			branch;

		struct {

#ifdef CONFIG_X86_64

			long	riprel_target;

#endif

			u8	fixups;

			u8	ilen;

		} 			def;

	};

};

arch/x86/kernel/process_64.c

+4 −3
Original line number Diff line number Diff line
@@ -413,12 +413,11 @@ void set_personality_ia32(bool x32) 
	set_thread_flag(TIF_ADDR32);



	/* Mark the associated mm as containing 32-bit tasks. */

	if (current->mm)

		current->mm->context.ia32_compat = 1;



	if (x32) {

		clear_thread_flag(TIF_IA32);

		set_thread_flag(TIF_X32);

		if (current->mm)

			current->mm->context.ia32_compat = TIF_X32;

		current->personality &= ~READ_IMPLIES_EXEC;

		/* is_compat_task() uses the presence of the x32

		   syscall bit flag to determine compat status */
@@ -426,6 +425,8 @@ void set_personality_ia32(bool x32) 
	} else {

		set_thread_flag(TIF_IA32);

		clear_thread_flag(TIF_X32);

		if (current->mm)

			current->mm->context.ia32_compat = TIF_IA32;

		current->personality |= force_personality32;

		/* Prepare the first "return" to user space */

		current_thread_info()->status |= TS_COMPAT;

arch/x86/kernel/uprobes.c

+162 −171

File changed.

Preview size limit exceeded, changes collapsed.

kernel/events/uprobes.c

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ struct xol_area { 
 */

static bool valid_vma(struct vm_area_struct *vma, bool is_register)

{

	vm_flags_t flags = VM_HUGETLB | VM_MAYEXEC | VM_SHARED;

	vm_flags_t flags = VM_HUGETLB | VM_MAYEXEC | VM_MAYSHARE;



	if (is_register)

		flags |= VM_WRITE;

kernel/trace/trace_uprobe.c

+25 −21
Original line number Diff line number Diff line
@@ -1009,56 +1009,60 @@ uprobe_filter_event(struct trace_uprobe *tu, struct perf_event *event) 
	return __uprobe_perf_filter(&tu->filter, event->hw.tp_target->mm);

}



static int uprobe_perf_open(struct trace_uprobe *tu, struct perf_event *event)

static int uprobe_perf_close(struct trace_uprobe *tu, struct perf_event *event)

{

	bool done;



	write_lock(&tu->filter.rwlock);

	if (event->hw.tp_target) {

		/*

		 * event->parent != NULL means copy_process(), we can avoid

		 * uprobe_apply(). current->mm must be probed and we can rely

		 * on dup_mmap() which preserves the already installed bp's.

		 *

		 * attr.enable_on_exec means that exec/mmap will install the

		 * breakpoints we need.

		 */

		list_del(&event->hw.tp_list);

		done = tu->filter.nr_systemwide ||

			event->parent || event->attr.enable_on_exec ||

			(event->hw.tp_target->flags & PF_EXITING) ||

			uprobe_filter_event(tu, event);

		list_add(&event->hw.tp_list, &tu->filter.perf_events);

	} else {

		tu->filter.nr_systemwide--;

		done = tu->filter.nr_systemwide;

		tu->filter.nr_systemwide++;

	}

	write_unlock(&tu->filter.rwlock);



	if (!done)

		uprobe_apply(tu->inode, tu->offset, &tu->consumer, true);

		return uprobe_apply(tu->inode, tu->offset, &tu->consumer, false);



	return 0;

}



static int uprobe_perf_close(struct trace_uprobe *tu, struct perf_event *event)

static int uprobe_perf_open(struct trace_uprobe *tu, struct perf_event *event)

{

	bool done;

	int err;



	write_lock(&tu->filter.rwlock);

	if (event->hw.tp_target) {

		list_del(&event->hw.tp_list);

		/*

		 * event->parent != NULL means copy_process(), we can avoid

		 * uprobe_apply(). current->mm must be probed and we can rely

		 * on dup_mmap() which preserves the already installed bp's.

		 *

		 * attr.enable_on_exec means that exec/mmap will install the

		 * breakpoints we need.

		 */

		done = tu->filter.nr_systemwide ||

			(event->hw.tp_target->flags & PF_EXITING) ||

			event->parent || event->attr.enable_on_exec ||

			uprobe_filter_event(tu, event);

		list_add(&event->hw.tp_list, &tu->filter.perf_events);

	} else {

		tu->filter.nr_systemwide--;

		done = tu->filter.nr_systemwide;

		tu->filter.nr_systemwide++;

	}

	write_unlock(&tu->filter.rwlock);



	if (!done)

		uprobe_apply(tu->inode, tu->offset, &tu->consumer, false);



	return 0;

	err = 0;

	if (!done) {

		err = uprobe_apply(tu->inode, tu->offset, &tu->consumer, true);

		if (err)

			uprobe_perf_close(tu, event);

	}

	return err;

}



static bool uprobe_perf_filter(struct uprobe_consumer *uc,

CRA Git | Maintained and supported by SUSTech CRA and CCSE