arm64: entry: simplify kernel_exit logic
authorMark Rutland <mark.rutland@arm.com>
Tue, 16 Jan 2024 11:02:21 +0000 (11:02 +0000)
committerWill Deacon <will@kernel.org>
Thu, 18 Jan 2024 11:00:09 +0000 (11:00 +0000)
commitda59f1d051d57e85eca49401a3a36d5a622babde
treed937594d6f27b2ab49e62c98dd6560aa9d1ca517
parent832dd634bd1b4e3bbe9f10b9c9ba5db6f6f2b97f
arm64: entry: simplify kernel_exit logic

For historical reasons, the non-KPTI exception return path is duplicated for
EL1 and EL0, with the structure:

.if \el == 0
[ KPTI handling ]
ldr     lr, [sp, #S_LR]
  add sp, sp, #PT_REGS_SIZE // restore sp
[ EL0 exception return workaround ]
eret
.else
ldr     lr, [sp, #S_LR]
  add sp, sp, #PT_REGS_SIZE // restore sp
[ EL1 exception return workaround ]
eret
.endif
sb

This would be simpler and clearer with the common portions factored out,
e.g.

.if \el == 0
[ KPTI handling ]
.endif

ldr     lr, [sp, #S_LR]
  add sp, sp, #PT_REGS_SIZE // restore sp

.if \el == 0
[ EL0 exception return workaround ]
.else
[ EL1 exception return workaround ]
.endif

eret
sb

This expands to the same code, but is simpler for a human to follow as
it avoids duplicates the restore of LR+SP, and makes it clear that the
ERET is associated with the SB.

There should be no functional change as a result of this patch.

Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: James Morse <james.morse@arm.com>
Cc: Rob Herring <robh@kernel.org>
Cc: Will Deacon <will@kernel.org>
Link: https://lore.kernel.org/r/20240116110221.420467-3-mark.rutland@arm.com
Signed-off-by: Will Deacon <will@kernel.org>
arch/arm64/kernel/entry.S