mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-13 20:16:26 +00:00
c50cb04303
With nVHE code now fully separated from the rest of the kernel, the effects of
the __hyp_text macro (which had to be applied on all nVHE code) can be
achieved with build rules instead. The macro used to:
(a) move code to .hyp.text ELF section, now done by renaming .text using
`objcopy`, and
(b) `notrace` and `__noscs` would negate effects of CC_FLAGS_FTRACE and
CC_FLAGS_SCS, respectivelly, now those flags are erased from
KBUILD_CFLAGS (same way as in EFI stub).
Note that by removing __hyp_text from code shared with VHE, all VHE code is now
compiled into .text and without `notrace` and `__noscs`.
Use of '.pushsection .hyp.text' removed from assembly files as this is now also
covered by the build rules.
For MAINTAINERS: if needed to re-run, uses of macro were removed with the
following command. Formatting was fixed up manually.
find arch/arm64/kvm/hyp -type f -name '*.c' -o -name '*.h' \
-exec sed -i 's/ __hyp_text//g' {} +
Signed-off-by: David Brazdil <dbrazdil@google.com>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20200625131420.71444-15-dbrazdil@google.com
77 lines
1.7 KiB
C
77 lines
1.7 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
/*
|
|
* Copyright (C) 2015 - ARM Ltd
|
|
* Author: Marc Zyngier <marc.zyngier@arm.com>
|
|
*/
|
|
|
|
#include <hyp/debug-sr.h>
|
|
|
|
#include <linux/compiler.h>
|
|
#include <linux/kvm_host.h>
|
|
|
|
#include <asm/debug-monitors.h>
|
|
#include <asm/kvm_asm.h>
|
|
#include <asm/kvm_hyp.h>
|
|
#include <asm/kvm_mmu.h>
|
|
|
|
static void __debug_save_spe(u64 *pmscr_el1)
|
|
{
|
|
u64 reg;
|
|
|
|
/* Clear pmscr in case of early return */
|
|
*pmscr_el1 = 0;
|
|
|
|
/* SPE present on this CPU? */
|
|
if (!cpuid_feature_extract_unsigned_field(read_sysreg(id_aa64dfr0_el1),
|
|
ID_AA64DFR0_PMSVER_SHIFT))
|
|
return;
|
|
|
|
/* Yes; is it owned by EL3? */
|
|
reg = read_sysreg_s(SYS_PMBIDR_EL1);
|
|
if (reg & BIT(SYS_PMBIDR_EL1_P_SHIFT))
|
|
return;
|
|
|
|
/* No; is the host actually using the thing? */
|
|
reg = read_sysreg_s(SYS_PMBLIMITR_EL1);
|
|
if (!(reg & BIT(SYS_PMBLIMITR_EL1_E_SHIFT)))
|
|
return;
|
|
|
|
/* Yes; save the control register and disable data generation */
|
|
*pmscr_el1 = read_sysreg_s(SYS_PMSCR_EL1);
|
|
write_sysreg_s(0, SYS_PMSCR_EL1);
|
|
isb();
|
|
|
|
/* Now drain all buffered data to memory */
|
|
psb_csync();
|
|
dsb(nsh);
|
|
}
|
|
|
|
static void __debug_restore_spe(u64 pmscr_el1)
|
|
{
|
|
if (!pmscr_el1)
|
|
return;
|
|
|
|
/* The host page table is installed, but not yet synchronised */
|
|
isb();
|
|
|
|
/* Re-enable data generation */
|
|
write_sysreg_s(pmscr_el1, SYS_PMSCR_EL1);
|
|
}
|
|
|
|
void __debug_switch_to_guest(struct kvm_vcpu *vcpu)
|
|
{
|
|
/* Disable and flush SPE data generation */
|
|
__debug_save_spe(&vcpu->arch.host_debug_state.pmscr_el1);
|
|
__debug_switch_to_guest_common(vcpu);
|
|
}
|
|
|
|
void __debug_switch_to_host(struct kvm_vcpu *vcpu)
|
|
{
|
|
__debug_restore_spe(vcpu->arch.host_debug_state.pmscr_el1);
|
|
__debug_switch_to_host_common(vcpu);
|
|
}
|
|
|
|
u32 __kvm_get_mdcr_el2(void)
|
|
{
|
|
return read_sysreg(mdcr_el2);
|
|
}
|