Commit 8c99d345 authored by Tianjia Zhang's avatar Tianjia Zhang Committed by Paul Mackerras
Browse files

KVM: PPC: 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>
Reviewed-by: default avatarPaul Mackerras <paulus@ozlabs.org>
Signed-off-by: default avatarPaul Mackerras <paulus@ozlabs.org>
parent 2610a57f

arch/powerpc/include/asm/kvm_book3s.h

+7 −9
Original line number Diff line number Diff line
@@ -155,12 +155,11 @@ extern void kvmppc_mmu_unmap_page(struct kvm_vcpu *vcpu, struct kvmppc_pte *pte) 
extern int kvmppc_mmu_map_segment(struct kvm_vcpu *vcpu, ulong eaddr);

extern void kvmppc_mmu_flush_segment(struct kvm_vcpu *vcpu, ulong eaddr, ulong seg_size);

extern void kvmppc_mmu_flush_segments(struct kvm_vcpu *vcpu);

extern int kvmppc_book3s_hv_page_fault(struct kvm_run *run,

			struct kvm_vcpu *vcpu, unsigned long addr,

			unsigned long status);

extern int kvmppc_book3s_hv_page_fault(struct kvm_vcpu *vcpu,

			unsigned long addr, unsigned long status);

extern long kvmppc_hv_find_lock_hpte(struct kvm *kvm, gva_t eaddr,

			unsigned long slb_v, unsigned long valid);

