KVM: PPC: Split host-state fields out of kvmppc_book3s_shadow_vcpu

There are several fields in struct kvmppc_book3s_shadow_vcpu that
temporarily store bits of host state while a guest is running,
rather than anything relating to the particular guest or vcpu.
This splits them out into a new kvmppc_host_state structure and
modifies the definitions in asm-offsets.c to suit.

On 32-bit, we have a kvmppc_host_state structure inside the
kvmppc_book3s_shadow_vcpu since the assembly code needs to be able
to get to them both with one pointer.  On 64-bit they are separate
fields in the PACA.  This means that on 64-bit we don't need to
copy the kvmppc_host_state in and out on vcpu load/unload, and
in future will mean that the book3s_hv code doesn't need a
shadow_vcpu struct in the PACA at all.  That does mean that we
have to be careful not to rely on any values persisting in the
hstate field of the paca across any point where we could block
or get preempted.

Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Alexander Graf <agraf@suse.de>

1 files changed, 5 insertions, 5 deletions

diff --git a/arch/powerpc/include/asm/exception-64s.h b/arch/powerpc/include/asm/exception-64s.h
index b6a3a443fbde..296c9b66c04a 100644
--- a/arch/powerpc/include/asm/exception-64s.h
+++ b/arch/powerpc/include/asm/exception-64s.h
@@ -96,16 +96,16 @@
         EXCEPTION_PROLOG_PSERIES_1(label, h);
 
 #define __KVMTEST(n)                                                    \
-        lbz     r10,PACA_KVM_SVCPU+SVCPU_IN_GUEST(r13);                 \
+        lbz     r10,HSTATE_IN_GUEST(r13);                       \
         cmpwi   r10,0;                                                  \
         bne     do_kvm_##n
 
 #define __KVM_HANDLER(area, h, n)                                       \
 do_kvm_##n:                                                             \
         ld      r10,area+EX_R10(r13);                                   \
-        stw     r9,PACA_KVM_SVCPU+SVCPU_SCRATCH1(r13);                  \
+        stw     r9,HSTATE_SCRATCH1(r13);                        \
         ld      r9,area+EX_R9(r13);                                     \
-        std     r12,PACA_KVM_SVCPU+SVCPU_SCRATCH0(r13);                 \
+        std     r12,HSTATE_SCRATCH0(r13);                       \
         li      r12,n;                                                  \
         b       kvmppc_interrupt
 
@@ -114,9 +114,9 @@ do_kvm_##n:								\
         cmpwi   r10,KVM_GUEST_MODE_SKIP;                                \
         ld      r10,area+EX_R10(r13);                                   \
         beq     89f;                                                    \
-        stw     r9,PACA_KVM_SVCPU+SVCPU_SCRATCH1(r13);                  \
+        stw     r9,HSTATE_SCRATCH1(r13);                        \
         ld      r9,area+EX_R9(r13);                                     \
-        std     r12,PACA_KVM_SVCPU+SVCPU_SCRATCH0(r13);                 \
+        std     r12,HSTATE_SCRATCH0(r13);                       \
         li      r12,n;                                                  \
         b       kvmppc_interrupt;                                       \
 89:     mtocrf  0x80,r9;                                                \