From nobody Sat Oct 4 03:07:03 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 EDDD41EE7DC for ; Fri, 3 Oct 2025 13:39:17 +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=1759498760; cv=none; b=LZPeX460aV2qkV+K6sCHFzdJhccKJnO2vOOUkGLtACvTw82IP36iq64k6xRmfNC2gLKpar4U7AvDXnjXHdivOqDKnzVJoX/07Mvl4UtPH+p+8ulWm5k/k8xdC4qc2nIATeR+KUy4mgMwHaAB6koib197LzTnzz9XKuZRZg3Io8o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759498760; c=relaxed/simple; bh=g+NA4zSfwGxqsI4IC/ZtvkJUw3mWlopfHq/pqvBkNBQ=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=DmGsUgPG9IY+2qJ6NURe9fYot7jUFece3iEwwmaNiTvoabGTUhQdFzPkjFXMRPuTqeRfn//tCwwTllVo35HQ5JCyp0syqfL4LlMnTnTwsbGvGp566n1rQEZsTJwzZsfjnVgQFxkdOQPY//Vn3obY3vxKKwtMu+twjr/Nqri1Jgg= 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=P4Go2lEm; 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="P4Go2lEm" Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-46e41c32209so9806175e9.0 for ; Fri, 03 Oct 2025 06:39:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1759498756; x=1760103556; 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=ylDyk9s+5460dWO0uwqzLTOwTHPUFfBCKGnbJPl3EJ0=; b=P4Go2lEmbcp1oiL+k1DbeT+rub247fAJHHsHvPMwW9EEMx/Vhy8s9SjmB8WCK06uKU ChTmilKOndJcgZvPUCFW+hUvzdFLBP8zHIRHHR67p1KJXGv33Ek2XwycjWdlDFLBc0yQ E8IlZGVO7Dg5wRWUH5Q/6kNNLfjimqJ2YsGhYemoyVbu7X1vSh0bGoMPGRbVffVc8ZHH cxEKpNigY5+8b75au2OO1k8bEVIlXfIh29ZYOkMibyBEkqkTyxjZxb5xzA+Lz3foWQT8 M7ZFEj8FVf1RL3hFqVHuorcWxiVSktkoEPJcIltzJo+LSi0+iWqAd/rF7jmYTTqIuse0 lxtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759498756; x=1760103556; 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=ylDyk9s+5460dWO0uwqzLTOwTHPUFfBCKGnbJPl3EJ0=; b=ZxRLxUKuI7kZprECVLmuJnSeaY2T2YrT+H9Q58bgYPLPFwagDeIUotmC6BGwEoWyjQ 0xxBAQjtxnpFfFHuHrngiuuLnKspBeD2cjMWEjvbS1RnmIsAMGiNq+jU8v7emmG+QFyA Od1G33DkhuGcV/hZwrBOdbhFgXkS6xWxjSDGrRdamEqZwI/whFi8imxXqEh8kMVKoUZC xeo4sD45xTxHHVzaEGyXrweS4JgfZcLJfhyCKvj6AI57GzFzZOJsE+Z46up8Lt2MB0oR v2bhHAOGkVw2k317zkc7P6vUTRBdswQBCYRtdiueK72yN1zjcME4ZO9RXkcCeH/b3QMf LZNA== X-Forwarded-Encrypted: i=1; AJvYcCUTFyink8MzPcik5xJGm3jLeBTHa3OWzQvx5fzojLAAznek6tw2Typ6D4msGkuEJe/cz+SaKUfiQXrfoH4=@vger.kernel.org X-Gm-Message-State: AOJu0YxYQ618liAG0pV1sJStICdl4msvAMMrpvDqiGPPrpBXrSJIWVCZ l6dy2kv8ZjisJP4wgFdHsTcpIDNcdoepEvXt5zyfVmp+j+THk9Fap9RfJyuDtW8wS3uHh3s1Bbq GDsG0Mvq70wQEil62Ae1CjA== X-Google-Smtp-Source: AGHT+IFhcfElMZQqoCh3Cq6hmENi8kEnMvrnlOccnmd1TZhS72DJCQ0YPYUh2/TUKvb4CJDArB7pSvRYLVze8uJU X-Received: from wmjf9.prod.google.com ([2002:a7b:cd09:0:b0:46b:7c6d:220]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:468e:b0:43c:ec4c:25b4 with SMTP id 5b1f17b1804b1-46e71102467mr22982065e9.10.1759498755769; Fri, 03 Oct 2025 06:39:15 -0700 (PDT) Date: Fri, 3 Oct 2025 14:38:17 +0100 In-Reply-To: <20251003133825.2068970-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: <20251003133825.2068970-1-vdonnefort@google.com> X-Mailer: git-send-email 2.51.0.618.g983fd99d29-goog Message-ID: <20251003133825.2068970-21-vdonnefort@google.com> Subject: [PATCH v7 20/28] KVM: arm64: Add clock support for the 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" By default, the arm64 host kernel is using the arch timer as a source for sched_clock. Conveniently, EL2 has access to that same counter, allowing to generate clock values that are synchronized. The clock needs nonetheless to be setup with the same slope values as the kernel. Introducing at the same time trace_clock() which is expected to be later configured by the hypervisor tracing. Signed-off-by: Vincent Donnefort diff --git a/arch/arm64/include/asm/kvm_hyp.h b/arch/arm64/include/asm/kvm_= hyp.h index e6be1f5d0967..d46621d936e3 100644 --- a/arch/arm64/include/asm/kvm_hyp.h +++ b/arch/arm64/include/asm/kvm_hyp.h @@ -146,5 +146,4 @@ extern u64 kvm_nvhe_sym(id_aa64smfr0_el1_sys_val); extern unsigned long kvm_nvhe_sym(__icache_flags); extern unsigned int kvm_nvhe_sym(kvm_arm_vmid_bits); extern unsigned int kvm_nvhe_sym(kvm_host_sve_max_vl); - #endif /* __ARM64_KVM_HYP_H__ */ 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..9e152521f345 --- /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_PKVM_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 0b0a68b663d4..607357e36026 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 @@ -28,6 +28,7 @@ hyp-obj-y :=3D timer-sr.o sysreg-sr.o debug-sr.o switch.o= tlb.o hyp-init.o host.o hyp-obj-y +=3D ../vgic-v3-sr.o ../aarch32.o ../vgic-v2-cpuif-proxy.o ../en= try.o \ ../fpsimd.o ../hyp-entry.o ../exception.o ../pgtable.o hyp-obj-$(CONFIG_LIST_HARDENED) +=3D list_debug.o +hyp-obj-$(CONFIG_PKVM_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..600a300bece7 --- /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); +} + +/* Using host provided data. Do not use for anything else than debugging. = */ +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_cntpct() - 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.51.0.618.g983fd99d29-goog