diff mbox

[v2,2/2] KVM: s390: add exit io request stats and simplify code

Message ID 20180223111025.130315-3-borntraeger@de.ibm.com (mailing list archive)
State New, archived
Headers show

Commit Message

Christian Borntraeger Feb. 23, 2018, 11:10 a.m. UTC 
We want to count IO exit requests in kvm_stat. At the same time
we can get rid of the handle_noop function.

Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
---
 arch/s390/include/asm/kvm_host.h |  1 +
 arch/s390/kvm/intercept.c        | 17 ++++-------------
 arch/s390/kvm/kvm-s390.c         |  1 +
 3 files changed, 6 insertions(+), 13 deletions(-)

Comments

David Hildenbrand Feb. 23, 2018, 11:11 a.m. UTC | #1 
On 23.02.2018 12:10, Christian Borntraeger wrote:
> We want to count IO exit requests in kvm_stat. At the same time
> we can get rid of the handle_noop function.
> 
> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
> ---
>  arch/s390/include/asm/kvm_host.h |  1 +
>  arch/s390/kvm/intercept.c        | 17 ++++-------------
>  arch/s390/kvm/kvm-s390.c         |  1 +
>  3 files changed, 6 insertions(+), 13 deletions(-)
> 
> diff --git a/arch/s390/include/asm/kvm_host.h b/arch/s390/include/asm/kvm_host.h
> index 27918b15a8ba..22615af0b6e6 100644
> --- a/arch/s390/include/asm/kvm_host.h
> +++ b/arch/s390/include/asm/kvm_host.h
> @@ -294,6 +294,7 @@ struct kvm_vcpu_stat {
>  	u64 exit_userspace;
>  	u64 exit_null;
>  	u64 exit_external_request;
> +	u64 exit_io_request;
>  	u64 exit_external_interrupt;
>  	u64 exit_stop_request;
>  	u64 exit_validity;
> diff --git a/arch/s390/kvm/intercept.c b/arch/s390/kvm/intercept.c
> index 07c6e81163bf..a389fa85cca2 100644
> --- a/arch/s390/kvm/intercept.c
> +++ b/arch/s390/kvm/intercept.c
> @@ -50,18 +50,6 @@ u8 kvm_s390_get_ilen(struct kvm_vcpu *vcpu)
>  	return ilen;
>  }
>  
> -static int handle_noop(struct kvm_vcpu *vcpu)
> -{
> -	switch (vcpu->arch.sie_block->icptcode) {
> -	case 0x10:
> -		vcpu->stat.exit_external_request++;
> -		break;
> -	default:
> -		break; /* nothing */
> -	}
> -	return 0;
> -}
> -
>  static int handle_stop(struct kvm_vcpu *vcpu)
>  {
>  	struct kvm_s390_local_interrupt *li = &vcpu->arch.local_int;
> @@ -465,8 +453,11 @@ int kvm_handle_sie_intercept(struct kvm_vcpu *vcpu)
>  
>  	switch (vcpu->arch.sie_block->icptcode) {
>  	case ICPT_EXTREQ:
> +		vcpu->stat.exit_external_request++;
> +		return 0;
>  	case ICPT_IOREQ:
> -		return handle_noop(vcpu);
> +		vcpu->stat.exit_io_request++;
> +		return 0;
>  	case ICPT_INST:
>  		rc = handle_instruction(vcpu);
>  		break;
> diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
> index 5f5a4cb92bbd..385d3b5ceb58 100644
> --- a/arch/s390/kvm/kvm-s390.c
> +++ b/arch/s390/kvm/kvm-s390.c
> @@ -64,6 +64,7 @@ struct kvm_stats_debugfs_item debugfs_entries[] = {
>  	{ "exit_validity", VCPU_STAT(exit_validity) },
>  	{ "exit_stop_request", VCPU_STAT(exit_stop_request) },
>  	{ "exit_external_request", VCPU_STAT(exit_external_request) },
> +	{ "exit_io_request", VCPU_STAT(exit_io_request) },
>  	{ "exit_external_interrupt", VCPU_STAT(exit_external_interrupt) },
>  	{ "exit_instruction", VCPU_STAT(exit_instruction) },
>  	{ "exit_pei", VCPU_STAT(exit_pei) },
> 

Reviewed-by: David Hildenbrand <david@redhat.com>
Cornelia Huck Feb. 23, 2018, 11:11 a.m. UTC | #2 
On Fri, 23 Feb 2018 11:10:25 +0000
Christian Borntraeger <borntraeger@de.ibm.com> wrote:

> We want to count IO exit requests in kvm_stat. At the same time
> we can get rid of the handle_noop function.
> 
> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
> ---
>  arch/s390/include/asm/kvm_host.h |  1 +
>  arch/s390/kvm/intercept.c        | 17 ++++-------------
>  arch/s390/kvm/kvm-s390.c         |  1 +
>  3 files changed, 6 insertions(+), 13 deletions(-)

Reviewed-by: Cornelia Huck <cohuck@redhat.com>
diff mbox

Patch

diff --git a/arch/s390/include/asm/kvm_host.h b/arch/s390/include/asm/kvm_host.h
index 27918b15a8ba..22615af0b6e6 100644
--- a/arch/s390/include/asm/kvm_host.h
+++ b/arch/s390/include/asm/kvm_host.h
@@ -294,6 +294,7 @@  struct kvm_vcpu_stat {
 	u64 exit_userspace;
 	u64 exit_null;
 	u64 exit_external_request;
+	u64 exit_io_request;
 	u64 exit_external_interrupt;
 	u64 exit_stop_request;
 	u64 exit_validity;
diff --git a/arch/s390/kvm/intercept.c b/arch/s390/kvm/intercept.c
index 07c6e81163bf..a389fa85cca2 100644
--- a/arch/s390/kvm/intercept.c
+++ b/arch/s390/kvm/intercept.c
@@ -50,18 +50,6 @@  u8 kvm_s390_get_ilen(struct kvm_vcpu *vcpu)
 	return ilen;
 }
 
-static int handle_noop(struct kvm_vcpu *vcpu)
-{
-	switch (vcpu->arch.sie_block->icptcode) {
-	case 0x10:
-		vcpu->stat.exit_external_request++;
-		break;
-	default:
-		break; /* nothing */
-	}
-	return 0;
-}
-
 static int handle_stop(struct kvm_vcpu *vcpu)
 {
 	struct kvm_s390_local_interrupt *li = &vcpu->arch.local_int;
@@ -465,8 +453,11 @@  int kvm_handle_sie_intercept(struct kvm_vcpu *vcpu)
 
 	switch (vcpu->arch.sie_block->icptcode) {
 	case ICPT_EXTREQ:
+		vcpu->stat.exit_external_request++;
+		return 0;
 	case ICPT_IOREQ:
-		return handle_noop(vcpu);
+		vcpu->stat.exit_io_request++;
+		return 0;
 	case ICPT_INST:
 		rc = handle_instruction(vcpu);
 		break;
diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
index 5f5a4cb92bbd..385d3b5ceb58 100644
--- a/arch/s390/kvm/kvm-s390.c
+++ b/arch/s390/kvm/kvm-s390.c
@@ -64,6 +64,7 @@  struct kvm_stats_debugfs_item debugfs_entries[] = {
 	{ "exit_validity", VCPU_STAT(exit_validity) },
 	{ "exit_stop_request", VCPU_STAT(exit_stop_request) },
 	{ "exit_external_request", VCPU_STAT(exit_external_request) },
+	{ "exit_io_request", VCPU_STAT(exit_io_request) },
 	{ "exit_external_interrupt", VCPU_STAT(exit_external_interrupt) },
 	{ "exit_instruction", VCPU_STAT(exit_instruction) },
 	{ "exit_pei", VCPU_STAT(exit_pei) },