Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

arm64: lib: __arch_copy_from_user(): fold fixups into body

Like other functions, __arch_copy_from_user() places its exception
fixups in the `.fixup` section without any clear association with
__arch_copy_from_user() itself. If we backtrace the fixup code, it will
be symbolized as an offset from the nearest prior symbol, which happens
to be `__entry_tramp_text_end`. Further, since the PC adjustment for the
fixup is akin to a direct branch rather than a function call,
__arch_copy_from_user() itself will be missing from the backtrace.

This is confusing and hinders debugging. In general this pattern will
also be problematic for CONFIG_LIVEPATCH, since fixups often return to
their associated function, but this isn't accurately captured in the
stacktrace.

To solve these issues for assembly functions, we must move fixups into
the body of the functions themselves, after the usual fast-path returns.
This patch does so for __arch_copy_from_user().

Inline assembly will be dealt with in subsequent patches.

Other than the improved backtracing, there should be no functional
change as a result of this patch.

Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Acked-by: Robin Murphy <robin.murphy@arm.com>
Reviewed-by: Ard Biesheuvel <ardb@kernel.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: James Morse <james.morse@arm.com>
Cc: Mark Brown <broonie@kernel.org>
Cc: Will Deacon <will@kernel.org>
Link: https://lore.kernel.org/r/20211019160219.5202-3-mark.rutland@arm.com
Signed-off-by: Will Deacon <will@kernel.org>

authored by

Mark Rutland and committed by
Will Deacon
4012e0e2 35d67794

+3 -5
+3 -5
arch/arm64/lib/copy_from_user.S
··· 60 60 #include "copy_template.S" 61 61 mov x0, #0 // Nothing to copy 62 62 ret 63 - SYM_FUNC_END(__arch_copy_from_user) 64 - EXPORT_SYMBOL(__arch_copy_from_user) 65 63 66 - .section .fixup,"ax" 67 - .align 2 64 + // Exception fixups 68 65 9997: cmp dst, dstin 69 66 b.ne 9998f 70 67 // Before being absolutely sure we couldn't copy anything, try harder ··· 69 72 strb tmp1w, [dst], #1 70 73 9998: sub x0, end, dst // bytes not copied 71 74 ret 72 - .previous 75 + SYM_FUNC_END(__arch_copy_from_user) 76 + EXPORT_SYMBOL(__arch_copy_from_user)