Re: [RFC PATCH 01/10] KVM: PPC: BOOK3S: PR: Fix PURR and SPURR emulation

2014-02-05 Thread Alexander Graf 

On 31.01.2014, at 23:17, Paul Mackerras pau...@samba.org wrote:

 On Fri, Jan 31, 2014 at 11:47:44AM +0100, Alexander Graf wrote:
 
 On 31.01.2014, at 11:38, Aneesh Kumar K.V aneesh.ku...@linux.vnet.ibm.com 
 wrote:
 
 Alexander Graf ag...@suse.de writes:
 
 On 01/28/2014 05:44 PM, Aneesh Kumar K.V wrote:
 We definitely don't need to emulate mtspr, because both the registers
 are hypervisor resource.
 
 This patch description doesn't cover what the patch actually does. It 
 changes the implementation from always tell the guest it uses 100% to 
 give the guest an accurate amount of cpu time spent inside guest
 context.
 
 Will fix that
 
 
 Also, I think we either go with full hyp semantics which means we also 
 emulate the offset or we go with no hyp awareness in the guest at all 
 which means we also don't emulate SPURR which is a hyp privileged
 register.
 
 Can you clarify this ?
 
 In the 2.06 ISA SPURR is hypervisor privileged. That changed for 2.07 where 
 it became supervisor privileged. So I suppose your patch is ok. When 
 reviewing those patches I only had 2.06 around because power.org was broken.
 
 It's always been supervisor privilege for reading and hypervisor
 privilege for writing, ever since it was introduced in 2.05, and that
 hasn't changed.  So I think what Aneesh is doing is correct.

This is what ISA 2.06B says:

308 SPURR   hypvhypv64  S
309 PURRhypvyes 64  S

And this is ISA 2.07:

308 SPURR   hypvyes 64  S
309 PURRhypvyes 64  S

So as you can see, from 2.06 to 2.07 SPURR became supervisor readable. Either 
the spec is wrong, the respective POWER CPUs don't implement the spec correctly 
or hypv doesn't mean hypv but means may be hypv or yes.

I think in the context of this patch it's perfectly reasonable to treat SPURR 
as supervisor readable.


Alex

___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev

Re: [RFC PATCH 01/10] KVM: PPC: BOOK3S: PR: Fix PURR and SPURR emulation

2014-01-31 Thread Aneesh Kumar K.V 
Alexander Graf ag...@suse.de writes:

 On 01/28/2014 05:44 PM, Aneesh Kumar K.V wrote:
 We definitely don't need to emulate mtspr, because both the registers
 are hypervisor resource.

 This patch description doesn't cover what the patch actually does. It 
 changes the implementation from always tell the guest it uses 100% to 
 give the guest an accurate amount of cpu time spent inside guest
 context.

Will fix that


 Also, I think we either go with full hyp semantics which means we also 
 emulate the offset or we go with no hyp awareness in the guest at all 
 which means we also don't emulate SPURR which is a hyp privileged
 register.

Can you clarify this ?


 Otherwise I like the patch :).


-aneesh

___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev

Re: [RFC PATCH 01/10] KVM: PPC: BOOK3S: PR: Fix PURR and SPURR emulation

2014-01-31 Thread Alexander Graf 

On 31.01.2014, at 11:38, Aneesh Kumar K.V aneesh.ku...@linux.vnet.ibm.com 
wrote:

 Alexander Graf ag...@suse.de writes:
 
 On 01/28/2014 05:44 PM, Aneesh Kumar K.V wrote:
 We definitely don't need to emulate mtspr, because both the registers
 are hypervisor resource.
 
 This patch description doesn't cover what the patch actually does. It 
 changes the implementation from always tell the guest it uses 100% to 
 give the guest an accurate amount of cpu time spent inside guest
 context.
 
 Will fix that
 
 
 Also, I think we either go with full hyp semantics which means we also 
 emulate the offset or we go with no hyp awareness in the guest at all 
 which means we also don't emulate SPURR which is a hyp privileged
 register.
 
 Can you clarify this ?

