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

Commit 175a5c9e authored by Christian Borntraeger's avatar Christian Borntraeger
Browse files

KVM: s390: add kvm stat counter for all diagnoses 



Sometimes kvm stat counters are the only performance metric to check
after something went wrong. Let's add additional counters for some
diagnoses.

In addition do the count for diag 10 all the time, even if we inject
a program interrupt.

Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: default avatarJens Freimann <jfrei@linux.vnet.ibm.com>
parent c3489155

arch/s390/include/asm/kvm_host.h

+3 −0
Original line number Diff line number Diff line
@@ -258,6 +258,9 @@ struct kvm_vcpu_stat { 
	u32 diagnose_10;

	u32 diagnose_44;

	u32 diagnose_9c;

	u32 diagnose_258;

	u32 diagnose_308;

	u32 diagnose_500;

};



#define PGM_OPERATION			0x01

arch/s390/kvm/diag.c

+4 −1
Original line number Diff line number Diff line
@@ -27,13 +27,13 @@ static int diag_release_pages(struct kvm_vcpu *vcpu) 


	start = vcpu->run->s.regs.gprs[(vcpu->arch.sie_block->ipa & 0xf0) >> 4];

	end = vcpu->run->s.regs.gprs[vcpu->arch.sie_block->ipa & 0xf] + 4096;

	vcpu->stat.diagnose_10++;



	if (start & ~PAGE_MASK || end & ~PAGE_MASK || start >= end

	    || start < 2 * PAGE_SIZE)

		return kvm_s390_inject_program_int(vcpu, PGM_SPECIFICATION);



	VCPU_EVENT(vcpu, 5, "diag release pages %lX %lX", start, end);

	vcpu->stat.diagnose_10++;



	/*

	 * We checked for start >= end above, so lets check for the
@@ -75,6 +75,7 @@ static int __diag_page_ref_service(struct kvm_vcpu *vcpu) 
	u16 rx = (vcpu->arch.sie_block->ipa & 0xf0) >> 4;

	u16 ry = (vcpu->arch.sie_block->ipa & 0x0f);



	vcpu->stat.diagnose_258++;

	if (vcpu->run->s.regs.gprs[rx] & 7)

		return kvm_s390_inject_program_int(vcpu, PGM_SPECIFICATION);

	rc = read_guest(vcpu, vcpu->run->s.regs.gprs[rx], rx, &parm, sizeof(parm));
@@ -175,6 +176,7 @@ static int __diag_ipl_functions(struct kvm_vcpu *vcpu) 
	unsigned long subcode = vcpu->run->s.regs.gprs[reg] & 0xffff;



	VCPU_EVENT(vcpu, 5, "diag ipl functions, subcode %lx", subcode);

	vcpu->stat.diagnose_308++;

	switch (subcode) {

	case 3:

		vcpu->run->s390_reset_flags = KVM_S390_RESET_CLEAR;
@@ -202,6 +204,7 @@ static int __diag_virtio_hypercall(struct kvm_vcpu *vcpu) 
{

	int ret;



	vcpu->stat.diagnose_500++;

	/* No virtio-ccw notification? Get out quickly. */

	if (!vcpu->kvm->arch.css_support ||

	    (vcpu->run->s.regs.gprs[1] != KVM_S390_VIRTIO_CCW_NOTIFY))

arch/s390/kvm/kvm-s390.c

+3 −0
Original line number Diff line number Diff line
@@ -108,6 +108,9 @@ struct kvm_stats_debugfs_item debugfs_entries[] = { 
	{ "diagnose_10", VCPU_STAT(diagnose_10) },

	{ "diagnose_44", VCPU_STAT(diagnose_44) },

	{ "diagnose_9c", VCPU_STAT(diagnose_9c) },

	{ "diagnose_258", VCPU_STAT(diagnose_258) },

	{ "diagnose_308", VCPU_STAT(diagnose_308) },

	{ "diagnose_500", VCPU_STAT(diagnose_500) },

	{ NULL }

};