[GIT PULL 0/2] KVM: s390: 4.7: fixup and missing stat

[GIT PULL 0/2] KVM: s390: 4.7: fixup and missing stat

[Christian Borntraeger]

Paolo, Radim,

two patches for 4.7 from the s390 side.

The following changes since commit af8c34ce6ae32addda3788d54a7e340cad22516b:

  Linux 4.7-rc2 (2016-06-05 14:31:26 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git  tags/kvm-s390-master-4.7-1

for you to fetch changes up to 9ec6de19235889ab0118e970ee732cb33c9efc06:

  KVM: s390: Add stats for PEI events (2016-06-10 10:24:24 +0200)

----------------------------------------------------------------
KVM: s390: fixup and missing stat

1. A fixup for a bug that was introduced in 4.7-rc1 if userspace uses
   the cpu model ioctls
2. Add the missing kvm stat for pei events

----------------------------------------------------------------
Alexander Yarygin (1):
      KVM: s390: Add stats for PEI events

David Hildenbrand (1):
      KVM: s390: ignore IBC if zero

 arch/s390/include/asm/kvm_host.h | 1 +
 arch/s390/kvm/intercept.c        | 2 ++
 arch/s390/kvm/kvm-s390.c         | 3 ++-
 3 files changed, 5 insertions(+), 1 deletion(-)

[GIT PULL 1/2] KVM: s390: ignore IBC if zero

[Christian Borntraeger]

From: David Hildenbrand <dahi@linux.vnet.ibm.com>

Looks like we forgot about the special IBC value of 0 meaning "no IBC".
Let's fix that, otherwise it gets rounded up and suddenly an IBC is active
with the lowest possible machine.

Signed-off-by: David Hildenbrand <dahi@linux.vnet.ibm.com>
Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Fixes: commit 053dd2308d81 ("KVM: s390: force ibc into valid range")
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
---
 arch/s390/kvm/kvm-s390.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
index 6d8ec3a..c9ae539 100644
--- a/arch/s390/kvm/kvm-s390.c
+++ b/arch/s390/kvm/kvm-s390.c
@@ -657,7 +657,7 @@ static int kvm_s390_set_processor(struct kvm *kvm, struct kvm_device_attr *attr)
 		kvm->arch.model.cpuid = proc->cpuid;
 		lowest_ibc = sclp.ibc >> 16 & 0xfff;
 		unblocked_ibc = sclp.ibc & 0xfff;
-		if (lowest_ibc) {
+		if (lowest_ibc && proc->ibc) {
 			if (proc->ibc > unblocked_ibc)
 				kvm->arch.model.ibc = unblocked_ibc;
 			else if (proc->ibc < lowest_ibc)
-- 
2.5.5

[GIT PULL 2/2] KVM: s390: Add stats for PEI events

[Christian Borntraeger]

From: Alexander Yarygin <yarygin@linux.vnet.ibm.com>

Add partial execution intercepted events in kvm_stats_debugfs.

Signed-off-by: Alexander Yarygin <yarygin@linux.vnet.ibm.com>
Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Reviewed-by: David Hildenbrand <dahi@linux.vnet.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
---
 arch/s390/include/asm/kvm_host.h | 1 +
 arch/s390/kvm/intercept.c        | 2 ++
 arch/s390/kvm/kvm-s390.c         | 1 +
 3 files changed, 4 insertions(+)

diff --git a/arch/s390/include/asm/kvm_host.h b/arch/s390/include/asm/kvm_host.h
index 37b9017..ac82e8e 100644
--- a/arch/s390/include/asm/kvm_host.h
+++ b/arch/s390/include/asm/kvm_host.h
@@ -245,6 +245,7 @@ struct kvm_vcpu_stat {
 	u32 exit_stop_request;
 	u32 exit_validity;
 	u32 exit_instruction;
+	u32 exit_pei;
 	u32 halt_successful_poll;
 	u32 halt_attempted_poll;
 	u32 halt_poll_invalid;
diff --git a/arch/s390/kvm/intercept.c b/arch/s390/kvm/intercept.c
index 2e6b54e..2521571 100644
--- a/arch/s390/kvm/intercept.c
+++ b/arch/s390/kvm/intercept.c
@@ -341,6 +341,8 @@ static int handle_mvpg_pei(struct kvm_vcpu *vcpu)
 
 static int handle_partial_execution(struct kvm_vcpu *vcpu)
 {
+	vcpu->stat.exit_pei++;
+
 	if (vcpu->arch.sie_block->ipa == 0xb254)	/* MVPG */
 		return handle_mvpg_pei(vcpu);
 	if (vcpu->arch.sie_block->ipa >> 8 == 0xae)	/* SIGP */
diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
index c9ae539..43f2a2b 100644
--- a/arch/s390/kvm/kvm-s390.c
+++ b/arch/s390/kvm/kvm-s390.c
@@ -61,6 +61,7 @@ struct kvm_stats_debugfs_item debugfs_entries[] = {
 	{ "exit_external_request", VCPU_STAT(exit_external_request) },
 	{ "exit_external_interrupt", VCPU_STAT(exit_external_interrupt) },
 	{ "exit_instruction", VCPU_STAT(exit_instruction) },
+	{ "exit_pei", VCPU_STAT(exit_pei) },
 	{ "exit_program_interruption", VCPU_STAT(exit_program_interruption) },
 	{ "exit_instr_and_program_int", VCPU_STAT(exit_instr_and_program) },
 	{ "halt_successful_poll", VCPU_STAT(halt_successful_poll) },
-- 
2.5.5

Re: [GIT PULL 0/2] KVM: s390: 4.7: fixup and missing stat

[Paolo Bonzini]

On 10/06/2016 12:04, Christian Borntraeger wrote:
> Paolo, Radim,
> 
> two patches for 4.7 from the s390 side.
> 
> The following changes since commit af8c34ce6ae32addda3788d54a7e340cad22516b:
> 
>   Linux 4.7-rc2 (2016-06-05 14:31:26 -0700)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git  tags/kvm-s390-master-4.7-1
> 
> for you to fetch changes up to 9ec6de19235889ab0118e970ee732cb33c9efc06:
> 
>   KVM: s390: Add stats for PEI events (2016-06-10 10:24:24 +0200)
> 
> ----------------------------------------------------------------
> KVM: s390: fixup and missing stat
> 
> 1. A fixup for a bug that was introduced in 4.7-rc1 if userspace uses
>    the cpu model ioctls
> 2. Add the missing kvm stat for pei events
> 
> ----------------------------------------------------------------
> Alexander Yarygin (1):
>       KVM: s390: Add stats for PEI events
> 
> David Hildenbrand (1):
>       KVM: s390: ignore IBC if zero
> 
>  arch/s390/include/asm/kvm_host.h | 1 +
>  arch/s390/kvm/intercept.c        | 2 ++
>  arch/s390/kvm/kvm-s390.c         | 3 ++-
>  3 files changed, 5 insertions(+), 1 deletion(-)
> 

Pulled, thanks!

Paolo