Commit 746bdead authored by Marc Zyngier's avatar Marc Zyngier
Browse files

KVM: arm64: pkvm: Move kvm_handle_pvm_restricted around 



Place kvm_handle_pvm_restricted() next to its little friends such
as kvm_handle_pvm_sysreg().

This allows to make inject_undef64() static.

Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Reviewed-by: default avatarFuad Tabba <tabba@google.com>
Tested-by: default avatarFuad Tabba <tabba@google.com>
Link: https://lore.kernel.org/r/20211013120346.2926621-10-maz@kernel.org
parent 3061725d

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

+1 −1
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ 


u64 pvm_read_id_reg(const struct kvm_vcpu *vcpu, u32 id);

bool kvm_handle_pvm_sysreg(struct kvm_vcpu *vcpu, u64 *exit_code);

bool kvm_handle_pvm_restricted(struct kvm_vcpu *vcpu, u64 *exit_code);

int kvm_check_pvm_sysreg_table(void);

void inject_undef64(struct kvm_vcpu *vcpu);



#endif /* __ARM64_KVM_FIXED_CONFIG_H__ */

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

+0 −12
Original line number Diff line number Diff line
@@ -159,18 +159,6 @@ static void __pmu_switch_to_host(struct kvm_cpu_context *host_ctxt) 
		write_sysreg(pmu->events_host, pmcntenset_el0);

}



/**

 * Handler for protected VM restricted exceptions.

 *

 * Inject an undefined exception into the guest and return true to indicate that

 * the hypervisor has handled the exit, and control should go back to the guest.

 */

static bool kvm_handle_pvm_restricted(struct kvm_vcpu *vcpu, u64 *exit_code)

{

	inject_undef64(vcpu);

	return true;

}



/**

 * Handler for protected VM MSR, MRS or System instruction execution in AArch64.

 *

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

+13 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ u64 id_aa64mmfr2_el1_sys_val; 
 * Inject an unknown/undefined exception to an AArch64 guest while most of its

 * sysregs are live.

 */

void inject_undef64(struct kvm_vcpu *vcpu)

static void inject_undef64(struct kvm_vcpu *vcpu)

{

	u32 esr = (ESR_ELx_EC_UNKNOWN << ESR_ELx_EC_SHIFT);
@@ -473,3 +473,15 @@ bool kvm_handle_pvm_sysreg(struct kvm_vcpu *vcpu, u64 *exit_code) 


	return true;

}



/**

 * Handler for protected VM restricted exceptions.

 *

 * Inject an undefined exception into the guest and return true to indicate that

 * the hypervisor has handled the exit, and control should go back to the guest.

 */

bool kvm_handle_pvm_restricted(struct kvm_vcpu *vcpu, u64 *exit_code)

{

	inject_undef64(vcpu);

	return true;

}