From nobody Wed Dec 17 07:52:43 2025 Received: from mail-wm1-f74.google.com (mail-wm1-f74.google.com [209.85.128.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C249E311971 for ; Tue, 2 Dec 2025 09:36:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764668215; cv=none; b=OrT8NNl3C7WWxS+iF/uO6oa/fA6JzeF7tytzUAjyRbamAsBN6gpmcn0MfLhHlgGFb6W6LVsM0m1fdE1TgYdEbFO8z9r8xn456nr0TQIVR60lB5ed7kZ0LakCx8tgKSHEtziZmGHSSDYg/fnmAkCqzXEZF4dMLHLoUA8zP2E42ZE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764668215; c=relaxed/simple; bh=A78S6v7BQPnmpLsH0ngbIfRTLjDC1AwOsWlasqsBA5g=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=XvcguUi73DnTQ49dOo9jIRrHSk/xoGx7IHaEcYZDRAkbNnuy3GJPghFDzE+kNF3Zfto9C3kqpKN3hnu3KE+WiA2UN5IDvCj2pgBI+uc2Hp14xWW/kWOqCHknO5NVCiGolRzI7UNt5R2Uswd/axHfVosxBI2xACeC/4GKgzLvk+I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--vdonnefort.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=27zSGu6+; arc=none smtp.client-ip=209.85.128.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--vdonnefort.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="27zSGu6+" Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-4779b3749a8so44695695e9.1 for ; Tue, 02 Dec 2025 01:36:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1764668211; x=1765273011; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=NElJUUivXewr9qr1zG4n3pnbZgrgkOxER+Z6nnzxCU0=; b=27zSGu6+BgHgkO9ZhxSPHWJuPetJ4/UO0KKtbEcoa+u7KWD7OnEG9eSR+UmTzHWAhm KLXwrYDVtQaNfbihUHcKDx0ySyOgAi3+WOH8nwZziELcXlS/64B35GgGclLVyqMFpJRV LDY9GngnwdA0MioyFsUuvPhpGojTvvnMPQEO/0x3nGVlXeqcrI7zC8J+9U0vvyqHVyKM TAr+BRXjF0jyndN2LyM0BU0M8PgDwluNYLCGgsvwwg882EtC2fT9sP+9rQBAlxMV7TYM 8HwXNvA/8A/iFWvzihG/NVZgbAXY2Bud3anT9Gx+vMDG8dlKpZVopcpsLuO+ygvhP3V0 Nikg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764668211; x=1765273011; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=NElJUUivXewr9qr1zG4n3pnbZgrgkOxER+Z6nnzxCU0=; b=IR8qhz52vNnaUAiVRNzujTo9EJ6L9vk/O5FzllnIYtKHHuPQrnDiyaHmmY9TNzByr6 vkLugd0IDLYmml71Gqh2jiizuh0iKRu7j3HzbBirMqWMbb461SF6SKC7/wjwbf1nN6je v47LVJBovxOAJQgQfEf/a7dEOPt7WxskABbwSZA4RjOAspU2ukOpWHb1+ASx5SK2bOzm yVMFG/hjCr+dTpCA/mFkpEguOljNXzASxzDORwVVSBLkveIleC55YhuyXodMj9PR+U83 qZFpUqBLQmGictcT8s5By99VNzHccZgyK/1ycdHbXbArYy4DbUnD6BBibxktMpqKDp0l LnTA== X-Forwarded-Encrypted: i=1; AJvYcCX3PvO8093N7ApTYesERajZFA2a1YISde32w7NhSdj3OoBq6PiTWnPWmB4J+J0o0CCJu9Sr6BPZ4QAQbbg=@vger.kernel.org X-Gm-Message-State: AOJu0YxvlrW+fZZP7SjhuB4xAQSvVkiy6PCU2KcDAd00zpj6F1aB5HHd oXRJnmlYjAN1EdXl5PEO4thw0X/ilOE/hf95uGuQbVQBsWIWBIXiFWc+bRf54Ie7Q9SNCRZwiix E0SospyBkvt8L44LlbcDijw== X-Google-Smtp-Source: AGHT+IGBBJ9ZKyVEXt6XGTNMrn5BtibPGIAljJk4FuV2zHz3VorRA+b/HT0CYv4OlfvdksSWqdGiSdjCCrfe5NcS X-Received: from wmdd21.prod.google.com ([2002:a05:600c:a215:b0:477:14b8:19f6]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:45cf:b0:477:8ba7:fe0a with SMTP id 5b1f17b1804b1-477c01c001bmr470590905e9.24.1764668210877; Tue, 02 Dec 2025 01:36:50 -0800 (PST) Date: Tue, 2 Dec 2025 09:36:13 +0000 In-Reply-To: <20251202093623.2337860-1-vdonnefort@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20251202093623.2337860-1-vdonnefort@google.com> X-Mailer: git-send-email 2.52.0.107.ga0afd4fd5b-goog Message-ID: <20251202093623.2337860-21-vdonnefort@google.com> Subject: [PATCH v9 20/30] KVM: arm64: Add clock support to nVHE/pKVM hyp From: Vincent Donnefort 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 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 dependant on the upcoming CONFIG_NVHE_EL2_TRACING. Signed-off-by: Vincent Donnefort diff --git a/arch/arm64/kvm/hyp/include/nvhe/clock.h b/arch/arm64/kvm/hyp/i= nclude/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 + +#include + +#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/Mak= efile index a244ec25f8c5..8dc95257c291 100644 --- a/arch/arm64/kvm/hyp/nvhe/Makefile +++ b/arch/arm64/kvm/hyp/nvhe/Makefile @@ -17,7 +17,7 @@ ccflags-y +=3D -fno-stack-protector \ hostprogs :=3D gen-hyprel HOST_EXTRACFLAGS +=3D -I$(objtree)/include =20 -lib-objs :=3D clear_page.o copy_page.o memcpy.o memset.o +lib-objs :=3D clear_page.o copy_page.o memcpy.o memset.o tishift.o lib-objs :=3D $(addprefix ../../../lib/, $(lib-objs)) =20 CFLAGS_switch.nvhe.o +=3D -Wno-override-init @@ -29,6 +29,7 @@ hyp-obj-y +=3D ../vgic-v3-sr.o ../aarch32.o ../vgic-v2-cp= uif-proxy.o ../entry.o \ ../fpsimd.o ../hyp-entry.o ../exception.o ../pgtable.o hyp-obj-y +=3D ../../../kernel/smccc-call.o hyp-obj-$(CONFIG_LIST_HARDENED) +=3D list_debug.o +hyp-obj-$(CONFIG_NVHE_EL2_TRACING) +=3D clock.o hyp-obj-y +=3D $(lib-objs) =20 ## diff --git a/arch/arm64/kvm/hyp/nvhe/clock.c b/arch/arm64/kvm/hyp/nvhe/cloc= k.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 + */ + +#include + +#include +#include + +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 =3D (__uint128_t)cyc * mult; + + ns >>=3D 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 =3D &trace_clock_data; + u64 bank =3D clock->cur ^ 1; + + clock->data[bank].mult =3D mult; + clock->data[bank].shift =3D shift; + clock->data[bank].epoch_ns =3D epoch_ns; + clock->data[bank].epoch_cyc =3D epoch_cyc; + clock->data[bank].cyc_overflow64 =3D ULONG_MAX / mult; + + smp_store_release(&clock->cur, bank); +} + +/* Use untrusted host data */ +u64 trace_clock(void) +{ + struct clock_data *clock =3D &trace_clock_data; + u64 bank =3D smp_load_acquire(&clock->cur); + u64 cyc, ns; + + cyc =3D __arch_counter_get_cntvct() - clock->data[bank].epoch_cyc; + + if (likely(cyc < clock->data[bank].cyc_overflow64)) { + ns =3D cyc * clock->data[bank].mult; + ns >>=3D clock->data[bank].shift; + } else { + ns =3D __clock_mult_uint128(cyc, clock->data[bank].mult, + clock->data[bank].shift); + } + + return (u64)ns + clock->data[bank].epoch_ns; +} --=20 2.52.0.107.ga0afd4fd5b-goog