From: Oliver Upton <oliver.upton@linux.dev>
To: kvmarm@lists.linux.dev
Cc: kvm@vger.kernel.org, Marc Zyngier <maz@kernel.org>,
James Morse <james.morse@arm.com>,
Suzuki K Poulose <suzuki.poulose@arm.com>,
Zenghui Yu <yuzenghui@huawei.com>,
linux-kernel@vger.kernel.org,
Oliver Upton <oliver.upton@linux.dev>
Subject: [PATCH v2 01/23] KVM: arm64: Add tracepoints + stats for LPI cache effectiveness
Date: Tue, 13 Feb 2024 09:32:38 +0000 [thread overview]
Message-ID: <20240213093250.3960069-2-oliver.upton@linux.dev> (raw)
In-Reply-To: <20240213093250.3960069-1-oliver.upton@linux.dev>
LPI translation and injection has been shown to have a significant
impact on the performance of VM workloads, so it probably makes sense to
add some signals in this area.
Introduce the concept of a KVM tracepoint that associates with a VM
stat and use it for the LPI translation cache tracepoints. It isn't too
uncommon for a kernel hacker to attach to tracepoints, while at the same
time userspace may open a 'binary stats' FD to peek at the corresponding
VM stats.
Signed-off-by: Oliver Upton <oliver.upton@linux.dev>
---
arch/arm64/include/asm/kvm_host.h | 3 ++
arch/arm64/kvm/guest.c | 5 ++-
arch/arm64/kvm/vgic/trace.h | 66 +++++++++++++++++++++++++++++++
arch/arm64/kvm/vgic/vgic-its.c | 14 ++++++-
include/linux/kvm_host.h | 4 ++
5 files changed, 89 insertions(+), 3 deletions(-)
diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h
index 21c57b812569..6f88b76373a5 100644
--- a/arch/arm64/include/asm/kvm_host.h
+++ b/arch/arm64/include/asm/kvm_host.h
@@ -966,6 +966,9 @@ static inline bool __vcpu_write_sys_reg_to_cpu(u64 val, int reg)
struct kvm_vm_stat {
struct kvm_vm_stat_generic generic;
+ u64 vgic_its_trans_cache_hit;
+ u64 vgic_its_trans_cache_miss;
+ u64 vgic_its_trans_cache_victim;
};
struct kvm_vcpu_stat {
diff --git a/arch/arm64/kvm/guest.c b/arch/arm64/kvm/guest.c
index aaf1d4939739..354d67251fc2 100644
--- a/arch/arm64/kvm/guest.c
+++ b/arch/arm64/kvm/guest.c
@@ -30,7 +30,10 @@
#include "trace.h"
const struct _kvm_stats_desc kvm_vm_stats_desc[] = {
- KVM_GENERIC_VM_STATS()
+ KVM_GENERIC_VM_STATS(),
+ STATS_DESC_COUNTER(VM, vgic_its_trans_cache_hit),
+ STATS_DESC_COUNTER(VM, vgic_its_trans_cache_miss),
+ STATS_DESC_COUNTER(VM, vgic_its_trans_cache_victim)
};
const struct kvm_stats_header kvm_vm_stats_header = {
diff --git a/arch/arm64/kvm/vgic/trace.h b/arch/arm64/kvm/vgic/trace.h
index 83c64401a7fc..ff6423f22c91 100644
--- a/arch/arm64/kvm/vgic/trace.h
+++ b/arch/arm64/kvm/vgic/trace.h
@@ -27,6 +27,72 @@ TRACE_EVENT(vgic_update_irq_pending,
__entry->vcpu_id, __entry->irq, __entry->level)
);
+TRACE_EVENT(vgic_its_trans_cache_hit,
+ TP_PROTO(__u64 db_addr, __u32 device_id, __u32 event_id, __u32 intid),
+ TP_ARGS(db_addr, device_id, event_id, intid),
+
+ TP_STRUCT__entry(
+ __field( __u64, db_addr )
+ __field( __u32, device_id )
+ __field( __u32, event_id )
+ __field( __u32, intid )
+ ),
+
+ TP_fast_assign(
+ __entry->db_addr = db_addr;
+ __entry->device_id = device_id;
+ __entry->event_id = event_id;
+ __entry->intid = intid;
+ ),
+
+ TP_printk("DB: %016llx, device_id %u, event_id %u, intid %u",
+ __entry->db_addr, __entry->device_id, __entry->event_id,
+ __entry->intid)
+);
+
+TRACE_EVENT(vgic_its_trans_cache_miss,
+ TP_PROTO(__u64 db_addr, __u32 device_id, __u32 event_id),
+ TP_ARGS(db_addr, device_id, event_id),
+
+ TP_STRUCT__entry(
+ __field( __u64, db_addr )
+ __field( __u32, device_id )
+ __field( __u32, event_id )
+ ),
+
+ TP_fast_assign(
+ __entry->db_addr = db_addr;
+ __entry->device_id = device_id;
+ __entry->event_id = event_id;
+ ),
+
+ TP_printk("DB: %016llx, device_id %u, event_id %u",
+ __entry->db_addr, __entry->device_id, __entry->event_id)
+);
+
+TRACE_EVENT(vgic_its_trans_cache_victim,
+ TP_PROTO(__u64 db_addr, __u32 device_id, __u32 event_id, __u32 intid),
+ TP_ARGS(db_addr, device_id, event_id, intid),
+
+ TP_STRUCT__entry(
+ __field( __u64, db_addr )
+ __field( __u32, device_id )
+ __field( __u32, event_id )
+ __field( __u32, intid )
+ ),
+
+ TP_fast_assign(
+ __entry->db_addr = db_addr;
+ __entry->device_id = device_id;
+ __entry->event_id = event_id;
+ __entry->intid = intid;
+ ),
+
+ TP_printk("DB: %016llx, device_id %u, event_id %u, intid %u",
+ __entry->db_addr, __entry->device_id, __entry->event_id,
+ __entry->intid)
+);
+
#endif /* _TRACE_VGIC_H */
#undef TRACE_INCLUDE_PATH
diff --git a/arch/arm64/kvm/vgic/vgic-its.c b/arch/arm64/kvm/vgic/vgic-its.c
index e2764d0ffa9f..59179268ac2d 100644
--- a/arch/arm64/kvm/vgic/vgic-its.c
+++ b/arch/arm64/kvm/vgic/vgic-its.c
@@ -20,6 +20,7 @@
#include <asm/kvm_arm.h>
#include <asm/kvm_mmu.h>
+#include "trace.h"
#include "vgic.h"
#include "vgic-mmio.h"
@@ -636,8 +637,11 @@ static void vgic_its_cache_translation(struct kvm *kvm, struct vgic_its *its,
* to the interrupt, so drop the potential reference on what
* was in the cache, and increment it on the new interrupt.
*/
- if (cte->irq)
+ if (cte->irq) {
+ KVM_VM_TRACE_EVENT(kvm, vgic_its_trans_cache_victim, cte->db,
+ cte->devid, cte->eventid, cte->irq->intid);
__vgic_put_lpi_locked(kvm, cte->irq);
+ }
vgic_get_irq_kref(irq);
@@ -767,8 +771,14 @@ int vgic_its_inject_cached_translation(struct kvm *kvm, struct kvm_msi *msi)
db = (u64)msi->address_hi << 32 | msi->address_lo;
irq = vgic_its_check_cache(kvm, db, msi->devid, msi->data);
- if (!irq)
+ if (!irq) {
+ KVM_VM_TRACE_EVENT(kvm, vgic_its_trans_cache_miss, db, msi->devid,
+ msi->data);
return -EWOULDBLOCK;
+ }
+
+ KVM_VM_TRACE_EVENT(kvm, vgic_its_trans_cache_hit, db, msi->devid,
+ msi->data, irq->intid);
raw_spin_lock_irqsave(&irq->irq_lock, flags);
irq->pending_latch = true;
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
index 7e7fd25b09b3..846b447b6798 100644
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -1927,6 +1927,10 @@ struct _kvm_stats_desc {
HALT_POLL_HIST_COUNT), \
STATS_DESC_IBOOLEAN(VCPU_GENERIC, blocking)
+#define KVM_VM_TRACE_EVENT(vm, event, ...) \
+ ((vm)->stat.event)++; trace_## event(__VA_ARGS__)
+
+
extern struct dentry *kvm_debugfs_dir;
ssize_t kvm_stats_read(char *id, const struct kvm_stats_header *header,
--
2.43.0.687.g38aa6559b0-goog
next prev parent reply other threads:[~2024-02-13 9:33 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-13 9:32 [PATCH v2 00/23] KVM: arm64: Improvements to LPI injection Oliver Upton
2024-02-13 9:32 ` Oliver Upton [this message]
2024-02-14 15:55 ` [PATCH v2 01/23] KVM: arm64: Add tracepoints + stats for LPI cache effectiveness Marc Zyngier
2024-02-13 9:32 ` [PATCH v2 02/23] KVM: arm64: vgic: Store LPIs in an xarray Oliver Upton
2024-02-13 21:52 ` Oliver Upton
2024-02-13 9:32 ` [PATCH v2 03/23] KVM: arm64: vgic: Use xarray to find LPI in vgic_get_lpi() Oliver Upton
2024-02-13 9:32 ` [PATCH v2 04/23] KVM: arm64: vgic-v3: Iterate the xarray to find pending LPIs Oliver Upton
2024-02-13 9:32 ` [PATCH v2 05/23] KVM: arm64: vgic-its: Walk the LPI xarray in vgic_copy_lpi_list() Oliver Upton
2024-02-13 9:32 ` [PATCH v2 06/23] KVM: arm64: vgic: Get rid of the LPI linked-list Oliver Upton
2024-02-13 9:32 ` [PATCH v2 07/23] KVM: arm64: vgic: Use atomics to count LPIs Oliver Upton
2024-02-14 16:47 ` Marc Zyngier
2024-02-14 18:32 ` Oliver Upton
2024-02-14 20:01 ` Marc Zyngier
2024-02-14 23:01 ` Oliver Upton
2024-02-15 9:44 ` Marc Zyngier
2024-02-13 9:32 ` [PATCH v2 08/23] KVM: arm64: vgic: Free LPI vgic_irq structs in an RCU-safe manner Oliver Upton
2024-02-13 9:32 ` [PATCH v2 09/23] KVM: arm64: vgic: Rely on RCU protection in vgic_get_lpi() Oliver Upton
2024-02-13 9:32 ` [PATCH v2 10/23] KVM: arm64: vgic: Ensure the irq refcount is nonzero when taking a ref Oliver Upton
2024-02-13 9:32 ` [PATCH v2 11/23] KVM: arm64: vgic: Don't acquire the lpi_list_lock in vgic_put_irq() Oliver Upton
2024-02-13 9:32 ` [PATCH v2 12/23] KVM: arm64: vgic-its: Lazily allocate LPI translation cache Oliver Upton
2024-02-13 9:32 ` [PATCH v2 13/23] KVM: arm64: vgic-its: Pick cache victim based on usage count Oliver Upton
2024-02-13 9:37 ` [PATCH v2 14/23] KVM: arm64: vgic-its: Protect cached vgic_irq pointers with RCU Oliver Upton
2024-02-13 9:39 ` [PATCH v2 15/23] KVM: arm64: vgic-its: Treat the LPI translation cache as an rculist Oliver Upton
2024-02-13 9:40 ` [PATCH v2 16/23] KVM: arm64: vgic-its: Rely on RCU to protect translation cache reads Oliver Upton
2024-02-13 9:40 ` [PATCH v2 17/23] KVM: selftests: Align with kernel's GIC definitions Oliver Upton
2024-02-13 9:40 ` [PATCH v2 18/23] KVM: selftests: Standardise layout of GIC frames Oliver Upton
2024-02-13 9:41 ` [PATCH v2 19/23] KVM: selftests: Add a minimal library for interacting with an ITS Oliver Upton
2024-02-14 17:32 ` Marc Zyngier
2024-02-14 19:00 ` Oliver Upton
2024-02-14 20:09 ` Marc Zyngier
2024-02-14 20:55 ` Oliver Upton
2024-02-14 21:06 ` Oliver Upton
2024-02-13 9:41 ` [PATCH v2 20/23] KVM: selftests: Add helper for enabling LPIs on a redistributor Oliver Upton
2024-02-13 9:42 ` [PATCH v2 21/23] KVM: selftests: Use MPIDR_HWID_BITMASK from cputype.h Oliver Upton
2024-02-13 9:43 ` [PATCH v2 22/23] KVM: selftests: Hack in support for aligned page allocations Oliver Upton
2024-02-13 9:43 ` [PATCH v2 23/23] KVM: selftests: Add stress test for LPI injection Oliver Upton
2024-02-13 20:12 ` [PATCH v2 00/23] KVM: arm64: Improvements to " Oliver Upton
2024-02-14 17:43 ` Marc Zyngier
2024-02-14 18:40 ` Oliver Upton
2024-02-15 15:37 ` Marc Zyngier
2024-02-15 20:15 ` Oliver Upton
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240213093250.3960069-2-oliver.upton@linux.dev \
--to=oliver.upton@linux.dev \
--cc=james.morse@arm.com \
--cc=kvm@vger.kernel.org \
--cc=kvmarm@lists.linux.dev \
--cc=linux-kernel@vger.kernel.org \
--cc=maz@kernel.org \
--cc=suzuki.poulose@arm.com \
--cc=yuzenghui@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox