Commit c50cb043 authored by David Brazdil's avatar David Brazdil Committed by Marc Zyngier
Browse files

KVM: arm64: Remove __hyp_text macro, use build rules instead 



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: default avatarDavid Brazdil <dbrazdil@google.com>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20200625131420.71444-15-dbrazdil@google.com
parent c04dd455

arch/arm64/include/asm/kvm_emulate.h

+1 −1
Original line number Diff line number Diff line
@@ -516,7 +516,7 @@ static __always_inline void kvm_skip_instr(struct kvm_vcpu *vcpu, bool is_wide_i 
 * Skip an instruction which has been emulated at hyp while most guest sysregs

 * are live.

 */

static __always_inline void __hyp_text __kvm_skip_instr(struct kvm_vcpu *vcpu)

static __always_inline void __kvm_skip_instr(struct kvm_vcpu *vcpu)

{

	*vcpu_pc(vcpu) = read_sysreg_el2(SYS_ELR);

	vcpu->arch.ctxt.gp_regs.regs.pstate = read_sysreg_el2(SYS_SPSR);

arch/arm64/include/asm/kvm_hyp.h

+0 −2
Original line number Diff line number Diff line
@@ -12,8 +12,6 @@ 
#include <asm/alternative.h>

#include <asm/sysreg.h>



#define __hyp_text __section(.hyp.text) notrace __noscs



#define read_sysreg_elx(r,nvh,vh)					\

	({								\

		u64 reg;						\

arch/arm64/kvm/hyp/aarch32.c

+3 −3
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ static const unsigned short cc_map[16] = { 
/*

 * Check if a trapped instruction should have been executed or not.

 */

bool __hyp_text kvm_condition_valid32(const struct kvm_vcpu *vcpu)

bool kvm_condition_valid32(const struct kvm_vcpu *vcpu)

{

	unsigned long cpsr;

	u32 cpsr_cond;
@@ -93,7 +93,7 @@ bool __hyp_text kvm_condition_valid32(const struct kvm_vcpu *vcpu) 
 *

 * IT[7:0] -> CPSR[26:25],CPSR[15:10]

 */

static void __hyp_text kvm_adjust_itstate(struct kvm_vcpu *vcpu)

static void kvm_adjust_itstate(struct kvm_vcpu *vcpu)

{

	unsigned long itbits, cond;

	unsigned long cpsr = *vcpu_cpsr(vcpu);
@@ -123,7 +123,7 @@ static void __hyp_text kvm_adjust_itstate(struct kvm_vcpu *vcpu) 
 * kvm_skip_instr - skip a trapped instruction and proceed to the next

 * @vcpu: The vcpu pointer

 */

void __hyp_text kvm_skip_instr32(struct kvm_vcpu *vcpu, bool is_wide_instr)

void kvm_skip_instr32(struct kvm_vcpu *vcpu, bool is_wide_instr)

{

	u32 pc = *vcpu_pc(vcpu);

	bool is_thumb;

arch/arm64/kvm/hyp/entry.S

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
#define CPU_SP_EL0_OFFSET	(CPU_XREG_OFFSET(30) + 8)



	.text

	.pushsection	.hyp.text, "ax"



/*

 * We treat x18 as callee-saved as the host may use it as a platform

arch/arm64/kvm/hyp/fpsimd.S

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 
#include <asm/fpsimdmacros.h>



	.text

	.pushsection	.hyp.text, "ax"



SYM_FUNC_START(__fpsimd_save_state)

	fpsimd_save	x0, 1

CRA Git | Maintained and supported by SUSTech CRA and CCSE