Revert "x86/unwind/orc: Change REG_SP_INDIRECT"

hulk inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I5MC71


CVE: NA

---------------------------------

This reverts commit 657a6bec.

This patch was backport from mainline and intend to fix REG_SP_INDIRECT
type in orc unwinder.The patch was fix an objtools problem on mainline,
which The upstream commit havn't been merged in hulk-4.19,and it led to
parse the sp value form orc data was wrong. So we need revert this patch.

Signed-off-by: Yipeng Zou <zouyipeng@huawei.com>
Reviewed-by: Zhang Jianhua <chris.zjh@huawei.com>
Signed-off-by: Yongqiang Liu <liuyongqiang13@huawei.com>

arch/x86/kernel/unwind_orc.c

@@ -450,7 +450,7 @@ bool unwind_next_frame(struct unwind_state *state)
 		break;
 
 	case ORC_REG_SP_INDIRECT:
-		sp = state->sp;
+		sp = state->sp + orc->sp_offset;
 		indirect = true;
 		break;
 
@@ -500,9 +500,6 @@ bool unwind_next_frame(struct unwind_state *state)
 	if (indirect) {
 		if (!deref_stack_reg(state, sp, &sp))
 			goto err;
-
-		if (orc->sp_reg == ORC_REG_SP_INDIRECT)
-			sp += orc->sp_offset;
 	}
 
 	/* Find IP, SP and possibly regs: */

tools/objtool/orc_dump.c

@@ -64,7 +64,7 @@ static void print_reg(unsigned int reg, int offset)
 	if (reg == ORC_REG_BP_INDIRECT)
 		printf("(bp%+d)", offset);
 	else if (reg == ORC_REG_SP_INDIRECT)
-		printf("(sp)%+d", offset);
+		printf("(sp%+d)", offset);
 	else if (reg == ORC_REG_UNDEFINED)
 		printf("(und)");
 	else