Commit 1c0006d8 authored by Alexander Graf's avatar Alexander Graf Committed by Marcelo Tosatti
Browse files

KVM: PPC: Fix initial GPR settings 



Commit 7d01b4c3ed2bb33ceaf2d270cb4831a67a76b51b introduced PACA backed vcpu
values. With this patch, when a userspace app was setting GPRs before it was
actually first loaded, the set values get discarded.

This is because vcpu_load loads them from the vcpu backing store that we use
whenever we're not owning the PACA.

That behavior is not really a major problem, because we don't need it for
qemu. Other users (like kvmctl) do have problems with it though, so let's
better do it right.

Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 180a34d2

arch/powerpc/include/asm/kvm_book3s.h

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 


#include <linux/types.h>

#include <linux/kvm_host.h>

#include <asm/kvm_ppc.h>

#include <asm/kvm_book3s_64_asm.h>



struct kvmppc_slb {

arch/powerpc/include/asm/kvm_ppc.h

+8 −2
Original line number Diff line number Diff line
@@ -28,6 +28,9 @@ 
#include <linux/types.h>

#include <linux/kvm_types.h>

#include <linux/kvm_host.h>

#ifdef CONFIG_PPC_BOOK3S

#include <asm/kvm_book3s.h>

#endif



enum emulation_result {

	EMULATE_DONE,         /* no further processing */
@@ -102,9 +105,10 @@ extern void kvmppc_core_destroy_mmu(struct kvm_vcpu *vcpu); 


static inline void kvmppc_set_gpr(struct kvm_vcpu *vcpu, int num, ulong val)

{

	if ( num < 14 )

	if ( num < 14 ) {

		get_paca()->shadow_vcpu.gpr[num] = val;

	else

		to_book3s(vcpu)->shadow_vcpu.gpr[num] = val;

	} else

		vcpu->arch.gpr[num] = val;

}
@@ -119,6 +123,7 @@ static inline ulong kvmppc_get_gpr(struct kvm_vcpu *vcpu, int num) 
static inline void kvmppc_set_cr(struct kvm_vcpu *vcpu, u32 val)

{

	get_paca()->shadow_vcpu.cr = val;

	to_book3s(vcpu)->shadow_vcpu.cr = val;

}



static inline u32 kvmppc_get_cr(struct kvm_vcpu *vcpu)
@@ -129,6 +134,7 @@ static inline u32 kvmppc_get_cr(struct kvm_vcpu *vcpu) 
static inline void kvmppc_set_xer(struct kvm_vcpu *vcpu, u32 val)

{

	get_paca()->shadow_vcpu.xer = val;

	to_book3s(vcpu)->shadow_vcpu.xer = val;

}



static inline u32 kvmppc_get_xer(struct kvm_vcpu *vcpu)

CRA Git | Maintained and supported by SUSTech CRA and CCSE