extern int kvmppc_hv_emulate_mmio(struct kvm_run *run, struct kvm_vcpu *vcpu,

extern int kvmppc_hv_emulate_mmio(struct kvm_vcpu *vcpu,

			unsigned long gpa, gva_t ea, int is_store);



extern void kvmppc_mmu_hpte_cache_map(struct kvm_vcpu *vcpu, struct hpte_cache *pte);
@@ -174,8 +173,7 @@ extern void kvmppc_mmu_hpte_sysexit(void); 
extern int kvmppc_mmu_hv_init(void);

extern int kvmppc_book3s_hcall_implemented(struct kvm *kvm, unsigned long hc);



extern int kvmppc_book3s_radix_page_fault(struct kvm_run *run,

			struct kvm_vcpu *vcpu,

extern int kvmppc_book3s_radix_page_fault(struct kvm_vcpu *vcpu,

			unsigned long ea, unsigned long dsisr);

extern unsigned long __kvmhv_copy_tofrom_guest_radix(int lpid, int pid,

					gva_t eaddr, void *to, void *from,
@@ -234,7 +232,7 @@ extern void kvmppc_trigger_fac_interrupt(struct kvm_vcpu *vcpu, ulong fac); 
extern void kvmppc_set_bat(struct kvm_vcpu *vcpu, struct kvmppc_bat *bat,

			   bool upper, u32 val);

extern void kvmppc_giveup_ext(struct kvm_vcpu *vcpu, ulong msr);

extern int kvmppc_emulate_paired_single(struct kvm_run *run, struct kvm_vcpu *vcpu);

extern int kvmppc_emulate_paired_single(struct kvm_vcpu *vcpu);

extern kvm_pfn_t kvmppc_gpa_to_pfn(struct kvm_vcpu *vcpu, gpa_t gpa,

			bool writing, bool *writable);

extern void kvmppc_add_revmap_chain(struct kvm *kvm, struct revmap_entry *rev,
@@ -300,12 +298,12 @@ void kvmhv_set_ptbl_entry(unsigned int lpid, u64 dw0, u64 dw1); 
void kvmhv_release_all_nested(struct kvm *kvm);

long kvmhv_enter_nested_guest(struct kvm_vcpu *vcpu);

long kvmhv_do_nested_tlbie(struct kvm_vcpu *vcpu);

int kvmhv_run_single_vcpu(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu,

int kvmhv_run_single_vcpu(struct kvm_vcpu *vcpu,

			  u64 time_limit, unsigned long lpcr);

void kvmhv_save_hv_regs(struct kvm_vcpu *vcpu, struct hv_guest_state *hr);

void kvmhv_restore_hv_return_state(struct kvm_vcpu *vcpu,

				   struct hv_guest_state *hr);

long int kvmhv_nested_page_fault(struct kvm_run *run, struct kvm_vcpu *vcpu);

long int kvmhv_nested_page_fault(struct kvm_vcpu *vcpu);



void kvmppc_giveup_fac(struct kvm_vcpu *vcpu, ulong fac);

arch/powerpc/include/asm/kvm_ppc.h

+13 −14
Original line number Diff line number Diff line
@@ -58,28 +58,28 @@ enum xlate_readwrite { 
	XLATE_WRITE		/* check for write permissions */

};



extern int kvmppc_vcpu_run(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu);

extern int __kvmppc_vcpu_run(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu);

extern int kvmppc_vcpu_run(struct kvm_vcpu *vcpu);

extern int __kvmppc_vcpu_run(struct kvm_run *run, struct kvm_vcpu *vcpu);

extern void kvmppc_handler_highmem(void);



extern void kvmppc_dump_vcpu(struct kvm_vcpu *vcpu);

extern int kvmppc_handle_load(struct kvm_run *run, struct kvm_vcpu *vcpu,

extern int kvmppc_handle_load(struct kvm_vcpu *vcpu,

                              unsigned int rt, unsigned int bytes,

			      int is_default_endian);

extern int kvmppc_handle_loads(struct kvm_run *run, struct kvm_vcpu *vcpu,

extern int kvmppc_handle_loads(struct kvm_vcpu *vcpu,

                               unsigned int rt, unsigned int bytes,

			       int is_default_endian);

extern int kvmppc_handle_vsx_load(struct kvm_run *run, struct kvm_vcpu *vcpu,

extern int kvmppc_handle_vsx_load(struct kvm_vcpu *vcpu,

				unsigned int rt, unsigned int bytes,

			int is_default_endian, int mmio_sign_extend);

extern int kvmppc_handle_vmx_load(struct kvm_run *run, struct kvm_vcpu *vcpu,

extern int kvmppc_handle_vmx_load(struct kvm_vcpu *vcpu,

		unsigned int rt, unsigned int bytes, int is_default_endian);

extern int kvmppc_handle_vmx_store(struct kvm_run *run, struct kvm_vcpu *vcpu,

extern int kvmppc_handle_vmx_store(struct kvm_vcpu *vcpu,

		unsigned int rs, unsigned int bytes, int is_default_endian);

extern int kvmppc_handle_store(struct kvm_run *run, struct kvm_vcpu *vcpu,

extern int kvmppc_handle_store(struct kvm_vcpu *vcpu,

			       u64 val, unsigned int bytes,

			       int is_default_endian);

extern int kvmppc_handle_vsx_store(struct kvm_run *run, struct kvm_vcpu *vcpu,

extern int kvmppc_handle_vsx_store(struct kvm_vcpu *vcpu,

				int rs, unsigned int bytes,

				int is_default_endian);
@@ -90,10 +90,9 @@ extern int kvmppc_ld(struct kvm_vcpu *vcpu, ulong *eaddr, int size, void *ptr, 
		     bool data);

extern int kvmppc_st(struct kvm_vcpu *vcpu, ulong *eaddr, int size, void *ptr,

		     bool data);

extern int kvmppc_emulate_instruction(struct kvm_run *run,

                                      struct kvm_vcpu *vcpu);

extern int kvmppc_emulate_instruction(struct kvm_vcpu *vcpu);

extern int kvmppc_emulate_loadstore(struct kvm_vcpu *vcpu);

extern int kvmppc_emulate_mmio(struct kvm_run *run, struct kvm_vcpu *vcpu);

extern int kvmppc_emulate_mmio(struct kvm_vcpu *vcpu);

extern void kvmppc_emulate_dec(struct kvm_vcpu *vcpu);

extern u32 kvmppc_get_dec(struct kvm_vcpu *vcpu, u64 tb);

extern void kvmppc_decrementer_func(struct kvm_vcpu *vcpu);
@@ -267,7 +266,7 @@ struct kvmppc_ops { 
	void (*vcpu_put)(struct kvm_vcpu *vcpu);

	void (*inject_interrupt)(struct kvm_vcpu *vcpu, int vec, u64 srr1_flags);

	void (*set_msr)(struct kvm_vcpu *vcpu, u64 msr);

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

	int (*vcpu_run)(struct kvm_vcpu *vcpu);

	int (*vcpu_create)(struct kvm_vcpu *vcpu);

	void (*vcpu_free)(struct kvm_vcpu *vcpu);

	int (*check_requests)(struct kvm_vcpu *vcpu);
@@ -291,7 +290,7 @@ struct kvmppc_ops { 
	int (*init_vm)(struct kvm *kvm);

	void (*destroy_vm)(struct kvm *kvm);

	int (*get_smmu_info)(struct kvm *kvm, struct kvm_ppc_smmu_info *info);

	int (*emulate_op)(struct kvm_run *run, struct kvm_vcpu *vcpu,

	int (*emulate_op)(struct kvm_vcpu *vcpu,

			  unsigned int inst, int *advance);

	int (*emulate_mtspr)(struct kvm_vcpu *vcpu, int sprn, ulong spr_val);

	int (*emulate_mfspr)(struct kvm_vcpu *vcpu, int sprn, ulong *spr_val);

arch/powerpc/kvm/book3s.c

+2 −2
Original line number Diff line number Diff line
@@ -755,9 +755,9 @@ void kvmppc_set_msr(struct kvm_vcpu *vcpu, u64 msr) 
}

EXPORT_SYMBOL_GPL(kvmppc_set_msr);



int kvmppc_vcpu_run(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu)

int kvmppc_vcpu_run(struct kvm_vcpu *vcpu)

{

	return vcpu->kvm->arch.kvm_ops->vcpu_run(kvm_run, vcpu);

	return vcpu->kvm->arch.kvm_ops->vcpu_run(vcpu);

}



int kvm_arch_vcpu_ioctl_translate(struct kvm_vcpu *vcpu,

arch/powerpc/kvm/book3s.h

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ extern void kvm_set_spte_hva_hv(struct kvm *kvm, unsigned long hva, pte_t pte); 


extern int kvmppc_mmu_init_pr(struct kvm_vcpu *vcpu);

extern void kvmppc_mmu_destroy_pr(struct kvm_vcpu *vcpu);

extern int kvmppc_core_emulate_op_pr(struct kvm_run *run, struct kvm_vcpu *vcpu,

extern int kvmppc_core_emulate_op_pr(struct kvm_vcpu *vcpu,

				     unsigned int inst, int *advance);

extern int kvmppc_core_emulate_mtspr_pr(struct kvm_vcpu *vcpu,

					int sprn, ulong spr_val);

arch/powerpc/kvm/book3s_64_mmu_hv.c

+6 −6
Original line number Diff line number Diff line
@@ -413,7 +413,7 @@ static int instruction_is_store(unsigned int instr) 
	return (instr & mask) != 0;

}



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

int kvmppc_hv_emulate_mmio(struct kvm_vcpu *vcpu,

			   unsigned long gpa, gva_t ea, int is_store)

{

	u32 last_inst;
@@ -473,10 +473,10 @@ int kvmppc_hv_emulate_mmio(struct kvm_run *run, struct kvm_vcpu *vcpu, 


	vcpu->arch.paddr_accessed = gpa;

	vcpu->arch.vaddr_accessed = ea;

	return kvmppc_emulate_mmio(run, vcpu);

	return kvmppc_emulate_mmio(vcpu);

}



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

int kvmppc_book3s_hv_page_fault(struct kvm_vcpu *vcpu,

				unsigned long ea, unsigned long dsisr)

{

	struct kvm *kvm = vcpu->kvm;
@@ -499,7 +499,7 @@ int kvmppc_book3s_hv_page_fault(struct kvm_run *run, struct kvm_vcpu *vcpu, 
	pte_t pte, *ptep;



	if (kvm_is_radix(kvm))

		return kvmppc_book3s_radix_page_fault(run, vcpu, ea, dsisr);

		return kvmppc_book3s_radix_page_fault(vcpu, ea, dsisr);



	/*

	 * Real-mode code has already searched the HPT and found the
@@ -519,7 +519,7 @@ int kvmppc_book3s_hv_page_fault(struct kvm_run *run, struct kvm_vcpu *vcpu, 
			gpa_base = r & HPTE_R_RPN & ~(psize - 1);

			gfn_base = gpa_base >> PAGE_SHIFT;

			gpa = gpa_base | (ea & (psize - 1));

			return kvmppc_hv_emulate_mmio(run, vcpu, gpa, ea,

			return kvmppc_hv_emulate_mmio(vcpu, gpa, ea,

						dsisr & DSISR_ISSTORE);

		}

	}
@@ -555,7 +555,7 @@ int kvmppc_book3s_hv_page_fault(struct kvm_run *run, struct kvm_vcpu *vcpu, 


	/* No memslot means it's an emulated MMIO region */

	if (!memslot || (memslot->flags & KVM_MEMSLOT_INVALID))

		return kvmppc_hv_emulate_mmio(run, vcpu, gpa, ea,

		return kvmppc_hv_emulate_mmio(vcpu, gpa, ea,

					      dsisr & DSISR_ISSTORE);



	/*