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

KVM: PPC: Book3S HV nestedv2: Get the PID only if needed to copy tofrom a guest 



kvmhv_copy_tofrom_guest_radix() gets the PID at the start of the
function. If pid is not used, then this is a wasteful H_GUEST_GET_STATE
hcall for nestedv2 hosts. Move the assignment to where pid will be used.

Suggested-by: default avatarNicholas Piggin <npiggin@gmail.com>
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-5-vaibhav@linux.ibm.com
parent 63ccae78

arch/powerpc/kvm/book3s_64_mmu_radix.c

+3 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ static long kvmhv_copy_tofrom_guest_radix(struct kvm_vcpu *vcpu, gva_t eaddr, 
					  void *to, void *from, unsigned long n)

{

	int lpid = vcpu->kvm->arch.lpid;

	int pid = kvmppc_get_pid(vcpu);

	int pid;



	/* This would cause a data segment intr so don't allow the access */

	if (eaddr & (0x3FFUL << 52))
@@ -110,6 +110,8 @@ static long kvmhv_copy_tofrom_guest_radix(struct kvm_vcpu *vcpu, gva_t eaddr, 
	/* If accessing quadrant 3 then pid is expected to be 0 */

	if (((eaddr >> 62) & 0x3) == 0x3)

		pid = 0;

	else

		pid = kvmppc_get_pid(vcpu);



	eaddr &= ~(0xFFFUL << 52);