In the 2.06 ISA SPURR is hypervisor privileged. That changed for 2.07 where it 
became supervisor privileged. So I suppose your patch is ok. When reviewing 
those patches I only had 2.06 around because power.org was broken.


Alex

___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev

Re: [RFC PATCH 01/10] KVM: PPC: BOOK3S: PR: Fix PURR and SPURR emulation

2014-01-31 Thread Paul Mackerras 
On Fri, Jan 31, 2014 at 11:47:44AM +0100, Alexander Graf wrote:
 
 On 31.01.2014, at 11:38, Aneesh Kumar K.V aneesh.ku...@linux.vnet.ibm.com 
 wrote:
 
  Alexander Graf ag...@suse.de writes:
  
  On 01/28/2014 05:44 PM, Aneesh Kumar K.V wrote:
  We definitely don't need to emulate mtspr, because both the registers
  are hypervisor resource.
  
  This patch description doesn't cover what the patch actually does. It 
  changes the implementation from always tell the guest it uses 100% to 
  give the guest an accurate amount of cpu time spent inside guest
  context.
  
  Will fix that
  
  
  Also, I think we either go with full hyp semantics which means we also 
  emulate the offset or we go with no hyp awareness in the guest at all 
  which means we also don't emulate SPURR which is a hyp privileged
  register.
  
  Can you clarify this ?
 
 In the 2.06 ISA SPURR is hypervisor privileged. That changed for 2.07 where 
 it became supervisor privileged. So I suppose your patch is ok. When 
 reviewing those patches I only had 2.06 around because power.org was broken.

It's always been supervisor privilege for reading and hypervisor
privilege for writing, ever since it was introduced in 2.05, and that
hasn't changed.  So I think what Aneesh is doing is correct.

Regards,
Paul.
___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev

Re: [RFC PATCH 01/10] KVM: PPC: BOOK3S: PR: Fix PURR and SPURR emulation

2014-01-29 Thread Alexander Graf 

On 01/28/2014 05:44 PM, Aneesh Kumar K.V wrote:

We definitely don't need to emulate mtspr, because both the registers
are hypervisor resource.


This patch description doesn't cover what the patch actually does. It 
changes the implementation from always tell the guest it uses 100% to 
give the guest an accurate amount of cpu time spent inside guest context.


Also, I think we either go with full hyp semantics which means we also 
emulate the offset or we go with no hyp awareness in the guest at all 
which means we also don't emulate SPURR which is a hyp privileged register.


Otherwise I like the patch :).


Alex



Signed-off-by: Aneesh Kumar K.V aneesh.ku...@linux.vnet.ibm.com
---
  arch/powerpc/include/asm/kvm_book3s.h |  2 --
  arch/powerpc/include/asm/kvm_host.h   |  4 ++--
  arch/powerpc/kvm/book3s_emulate.c | 16 
  arch/powerpc/kvm/book3s_pr.c  | 10 ++
  4 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/arch/powerpc/include/asm/kvm_book3s.h 
