Commit 74cc7e0c authored by Tianjia Zhang's avatar Tianjia Zhang Committed by Paolo Bonzini
Browse files

KVM: arm64: clean up redundant 'kvm_run' parameters 



In the current kvm version, 'kvm_run' has been included in the 'kvm_vcpu'
structure. For historical reasons, many kvm-related function parameters
retain the 'kvm_run' and 'kvm_vcpu' parameters at the same time. This
patch does a unified cleanup of these remaining redundant parameters.

Signed-off-by: default avatarTianjia Zhang <tianjia.zhang@linux.alibaba.com>
Reviewed-by: default avatarVitaly Kuznetsov <vkuznets@redhat.com>
Message-Id: <20200623131418.31473-3-tianjia.zhang@linux.alibaba.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 2f0a83be

arch/arm64/include/asm/kvm_coproc.h

+6 −6
Original line number Diff line number Diff line
@@ -27,12 +27,12 @@ struct kvm_sys_reg_target_table { 
void kvm_register_target_sys_reg_table(unsigned int target,

				       struct kvm_sys_reg_target_table *table);



int kvm_handle_cp14_load_store(struct kvm_vcpu *vcpu, struct kvm_run *run);

int kvm_handle_cp14_32(struct kvm_vcpu *vcpu, struct kvm_run *run);

int kvm_handle_cp14_64(struct kvm_vcpu *vcpu, struct kvm_run *run);

int kvm_handle_cp15_32(struct kvm_vcpu *vcpu, struct kvm_run *run);

int kvm_handle_cp15_64(struct kvm_vcpu *vcpu, struct kvm_run *run);

int kvm_handle_sys_reg(struct kvm_vcpu *vcpu, struct kvm_run *run);

int kvm_handle_cp14_load_store(struct kvm_vcpu *vcpu);

int kvm_handle_cp14_32(struct kvm_vcpu *vcpu);

int kvm_handle_cp14_64(struct kvm_vcpu *vcpu);

int kvm_handle_cp15_32(struct kvm_vcpu *vcpu);

int kvm_handle_cp15_64(struct kvm_vcpu *vcpu);

int kvm_handle_sys_reg(struct kvm_vcpu *vcpu);



#define kvm_coproc_table_init kvm_sys_reg_table_init

void kvm_sys_reg_table_init(void);

arch/arm64/include/asm/kvm_host.h

+4 −7
Original line number Diff line number Diff line
@@ -470,18 +470,15 @@ u64 __kvm_call_hyp(void *hypfn, ...); 
void force_vm_exit(const cpumask_t *mask);

void kvm_mmu_wp_memory_region(struct kvm *kvm, int slot);



int handle_exit(struct kvm_vcpu *vcpu, struct kvm_run *run,

		int exception_index);

void handle_exit_early(struct kvm_vcpu *vcpu, struct kvm_run *run,

		       int exception_index);

int handle_exit(struct kvm_vcpu *vcpu, int exception_index);

void handle_exit_early(struct kvm_vcpu *vcpu, int exception_index);



/* MMIO helpers */

void kvm_mmio_write_buf(void *buf, unsigned int len, unsigned long data);

unsigned long kvm_mmio_read_buf(const void *buf, unsigned int len);



int kvm_handle_mmio_return(struct kvm_vcpu *vcpu, struct kvm_run *run);

int io_mem_abort(struct kvm_vcpu *vcpu, struct kvm_run *run,

		 phys_addr_t fault_ipa);

int kvm_handle_mmio_return(struct kvm_vcpu *vcpu);

int io_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa);



int kvm_perf_init(void);

int kvm_perf_teardown(void);

arch/arm64/include/asm/kvm_mmu.h

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ void kvm_free_stage2_pgd(struct kvm *kvm); 
int kvm_phys_addr_ioremap(struct kvm *kvm, phys_addr_t guest_ipa,

			  phys_addr_t pa, unsigned long size, bool writable);



int kvm_handle_guest_abort(struct kvm_vcpu *vcpu, struct kvm_run *run);

int kvm_handle_guest_abort(struct kvm_vcpu *vcpu);



void kvm_mmu_free_memory_caches(struct kvm_vcpu *vcpu);

arch/arm64/kvm/arm.c

+3 −3
Original line number Diff line number Diff line
@@ -660,7 +660,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu) 
		return ret;



	if (run->exit_reason == KVM_EXIT_MMIO) {

		ret = kvm_handle_mmio_return(vcpu, run);

		ret = kvm_handle_mmio_return(vcpu);

		if (ret)

			return ret;

	}
@@ -812,11 +812,11 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu) 
		trace_kvm_exit(ret, kvm_vcpu_trap_get_class(vcpu), *vcpu_pc(vcpu));



		/* Exit types that need handling before we can be preempted */

		handle_exit_early(vcpu, run, ret);

		handle_exit_early(vcpu, ret);



		preempt_enable();



		ret = handle_exit(vcpu, run, ret);

		ret = handle_exit(vcpu, ret);

	}



	/* Tell userspace about in-kernel device output levels */

arch/arm64/kvm/handle_exit.c

+18 −18
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
#define CREATE_TRACE_POINTS

#include "trace_handle_exit.h"



typedef int (*exit_handle_fn)(struct kvm_vcpu *, struct kvm_run *);

typedef int (*exit_handle_fn)(struct kvm_vcpu *);



static void kvm_handle_guest_serror(struct kvm_vcpu *vcpu, u32 esr)

{
@@ -33,7 +33,7 @@ static void kvm_handle_guest_serror(struct kvm_vcpu *vcpu, u32 esr) 
		kvm_inject_vabt(vcpu);

}



static int handle_hvc(struct kvm_vcpu *vcpu, struct kvm_run *run)

static int handle_hvc(struct kvm_vcpu *vcpu)

{

	int ret;
@@ -50,7 +50,7 @@ static int handle_hvc(struct kvm_vcpu *vcpu, struct kvm_run *run) 
	return ret;

}



static int handle_smc(struct kvm_vcpu *vcpu, struct kvm_run *run)

static int handle_smc(struct kvm_vcpu *vcpu)

{

	/*

	 * "If an SMC instruction executed at Non-secure EL1 is
@@ -69,7 +69,7 @@ static int handle_smc(struct kvm_vcpu *vcpu, struct kvm_run *run) 
 * Guest access to FP/ASIMD registers are routed to this handler only

 * when the system doesn't support FP/ASIMD.

 */

static int handle_no_fpsimd(struct kvm_vcpu *vcpu, struct kvm_run *run)

static int handle_no_fpsimd(struct kvm_vcpu *vcpu)

{

	kvm_inject_undefined(vcpu);

	return 1;
@@ -87,7 +87,7 @@ static int handle_no_fpsimd(struct kvm_vcpu *vcpu, struct kvm_run *run) 
 * world-switches and schedule other host processes until there is an

 * incoming IRQ or FIQ to the VM.

 */

static int kvm_handle_wfx(struct kvm_vcpu *vcpu, struct kvm_run *run)

static int kvm_handle_wfx(struct kvm_vcpu *vcpu)

{

	if (kvm_vcpu_get_hsr(vcpu) & ESR_ELx_WFx_ISS_WFE) {

		trace_kvm_wfx_arm64(*vcpu_pc(vcpu), true);
@@ -109,16 +109,16 @@ static int kvm_handle_wfx(struct kvm_vcpu *vcpu, struct kvm_run *run) 
 * kvm_handle_guest_debug - handle a debug exception instruction

 *

 * @vcpu:	the vcpu pointer

 * @run:	access to the kvm_run structure for results

 *

 * We route all debug exceptions through the same handler. If both the

 * guest and host are using the same debug facilities it will be up to

 * userspace to re-inject the correct exception for guest delivery.

 *

 * @return: 0 (while setting run->exit_reason), -1 for error

 * @return: 0 (while setting vcpu->run->exit_reason), -1 for error

 */

static int kvm_handle_guest_debug(struct kvm_vcpu *vcpu, struct kvm_run *run)

static int kvm_handle_guest_debug(struct kvm_vcpu *vcpu)

{

	struct kvm_run *run = vcpu->run;

	u32 hsr = kvm_vcpu_get_hsr(vcpu);

	int ret = 0;
@@ -144,7 +144,7 @@ static int kvm_handle_guest_debug(struct kvm_vcpu *vcpu, struct kvm_run *run) 
	return ret;

}



static int kvm_handle_unknown_ec(struct kvm_vcpu *vcpu, struct kvm_run *run)

static int kvm_handle_unknown_ec(struct kvm_vcpu *vcpu)

{

	u32 hsr = kvm_vcpu_get_hsr(vcpu);
@@ -155,7 +155,7 @@ static int kvm_handle_unknown_ec(struct kvm_vcpu *vcpu, struct kvm_run *run) 
	return 1;

}



static int handle_sve(struct kvm_vcpu *vcpu, struct kvm_run *run)

static int handle_sve(struct kvm_vcpu *vcpu)

{

	/* Until SVE is supported for guests: */

	kvm_inject_undefined(vcpu);
@@ -167,7 +167,7 @@ static int handle_sve(struct kvm_vcpu *vcpu, struct kvm_run *run) 
 * a NOP). If we get here, it is that we didn't fixup ptrauth on exit, and all

 * that we can do is give the guest an UNDEF.

 */

static int kvm_handle_ptrauth(struct kvm_vcpu *vcpu, struct kvm_run *run)

static int kvm_handle_ptrauth(struct kvm_vcpu *vcpu)

{

	kvm_inject_undefined(vcpu);

	return 1;
@@ -212,7 +212,7 @@ static exit_handle_fn kvm_get_exit_handler(struct kvm_vcpu *vcpu) 
 * KVM_EXIT_DEBUG, otherwise userspace needs to complete its

 * emulation first.

 */

static int handle_trap_exceptions(struct kvm_vcpu *vcpu, struct kvm_run *run)

static int handle_trap_exceptions(struct kvm_vcpu *vcpu)

{

	int handled;
@@ -227,7 +227,7 @@ static int handle_trap_exceptions(struct kvm_vcpu *vcpu, struct kvm_run *run) 
		exit_handle_fn exit_handler;



		exit_handler = kvm_get_exit_handler(vcpu);

		handled = exit_handler(vcpu, run);

		handled = exit_handler(vcpu);

	}



	return handled;
@@ -237,9 +237,10 @@ static int handle_trap_exceptions(struct kvm_vcpu *vcpu, struct kvm_run *run) 
 * Return > 0 to return to guest, < 0 on error, 0 (and set exit_reason) on

 * proper exit to userspace.

 */

int handle_exit(struct kvm_vcpu *vcpu, struct kvm_run *run,

		       int exception_index)

int handle_exit(struct kvm_vcpu *vcpu, int exception_index)

{

	struct kvm_run *run = vcpu->run;



	if (ARM_SERROR_PENDING(exception_index)) {

		u8 hsr_ec = ESR_ELx_EC(kvm_vcpu_get_hsr(vcpu));
@@ -265,7 +266,7 @@ int handle_exit(struct kvm_vcpu *vcpu, struct kvm_run *run, 
	case ARM_EXCEPTION_EL1_SERROR:

		return 1;

	case ARM_EXCEPTION_TRAP:

		return handle_trap_exceptions(vcpu, run);

		return handle_trap_exceptions(vcpu);

	case ARM_EXCEPTION_HYP_GONE:

		/*

		 * EL2 has been reset to the hyp-stub. This happens when a guest
@@ -289,8 +290,7 @@ int handle_exit(struct kvm_vcpu *vcpu, struct kvm_run *run, 
}



/* For exit types that need handling before we can be preempted */

void handle_exit_early(struct kvm_vcpu *vcpu, struct kvm_run *run,

		       int exception_index)

void handle_exit_early(struct kvm_vcpu *vcpu, int exception_index)

{

	if (ARM_SERROR_PENDING(exception_index)) {

		if (this_cpu_has_cap(ARM64_HAS_RAS_EXTN)) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE