Merge branch 'tip/perf/core' of... (26f45274) · Commits · e / devices / android_kernel_fairphone_FP4

arch/x86/kernel/entry_32.S

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1148,7 +1148,6 @@ ENTRY(ftrace_regs_caller)
	* ip location, and move flags into the return ip location.		* ip location, and move flags into the return ip location.
	*/		*/
	pushl 4(%esp) /* save return ip into ip slot */		pushl 4(%esp) /* save return ip into ip slot */
	subl $MCOUNT_INSN_SIZE, (%esp) /* Adjust ip */

	pushl $0 /* Load 0 into orig_ax */		pushl $0 /* Load 0 into orig_ax */
	pushl %gs		pushl %gs
	@@ -1169,6 +1168,7 @@ ENTRY(ftrace_regs_caller)
	movl $__KERNEL_CS,13*4(%esp)		movl $__KERNEL_CS,13*4(%esp)

	movl 124(%esp), %eax / Load ip (1st parameter) */		movl 124(%esp), %eax / Load ip (1st parameter) */
			subl $MCOUNT_INSN_SIZE, %eax /* Adjust ip */
	movl 0x4(%ebp), %edx /* Load parent ip (2nd parameter) */		movl 0x4(%ebp), %edx /* Load parent ip (2nd parameter) */
	leal function_trace_op, %ecx /* Save ftrace_pos in 3rd parameter */		leal function_trace_op, %ecx /* Save ftrace_pos in 3rd parameter */
	pushl %esp /* Save pt_regs as 4th parameter */		pushl %esp /* Save pt_regs as 4th parameter */
	@@ -1180,7 +1180,6 @@ GLOBAL(ftrace_regs_call)
	movl 144(%esp), %eax / Move flags back into cs */		movl 144(%esp), %eax / Move flags back into cs */
	movl %eax, 134(%esp) / Needed to keep addl from modifying flags */		movl %eax, 134(%esp) / Needed to keep addl from modifying flags */
	movl 124(%esp), %eax / Get return ip from regs->ip */		movl 124(%esp), %eax / Get return ip from regs->ip */
	addl $MCOUNT_INSN_SIZE, %eax
	movl %eax, 144(%esp) / Put return ip back for ret */		movl %eax, 144(%esp) / Put return ip back for ret */

	popl %ebx		popl %ebx

arch/x86/kernel/entry_64.S

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -165,6 +165,10 @@ GLOBAL(ftrace_regs_call)
	movq EFLAGS(%rsp), %rax		movq EFLAGS(%rsp), %rax
	movq %rax, SS(%rsp)		movq %rax, SS(%rsp)

			/* Handlers can change the RIP */
			movq RIP(%rsp), %rax
			movq %rax, SS+8(%rsp)

	/* restore the rest of pt_regs */		/* restore the rest of pt_regs */
	movq R15(%rsp), %r15		movq R15(%rsp), %r15
	movq R14(%rsp), %r14		movq R14(%rsp), %r14

arch/x86/kernel/kprobes.c

+31 −12

