Commit 9ef78b62 authored by Michael Ellerman's avatar Michael Ellerman
Browse files

Merge branch 'topic/ppc-kvm' into next 

Merge our topic branch containing powerpc KVM related commits.

Alexey Kardashevskiy (1):
      KVM: PPC: Merge powerpc's debugfs entry content into generic entry

Fabiano Rosas (9):
      KVM: PPC: Book3S HV: Stop returning internal values to userspace
      KVM: PPC: Fix vmx/vsx mixup in mmio emulation
      KVM: PPC: mmio: Reject instructions that access more than mmio.data size
      KVM: PPC: mmio: Return to guest after emulation failure
      KVM: PPC: Book3s: mmio: Deliver DSI after emulation failure
      KVM: PPC: Book3S HV: Check return value of kvmppc_radix_init
      KVM: PPC: Book3S HV: Delay setting of kvm ops
      KVM: PPC: Book3S HV: Free allocated memory if module init fails
      KVM: PPC: Decrement module refcount if init_vm fails

Jason Wang (1):
      powerpc/kvm: no need to initialise statics to 0

Nour-eddine Taleb (1):
      KVM: PPC: Book3S HV: remove unnecessary casts
parents 4bc06c59 e40b38a4

arch/powerpc/include/asm/kvm_host.h

+2 −4
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ 
#include <asm/hvcall.h>

#include <asm/mce.h>



#define __KVM_HAVE_ARCH_VCPU_DEBUGFS



#define KVM_MAX_VCPUS		NR_CPUS

#define KVM_MAX_VCORES		NR_CPUS
@@ -295,7 +297,6 @@ struct kvm_arch { 
	bool dawr1_enabled;

	pgd_t *pgtable;

	u64 process_table;

	struct dentry *debugfs_dir;

	struct kvm_resize_hpt *resize_hpt; /* protected by kvm->lock */

#endif /* CONFIG_KVM_BOOK3S_HV_POSSIBLE */

#ifdef CONFIG_KVM_BOOK3S_PR_POSSIBLE
@@ -673,7 +674,6 @@ struct kvm_vcpu_arch { 
	u64 timing_min_duration[__NUMBER_OF_KVM_EXIT_TYPES];

	u64 timing_max_duration[__NUMBER_OF_KVM_EXIT_TYPES];

	u64 timing_last_exit;

	struct dentry *debugfs_exit_timing;

#endif



#ifdef CONFIG_PPC_BOOK3S
@@ -831,8 +831,6 @@ struct kvm_vcpu_arch { 
	struct kvmhv_tb_accumulator rm_exit;	/* real-mode exit code */

	struct kvmhv_tb_accumulator guest_time;	/* guest execution */

	struct kvmhv_tb_accumulator cede_time;	/* time napping inside guest */



	struct dentry *debugfs_dir;

#endif /* CONFIG_KVM_BOOK3S_HV_EXIT_TIMING */

};

arch/powerpc/include/asm/kvm_ppc.h

+2 −0
Original line number Diff line number Diff line
@@ -314,6 +314,8 @@ struct kvmppc_ops { 
	int (*svm_off)(struct kvm *kvm);

	int (*enable_dawr1)(struct kvm *kvm);

	bool (*hash_v3_possible)(void);

	int (*create_vm_debugfs)(struct kvm *kvm);

	int (*create_vcpu_debugfs)(struct kvm_vcpu *vcpu, struct dentry *debugfs_dentry);

};



extern struct kvmppc_ops *kvmppc_hv_ops;

arch/powerpc/kvm/book3s_64_mmu_host.c

+1 −1
Original line number Diff line number Diff line
@@ -228,7 +228,7 @@ static struct kvmppc_sid_map *create_sid_map(struct kvm_vcpu *vcpu, u64 gvsid) 
	struct kvmppc_sid_map *map;

	struct kvmppc_vcpu_book3s *vcpu_book3s = to_book3s(vcpu);

	u16 sid_map_mask;

	static int backwards_map = 0;

	static int backwards_map;



	if (kvmppc_get_msr(vcpu) & MSR_PR)

		gvsid |= VSID_PR;

arch/powerpc/kvm/book3s_64_mmu_hv.c

+1 −1
Original line number Diff line number Diff line
@@ -2112,7 +2112,7 @@ static const struct file_operations debugfs_htab_fops = { 


void kvmppc_mmu_debugfs_init(struct kvm *kvm)

{

	debugfs_create_file("htab", 0400, kvm->arch.debugfs_dir, kvm,

	debugfs_create_file("htab", 0400, kvm->debugfs_dentry, kvm,

			    &debugfs_htab_fops);

}

arch/powerpc/kvm/book3s_64_mmu_radix.c

+1 −1
Original line number Diff line number Diff line
@@ -1454,7 +1454,7 @@ static const struct file_operations debugfs_radix_fops = { 


void kvmhv_radix_debugfs_init(struct kvm *kvm)

{

	debugfs_create_file("radix", 0400, kvm->arch.debugfs_dir, kvm,

	debugfs_create_file("radix", 0400, kvm->debugfs_dentry, kvm,

			    &debugfs_radix_fops);

}