KVM: add machine check counter to kvm_stat

This counter can be used for administration, debug or test purposes.

Suggested-by: Vladislav Mironov <mironov@de.ibm.com>
Signed-off-by: QingFeng Hao <haoqf@linux.vnet.ibm.com>
Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>

diff --git a/arch/s390/include/asm/kvm_host.h b/arch/s390/include/asm/kvm_host.h
index 22615af0b6e62d0386539307917e33a117283358..77a49de9c511e2e4d41f4e9e6c825a4a3e6996db 100644 (file)
--- a/arch/s390/include/asm/kvm_host.h
+++ b/arch/s390/include/asm/kvm_host.h
@@ -320,6 +320,7 @@ struct kvm_vcpu_stat {
        u64 deliver_restart_signal;
        u64 deliver_program_int;
        u64 deliver_io_int;
+       u64 deliver_machine_check;
        u64 exit_wait_state;
        u64 instruction_epsw;
        u64 instruction_gs;

diff --git a/arch/s390/kvm/interrupt.c b/arch/s390/kvm/interrupt.c
index b04616b57a94713a24ed19b142adb94b8c96e748..bde04a6191caf0b43f1fe870404458cc3740e948 100644 (file)
--- a/arch/s390/kvm/interrupt.c
+++ b/arch/s390/kvm/interrupt.c
@@ -595,6 +595,7 @@ static int __must_check __deliver_machine_check(struct kvm_vcpu *vcpu)
                trace_kvm_s390_deliver_interrupt(vcpu->vcpu_id,
                                                 KVM_S390_MCHK,
                                                 mchk.cr14, mchk.mcic);
+               vcpu->stat.deliver_machine_check++;
                rc = __write_machine_check(vcpu, &mchk);
        }
        return rc;

diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
index 41adcfe169a9190d25456f98179fbf68bf81a135..41615c900348b55ba177f1b2851ab1e13201a5be 100644 (file)
--- a/arch/s390/kvm/kvm-s390.c
+++ b/arch/s390/kvm/kvm-s390.c
@@ -88,6 +88,7 @@ struct kvm_stats_debugfs_item debugfs_entries[] = {
        { "deliver_restart_signal", VCPU_STAT(deliver_restart_signal) },
        { "deliver_program_interruption", VCPU_STAT(deliver_program_int) },
        { "deliver_io_interrupt", VCPU_STAT(deliver_io_int) },
+       { "deliver_machine_check", VCPU_STAT(deliver_machine_check) },
        { "exit_wait_state", VCPU_STAT(exit_wait_state) },
        { "instruction_epsw", VCPU_STAT(instruction_epsw) },
        { "instruction_gs", VCPU_STAT(instruction_gs) },