Original line number	Original line	Diff line number	Diff line
	@@ -541,6 +541,8 @@ reenter_kprobe(struct kprobe p, struct pt_regs regs, struct kprobe_ctlblk *kcb
	return 1;		return 1;
	}		}

			static void __kprobes skip_singlestep(struct kprobe p, struct pt_regs regs,
			struct kprobe_ctlblk *kcb);
	/*		/*
	* Interrupts are disabled on entry as trap3 is an interrupt gate and they		* Interrupts are disabled on entry as trap3 is an interrupt gate and they
	* remain disabled throughout this function.		* remain disabled throughout this function.
	@@ -599,6 +601,12 @@ static int __kprobes kprobe_handler(struct pt_regs *regs)
	} else if (kprobe_running()) {		} else if (kprobe_running()) {
	p = __this_cpu_read(current_kprobe);		p = __this_cpu_read(current_kprobe);
	if (p->break_handler && p->break_handler(p, regs)) {		if (p->break_handler && p->break_handler(p, regs)) {
			#ifdef KPROBES_CAN_USE_FTRACE
			if (kprobe_ftrace(p)) {
			skip_singlestep(p, regs, kcb);
			return 1;
			}
			#endif
	setup_singlestep(p, regs, kcb, 0);		setup_singlestep(p, regs, kcb, 0);
	return 1;		return 1;
	}		}
	@@ -1053,6 +1061,21 @@ int __kprobes longjmp_break_handler(struct kprobe p, struct pt_regs regs)
	}		}

	#ifdef KPROBES_CAN_USE_FTRACE		#ifdef KPROBES_CAN_USE_FTRACE
			static void __kprobes skip_singlestep(struct kprobe p, struct pt_regs regs,
			struct kprobe_ctlblk *kcb)
			{
			/*
			* Emulate singlestep (and also recover regs->ip)
			* as if there is a 5byte nop
			*/
			regs->ip = (unsigned long)p->addr + MCOUNT_INSN_SIZE;
			if (unlikely(p->post_handler)) {
			kcb->kprobe_status = KPROBE_HIT_SSDONE;
			p->post_handler(p, regs, 0);
			}
			__this_cpu_write(current_kprobe, NULL);
			}

	/* Ftrace callback handler for kprobes */		/* Ftrace callback handler for kprobes */
	void __kprobes kprobe_ftrace_handler(unsigned long ip, unsigned long parent_ip,		void __kprobes kprobe_ftrace_handler(unsigned long ip, unsigned long parent_ip,
	struct ftrace_ops ops, struct pt_regs regs)		struct ftrace_ops ops, struct pt_regs regs)
	@@ -1072,21 +1095,17 @@ void __kprobes kprobe_ftrace_handler(unsigned long ip, unsigned long parent_ip,
	if (kprobe_running()) {		if (kprobe_running()) {
	kprobes_inc_nmissed_count(p);		kprobes_inc_nmissed_count(p);
	} else {		} else {
	regs->ip += sizeof(kprobe_opcode_t);		/* Kprobe handler expects regs->ip = ip + 1 as breakpoint hit */
			regs->ip = ip + sizeof(kprobe_opcode_t);

	__this_cpu_write(current_kprobe, p);		__this_cpu_write(current_kprobe, p);
	kcb->kprobe_status = KPROBE_HIT_ACTIVE;		kcb->kprobe_status = KPROBE_HIT_ACTIVE;
	if (p->pre_handler)		if (!p->pre_handler \|\| !p->pre_handler(p, regs))
	p->pre_handler(p, regs);		skip_singlestep(p, regs, kcb);
			/*
	if (unlikely(p->post_handler)) {		* If pre_handler returns !0, it sets regs->ip and
	/* Emulate singlestep as if there is a 5byte nop */		* resets current kprobe.
	regs->ip = ip + MCOUNT_INSN_SIZE;		*/
	kcb->kprobe_status = KPROBE_HIT_SSDONE;
	p->post_handler(p, regs, 0);
	}
	__this_cpu_write(current_kprobe, NULL);
	regs->ip = ip; /* Recover for next callback */
	}		}
	end:		end:
	local_irq_restore(flags);		local_irq_restore(flags);

kernel/Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -98,7 +98,7 @@ obj-$(CONFIG_COMPAT_BINFMT_ELF) += elfcore.o
	obj-$(CONFIG_BINFMT_ELF_FDPIC) += elfcore.o		obj-$(CONFIG_BINFMT_ELF_FDPIC) += elfcore.o
	obj-$(CONFIG_FUNCTION_TRACER) += trace/		obj-$(CONFIG_FUNCTION_TRACER) += trace/
	obj-$(CONFIG_TRACING) += trace/		obj-$(CONFIG_TRACING) += trace/
	obj-$(CONFIG_X86_DS) += trace/		obj-$(CONFIG_TRACE_CLOCK) += trace/
	obj-$(CONFIG_RING_BUFFER) += trace/		obj-$(CONFIG_RING_BUFFER) += trace/
	obj-$(CONFIG_TRACEPOINTS) += trace/		obj-$(CONFIG_TRACEPOINTS) += trace/
	obj-$(CONFIG_IRQ_WORK) += irq_work.o		obj-$(CONFIG_IRQ_WORK) += irq_work.o

kernel/kprobes.c

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -1418,9 +1418,6 @@ static __kprobes int check_kprobe_address_safe(struct kprobe *p,
	/* Given address is not on the instruction boundary */		/* Given address is not on the instruction boundary */
	if ((unsigned long)p->addr != ftrace_addr)		if ((unsigned long)p->addr != ftrace_addr)
	return -EILSEQ;		return -EILSEQ;
	/* break_handler (jprobe) can not work with ftrace */
	if (p->break_handler)
	return -EINVAL;
	p->flags \|= KPROBE_FLAG_FTRACE;		p->flags \|= KPROBE_FLAG_FTRACE;
	#else /* !KPROBES_CAN_USE_FTRACE */		#else /* !KPROBES_CAN_USE_FTRACE */
	return -EINVAL;		return -EINVAL;