Commit fcfe1bae authored by Jing Zhang's avatar Jing Zhang Committed by Paolo Bonzini
Browse files

KVM: stats: Support binary stats retrieval for a VM 



Add a VM ioctl to get a statistics file descriptor by which a read
functionality is provided for userspace to read out VM stats header,
descriptors and data.
Define VM statistics descriptors and header for all architectures.

Reviewed-by: default avatarDavid Matlack <dmatlack@google.com>
Reviewed-by: default avatarRicardo Koller <ricarkol@google.com>
Reviewed-by: default avatarKrish Sadhukhan <krish.sadhukhan@oracle.com>
Reviewed-by: default avatarFuad Tabba <tabba@google.com>
Tested-by: Fuad Tabba <tabba@google.com> #arm64
Signed-off-by: default avatarJing Zhang <jingzhangos@google.com>
Message-Id: <20210618222709.1858088-4-jingzhangos@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent cb082bfa

arch/arm64/kvm/guest.c

+15 −0
Original line number Diff line number Diff line
@@ -28,6 +28,21 @@ 


#include "trace.h"



const struct _kvm_stats_desc kvm_vm_stats_desc[] = {

	KVM_GENERIC_VM_STATS()

};

static_assert(ARRAY_SIZE(kvm_vm_stats_desc) ==

		sizeof(struct kvm_vm_stat) / sizeof(u64));



const struct kvm_stats_header kvm_vm_stats_header = {

	.name_size = KVM_STATS_NAME_SIZE,

	.num_desc = ARRAY_SIZE(kvm_vm_stats_desc),

	.id_offset =  sizeof(struct kvm_stats_header),

	.desc_offset = sizeof(struct kvm_stats_header) + KVM_STATS_NAME_SIZE,

	.data_offset = sizeof(struct kvm_stats_header) + KVM_STATS_NAME_SIZE +

		       sizeof(kvm_vm_stats_desc),

};



struct kvm_stats_debugfs_item debugfs_entries[] = {

	VCPU_STAT("halt_successful_poll", generic.halt_successful_poll),

	VCPU_STAT("halt_attempted_poll", generic.halt_attempted_poll),

arch/mips/kvm/mips.c

+15 −0
Original line number Diff line number Diff line
@@ -38,6 +38,21 @@ 
#define VECTORSPACING 0x100	/* for EI/VI mode */

#endif



const struct _kvm_stats_desc kvm_vm_stats_desc[] = {

	KVM_GENERIC_VM_STATS()

};

static_assert(ARRAY_SIZE(kvm_vm_stats_desc) ==

		sizeof(struct kvm_vm_stat) / sizeof(u64));



const struct kvm_stats_header kvm_vm_stats_header = {

	.name_size = KVM_STATS_NAME_SIZE,

	.num_desc = ARRAY_SIZE(kvm_vm_stats_desc),

	.id_offset = sizeof(struct kvm_stats_header),

	.desc_offset = sizeof(struct kvm_stats_header) + KVM_STATS_NAME_SIZE,

	.data_offset = sizeof(struct kvm_stats_header) + KVM_STATS_NAME_SIZE +

		       sizeof(kvm_vm_stats_desc),

};



struct kvm_stats_debugfs_item debugfs_entries[] = {

	VCPU_STAT("wait", wait_exits),

	VCPU_STAT("cache", cache_exits),

arch/powerpc/kvm/book3s.c

+17 −0
Original line number Diff line number Diff line
@@ -38,6 +38,23 @@ 


/* #define EXIT_DEBUG */



const struct _kvm_stats_desc kvm_vm_stats_desc[] = {

	KVM_GENERIC_VM_STATS(),

	STATS_DESC_ICOUNTER(VM, num_2M_pages),

	STATS_DESC_ICOUNTER(VM, num_1G_pages)

};

static_assert(ARRAY_SIZE(kvm_vm_stats_desc) ==

		sizeof(struct kvm_vm_stat) / sizeof(u64));



const struct kvm_stats_header kvm_vm_stats_header = {

	.name_size = KVM_STATS_NAME_SIZE,

	.num_desc = ARRAY_SIZE(kvm_vm_stats_desc),

	.id_offset = sizeof(struct kvm_stats_header),

	.desc_offset = sizeof(struct kvm_stats_header) + KVM_STATS_NAME_SIZE,

	.data_offset = sizeof(struct kvm_stats_header) + KVM_STATS_NAME_SIZE +

		       sizeof(kvm_vm_stats_desc),

};



struct kvm_stats_debugfs_item debugfs_entries[] = {

	VCPU_STAT("exits", sum_exits),

	VCPU_STAT("mmio", mmio_exits),

arch/powerpc/kvm/booke.c

+17 −0
Original line number Diff line number Diff line
@@ -36,6 +36,23 @@ 


unsigned long kvmppc_booke_handlers;



const struct _kvm_stats_desc kvm_vm_stats_desc[] = {

	KVM_GENERIC_VM_STATS(),

	STATS_DESC_ICOUNTER(VM, num_2M_pages),

	STATS_DESC_ICOUNTER(VM, num_1G_pages)

};

static_assert(ARRAY_SIZE(kvm_vm_stats_desc) ==

		sizeof(struct kvm_vm_stat) / sizeof(u64));



const struct kvm_stats_header kvm_vm_stats_header = {

	.name_size = KVM_STATS_NAME_SIZE,

	.num_desc = ARRAY_SIZE(kvm_vm_stats_desc),

	.id_offset = sizeof(struct kvm_stats_header),

	.desc_offset = sizeof(struct kvm_stats_header) + KVM_STATS_NAME_SIZE,

	.data_offset = sizeof(struct kvm_stats_header) + KVM_STATS_NAME_SIZE +

		       sizeof(kvm_vm_stats_desc),

};



struct kvm_stats_debugfs_item debugfs_entries[] = {

	VCPU_STAT("mmio", mmio_exits),

	VCPU_STAT("sig", signal_exits),

arch/s390/kvm/kvm-s390.c

+20 −0
Original line number Diff line number Diff line
@@ -58,6 +58,26 @@ 
#define VCPU_IRQS_MAX_BUF (sizeof(struct kvm_s390_irq) * \

			   (KVM_MAX_VCPUS + LOCAL_IRQS))



const struct _kvm_stats_desc kvm_vm_stats_desc[] = {

	KVM_GENERIC_VM_STATS(),

	STATS_DESC_COUNTER(VM, inject_io),

	STATS_DESC_COUNTER(VM, inject_float_mchk),

	STATS_DESC_COUNTER(VM, inject_pfault_done),

	STATS_DESC_COUNTER(VM, inject_service_signal),

	STATS_DESC_COUNTER(VM, inject_virtio)

};

static_assert(ARRAY_SIZE(kvm_vm_stats_desc) ==

		sizeof(struct kvm_vm_stat) / sizeof(u64));



const struct kvm_stats_header kvm_vm_stats_header = {

	.name_size = KVM_STATS_NAME_SIZE,

	.num_desc = ARRAY_SIZE(kvm_vm_stats_desc),

	.id_offset = sizeof(struct kvm_stats_header),

	.desc_offset = sizeof(struct kvm_stats_header) + KVM_STATS_NAME_SIZE,

	.data_offset = sizeof(struct kvm_stats_header) + KVM_STATS_NAME_SIZE +

		       sizeof(kvm_vm_stats_desc),

};



struct kvm_stats_debugfs_item debugfs_entries[] = {

	VCPU_STAT("userspace_handled", exit_userspace),

	VCPU_STAT("exit_null", exit_null),