Commit 7c7cce2c authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'kvmarm-fixes-6.6-1' of... 

Merge tag 'kvmarm-fixes-6.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD

KVM/arm64 fixes for 6.6, take #1

- Fix EL2 Stage-1 MMIO mappings where a random address was used

- Fix SMCCC function number comparison when the SVE hint is set
parents 0bb80ecc 373beef0

arch/arm64/include/asm/kvm_hyp.h

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ void deactivate_traps_vhe_put(struct kvm_vcpu *vcpu); 


u64 __guest_enter(struct kvm_vcpu *vcpu);



bool kvm_host_psci_handler(struct kvm_cpu_context *host_ctxt);

bool kvm_host_psci_handler(struct kvm_cpu_context *host_ctxt, u32 func_id);



#ifdef __KVM_NVHE_HYPERVISOR__

void __noreturn __hyp_do_panic(struct kvm_cpu_context *host_ctxt, u64 spsr,

arch/arm64/kvm/hyp/include/nvhe/ffa.h

+1 −1
Original line number Diff line number Diff line
@@ -12,6 +12,6 @@ 
#define FFA_MAX_FUNC_NUM 0x7F



int hyp_ffa_init(void *pages);

bool kvm_host_ffa_handler(struct kvm_cpu_context *host_ctxt);

bool kvm_host_ffa_handler(struct kvm_cpu_context *host_ctxt, u32 func_id);



#endif /* __KVM_HYP_FFA_H */

arch/arm64/kvm/hyp/nvhe/ffa.c

+1 −2
Original line number Diff line number Diff line
@@ -634,9 +634,8 @@ static bool do_ffa_features(struct arm_smccc_res *res, 
	return true;

}



bool kvm_host_ffa_handler(struct kvm_cpu_context *host_ctxt)

bool kvm_host_ffa_handler(struct kvm_cpu_context *host_ctxt, u32 func_id)

{

	DECLARE_REG(u64, func_id, host_ctxt, 0);

	struct arm_smccc_res res;



	/*

arch/arm64/kvm/hyp/nvhe/hyp-init.S

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ __do_hyp_init: 
	cmp	x0, #HVC_STUB_HCALL_NR

	b.lo	__kvm_handle_stub_hvc



	bic	x0, x0, #ARM_SMCCC_CALL_HINTS

	mov	x3, #KVM_HOST_SMCCC_FUNC(__kvm_hyp_init)

	cmp	x0, x3

	b.eq	1f

arch/arm64/kvm/hyp/nvhe/hyp-main.c

+6 −2
Original line number Diff line number Diff line
@@ -368,6 +368,7 @@ static void handle_host_hcall(struct kvm_cpu_context *host_ctxt) 
	if (static_branch_unlikely(&kvm_protected_mode_initialized))

		hcall_min = __KVM_HOST_SMCCC_FUNC___pkvm_prot_finalize;



	id &= ~ARM_SMCCC_CALL_HINTS;

	id -= KVM_HOST_SMCCC_ID(0);



	if (unlikely(id < hcall_min || id >= ARRAY_SIZE(host_hcall)))
@@ -392,11 +393,14 @@ static void default_host_smc_handler(struct kvm_cpu_context *host_ctxt) 


static void handle_host_smc(struct kvm_cpu_context *host_ctxt)

{

	DECLARE_REG(u64, func_id, host_ctxt, 0);

	bool handled;



	handled = kvm_host_psci_handler(host_ctxt);

	func_id &= ~ARM_SMCCC_CALL_HINTS;



	handled = kvm_host_psci_handler(host_ctxt, func_id);

	if (!handled)

		handled = kvm_host_ffa_handler(host_ctxt);

		handled = kvm_host_ffa_handler(host_ctxt, func_id);

	if (!handled)

		default_host_smc_handler(host_ctxt);