From: Vincent Donnefort <vdonnefort@google.com>
To: rostedt@goodmis.org, mhiramat@kernel.org,
mathieu.desnoyers@efficios.com,
linux-trace-kernel@vger.kernel.org, maz@kernel.org,
oliver.upton@linux.dev, joey.gouly@arm.com,
suzuki.poulose@arm.com, yuzenghui@huawei.com
Cc: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org,
jstultz@google.com, qperret@google.com, will@kernel.org,
aneesh.kumar@kernel.org, kernel-team@android.com,
linux-kernel@vger.kernel.org,
Vincent Donnefort <vdonnefort@google.com>
Subject: [PATCH v13 20/32] KVM: arm64: Add clock support to nVHE/pKVM hyp
Date: Fri, 6 Mar 2026 14:35:24 +0000 [thread overview]
Message-ID: <20260306143536.339777-21-vdonnefort@google.com> (raw)
In-Reply-To: <20260306143536.339777-1-vdonnefort@google.com>
In preparation for supporting tracing from the nVHE hyp, add support to
generate timestamps with a clock fed by the CNTCVT counter. The clock
can be kept in sync with the kernel's by updating the slope values. This
will be done later.
As current we do only create a trace clock, make the whole support
dependent on the upcoming CONFIG_NVHE_EL2_TRACING.
Signed-off-by: Vincent Donnefort <vdonnefort@google.com>
diff --git a/arch/arm64/kvm/hyp/include/nvhe/clock.h b/arch/arm64/kvm/hyp/include/nvhe/clock.h
new file mode 100644
index 000000000000..9f429f5c0664
--- /dev/null
+++ b/arch/arm64/kvm/hyp/include/nvhe/clock.h
@@ -0,0 +1,16 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef __ARM64_KVM_HYP_NVHE_CLOCK_H
+#define __ARM64_KVM_HYP_NVHE_CLOCK_H
+#include <linux/types.h>
+
+#include <asm/kvm_hyp.h>
+
+#ifdef CONFIG_NVHE_EL2_TRACING
+void trace_clock_update(u32 mult, u32 shift, u64 epoch_ns, u64 epoch_cyc);
+u64 trace_clock(void);
+#else
+static inline void
+trace_clock_update(u32 mult, u32 shift, u64 epoch_ns, u64 epoch_cyc) { }
+static inline u64 trace_clock(void) { return 0; }
+#endif
+#endif
diff --git a/arch/arm64/kvm/hyp/nvhe/Makefile b/arch/arm64/kvm/hyp/nvhe/Makefile
index a244ec25f8c5..8dc95257c291 100644
--- a/arch/arm64/kvm/hyp/nvhe/Makefile
+++ b/arch/arm64/kvm/hyp/nvhe/Makefile
@@ -17,7 +17,7 @@ ccflags-y += -fno-stack-protector \
hostprogs := gen-hyprel
HOST_EXTRACFLAGS += -I$(objtree)/include
-lib-objs := clear_page.o copy_page.o memcpy.o memset.o
+lib-objs := clear_page.o copy_page.o memcpy.o memset.o tishift.o
lib-objs := $(addprefix ../../../lib/, $(lib-objs))
CFLAGS_switch.nvhe.o += -Wno-override-init
@@ -29,6 +29,7 @@ hyp-obj-y += ../vgic-v3-sr.o ../aarch32.o ../vgic-v2-cpuif-proxy.o ../entry.o \
../fpsimd.o ../hyp-entry.o ../exception.o ../pgtable.o
hyp-obj-y += ../../../kernel/smccc-call.o
hyp-obj-$(CONFIG_LIST_HARDENED) += list_debug.o
+hyp-obj-$(CONFIG_NVHE_EL2_TRACING) += clock.o
hyp-obj-y += $(lib-objs)
##
diff --git a/arch/arm64/kvm/hyp/nvhe/clock.c b/arch/arm64/kvm/hyp/nvhe/clock.c
new file mode 100644
index 000000000000..32fc4313fe43
--- /dev/null
+++ b/arch/arm64/kvm/hyp/nvhe/clock.c
@@ -0,0 +1,65 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2025 Google LLC
+ * Author: Vincent Donnefort <vdonnefort@google.com>
+ */
+
+#include <nvhe/clock.h>
+
+#include <asm/arch_timer.h>
+#include <asm/div64.h>
+
+static struct clock_data {
+ struct {
+ u32 mult;
+ u32 shift;
+ u64 epoch_ns;
+ u64 epoch_cyc;
+ u64 cyc_overflow64;
+ } data[2];
+ u64 cur;
+} trace_clock_data;
+
+static u64 __clock_mult_uint128(u64 cyc, u32 mult, u32 shift)
+{
+ __uint128_t ns = (__uint128_t)cyc * mult;
+
+ ns >>= shift;
+
+ return (u64)ns;
+}
+
+/* Does not guarantee no reader on the modified bank. */
+void trace_clock_update(u32 mult, u32 shift, u64 epoch_ns, u64 epoch_cyc)
+{
+ struct clock_data *clock = &trace_clock_data;
+ u64 bank = clock->cur ^ 1;
+
+ clock->data[bank].mult = mult;
+ clock->data[bank].shift = shift;
+ clock->data[bank].epoch_ns = epoch_ns;
+ clock->data[bank].epoch_cyc = epoch_cyc;
+ clock->data[bank].cyc_overflow64 = ULONG_MAX / mult;
+
+ smp_store_release(&clock->cur, bank);
+}
+
+/* Use untrusted host data */
+u64 trace_clock(void)
+{
+ struct clock_data *clock = &trace_clock_data;
+ u64 bank = smp_load_acquire(&clock->cur);
+ u64 cyc, ns;
+
+ cyc = __arch_counter_get_cntvct() - clock->data[bank].epoch_cyc;
+
+ if (likely(cyc < clock->data[bank].cyc_overflow64)) {
+ ns = cyc * clock->data[bank].mult;
+ ns >>= clock->data[bank].shift;
+ } else {
+ ns = __clock_mult_uint128(cyc, clock->data[bank].mult,
+ clock->data[bank].shift);
+ }
+
+ return (u64)ns + clock->data[bank].epoch_ns;
+}
--
2.53.0.473.g4a7958ca14-goog
next prev parent reply other threads:[~2026-03-06 14:36 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-06 14:35 [PATCH v13 00/32] Tracefs support for pKVM Vincent Donnefort
2026-03-06 14:35 ` [PATCH v13 01/32] ring-buffer: Add page statistics to the meta-page Vincent Donnefort
2026-03-06 14:35 ` [PATCH v13 02/32] ring-buffer: Store bpage pointers into subbuf_ids Vincent Donnefort
2026-03-06 14:35 ` [PATCH v13 03/32] ring-buffer: Introduce ring-buffer remotes Vincent Donnefort
2026-03-06 16:37 ` Markus Elfring
2026-03-11 15:23 ` Vincent Donnefort
2026-03-06 14:35 ` [PATCH v13 04/32] ring-buffer: Add non-consuming read for " Vincent Donnefort
2026-03-06 14:35 ` [PATCH v13 05/32] tracing: Introduce trace remotes Vincent Donnefort
2026-03-06 14:35 ` [PATCH v13 06/32] tracing: Add reset to " Vincent Donnefort
2026-03-06 14:35 ` [PATCH v13 07/32] tracing: Add non-consuming read " Vincent Donnefort
2026-03-06 14:35 ` [PATCH v13 08/32] tracing: Add init callback " Vincent Donnefort
2026-03-06 14:35 ` [PATCH v13 09/32] tracing: Add events " Vincent Donnefort
2026-03-06 14:35 ` [PATCH v13 10/32] tracing: Add events/ root files " Vincent Donnefort
2026-03-06 14:35 ` [PATCH v13 11/32] tracing: Add helpers to create trace remote events Vincent Donnefort
2026-03-06 14:35 ` [PATCH v13 12/32] ring-buffer: Export buffer_data_page and macros Vincent Donnefort
2026-03-06 14:35 ` [PATCH v13 13/32] tracing: Introduce simple_ring_buffer Vincent Donnefort
2026-03-06 14:35 ` [PATCH v13 14/32] tracing: Add a trace remote module for testing Vincent Donnefort
2026-03-06 14:35 ` [PATCH v13 15/32] tracing: selftests: Add trace remote tests Vincent Donnefort
2026-03-06 14:35 ` [PATCH v13 16/32] Documentation: tracing: Add tracing remotes Vincent Donnefort
2026-03-06 14:35 ` [PATCH v13 17/32] tracing: load/unload page callbacks for simple_ring_buffer Vincent Donnefort
2026-03-06 14:35 ` [PATCH v13 18/32] tracing: Check for undefined symbols in simple_ring_buffer Vincent Donnefort
2026-03-06 14:35 ` [PATCH v13 19/32] KVM: arm64: Add PKVM_DISABLE_STAGE2_ON_PANIC Vincent Donnefort
2026-03-06 14:35 ` Vincent Donnefort [this message]
2026-03-06 14:35 ` [PATCH v13 21/32] KVM: arm64: Initialise hyp_nr_cpus for nVHE hyp Vincent Donnefort
2026-03-06 14:35 ` [PATCH v13 22/32] KVM: arm64: Support unaligned fixmap in the pKVM hyp Vincent Donnefort
2026-03-06 14:35 ` [PATCH v13 23/32] KVM: arm64: Add tracing capability for the nVHE/pKVM hyp Vincent Donnefort
2026-03-06 14:35 ` [PATCH v13 24/32] KVM: arm64: Add trace remote " Vincent Donnefort
2026-03-06 14:35 ` [PATCH v13 25/32] KVM: arm64: Sync boot clock with " Vincent Donnefort
2026-03-06 14:35 ` [PATCH v13 26/32] KVM: arm64: Add trace reset to " Vincent Donnefort
2026-03-06 14:35 ` [PATCH v13 27/32] KVM: arm64: Add event support to the nVHE/pKVM hyp and trace remote Vincent Donnefort
2026-03-06 14:35 ` [PATCH v13 28/32] KVM: arm64: Add hyp_enter/hyp_exit events to nVHE/pKVM hyp Vincent Donnefort
2026-03-06 14:35 ` [PATCH v13 29/32] KVM: arm64: Add selftest event support " Vincent Donnefort
2026-03-06 14:35 ` [PATCH v13 30/32] tracing: selftests: Add hypervisor trace remote tests Vincent Donnefort
2026-03-06 14:35 ` [PATCH v13 31/32] fixup! tracing: Add a trace remote module for testing Vincent Donnefort
2026-03-06 14:35 ` [PATCH v13 32/32] " Vincent Donnefort
2026-03-09 1:45 ` [PATCH v13 00/32] Tracefs support for pKVM Steven Rostedt
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=20260306143536.339777-21-vdonnefort@google.com \
--to=vdonnefort@google.com \
--cc=aneesh.kumar@kernel.org \
--cc=joey.gouly@arm.com \
--cc=jstultz@google.com \
--cc=kernel-team@android.com \
--cc=kvmarm@lists.linux.dev \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-trace-kernel@vger.kernel.org \
--cc=mathieu.desnoyers@efficios.com \
--cc=maz@kernel.org \
--cc=mhiramat@kernel.org \
--cc=oliver.upton@linux.dev \
--cc=qperret@google.com \
--cc=rostedt@goodmis.org \
--cc=suzuki.poulose@arm.com \
--cc=will@kernel.org \
--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