mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 21:57:43 +00:00
5fe41793bc
Nathan reports that the new get_current() and per-CPU offset accessors
may cause problems at build time due to the use of a literal to hold the
address of the respective variables. This is due to the fact that LLD
before v14 does not support the PC-relative group relocations that are
normally used for this, and the fallback relies on literals but does not
emit the literal pools explictly using the .ltorg directive.
./arch/arm/include/asm/current.h:53:6: error: out of range pc-relative fixup value
asm(LOAD_SYM_ARMV6(%0, __current) : "=r"(cur));
^
./arch/arm/include/asm/insn.h:25:2: note: expanded from macro 'LOAD_SYM_ARMV6'
" ldr " #reg ", =" #sym " nt"
^
<inline asm>:1:3: note: instantiated into assembly here
ldr r0, =__current
^
Since emitting a literal pool in this particular case is not possible,
let's avoid the LOAD_SYM_ARMV6() entirely, and use the ordinary C
assigment instead.
As it turns out, there are other such cases, and here, using .ltorg to
emit the literal pool within range of the LDR instruction would be
possible due to the presence of an unconditional branch right after it.
Unfortunately, putting .ltorg directives in subsections appears to
confuse the Clang inline assembler, resulting in similar errors even
though the .ltorg is most definitely within range.
So let's fix this by emitting the literal explicitly, and not rely on
the assembler to figure this out. This means we have move the fallback
out of the LOAD_SYM_ARMV6() macro and into the callers.
Link: https://github.com/ClangBuiltLinux/linux/issues/1551
Fixes: 9c46929e79 ("ARM: implement THREAD_INFO_IN_TASK for uniprocessor systems")
Reported-by: Nathan Chancellor <natechancellor@gmail.com>
Tested-by: Nathan Chancellor <nathan@kernel.org>
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
47 lines
1.3 KiB
C
47 lines
1.3 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#ifndef __ASM_ARM_INSN_H
|
|
#define __ASM_ARM_INSN_H
|
|
|
|
#include <linux/types.h>
|
|
|
|
/*
|
|
* Avoid a literal load by emitting a sequence of ADD/LDR instructions with the
|
|
* appropriate relocations. The combined sequence has a range of -/+ 256 MiB,
|
|
* which should be sufficient for the core kernel as well as modules loaded
|
|
* into the module region. (Not supported by LLD before release 14)
|
|
*/
|
|
#define LOAD_SYM_ARMV6(reg, sym) \
|
|
" .globl " #sym " \n\t" \
|
|
" .reloc 10f, R_ARM_ALU_PC_G0_NC, " #sym " \n\t" \
|
|
" .reloc 11f, R_ARM_ALU_PC_G1_NC, " #sym " \n\t" \
|
|
" .reloc 12f, R_ARM_LDR_PC_G2, " #sym " \n\t" \
|
|
"10: sub " #reg ", pc, #8 \n\t" \
|
|
"11: sub " #reg ", " #reg ", #4 \n\t" \
|
|
"12: ldr " #reg ", [" #reg ", #0] \n\t"
|
|
|
|
static inline unsigned long
|
|
arm_gen_nop(void)
|
|
{
|
|
#ifdef CONFIG_THUMB2_KERNEL
|
|
return 0xf3af8000; /* nop.w */
|
|
#else
|
|
return 0xe1a00000; /* mov r0, r0 */
|
|
#endif
|
|
}
|
|
|
|
unsigned long
|
|
__arm_gen_branch(unsigned long pc, unsigned long addr, bool link, bool warn);
|
|
|
|
static inline unsigned long
|
|
arm_gen_branch(unsigned long pc, unsigned long addr)
|
|
{
|
|
return __arm_gen_branch(pc, addr, false, true);
|
|
}
|
|
|
|
static inline unsigned long
|
|
arm_gen_branch_link(unsigned long pc, unsigned long addr, bool warn)
|
|
{
|
|
return __arm_gen_branch(pc, addr, true, warn);
|
|
}
|
|
|
|
#endif
|