b/arch/powerpc/include/asm/kvm_book3s.h
index bc23b1ba7980..396448afa38b 100644
--- a/arch/powerpc/include/asm/kvm_book3s.h
+++ b/arch/powerpc/include/asm/kvm_book3s.h
@@ -83,8 +83,6 @@ struct kvmppc_vcpu_book3s {
u64 sdr1;
u64 hior;
u64 msr_mask;
-   u64 purr_offset;
-   u64 spurr_offset;
  #ifdef CONFIG_PPC_BOOK3S_32
u32 vsid_pool[VSID_POOL_SIZE];
u32 vsid_next;
diff --git a/arch/powerpc/include/asm/kvm_host.h 
b/arch/powerpc/include/asm/kvm_host.h
index 9a0cdb2c9d58..0a3785271f34 100644
--- a/arch/powerpc/include/asm/kvm_host.h
+++ b/arch/powerpc/include/asm/kvm_host.h
@@ -506,8 +506,8 @@ struct kvm_vcpu_arch {
  #ifdef CONFIG_BOOKE
u32 decar;
  #endif
-   u32 tbl;
-   u32 tbu;
+   /* Time base value when we entered the guest */
+   u64 entry_tb;
u32 tcr;
ulong tsr; /* we need to perform set/clr_bits() which requires ulong */
u32 ivor[64];
diff --git a/arch/powerpc/kvm/book3s_emulate.c 
b/arch/powerpc/kvm/book3s_emulate.c
index a7d54aa203d0..e1f1e5e16449 100644
--- a/arch/powerpc/kvm/book3s_emulate.c
+++ b/arch/powerpc/kvm/book3s_emulate.c
@@ -422,12 +422,6 @@ int kvmppc_core_emulate_mtspr_pr(struct kvm_vcpu *vcpu, 
int sprn, ulong spr_val)
(mfmsr()  MSR_HV))
vcpu-arch.hflags |= BOOK3S_HFLAG_DCBZ32;
break;
-   case SPRN_PURR:
-   to_book3s(vcpu)-purr_offset = spr_val - get_tb();
-   break;
-   case SPRN_SPURR:
-   to_book3s(vcpu)-spurr_offset = spr_val - get_tb();
-   break;
case SPRN_GQR0:
case SPRN_GQR1:
case SPRN_GQR2:
@@ -523,10 +517,16 @@ int kvmppc_core_emulate_mfspr_pr(struct kvm_vcpu *vcpu, 
int sprn, ulong *spr_val
*spr_val = 0;
break;
case SPRN_PURR:
-   *spr_val = get_tb() + to_book3s(vcpu)-purr_offset;
+   /*
+* On exit we would have updated purr
+*/
+   *spr_val = vcpu-arch.purr;
break;
case SPRN_SPURR:
-   *spr_val = get_tb() + to_book3s(vcpu)-purr_offset;
+   /*
+* On exit we would have updated spurr
+*/
+   *spr_val = vcpu-arch.spurr;
break;
case SPRN_GQR0:
case SPRN_GQR1:
diff --git a/arch/powerpc/kvm/book3s_pr.c b/arch/powerpc/kvm/book3s_pr.c
index fdcbabdfb709..02231f5193c2 100644
--- a/arch/powerpc/kvm/book3s_pr.c
+++ b/arch/powerpc/kvm/book3s_pr.c
@@ -115,6 +115,11 @@ void kvmppc_copy_to_svcpu(struct kvmppc_book3s_shadow_vcpu 
*svcpu,
svcpu-lr  = vcpu-arch.lr;
svcpu-pc  = vcpu-arch.pc;
svcpu-in_use = true;
+   /*
+* Now also save the current time base value. We use this
+* to find the guest purr and spurr value.
+*/
+   vcpu-arch.entry_tb = get_tb();
  }
  
  /* Copy data touched by real-mode code from shadow vcpu back to vcpu */

@@ -161,6 +166,11 @@ void kvmppc_copy_from_svcpu(struct kvm_vcpu *vcpu,
  
  out:

preempt_enable();
+   /*
+* Update purr and spurr using time base
+*/
+   vcpu-arch.purr += get_tb() - vcpu-arch.entry_tb;
+   vcpu-arch.spurr += get_tb() - vcpu-arch.entry_tb;
  }
  
  static int kvmppc_core_check_requests_pr(struct kvm_vcpu *vcpu)


___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev

[RFC PATCH 01/10] KVM: PPC: BOOK3S: PR: Fix PURR and SPURR emulation

2014-01-28 Thread Aneesh Kumar K.V 
We definitely don't need to emulate mtspr, because both the registers
are hypervisor resource.

Signed-off-by: Aneesh Kumar K.V aneesh.ku...@linux.vnet.ibm.com
---
 arch/powerpc/include/asm/kvm_book3s.h |  2 --
 arch/powerpc/include/asm/kvm_host.h   |  4 ++--
 arch/powerpc/kvm/book3s_emulate.c | 16 
 arch/powerpc/kvm/book3s_pr.c  | 10 ++
 4 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/arch/powerpc/include/asm/kvm_book3s.h 
b/arch/powerpc/include/asm/kvm_book3s.h
index bc23b1ba7980..396448afa38b 100644
--- a/arch/powerpc/include/asm/kvm_book3s.h
+++ b/arch/powerpc/include/asm/kvm_book3s.h
@@ -83,8 +83,6 @@ struct kvmppc_vcpu_book3s {
u64 sdr1;
u64 hior;
u64 msr_mask;
-   u64 purr_offset;
-   u64 spurr_offset;
 #ifdef CONFIG_PPC_BOOK3S_32
u32 vsid_pool[VSID_POOL_SIZE];
u32 vsid_next;
diff --git a/arch/powerpc/include/asm/kvm_host.h 
b/arch/powerpc/include/asm/kvm_host.h
index 9a0cdb2c9d58..0a3785271f34 100644
--- a/arch/powerpc/include/asm/kvm_host.h
+++ b/arch/powerpc/include/asm/kvm_host.h
@@ -506,8 +506,8 @@ struct kvm_vcpu_arch {
 #ifdef CONFIG_BOOKE
u32 decar;
 #endif
-   u32 tbl;
-   u32 tbu;
+   /* Time base value when we entered the guest */
+   u64 entry_tb;
u32 tcr;
ulong tsr; /* we need to perform set/clr_bits() which requires ulong */
u32 ivor[64];
diff --git a/arch/powerpc/kvm/book3s_emulate.c 
b/arch/powerpc/kvm/book3s_emulate.c
index a7d54aa203d0..e1f1e5e16449 100644
--- a/arch/powerpc/kvm/book3s_emulate.c
+++ b/arch/powerpc/kvm/book3s_emulate.c
@@ -422,12 +422,6 @@ int kvmppc_core_emulate_mtspr_pr(struct kvm_vcpu *vcpu, 
int sprn, ulong spr_val)
(mfmsr()  MSR_HV))
vcpu-arch.hflags |= BOOK3S_HFLAG_DCBZ32;
break;
-   case SPRN_PURR:
-   to_book3s(vcpu)-purr_offset = spr_val - get_tb();
-   break;
-   case SPRN_SPURR:
-   to_book3s(vcpu)-spurr_offset = spr_val - get_tb();
-   break;
case SPRN_GQR0:
case SPRN_GQR1:
case SPRN_GQR2:
@@ -523,10 +517,16 @@ int kvmppc_core_emulate_mfspr_pr(struct kvm_vcpu *vcpu, 
int sprn, ulong *spr_val
*spr_val = 0;
break;
case SPRN_PURR:
-   *spr_val = get_tb() + to_book3s(vcpu)-purr_offset;
+   /*
+* On exit we would have updated purr
+*/
+   *spr_val = vcpu-arch.purr;
break;
case SPRN_SPURR:
-   *spr_val = get_tb() + to_book3s(vcpu)-purr_offset;
+   /*
+* On exit we would have updated spurr
+*/
+   *spr_val = vcpu-arch.spurr;
break;
case SPRN_GQR0:
case SPRN_GQR1:
diff --git a/arch/powerpc/kvm/book3s_pr.c b/arch/powerpc/kvm/book3s_pr.c
index fdcbabdfb709..02231f5193c2 100644
--- a/arch/powerpc/kvm/book3s_pr.c
+++ b/arch/powerpc/kvm/book3s_pr.c
@@ -115,6 +115,11 @@ void kvmppc_copy_to_svcpu(struct kvmppc_book3s_shadow_vcpu 
*svcpu,
svcpu-lr  = vcpu-arch.lr;
svcpu-pc  = vcpu-arch.pc;
svcpu-in_use = true;
+   /*
+* Now also save the current time base value. We use this
+* to find the guest purr and spurr value.
+*/
+   vcpu-arch.entry_tb = get_tb();
 }
 
 /* Copy data touched by real-mode code from shadow vcpu back to vcpu */
@@ -161,6 +166,11 @@ void kvmppc_copy_from_svcpu(struct kvm_vcpu *vcpu,
 
 out:
preempt_enable();
+   /*
+* Update purr and spurr using time base
+*/
+   vcpu-arch.purr += get_tb() - vcpu-arch.entry_tb;
+   vcpu-arch.spurr += get_tb() - vcpu-arch.entry_tb;
 }
 
 static int kvmppc_core_check_requests_pr(struct kvm_vcpu *vcpu)
-- 
1.8.5.3

___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev