Commit 7d370e18 authored by Jordan Niethe's avatar Jordan Niethe Committed by Michael Ellerman
Browse files

KVM: PPC: Book3S HV nestedv2: Invalidate RPT before deleting a guest 



An L0 must invalidate the L2's RPT during H_GUEST_DELETE if this has not
already been done. This is a slow operation that means H_GUEST_DELETE
must return H_BUSY multiple times before completing. Invalidating the
tables before deleting the guest so there is less work for the L0 to do.

Signed-off-by: default avatarJordan Niethe <jniethe5@gmail.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/20231201132618.555031-2-vaibhav@linux.ibm.com
parent 98b1cc82

arch/powerpc/include/asm/kvm_book3s.h

+1 −0
Original line number Diff line number Diff line
@@ -302,6 +302,7 @@ void kvmhv_nested_exit(void); 
void kvmhv_vm_nested_init(struct kvm *kvm);

long kvmhv_set_partition_table(struct kvm_vcpu *vcpu);

long kvmhv_copy_tofrom_guest_nested(struct kvm_vcpu *vcpu);

void kvmhv_flush_lpid(u64 lpid);

void kvmhv_set_ptbl_entry(u64 lpid, u64 dw0, u64 dw1);

void kvmhv_release_all_nested(struct kvm *kvm);

long kvmhv_enter_nested_guest(struct kvm_vcpu *vcpu);

arch/powerpc/kvm/book3s_hv.c

+4 −2
Original line number Diff line number Diff line
@@ -5691,10 +5691,12 @@ static void kvmppc_core_destroy_vm_hv(struct kvm *kvm) 
			kvmhv_set_ptbl_entry(kvm->arch.lpid, 0, 0);

	}



	if (kvmhv_is_nestedv2())

	if (kvmhv_is_nestedv2()) {

		kvmhv_flush_lpid(kvm->arch.lpid);

		plpar_guest_delete(0, kvm->arch.lpid);

	else

	} else {

		kvmppc_free_lpid(kvm->arch.lpid);

	}



	kvmppc_free_pimap(kvm);

}

arch/powerpc/kvm/book3s_hv_nested.c

+1 −1
Original line number Diff line number Diff line
@@ -503,7 +503,7 @@ void kvmhv_nested_exit(void) 
	}

}



static void kvmhv_flush_lpid(u64 lpid)

void kvmhv_flush_lpid(u64 lpid)

{

	long rc;