From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5C49BC88E5B for ; Fri, 11 Sep 2026 13:52:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type:Cc:To:From: Subject:Message-ID:References:Mime-Version:In-Reply-To:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=Vymh7WtkCS2L1vZH6F2vEzmi/F3C/O1M/vjWHAIX6fs=; b=H7jFzySQHYsebd+bQ42GTgEHeT bQ56re9kKzkTG/gemGng1FgR/A38nksUFDUq9UCKlPXAvCHnWxv7vxdpOaRL9svZa9PXCDyNBSqBi /u+2B/QWpYlUhuehip1esaTzcXNdFj6VMfDWeT63OpDrW44ZWZLwxhx26rdNnjqg5n+K33E4QkcC8 24R+ZE4z53WcmTU3PvTPBhRxIlJvnHlE92gYT5qnHC5TKzkCWx27Ah8AbiLH6RZdVO6Rxz8sl4z+l N19+oaEDva/RFCUgw/rgD4Iq2vJ7orEggUyOFmcnhCb6WMPib5Xc0fpj3wXziNgmDI4SwbQhMzi6A Clt/OC/g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1x51fQ-0000000GoOA-2rW0; Fri, 11 Sep 2026 13:51:48 +0000 Received: from mail-wm1-x348.google.com ([2a00:1450:4864:20::348]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1x51f1-0000000GnzN-0lfo for linux-arm-kernel@lists.infradead.org; Fri, 11 Sep 2026 13:51:27 +0000 Received: by mail-wm1-x348.google.com with SMTP id 5b1f17b1804b1-49953abe51fso5390595e9.1 for ; Fri, 11 Sep 2026 06:51:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1789134681; x=1789739481; darn=lists.infradead.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=Vymh7WtkCS2L1vZH6F2vEzmi/F3C/O1M/vjWHAIX6fs=; b=Oo9CH9iEAzt57bUudvqPvmIxnRDB8wose/vsW2m+iA/v9WhfGDkPja6RlTwbiZ9eWr 5Zj76EUpgAIbP8hHEoCcDObUdh+C3odJYdFaWiJA/0wQhoXH6Wu7Kq8ThE+nEgM7hrZ7 Ocig0orizg4vlvkjOlnadASdxxVvxv7VDQ5zoGB69oGqt/MpolLZ9Fhl9Ic3JKszdmYs BP5evtQYuyPfOQMBGr6qokcQjhoNJ3Z8k5Mj50DnYo8gZFiRicdznfL01FvaFXOnvqYT 70t8kuMmu/REwwFmRqpOT8dvPcjPm+uMcqWy4yepsS20pDIOO6XEFOeUntPxQrXM0Iom XIRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1789134681; x=1789739481; h=content-type: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:content-type; bh=Vymh7WtkCS2L1vZH6F2vEzmi/F3C/O1M/vjWHAIX6fs=; b=MlckM4cn22Jo3WjDkLSiIv+0m4ubz9yiU+bmYgTC0rdgtUejvGFTl1+TNI7eQC53wL l7Sf66URWP9SQLS4s/gjy2bgCBijhoaiBIupY8By7pyVJ5qg0AYgewXUk8gqolJQZeCl vDh7O7/ghoZRgBoF4wQb1FUslRRccSkNfFCRQCTBcqJGQD3tC4Vq8OKHXQUmpPAe7Ell CQS6v3Q7DTG3xACY7fwEKCKt3TzeK2wJK7BjzvlVJ9OxwwzJ5Y/Se9YfrK2ol4GjgNYX S2gtpgptaeyyIkrsAR5FVAyFrYgw1N66gawI2brHiLzg+RHeWjcxZtbvAnkxTOsKxa6C TM/g== X-Forwarded-Encrypted: i=1; AKwUvBzIHyuvXeb2cyKoFufCYBwu2Bfq7Tkay3UYNh9AsbhHr7QRxCyLC75vM6vQPx54TANnhMcvMW72Sv86TeX/jiuw@lists.infradead.org X-Gm-Message-State: AFuF++mkpQkDEWB06ipOUOqVYPmSmQuc0CSPD0yZiA46AxHfqxnVc+0G plDByvHinIxVLK1pN4AqlCHEGD2fVuIoF5np8oZXKCE30KQHADStEjNlnqe3+0IIlsKQitse3ff OxRiJAE1tNTMuUqiQCKIm7A== X-Received: from wmon22.prod.google.com ([2002:a05:600c:4656:b0:498:88df:a3b0]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:37c4:b0:49d:93c:d903 with SMTP id 5b1f17b1804b1-49e619e0e8fmr50487405e9.20.1789134680903; Fri, 11 Sep 2026 06:51:20 -0700 (PDT) Date: Fri, 11 Sep 2026 14:50:47 +0100 In-Reply-To: <20260911135053.146435-1-vdonnefort@google.com> Mime-Version: 1.0 References: <20260911135053.146435-1-vdonnefort@google.com> X-Mailer: git-send-email 2.55.0.1007.g17ff1f9808-goog Message-ID: <20260911135053.146435-17-vdonnefort@google.com> Subject: [PATCH v2 16/22] KVM: arm64: Add pkvm_hyp_req infrastructure From: Vincent Donnefort To: maz@kernel.org, oupton@kernel.org, kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org Cc: joey.gouly@arm.com, seiden@linux.ibm.com, suzuki.poulose@arm.com, yuzenghui@huawei.com, catalin.marinas@arm.com, will@kernel.org, kernel-team@android.com, fuad.tabba@linux.dev, qperret@google.com, weilin.chang@arm.com, Vincent Donnefort Content-Type: text/plain; charset="UTF-8" X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260911_065124_476291_7F06680E X-CRM114-Status: GOOD ( 20.55 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The pKVM hypervisor depends on the host for a lot of operations like memory allocation. Introduce a struct pkvm_hyp_req to enable the pKVM hypervisor to request resources from the host. Additionally, introduce a trace event to track the handling of these requests. Signed-off-by: Vincent Donnefort --- arch/arm64/include/asm/kvm_asm.h | 10 ++++--- arch/arm64/include/asm/kvm_host.h | 12 +++++++++ arch/arm64/include/asm/kvm_pkvm.h | 1 + arch/arm64/kvm/handle_exit.c | 3 +++ arch/arm64/kvm/pkvm.c | 20 ++++++++++++++ arch/arm64/kvm/trace_pkvm.h | 43 +++++++++++++++++++++++++++++++ 6 files changed, 85 insertions(+), 4 deletions(-) create mode 100644 arch/arm64/kvm/trace_pkvm.h diff --git a/arch/arm64/include/asm/kvm_asm.h b/arch/arm64/include/asm/kvm_asm.h index 95dd62e5601b..ec59f0fe9374 100644 --- a/arch/arm64/include/asm/kvm_asm.h +++ b/arch/arm64/include/asm/kvm_asm.h @@ -17,10 +17,11 @@ #define ARM_EXCEPTION_IS_TRAP(x) (ARM_EXCEPTION_CODE((x)) == ARM_EXCEPTION_TRAP) #define ARM_SERROR_PENDING(x) !!((x) & (1U << ARM_EXIT_WITH_SERROR_BIT)) -#define ARM_EXCEPTION_IRQ 0 -#define ARM_EXCEPTION_EL1_SERROR 1 -#define ARM_EXCEPTION_TRAP 2 -#define ARM_EXCEPTION_IL 3 +#define ARM_EXCEPTION_IRQ 0 +#define ARM_EXCEPTION_EL1_SERROR 1 +#define ARM_EXCEPTION_TRAP 2 +#define ARM_EXCEPTION_IL 3 +#define ARM_EXCEPTION_PKVM_HYP_REQ 4 /* The hyp-stub will return this for any kvm_call_hyp() call */ #define ARM_EXCEPTION_HYP_GONE HVC_STUB_ERR @@ -28,6 +29,7 @@ {ARM_EXCEPTION_IRQ, "IRQ" }, \ {ARM_EXCEPTION_EL1_SERROR, "SERROR" }, \ {ARM_EXCEPTION_TRAP, "TRAP" }, \ + {ARM_EXCEPTION_PKVM_HYP_REQ, "PKVM_HYP_REQ" }, \ {ARM_EXCEPTION_HYP_GONE, "HYP_GONE" } /* diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h index 27fe0cd5b2d7..ea76c0f3120e 100644 --- a/arch/arm64/include/asm/kvm_host.h +++ b/arch/arm64/include/asm/kvm_host.h @@ -85,6 +85,15 @@ u32 __attribute_const__ kvm_target_cpu(void); void kvm_reset_vcpu(struct kvm_vcpu *vcpu); void kvm_arm_vcpu_destroy(struct kvm_vcpu *vcpu); +enum pkvm_hyp_req_type { + PKVM_HYP_NO_REQ = 0, + __PKVM_HYP_REQ_TYPE_MAX, +}; + +struct pkvm_hyp_req { + u8 type; +}; + struct kvm_hyp_memcache { phys_addr_t head; unsigned long nr_pages; @@ -929,6 +938,9 @@ struct kvm_vcpu_arch { /* Pages to top-up the pKVM/EL2 guest pool */ struct kvm_hyp_memcache pkvm_memcache; + /* To be read on ARM_EXCEPTION_PKVM_HYP_REQ */ + struct pkvm_hyp_req pkvm_hyp_req; + /* Virtual SError ESR to restore when HCR_EL2.VSE is set */ u64 vsesr_el2; diff --git a/arch/arm64/include/asm/kvm_pkvm.h b/arch/arm64/include/asm/kvm_pkvm.h index ff8e93efcd7a..7240dcc4f395 100644 --- a/arch/arm64/include/asm/kvm_pkvm.h +++ b/arch/arm64/include/asm/kvm_pkvm.h @@ -22,6 +22,7 @@ int pkvm_create_hyp_vm(struct kvm *kvm); bool pkvm_hyp_vm_is_created(struct kvm *kvm); void pkvm_destroy_hyp_vm(struct kvm *kvm); int pkvm_create_hyp_vcpu(struct kvm_vcpu *vcpu); +int __pkvm_handle_vcpu_req(struct kvm_vcpu *vcpu); #ifdef CONFIG_NVHE_EL2_DEBUG void pkvm_ownership_selftest(void); diff --git a/arch/arm64/kvm/handle_exit.c b/arch/arm64/kvm/handle_exit.c index db37678dcb05..90500b204e16 100644 --- a/arch/arm64/kvm/handle_exit.c +++ b/arch/arm64/kvm/handle_exit.c @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include @@ -464,6 +465,8 @@ int handle_exit(struct kvm_vcpu *vcpu, int exception_index) return 1; case ARM_EXCEPTION_TRAP: return handle_trap_exceptions(vcpu); + case ARM_EXCEPTION_PKVM_HYP_REQ: + return __pkvm_handle_vcpu_req(vcpu); case ARM_EXCEPTION_HYP_GONE: /* * EL2 has been reset to the hyp-stub. This happens when a guest diff --git a/arch/arm64/kvm/pkvm.c b/arch/arm64/kvm/pkvm.c index ae434f806455..02ad686d7661 100644 --- a/arch/arm64/kvm/pkvm.c +++ b/arch/arm64/kvm/pkvm.c @@ -16,6 +16,9 @@ #include "hyp_constants.h" +#define CREATE_TRACE_POINTS +#include "trace_pkvm.h" + DEFINE_STATIC_KEY_FALSE(kvm_protected_mode_initialized); static struct memblock_region *hyp_memory = kvm_nvhe_sym(hyp_memory); @@ -632,3 +635,20 @@ bool pkvm_force_reclaim_guest_page(phys_addr_t phys) return !ret || ret == -EAGAIN; } + +static int pkvm_hyp_req_handle(struct pkvm_hyp_req *req, struct kvm_vcpu *vcpu) +{ + int ret = -EINVAL; + + switch (req->type) { + } + + trace_kvm_handle_pkvm_hyp_req(req, ret); + + return ret; +} + +int __pkvm_handle_vcpu_req(struct kvm_vcpu *vcpu) +{ + return pkvm_hyp_req_handle(&vcpu->arch.pkvm_hyp_req, vcpu) ?: 1; +} diff --git a/arch/arm64/kvm/trace_pkvm.h b/arch/arm64/kvm/trace_pkvm.h new file mode 100644 index 000000000000..3966c111e3ad --- /dev/null +++ b/arch/arm64/kvm/trace_pkvm.h @@ -0,0 +1,43 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#if !defined(_TRACE_PKVM_ARM64_KVM_H) || defined(TRACE_HEADER_MULTI_READ) +#define _TRACE_PKVM_ARM64_KVM_H + +#include +#include + +#undef TRACE_SYSTEM +#define TRACE_SYSTEM kvm + +TRACE_DEFINE_ENUM(PKVM_HYP_NO_REQ); + +#define PKVM_HYP_REQ_TYPES \ + { PKVM_HYP_NO_REQ, "NO_REQ" } + +TRACE_EVENT(kvm_handle_pkvm_hyp_req, + TP_PROTO(struct pkvm_hyp_req *req, int ret), + TP_ARGS(req, ret), + + TP_STRUCT__entry( + __field(u8, type) + __field(int, ret) + ), + + TP_fast_assign( + __entry->type = req->type; + __entry->ret = ret; + ), + + TP_printk("type: %s ret: %d", + __print_symbolic(__entry->type, PKVM_HYP_REQ_TYPES), + __entry->ret) +); + +#endif /* _TRACE_PKVM_ARM64_KVM_H */ + +#undef TRACE_INCLUDE_PATH +#define TRACE_INCLUDE_PATH . +#undef TRACE_INCLUDE_FILE +#define TRACE_INCLUDE_FILE trace_pkvm + +/* This part must be outside protection */ +#include -- 2.55.0.1007.g17ff1f9808-goog