From nobody Fri Dec 19 20:17:19 2025 Received: from mail-wr1-f74.google.com (mail-wr1-f74.google.com [209.85.221.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 E2C0D320A1A for ; Fri, 7 Nov 2025 09:39:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762508358; cv=none; b=pJE5NZyMEqWz0y3eXxxaTequ3L1EGvQD87SkAwRjfB7heu6uwsgyk53IoAqfW6xCqeQQKKvDoEpeD/IJcXX9Bl5d+iw2JOd/TYWwNSx0SqfRU/Aaf3jNpnIpjwMqEc7xyz9tx3rbMQde9hMhlbDuB5jclBiUH585OBoDMHRDKOo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762508358; c=relaxed/simple; bh=CnpG2QpjkkNDkYKK5inWza9MJr+svUJhufuMoeoqnuo=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=qv1eqYF+b6d79YkuSbtRd6GO1NtG6Y2rgpNcUP7ePGsnLYMbaNnvWmvwMPd4jGnhVyVYx/3k6FVBnNn8OVlsLhsCa45usnlRCKTUE9Kk4s5KDDPL0pNyte2rFMJJ6E/kOavvz8pTy1iZO+tMY0+wahmNzzr9xBFBM91d9zdZKQc= 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=Mcbm4sVW; arc=none smtp.client-ip=209.85.221.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="Mcbm4sVW" Received: by mail-wr1-f74.google.com with SMTP id ffacd0b85a97d-429c7b0ae36so272880f8f.0 for ; Fri, 07 Nov 2025 01:39:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1762508354; x=1763113154; 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=XTGXk+lEQWu2rXlHhBAaWQnSfDozXn1jFf3AtP0+OHw=; b=Mcbm4sVWQHXGCiYyYao8v3gixD4e7xeXPwElqBwgL3+ENF4EnrJupFE8OUIXJYVINI bynRG8AV7Inkgcl+kQHXJE+qW5P6YKLOphFuXrUSSjgMHkvOyVxxcL4uVfWeTDxuJKmf JdKv+2EHNhVFfcvBUCx+h7unyDOTpBfdnHlqf8HLaHYGtQiXX9jmKjbGsRip7nJW97LB 6+l6H/BmXqDjEyKNKAD8doLzWW63q8VTjwXoBtiRpSEQulezMtBBJNQ5PlP0PHk819q2 T4olqv8bhdYoSreJ8RTu3OObC6jNxdV4Aduu2wPZWzIUf1IbTa8iBnD+6lbrs6ZGPWe6 bxKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762508354; x=1763113154; 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=XTGXk+lEQWu2rXlHhBAaWQnSfDozXn1jFf3AtP0+OHw=; b=kIao0OQ3WuO+z4v1YQ1fDV5hzyxpDVHdztk5dN0okYPU8evcybfG/en55nA4ASGh7H 3KU9uXPUjtSXz4Q6KMXDRN2rCN8QTicPFN/lGbTIHfvmfx/3N26BukcKmvcKn7xRzbd1 sllXintPcPgxM12kErMd3d68VCZD2ItBfk1gA3jO511ETESrLw74MfVIKata24KIZaRT aAqFnMi9SHo/F2V8fnBqkRajCTMsRHsmID8VDbATEJ/qpJfjKX/D6x3vfAJn23rStLf/ Su64k7MDsT9MRbLYvize4XDEGpYl/nbkSYUPHVjBp6BPn5xX+hFlJHwYz/N1iTTXkbRw gHvQ== X-Forwarded-Encrypted: i=1; AJvYcCXil1eYFynCgCjg9tegYZOqj1vRb+0YZDy2Am68JjhVgPliVa9npGQ7Qdt2l+OrIw8Yp22zerVa8xBgGqs=@vger.kernel.org X-Gm-Message-State: AOJu0YxHD7Lx7cmS4r8PJmGEfbxBnuYjwsmdU/gVC4y1ddeCkn6R9tYD 85c6FwJCZ4YpdIRGWgrK6RWdYi87VAUO7Rz+eMkG+Pd4Lw4rdNCIWWga8/PlIjn1FgJfSHx8CX7 1NiE3elPOB79TLHEWK0+7TQ== X-Google-Smtp-Source: AGHT+IF/gtPJvCUAHC9x3215dCUFMskWv8ZlqPR+TxZo+QPZ0YsWx91fk4OG78nveWagqXOIs3IjHx01h0gv1Hon X-Received: from wrme6.prod.google.com ([2002:adf:e386:0:b0:429:c854:2a08]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6000:18a3:b0:3e7:6424:1b47 with SMTP id ffacd0b85a97d-42b26f637c7mr1167260f8f.6.1762508353798; Fri, 07 Nov 2025 01:39:13 -0800 (PST) Date: Fri, 7 Nov 2025 09:38:39 +0000 In-Reply-To: <20251107093840.3779150-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: <20251107093840.3779150-1-vdonnefort@google.com> X-Mailer: git-send-email 2.51.2.1041.gc1ab5b90ca-goog Message-ID: <20251107093840.3779150-28-vdonnefort@google.com> Subject: [PATCH v8 27/28] KVM: arm64: Add selftest event support to 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" Add a selftest event that can be triggered from a `write_event` tracefs file. This intends to be used by trace remote selftests. Signed-off-by: Vincent Donnefort diff --git a/arch/arm64/include/asm/kvm_asm.h b/arch/arm64/include/asm/kvm_= asm.h index f7b29eae7010..6a3d65918e5d 100644 --- a/arch/arm64/include/asm/kvm_asm.h +++ b/arch/arm64/include/asm/kvm_asm.h @@ -96,6 +96,7 @@ enum __kvm_host_smccc_func { __KVM_HOST_SMCCC_FUNC___pkvm_reset_tracing, __KVM_HOST_SMCCC_FUNC___pkvm_swap_reader_tracing, __KVM_HOST_SMCCC_FUNC___pkvm_enable_event, + __KVM_HOST_SMCCC_FUNC___pkvm_write_event, }; =20 #define DECLARE_KVM_VHE_SYM(sym) extern char sym[] diff --git a/arch/arm64/include/asm/kvm_hypevents.h b/arch/arm64/include/as= m/kvm_hypevents.h index ce3953bc884a..3d1244972869 100644 --- a/arch/arm64/include/asm/kvm_hypevents.h +++ b/arch/arm64/include/asm/kvm_hypevents.h @@ -24,4 +24,18 @@ HYP_EVENT(hyp_exit, ), HE_PRINTK() ); + +#ifdef CONFIG_PKVM_SELFTESTS +HYP_EVENT(selftest, + HE_PROTO(u64 id), + HE_STRUCT( + he_field(u64, id) + ), + HE_ASSIGN( + __entry->id =3D id; + ), + RE_PRINTK("id=3D%lld", __entry->id) +); #endif + +#endif /* __ARM64_KVM_HYPEVENTS_H_ */ diff --git a/arch/arm64/kvm/Kconfig b/arch/arm64/kvm/Kconfig index 64db254f0448..af66e4bbeea9 100644 --- a/arch/arm64/kvm/Kconfig +++ b/arch/arm64/kvm/Kconfig @@ -46,6 +46,7 @@ menuconfig KVM config NVHE_EL2_DEBUG bool "Debug mode for non-VHE EL2 object" depends on KVM + select PKVM_SELFTESTS help Say Y here to enable the debug mode for the non-VHE KVM EL2 object. Failure reports will BUG() in the hypervisor. This is intended for @@ -83,6 +84,15 @@ config PTDUMP_STAGE2_DEBUGFS =20 If in doubt, say N. =20 +config PKVM_SELFTESTS + bool "Protected KVM hypervisor selftests" + depends on KVM + default n + help + Say Y here to enable pKVM hypervisor testing infrastructure. + + If unsure, say N. + config PKVM_TRACING bool depends on KVM diff --git a/arch/arm64/kvm/hyp/nvhe/hyp-main.c b/arch/arm64/kvm/hyp/nvhe/h= yp-main.c index bb81906878c9..80e6b0159203 100644 --- a/arch/arm64/kvm/hyp/nvhe/hyp-main.c +++ b/arch/arm64/kvm/hyp/nvhe/hyp-main.c @@ -643,6 +643,20 @@ static void handle___pkvm_enable_event(struct kvm_cpu_= context *host_ctxt) cpu_reg(host_ctxt, 1) =3D __pkvm_enable_event(id, enable); } =20 +static void handle___pkvm_write_event(struct kvm_cpu_context *host_ctxt) +{ + int smc_ret =3D SMCCC_RET_NOT_SUPPORTED, ret =3D -EOPNOTSUPP; +#ifdef CONFIG_PKVM_SELFTESTS + DECLARE_REG(u64, id, host_ctxt, 1); + + trace_selftest(id); + smc_ret =3D SMCCC_RET_SUCCESS; + ret =3D 0; +#endif + cpu_reg(host_ctxt, 0) =3D smc_ret; + cpu_reg(host_ctxt, 1) =3D ret; +} + typedef void (*hcall_t)(struct kvm_cpu_context *); =20 #define HANDLE_FUNC(x) [__KVM_HOST_SMCCC_FUNC_##x] =3D (hcall_t)handle_##x @@ -691,6 +705,7 @@ static const hcall_t host_hcall[] =3D { HANDLE_FUNC(__pkvm_reset_tracing), HANDLE_FUNC(__pkvm_swap_reader_tracing), HANDLE_FUNC(__pkvm_enable_event), + HANDLE_FUNC(__pkvm_write_event), }; =20 static void handle_host_hcall(struct kvm_cpu_context *host_ctxt) diff --git a/arch/arm64/kvm/hyp_trace.c b/arch/arm64/kvm/hyp_trace.c index 73539f5b5e42..7d078f87f86d 100644 --- a/arch/arm64/kvm/hyp_trace.c +++ b/arch/arm64/kvm/hyp_trace.c @@ -318,8 +318,34 @@ static int hyp_trace_clock_show(struct seq_file *m, vo= id *v) } DEFINE_SHOW_ATTRIBUTE(hyp_trace_clock); =20 +#ifdef CONFIG_PKVM_SELFTESTS +static ssize_t hyp_trace_write_event_write(struct file *f, const char __us= er *ubuf, + size_t cnt, loff_t *pos) +{ + unsigned long val; + int ret; + + ret =3D kstrtoul_from_user(ubuf, cnt, 10, &val); + if (ret) + return ret; + + ret =3D kvm_call_hyp_nvhe(__pkvm_write_event, val); + if (ret) + return ret; + + return cnt; +} + +static const struct file_operations hyp_trace_write_event_fops =3D { + .write =3D hyp_trace_write_event_write, +}; +#endif + static int hyp_trace_init_tracefs(struct dentry *d, void *priv) { +#ifdef CONFIG_PKVM_SELFTESTS + tracefs_create_file("write_event", 0200, d, NULL, &hyp_trace_write_event_= fops); +#endif return tracefs_create_file("trace_clock", 0440, d, NULL, &hyp_trace_clock= _fops) ? 0 : -ENOMEM; } diff --git a/tools/testing/selftests/ftrace/test.d/remotes/pkvm/trace.tc b/= tools/testing/selftests/ftrace/test.d/remotes/pkvm/trace.tc new file mode 100644 index 000000000000..49dca7c3861a --- /dev/null +++ b/tools/testing/selftests/ftrace/test.d/remotes/pkvm/trace.tc @@ -0,0 +1,10 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0 +# description: Test pkvm hypervisor tracing pipe + +SOURCE_REMOTE_TEST=3D1 +. $TEST_DIR/remotes/trace_pipe.tc + +set -e +setup_remote "hypervisor" +test_trace --=20 2.51.2.1041.gc1ab5b90ca-goog