Commit 2e3df760 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'kvm-ppc-next-5.10-1' of... 

Merge tag 'kvm-ppc-next-5.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc into HEAD

PPC KVM update for 5.10

- Fix for running nested guests with in-kernel IRQ chip
- Fix race condition causing occasional host hard lockup
- Minor cleanups and bugfixes
parents bf3c0e5e cf59eb13

arch/powerpc/include/asm/kvm_host.h

+1 −0
Original line number Diff line number Diff line
@@ -326,6 +326,7 @@ struct kvm_arch { 
#endif

#ifdef CONFIG_KVM_XICS

	struct kvmppc_xics *xics;

	struct kvmppc_xics *xics_device;

	struct kvmppc_xive *xive;    /* Current XIVE device in use */

	struct {

		struct kvmppc_xive *native;

arch/powerpc/kvm/book3s.c

+5 −3
Original line number Diff line number Diff line
@@ -558,12 +558,12 @@ int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs) 


int kvm_arch_vcpu_ioctl_get_fpu(struct kvm_vcpu *vcpu, struct kvm_fpu *fpu)

{

	return -ENOTSUPP;

	return -EOPNOTSUPP;

}



int kvm_arch_vcpu_ioctl_set_fpu(struct kvm_vcpu *vcpu, struct kvm_fpu *fpu)

{

	return -ENOTSUPP;

	return -EOPNOTSUPP;

}



int kvmppc_get_one_reg(struct kvm_vcpu *vcpu, u64 id,
@@ -879,13 +879,15 @@ void kvmppc_core_destroy_vm(struct kvm *kvm) 


#ifdef CONFIG_KVM_XICS

	/*

	 * Free the XIVE devices which are not directly freed by the

	 * Free the XIVE and XICS devices which are not directly freed by the

	 * device 'release' method

	 */

	kfree(kvm->arch.xive_devices.native);

	kvm->arch.xive_devices.native = NULL;

	kfree(kvm->arch.xive_devices.xics_on_xive);

	kvm->arch.xive_devices.xics_on_xive = NULL;

	kfree(kvm->arch.xics_device);

	kvm->arch.xics_device = NULL;

#endif /* CONFIG_KVM_XICS */

}

arch/powerpc/kvm/book3s_64_mmu_radix.c

+1 −1
Original line number Diff line number Diff line
@@ -347,7 +347,7 @@ static unsigned long kvmppc_radix_update_pte(struct kvm *kvm, pte_t *ptep, 
	return __radix_pte_update(ptep, clr, set);

}



void kvmppc_radix_set_pte_at(struct kvm *kvm, unsigned long addr,

static void kvmppc_radix_set_pte_at(struct kvm *kvm, unsigned long addr,

			     pte_t *ptep, pte_t pte)

{

	radix__set_pte_at(kvm->mm, addr, ptep, pte, 0);

arch/powerpc/kvm/book3s_64_vio.c

+2 −2
Original line number Diff line number Diff line
@@ -283,7 +283,7 @@ long kvm_vm_ioctl_create_spapr_tce(struct kvm *kvm, 
	struct kvmppc_spapr_tce_table *siter;

	struct mm_struct *mm = kvm->mm;

	unsigned long npages, size = args->size;

	int ret = -ENOMEM;

	int ret;



	if (!args->size || args->page_shift < 12 || args->page_shift > 34 ||

		(args->offset + args->size > (ULLONG_MAX >> args->page_shift)))
@@ -489,7 +489,7 @@ static long kvmppc_tce_iommu_unmap(struct kvm *kvm, 
	return ret;

}



long kvmppc_tce_iommu_do_map(struct kvm *kvm, struct iommu_table *tbl,

static long kvmppc_tce_iommu_do_map(struct kvm *kvm, struct iommu_table *tbl,

		unsigned long entry, unsigned long ua,

		enum dma_data_direction dir)

{

arch/powerpc/kvm/book3s_64_vio_hv.c

+1 −1
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ static long iommu_tce_xchg_no_kill_rm(struct mm_struct *mm, 
	return ret;

}



extern void iommu_tce_kill_rm(struct iommu_table *tbl,

static void iommu_tce_kill_rm(struct iommu_table *tbl,

		unsigned long entry, unsigned long pages)

{

	if (tbl->it_ops->tce_kill)