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

KVM: stats: Add halt_wait_ns stats for all architectures 



Add simple stats halt_wait_ns to record the time a VCPU has spent on
waiting for all architectures (not just powerpc).

Signed-off-by: default avatarJing Zhang <jingzhangos@google.com>
Message-Id: <20210802165633.1866976-5-jingzhangos@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent d49b11f0

arch/powerpc/include/asm/kvm_host.h

+0 −1
Original line number Diff line number Diff line
@@ -103,7 +103,6 @@ struct kvm_vcpu_stat { 
	u64 emulated_inst_exits;

	u64 dec_exits;

	u64 ext_intr_exits;

	u64 halt_wait_ns;

	u64 halt_successful_wait;

	u64 dbell_exits;

	u64 gdbell_exits;

arch/powerpc/kvm/book3s.c

+0 −1
Original line number Diff line number Diff line
@@ -69,7 +69,6 @@ const struct _kvm_stats_desc kvm_vcpu_stats_desc[] = { 
	STATS_DESC_COUNTER(VCPU, emulated_inst_exits),

	STATS_DESC_COUNTER(VCPU, dec_exits),

	STATS_DESC_COUNTER(VCPU, ext_intr_exits),

	STATS_DESC_TIME_NSEC(VCPU, halt_wait_ns),

	STATS_DESC_COUNTER(VCPU, halt_successful_wait),

	STATS_DESC_COUNTER(VCPU, dbell_exits),

	STATS_DESC_COUNTER(VCPU, gdbell_exits),

arch/powerpc/kvm/book3s_hv.c

+1 −1
Original line number Diff line number Diff line
@@ -4144,7 +4144,7 @@ static void kvmppc_vcore_blocked(struct kvmppc_vcore *vc) 


	/* Attribute wait time */

	if (do_sleep) {

		vc->runner->stat.halt_wait_ns +=

		vc->runner->stat.generic.halt_wait_ns +=

			ktime_to_ns(cur) - ktime_to_ns(start_wait);

		/* Attribute failed poll time */

		if (vc->halt_poll_ns)

arch/powerpc/kvm/booke.c

+0 −1
Original line number Diff line number Diff line
@@ -67,7 +67,6 @@ const struct _kvm_stats_desc kvm_vcpu_stats_desc[] = { 
	STATS_DESC_COUNTER(VCPU, emulated_inst_exits),

	STATS_DESC_COUNTER(VCPU, dec_exits),

	STATS_DESC_COUNTER(VCPU, ext_intr_exits),

	STATS_DESC_TIME_NSEC(VCPU, halt_wait_ns),

	STATS_DESC_COUNTER(VCPU, halt_successful_wait),

	STATS_DESC_COUNTER(VCPU, dbell_exits),

	STATS_DESC_COUNTER(VCPU, gdbell_exits),

include/linux/kvm_host.h

+2 −1
Original line number Diff line number Diff line
@@ -1452,7 +1452,8 @@ struct _kvm_stats_desc { 
	STATS_DESC_COUNTER(VCPU_GENERIC, halt_poll_invalid),		       \

	STATS_DESC_COUNTER(VCPU_GENERIC, halt_wakeup),			       \

	STATS_DESC_TIME_NSEC(VCPU_GENERIC, halt_poll_success_ns),	       \

	STATS_DESC_TIME_NSEC(VCPU_GENERIC, halt_poll_fail_ns)

	STATS_DESC_TIME_NSEC(VCPU_GENERIC, halt_poll_fail_ns),		       \

	STATS_DESC_TIME_NSEC(VCPU_GENERIC, halt_wait_ns)



extern struct dentry *kvm_debugfs_dir;