KVM: stats: Add VM stat for remote tlb flush requests

Add a new stat that counts the number of times a remote TLB flush is
requested, regardless of whether it kicks vCPUs out of guest mode. This
allows us to look at how often flushes are initiated.

Unlike remote_tlb_flush, this one applies to ARM's instruction-set-based
TLB flush implementation, so apply it there too.

Original-by: David Matlack <dmatlack@google.com>
Signed-off-by: Jing Zhang <jingzhangos@google.com>
Message-Id: <20210817002639.3856694-1-jingzhangos@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c
index 0625bf2353c2297babea82e642a8b84d75b91577..f5bb235bbb59b3dbd11906926622b25a69d1200b 100644 (file)
--- a/arch/arm64/kvm/mmu.c
+++ b/arch/arm64/kvm/mmu.c
@@ -80,6 +80,7 @@ static bool memslot_is_logging(struct kvm_memory_slot *memslot)
  */
 void kvm_flush_remote_tlbs(struct kvm *kvm)
 {
+       ++kvm->stat.generic.remote_tlb_flush_requests;
        kvm_call_hyp(__kvm_tlb_flush_vmid, &kvm->arch.mmu);
 }
 

diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
index e4d712e9f76050fed977cf04767b5961c61d7dcd..c177789a8542efe4488673f8a48420d06f47052d 100644 (file)
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -1444,7 +1444,8 @@ struct _kvm_stats_desc {
                KVM_STATS_BASE_POW10, -9, sz)
 
 #define KVM_GENERIC_VM_STATS()                                                \
-       STATS_DESC_COUNTER(VM_GENERIC, remote_tlb_flush)
+       STATS_DESC_COUNTER(VM_GENERIC, remote_tlb_flush),                      \
+       STATS_DESC_COUNTER(VM_GENERIC, remote_tlb_flush_requests)
 
 #define KVM_GENERIC_VCPU_STATS()                                              \
        STATS_DESC_COUNTER(VCPU_GENERIC, halt_successful_poll),                \

diff --git a/include/linux/kvm_types.h b/include/linux/kvm_types.h
index de7fb5f364d8bacd27cd583740c32a6e83e4164f..2237abb93ccdefd82f89b63e5f664802570bb8f4 100644 (file)
--- a/include/linux/kvm_types.h
+++ b/include/linux/kvm_types.h
@@ -80,6 +80,7 @@ struct kvm_mmu_memory_cache {
 
 struct kvm_vm_stat_generic {
        u64 remote_tlb_flush;
+       u64 remote_tlb_flush_requests;
 };
 
 struct kvm_vcpu_stat_generic {

diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 140c7d3110217f37f3f96f123bee9c07efd53085..305956310174186d56b0dc5c7661c694d9b5f3a4 100644 (file)
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -318,6 +318,7 @@ void kvm_flush_remote_tlbs(struct kvm *kvm)
         */
        long dirty_count = smp_load_acquire(&kvm->tlbs_dirty);
 
+       ++kvm->stat.generic.remote_tlb_flush_requests;
        /*
         * We want to publish modifications to the page tables before reading
         * mode. Pairs with a memory barrier in arch-specific code.