Commit 5379564b authored Oct 28, 2015 by Will Deacon Committed by Sasha Levin Nov 15, 2015

Revert "ARM64: unwind: Fix PC calculation"



[ Upstream commit 9702970c7bd3e2d6fecb642a190269131d4ac16c ]

This reverts commit e306dfd0.

With this patch applied, we were the only architecture making this sort
of adjustment to the PC calculation in the unwinder. This causes
problems for ftrace, where the PC values are matched against the
contents of the stack frames in the callchain and fail to match any
records after the address adjustment.

Whilst there has been some effort to change ftrace to workaround this,
those patches are not yet ready for mainline and, since we're the odd
architecture in this regard, let's just step in line with other
architectures (like arch/arm/) for now.

Cc: <stable@vger.kernel.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>

parent 7b21a474

arch/arm64/kernel/stacktrace.c

+1 −5

Original line number	Diff line number	Diff line
		@@ -48,11 +48,7 @@ int notrace unwind_frame(struct stackframe *frame)

		frame->sp = fp + 0x10;
		frame->fp = (unsigned long )(fp);
		/*
		* -4 here because we care about the PC at time of bl,
		* not where the return will go.
		*/
		frame->pc = (unsigned long )(fp + 8) - 4;
		frame->pc = (unsigned long )(fp + 8);

		return 0;
		}