Sami Tolvanen
b1debb369c
We use non-canonical CFI jump tables with CONFIG_CFI_CLANG, which means the compiler replaces function address references with the address of the function's CFI jump table entry. This results in __pa_symbol(function), for example, returning the physical address of the jump table entry, which can lead to address space confusion since the jump table itself points to a virtual address. The same issue happens when passing function pointers to hypervisor code running at EL2. This change adds __va_function and __pa_function macros, which use inline assembly to take the actual function address instead, and changes the relevant code to use these macros. Bug: 145210207 Change-Id: Ie3079c10427bde705a2244cfb3cb5fb954e5e065 Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
33 lines
791 B
C
33 lines
791 B
C
/* SPDX-License-Identifier: GPL-2.0-only */
|
|
/*
|
|
* CPU reset routines
|
|
*
|
|
* Copyright (C) 2015 Huawei Futurewei Technologies.
|
|
*/
|
|
|
|
#ifndef _ARM64_CPU_RESET_H
|
|
#define _ARM64_CPU_RESET_H
|
|
|
|
#include <asm/virt.h>
|
|
|
|
void __cpu_soft_restart(unsigned long el2_switch, unsigned long entry,
|
|
unsigned long arg0, unsigned long arg1, unsigned long arg2);
|
|
|
|
static inline void __noreturn __nocfi cpu_soft_restart(unsigned long entry,
|
|
unsigned long arg0,
|
|
unsigned long arg1,
|
|
unsigned long arg2)
|
|
{
|
|
typeof(__cpu_soft_restart) *restart;
|
|
|
|
unsigned long el2_switch = !is_kernel_in_hyp_mode() &&
|
|
is_hyp_mode_available();
|
|
restart = (void *)__pa_function(__cpu_soft_restart);
|
|
|
|
cpu_install_idmap();
|
|
restart(el2_switch, entry, arg0, arg1, arg2);
|
|
unreachable();
|
|
}
|
|
|
|
#endif
|