[MIPS] Stacktrace build-fix and improvement (23126692) · Commits · e / devices / android_kernel_xiaomi_nabu

arch/mips/kernel/genex.S

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -220,8 +220,8 @@ NESTED(except_vec_vi_handler, 0, sp)
	CLI		CLI
	TRACE_IRQS_OFF		TRACE_IRQS_OFF
	move a0, sp		move a0, sp
	jalr v0		PTR_LA ra, ret_from_irq
	j ret_from_irq		jr v0
	END(except_vec_vi_handler)		END(except_vec_vi_handler)

	/*		/*
	@@ -349,8 +349,8 @@ NESTED(nmi_handler, PT_SIZE, sp)
	.set at		.set at
	__BUILD_\verbose \exception		__BUILD_\verbose \exception
	move a0, sp		move a0, sp
	jal do_\handler		PTR_LA ra, ret_from_exception
	j ret_from_exception		j do_\handler
	END(handle_\exception)		END(handle_\exception)
	.endm		.endm

arch/mips/kernel/stacktrace.c

+23 −29

Original line number	Original line	Diff line number	Diff line
	@@ -13,7 +13,7 @@
	* Save stack-backtrace addresses into a stack_trace buffer:		* Save stack-backtrace addresses into a stack_trace buffer:
	*/		*/
	static void save_raw_context_stack(struct stack_trace *trace,		static void save_raw_context_stack(struct stack_trace *trace,
	unsigned int skip, unsigned long reg29)		unsigned long reg29)
	{		{
	unsigned long sp = (unsigned long )reg29;		unsigned long sp = (unsigned long )reg29;
	unsigned long addr;		unsigned long addr;
	@@ -21,10 +21,10 @@ static void save_raw_context_stack(struct stack_trace *trace,
	while (!kstack_end(sp)) {		while (!kstack_end(sp)) {
	addr = *sp++;		addr = *sp++;
	if (__kernel_text_address(addr)) {		if (__kernel_text_address(addr)) {
	if (!skip)		if (trace->skip > 0)
	trace->entries[trace->nr_entries++] = addr;		trace->skip--;
	else		else
	skip--;		trace->entries[trace->nr_entries++] = addr;
	if (trace->nr_entries >= trace->max_entries)		if (trace->nr_entries >= trace->max_entries)
	break;		break;
	}		}
	@@ -32,37 +32,40 @@ static void save_raw_context_stack(struct stack_trace *trace,
	}		}

	static struct pt_regs * save_context_stack(struct stack_trace *trace,		static struct pt_regs * save_context_stack(struct stack_trace *trace,
	unsigned int skip, struct task_struct task, struct pt_regs regs)		struct task_struct task, struct pt_regs regs)
	{		{
	unsigned long sp = regs->regs[29];		unsigned long sp = regs->regs[29];
	#ifdef CONFIG_KALLSYMS		#ifdef CONFIG_KALLSYMS
	unsigned long ra = regs->regs[31];		unsigned long ra = regs->regs[31];
	unsigned long pc = regs->cp0_epc;		unsigned long pc = regs->cp0_epc;
			unsigned long stack_page =
			(unsigned long)task_stack_page(task);
	extern void ret_from_irq(void);		extern void ret_from_irq(void);
			extern void ret_from_exception(void);

	if (raw_show_trace \|\| !__kernel_text_address(pc)) {		if (raw_show_trace \|\| !__kernel_text_address(pc)) {
	save_raw_context_stack(trace, skip, sp);		if (stack_page && sp >= stack_page &&
			sp <= stack_page + THREAD_SIZE - 32)
			save_raw_context_stack(trace, sp);
	return NULL;		return NULL;
	}		}
	do {		do {
	if (!skip)		if (trace->skip > 0)
	trace->entries[trace->nr_entries++] = pc;		trace->skip--;
	else		else
	skip--;		trace->entries[trace->nr_entries++] = pc;
	if (trace->nr_entries >= trace->max_entries)		if (trace->nr_entries >= trace->max_entries)
	break;		break;
	/*		/*
	* If we reached the bottom of interrupt context,		* If we reached the bottom of interrupt context,
	* return saved pt_regs.		* return saved pt_regs.
	*/		*/
	if (pc == (unsigned long)ret_from_irq) {		if (pc == (unsigned long)ret_from_irq \|\|
	unsigned long stack_page =		pc == (unsigned long)ret_from_exception) {
	(unsigned long)task_stack_page(task);		if (stack_page && sp >= stack_page &&
	if (!stack_page \|\|		sp <= stack_page + THREAD_SIZE - 32)
	sp < stack_page \|\|
	sp > stack_page + THREAD_SIZE - 32)
	break;
	return (struct pt_regs *)sp;		return (struct pt_regs *)sp;
			break;
	}		}
	pc = unwind_stack(task, &sp, pc, ra);		pc = unwind_stack(task, &sp, pc, ra);
	ra = 0;		ra = 0;
	@@ -76,12 +79,8 @@ static struct pt_regs * save_context_stack(struct stack_trace *trace,

	/*		/*
	* Save stack-backtrace addresses into a stack_trace buffer.		* Save stack-backtrace addresses into a stack_trace buffer.
	* If all_contexts is set, all contexts (hardirq, softirq and process)
	* are saved. If not set then only the current context is saved.
	*/		*/
	void save_stack_trace(struct stack_trace *trace,		void save_stack_trace(struct stack_trace trace, struct task_struct task)
	struct task_struct *task, int all_contexts,
	unsigned int skip)
	{		{
	struct pt_regs dummyregs;		struct pt_regs dummyregs;
	struct pt_regs *regs = &dummyregs;		struct pt_regs *regs = &dummyregs;
	@@ -99,13 +98,8 @@ void save_stack_trace(struct stack_trace *trace,
	}		}

	while (1) {		while (1) {
	regs = save_context_stack(trace, skip, task, regs);		regs = save_context_stack(trace, task, regs);
	if (!all_contexts \|\| !regs \|\|		if (!regs \|\| trace->nr_entries >= trace->max_entries)
	trace->nr_entries >= trace->max_entries)
	break;
	trace->entries[trace->nr_entries++] = ULONG_MAX;
	if (trace->nr_entries >= trace->max_entries)
	break;		break;
	skip = 0;
	}		}
	}		}

arch/mips/mm/tlbex-fault.S

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -19,8 +19,8 @@
	move a0, sp		move a0, sp
	REG_S a2, PT_BVADDR(sp)		REG_S a2, PT_BVADDR(sp)
	li a1, \write		li a1, \write
	jal do_page_fault		PTR_LA ra, ret_from_exception
	j ret_from_exception		j do_page_fault
	END(tlb_do_page_fault_\write)		END(tlb_do_page_fault_\write)
	.endm		.endm