From mboxrd@z Thu Jan 1 00:00:00 1970 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 ADC793CC9E7 for ; Fri, 6 Mar 2026 14:36:23 +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=1772807785; cv=none; b=E0dg5F/28TXMEs2cX193ul3APMMDnObaNPW0MSpzismBQ0MvMGDCL2iKt+3hQqnHUBm/qS+vTQEh4Hy2wcDy14tCEBOCJmfAufY1+8nLQeQrbwhb4TyturtoFSdAqg0p07Vcxbc9Vk9Fo1F4cDNh6Tcf67AyASlutBDeTDTowos= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772807785; c=relaxed/simple; bh=Hq3pw944yEctnZlP5UAA9Ov4xnMxVYtjU2DXhQ3r5cM=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=utobt8rUPM1/wHuv25RlJPXscGy41BKPQM7YyXY8IXmxmHO1CkHdIUvW9XjlXOmvCVKOSLD2cS7huGFR9TIENEvFf/wuo5IMHZPqE3273Wkid0mIWUyGWgKNiJ/zVF4ejI1ww4IuDLGXwdeQJeAVeTPKDlwcadm9Zr+pa9VXH5k= 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=j05B1V9C; 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="j05B1V9C" Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-48378df3469so66699825e9.1 for ; Fri, 06 Mar 2026 06:36:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1772807782; x=1773412582; 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=VBnYryU8DAHWNMJIKaPrPbk+603MWk0xgkkJlIYXdOA=; b=j05B1V9Cvhto/mzagoJl47Vm63/8Uf8Bduwm0nWVXr3aYMNRBaarSEADIdSGaSqArV yAqz3B8rFKzMM9wqnRXR74QLIhEZE1RCM8GqZH8kIaEkwrxye83XeKUxN2TAfjCLEeUK /+KROx0xINWjZx6kL+TTxfVO/lAx8oqsQU12H+v0Ba1rsI0mvxuUGh1mTFxBCSi3Gs8Z oPjtaQ8r+cbiT6LiXtpiDD5R+dL9V03F8lUSmNkaJCgmJ3iyPMFB44ewiOIG56JL+eCV SG/z82lhX0e4YU0uSc4OaYReLpvtqK4JDd2fXi7WcFmNxkfU5T5V0tRXg1IPJ9bvO9zU 8Jew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772807782; x=1773412582; 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=VBnYryU8DAHWNMJIKaPrPbk+603MWk0xgkkJlIYXdOA=; b=PgovottqpW+jbXAJEsMMt+vcFcmDeHSkCyhVcIA80t6thlREY6bIFbv+7fIKU1EPa6 hd0mu6w/eR9xj0JOsXUA4+Mf1f6L1BODcg7vniEGzlG2PR9ThHs8LVDzmDNeU4qtsnwR 52AQ6L0ZaZXDTR7T07EWIVlZBjKH1kIXnzTnJsMMPCXX8fytAVdk2ILFBy05+8lUvQ4j GnMZuY5Que8UvFL02d558u8/2dEDtaSrwiE/FfU93omKieKlwSkr8cIjEfoIdZVsfu9N LwZBZCdPwk5cpG2jm23iEzy8nC+3nJoqg71CZiAP7R8OykUSsGtiPEYtE9CBi0e95inO Qf4A== X-Forwarded-Encrypted: i=1; AJvYcCVJqtsx8hpn4OQ2lhU23iK56apeuix/osCtzQj4osSY1P633tds8+/uYFn7TyZxb+0/nJDSQ+uHXc3q8I/4BT42tpo=@vger.kernel.org X-Gm-Message-State: AOJu0YwonJ1JWfbWBn/PN+zO1DRv3vPJG3lbsO4V7qj9AI4/QBf8N/6Q n2F9OpVnN7gYGf344dn1/pd+4pC7KkDBDhZNNeFDijXDVaVBgQCSE0XmQMRlfYWLhgqA4xzvYWA 53+H3UyvKNNXVOztkvYVl4w== X-Received: from wmna22.prod.google.com ([2002:a05:600c:696:b0:480:2051:60e1]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:4fc4:b0:483:6d9e:e4f5 with SMTP id 5b1f17b1804b1-4852671c9a6mr36238685e9.5.1772807782036; Fri, 06 Mar 2026 06:36:22 -0800 (PST) Date: Fri, 6 Mar 2026 14:35:33 +0000 In-Reply-To: <20260306143536.339777-1-vdonnefort@google.com> Precedence: bulk X-Mailing-List: linux-trace-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260306143536.339777-1-vdonnefort@google.com> X-Mailer: git-send-email 2.53.0.473.g4a7958ca14-goog Message-ID: <20260306143536.339777-30-vdonnefort@google.com> Subject: [PATCH v13 29/32] KVM: arm64: Add selftest event 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-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 47d250436f8c..c8eb992d3ac8 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___tracing_update_clock, __KVM_HOST_SMCCC_FUNC___tracing_reset, __KVM_HOST_SMCCC_FUNC___tracing_enable_event, + __KVM_HOST_SMCCC_FUNC___tracing_write_event, }; #define DECLARE_KVM_VHE_SYM(sym) extern char sym[] diff --git a/arch/arm64/include/asm/kvm_hypevents.h b/arch/arm64/include/asm/kvm_hypevents.h index 221a1dacb2f0..743c49bd878f 100644 --- a/arch/arm64/include/asm/kvm_hypevents.h +++ b/arch/arm64/include/asm/kvm_hypevents.h @@ -46,4 +46,15 @@ HYP_EVENT(hyp_exit, ), HE_PRINTK("reason=%s vcpu=%d", __hyp_enter_exit_reason_str(__entry->reason), __entry->vcpu) ); + +HYP_EVENT(selftest, + HE_PROTO(u64 id), + HE_STRUCT( + he_field(u64, id) + ), + HE_ASSIGN( + __entry->id = id; + ), + RE_PRINTK("id=%llu", __entry->id) +); #endif diff --git a/arch/arm64/kvm/hyp/nvhe/hyp-main.c b/arch/arm64/kvm/hyp/nvhe/hyp-main.c index 547d63679022..eff9cb208627 100644 --- a/arch/arm64/kvm/hyp/nvhe/hyp-main.c +++ b/arch/arm64/kvm/hyp/nvhe/hyp-main.c @@ -643,6 +643,13 @@ static void handle___tracing_enable_event(struct kvm_cpu_context *host_ctxt) cpu_reg(host_ctxt, 1) = __tracing_enable_event(id, enable); } +static void handle___tracing_write_event(struct kvm_cpu_context *host_ctxt) +{ + DECLARE_REG(u64, id, host_ctxt, 1); + + trace_selftest(id); +} + typedef void (*hcall_t)(struct kvm_cpu_context *); #define HANDLE_FUNC(x) [__KVM_HOST_SMCCC_FUNC_##x] = (hcall_t)handle_##x @@ -691,6 +698,7 @@ static const hcall_t host_hcall[] = { HANDLE_FUNC(__tracing_update_clock), HANDLE_FUNC(__tracing_reset), HANDLE_FUNC(__tracing_enable_event), + HANDLE_FUNC(__tracing_write_event), }; 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 1ad6a55ba95c..c1e28f6581ab 100644 --- a/arch/arm64/kvm/hyp_trace.c +++ b/arch/arm64/kvm/hyp_trace.c @@ -348,8 +348,30 @@ static int hyp_trace_clock_show(struct seq_file *m, void *v) } DEFINE_SHOW_ATTRIBUTE(hyp_trace_clock); +static ssize_t hyp_trace_write_event_write(struct file *f, const char __user *ubuf, + size_t cnt, loff_t *pos) +{ + unsigned long val; + int ret; + + ret = kstrtoul_from_user(ubuf, cnt, 10, &val); + if (ret) + return ret; + + kvm_call_hyp_nvhe(__tracing_write_event, val); + + return cnt; +} + +static const struct file_operations hyp_trace_write_event_fops = { + .write = hyp_trace_write_event_write, +}; + static int hyp_trace_init_tracefs(struct dentry *d, void *priv) { + if (!tracefs_create_file("write_event", 0200, d, NULL, &hyp_trace_write_event_fops)) + return -ENOMEM; + return tracefs_create_file("trace_clock", 0440, d, NULL, &hyp_trace_clock_fops) ? 0 : -ENOMEM; } -- 2.53.0.473.g4a7958ca14-goog