Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a5e0acea authored by Christian Borntraeger's avatar Christian Borntraeger
Browse files

KVM: s390: add exit io request stats and simplify code 



We want to count IO exit requests in kvm_stat. At the same time
we can get rid of the handle_noop function.

Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
Reviewed-by: default avatarCornelia Huck <cohuck@redhat.com>
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
parent 5c2b4d5b

arch/s390/include/asm/kvm_host.h

+1 −0
Original line number Diff line number Diff line
@@ -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;

arch/s390/kvm/intercept.c

+4 −13
Original line number Diff line number Diff line
@@ -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;

arch/s390/kvm/kvm-s390.c

+1 −0
Original line number Diff line number Diff line
@@ -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) },