Commit 63163661 authored by Marc Zyngier's avatar Marc Zyngier
Browse files

Merge branch kvm-arm64/misc-6.20 into kvmarm-master/next 



* kvm-arm64/misc-6.20:
  : .
  : Misc KVM/arm64 changes for 6.20
  :
  : - Trivial FPSIMD cleanups
  :
  : - Calculate hyp VA size only once, avoiding potential mapping issues when
  :   VA bits is smaller than expected
  :
  : - Silence sparse warning for the HYP stack base
  :
  : - Fix error checking when handling FFA_VERSION
  :
  : - Add missing trap configuration for DBGWCR15_EL1
  :
  : - Don't try to deal with nested S2 when NV isn't enabled for a guest
  :
  : - Various spelling fixes
  : .
  KVM: arm64: nv: Avoid NV stage-2 code when NV is not supported
  KVM: arm64: Fix various comments
  KVM: arm64: nv: Add trap config for DBGWCR<15>_EL1
  KVM: arm64: Fix error checking for FFA_VERSION
  KVM: arm64: Fix missing <asm/stackpage/nvhe.h> include
  KVM: arm64: Calculate hyp VA size only once
  KVM: arm64: Remove ISB after writing FPEXC32_EL2
  KVM: arm64: Shuffle KVM_HOST_DATA_FLAG_* indices
  KVM: arm64: Fix comment in fpsimd_lazy_switch_to_host()

Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
parents 1df3f01e 0c4762e2

arch/arm64/include/asm/kvm_host.h

+6 −6
Original line number Diff line number Diff line
@@ -734,11 +734,11 @@ struct cpu_sve_state { 
struct kvm_host_data {

#define KVM_HOST_DATA_FLAG_HAS_SPE			0

#define KVM_HOST_DATA_FLAG_HAS_TRBE			1

#define KVM_HOST_DATA_FLAG_TRBE_ENABLED			4

#define KVM_HOST_DATA_FLAG_EL1_TRACING_CONFIGURED	5

#define KVM_HOST_DATA_FLAG_VCPU_IN_HYP_CONTEXT		6

#define KVM_HOST_DATA_FLAG_L1_VNCR_MAPPED		7

#define KVM_HOST_DATA_FLAG_HAS_BRBE			8

#define KVM_HOST_DATA_FLAG_TRBE_ENABLED			2

#define KVM_HOST_DATA_FLAG_EL1_TRACING_CONFIGURED	3

#define KVM_HOST_DATA_FLAG_VCPU_IN_HYP_CONTEXT		4

#define KVM_HOST_DATA_FLAG_L1_VNCR_MAPPED		5

#define KVM_HOST_DATA_FLAG_HAS_BRBE			6

	unsigned long flags;



	struct kvm_cpu_context host_ctxt;

arch/arm64/include/asm/kvm_mmu.h

+2 −1
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ alternative_cb_end 
void kvm_update_va_mask(struct alt_instr *alt,

			__le32 *origptr, __le32 *updptr, int nr_inst);

void kvm_compute_layout(void);

u32 kvm_hyp_va_bits(void);

void kvm_apply_hyp_relocations(void);



#define __hyp_pa(x) (((phys_addr_t)(x)) + hyp_physvirt_offset)
@@ -185,7 +186,7 @@ int kvm_handle_guest_abort(struct kvm_vcpu *vcpu); 


phys_addr_t kvm_mmu_get_httbr(void);

phys_addr_t kvm_get_idmap_vector(void);

int __init kvm_mmu_init(u32 *hyp_va_bits);

int __init kvm_mmu_init(u32 hyp_va_bits);



static inline void *__kvm_vector_slot2addr(void *base,

					   enum arm64_hyp_spectre_vector slot)

arch/arm64/kvm/arm.c

+3 −2
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
#include <asm/kvm_pkvm.h>

#include <asm/kvm_ptrauth.h>

#include <asm/sections.h>

#include <asm/stacktrace/nvhe.h>



#include <kvm/arm_hypercalls.h>

#include <kvm/arm_pmu.h>
@@ -2623,7 +2624,7 @@ static void pkvm_hyp_init_ptrauth(void) 
/* Inits Hyp-mode on all online CPUs */

static int __init init_hyp_mode(void)

{

	u32 hyp_va_bits;

	u32 hyp_va_bits = kvm_hyp_va_bits();

	int cpu;

	int err = -ENOMEM;
@@ -2637,7 +2638,7 @@ static int __init init_hyp_mode(void) 
	/*

	 * Allocate Hyp PGD and setup Hyp identity mapping

	 */

	err = kvm_mmu_init(&hyp_va_bits);

	err = kvm_mmu_init(hyp_va_bits);

	if (err)

		goto out_err;

arch/arm64/kvm/emulate-nested.c

+1 −0
Original line number Diff line number Diff line
@@ -1174,6 +1174,7 @@ static const struct encoding_to_trap_config encoding_to_cgt[] __initconst = { 
	SR_TRAP(SYS_DBGWCRn_EL1(12),	CGT_MDCR_TDE_TDA),

	SR_TRAP(SYS_DBGWCRn_EL1(13),	CGT_MDCR_TDE_TDA),

	SR_TRAP(SYS_DBGWCRn_EL1(14),	CGT_MDCR_TDE_TDA),

	SR_TRAP(SYS_DBGWCRn_EL1(15),	CGT_MDCR_TDE_TDA),

	SR_TRAP(SYS_DBGCLAIMSET_EL1,	CGT_MDCR_TDE_TDA),

	SR_TRAP(SYS_DBGCLAIMCLR_EL1,	CGT_MDCR_TDE_TDA),

	SR_TRAP(SYS_DBGAUTHSTATUS_EL1,	CGT_MDCR_TDE_TDA),

arch/arm64/kvm/hyp/include/hyp/switch.h

+2 −4
Original line number Diff line number Diff line
@@ -59,10 +59,8 @@ static inline void __activate_traps_fpsimd32(struct kvm_vcpu *vcpu) 
	 * If FP/ASIMD is not implemented, FPEXC is UNDEFINED and any access to

	 * it will cause an exception.

	 */

	if (vcpu_el1_is_32bit(vcpu) && system_supports_fpsimd()) {

	if (vcpu_el1_is_32bit(vcpu) && system_supports_fpsimd())

		write_sysreg(1 << 30, fpexc32_el2);

		isb();

	}

}



static inline void __activate_cptr_traps_nvhe(struct kvm_vcpu *vcpu)
@@ -495,7 +493,7 @@ static inline void fpsimd_lazy_switch_to_host(struct kvm_vcpu *vcpu) 
	/*

	 * When the guest owns the FP regs, we know that guest+hyp traps for

	 * any FPSIMD/SVE/SME features exposed to the guest have been disabled

	 * by either fpsimd_lazy_switch_to_guest() or kvm_hyp_handle_fpsimd()

	 * by either __activate_cptr_traps() or kvm_hyp_handle_fpsimd()

	 * prior to __guest_entry(). As __guest_entry() guarantees a context

	 * synchronization event, we don't need an ISB here to avoid taking

	 * traps for anything that was exposed to the guest.