From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (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 5EBF6439325 for ; Mon, 20 Jul 2026 17:15:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.71 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784567735; cv=none; b=TN+i6PxSap6eOQCwvtRBF7Iw4UBVymCYHlb/MmdlqVtBnpz06hJrXoq2zftVgJgMMPgSgPsVAiHg7uBIJgCWfJyzpv4TynyJ4dRIDsN7OMCeqhLfreoFx9V315wODVtWTEjYb1sadOJ5Dkcm94xEnksIfIbjXLZqeycFU99pl0U= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784567735; c=relaxed/simple; bh=yUDT8ll+apjGNqSB94ALw2p98R1zOpXXKHWoF+K+LWI=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=C5ebwBFmcz537UdlVfH5YxtEZl3xpoCjBobnw6uF/xr9RXjZHgTU80NfruELjnUdUY9LW4NCT4SFcZ56Z/Hn08zcZc3rfosnBRlxvzuT39pIR8Bd6zUnOuM8uw6d94FK6zP22YE+JnCYgHUiRxYRP0OZ/qgQuz74s/f9pbkh/1I= 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=ZbazPuXS; arc=none smtp.client-ip=209.85.221.71 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="ZbazPuXS" Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-476608a9fefso3884457f8f.1 for ; Mon, 20 Jul 2026 10:15:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1784567727; x=1785172527; darn=lists.linux.dev; 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=QEuOwiudoWWTi/wv3fiL2ZzwS4iTMOnI0AtYPMOpiXE=; b=ZbazPuXSPxLj1bGXoS923IQYHptCZp2fJ+6gdrBPK8bVrhiaWAzurSwUIGhbnsIGC+ zOy2XHpSp3DIzxu031QEf39EvwbqK1nHib9Bfh085BZixfUnxvmutZITVOZDuJ8VHzFE fw7q140mw8sr++EreV5+i7fz4kEDCHz+Gzxlffe/vvq5LQN3t279IoutHK5bXkZBQEGZ kV6I7Gi4j6Zdy5fnaq4w9xaiUhFHpJVfymnlCGsPNb4MEdhD39epLAutWJpWn3QTu+Yw Hhl8gL2XSM4vqtEei3BLrHp9Biqq0GnShU9ogBqTNyECd0WClKsKrZCI6BGb6tBGJciG a6ag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784567727; x=1785172527; 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=QEuOwiudoWWTi/wv3fiL2ZzwS4iTMOnI0AtYPMOpiXE=; b=VGj8M23Zc3KwRUYag0X2UYGCJWqNCn0b0vh4eUi8e36Wt0KxH33E4UMFoP213E0rmX RupR3OhIgGqEnhbi/iZ02trsWlHbMUQoHPEd1ilbUz3kV9TGvFWMjSkxkk0vfkdeGdbV Il0vmh7c3OQ42PclDvVtlYzK9HItU2m84oJbPPmldSLOzD9dZgs+qmCv3jMHEE/fHolZ SPtBFPwpTK5hZYhvxFd4+JXURMO2xOPCeN8eMgwLgDGDCveDQ1kl4ULrHoieRKa1+Yop O6Bx59fovNmKlMvS+tE5kDH5JeqR6t3Vn1yCPxZPFMb69sYN1XVpITXSDFLSvAjCn8q0 8glQ== X-Forwarded-Encrypted: i=1; AHgh+RpK9QKkXlcBu5mqT52DFkLlXdhjvYYPj1tGKBmnIzxr0u1EYzFdXMov9c+qSTN/0uKCJ+By5eA=@lists.linux.dev X-Gm-Message-State: AOJu0Yzc5oYVQSk9DrLjBMcueOt5xsWDKNBbnYVs9hrqfn7Wt53DAjzV 0n9BmECuW/0j4zaXrU6zC3j70kxs553A2qK5LP9PX+NKQSCJ0Dtcn/hlPO/pyzqis+eRNBWoIMw s692xTksxI1AjXULECmTsLg== X-Received: from wrtc5.prod.google.com ([2002:a5d:4cc5:0:b0:47f:6d90:86fa]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6000:2404:b0:47f:7926:90c3 with SMTP id ffacd0b85a97d-47f7926913bmr5497612f8f.30.1784567726608; Mon, 20 Jul 2026 10:15:26 -0700 (PDT) Date: Mon, 20 Jul 2026 18:15:03 +0100 In-Reply-To: <20260720171513.1415357-1-vdonnefort@google.com> Precedence: bulk X-Mailing-List: kvmarm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260720171513.1415357-1-vdonnefort@google.com> X-Mailer: git-send-email 2.55.0.229.g6434b31f56-goog Message-ID: <20260720171513.1415357-8-vdonnefort@google.com> Subject: [PATCH v3 07/17] KVM: arm64: Add PKVM_HYP_REQ_HYP_ALLOC request 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, tabba@google.com, qperret@google.com, Vincent Donnefort Content-Type: text/plain; charset="UTF-8" Introduce a new pkvm_hyp_request type asking the host to top up the pKVM heap allocator. Signed-off-by: Vincent Donnefort diff --git a/arch/arm64/include/asm/kvm_asm.h b/arch/arm64/include/asm/kvm_asm.h index 043495f7fc78..b77acfd7d1c8 100644 --- a/arch/arm64/include/asm/kvm_asm.h +++ b/arch/arm64/include/asm/kvm_asm.h @@ -89,6 +89,7 @@ enum __kvm_host_smccc_func { __KVM_HOST_SMCCC_FUNC___vgic_v3_restore_vmcr_aprs, __KVM_HOST_SMCCC_FUNC___vgic_v5_save_apr, __KVM_HOST_SMCCC_FUNC___vgic_v5_restore_vmcr_apr, + __KVM_HOST_SMCCC_FUNC___pkvm_hyp_topup, MARKER(__KVM_HOST_SMCCC_FUNC_PKVM_ONLY), diff --git a/arch/arm64/include/asm/kvm_pkvm.h b/arch/arm64/include/asm/kvm_pkvm.h index 6c2497047f8d..99daa985856f 100644 --- a/arch/arm64/include/asm/kvm_pkvm.h +++ b/arch/arm64/include/asm/kvm_pkvm.h @@ -17,6 +17,10 @@ #define HYP_MEMBLOCK_REGIONS 128 +enum pkvm_topup_id { + PKVM_TOPUP_HYP_ALLOC, +}; + int pkvm_init_host_vm(struct kvm *kvm, unsigned long type); int pkvm_create_hyp_vm(struct kvm *kvm); bool pkvm_hyp_vm_is_created(struct kvm *kvm); @@ -201,6 +205,7 @@ struct pkvm_mapping { enum pkvm_hyp_req_type { PKVM_HYP_NO_REQ = 0, + PKVM_HYP_REQ_HYP_ALLOC, __PKVM_HYP_REQ_TYPE_MAX, }; @@ -222,9 +227,13 @@ struct pkvm_hyp_req { static inline size_t pkvm_hyp_req_arg_size(u8 type) { + struct pkvm_hyp_req *req; + switch (type) { case PKVM_HYP_NO_REQ: return 0; + case PKVM_HYP_REQ_HYP_ALLOC: + return sizeof(req->mem); default: WARN_ON(1); } diff --git a/arch/arm64/kvm/hyp/nvhe/hyp-main.c b/arch/arm64/kvm/hyp/nvhe/hyp-main.c index d3c69de698f4..439b91fc8aec 100644 --- a/arch/arm64/kvm/hyp/nvhe/hyp-main.c +++ b/arch/arm64/kvm/hyp/nvhe/hyp-main.c @@ -15,6 +15,7 @@ #include #include +#include #include #include #include @@ -632,6 +633,30 @@ static void handle___pkvm_finalize_teardown_vm(struct kvm_cpu_context *host_ctxt cpu_reg(host_ctxt, 1) = __pkvm_finalize_teardown_vm(handle); } +static void handle___pkvm_hyp_topup(struct kvm_cpu_context *host_ctxt) +{ + DECLARE_REG(enum pkvm_topup_id, id, host_ctxt, 1); + DECLARE_REG(phys_addr_t, head, host_ctxt, 2); + DECLARE_REG(unsigned long, nr_pages, host_ctxt, 3); + struct kvm_hyp_memcache host_mc = { + .head = head, + .nr_pages = nr_pages, + }; + int ret; + + switch (id) { + case PKVM_TOPUP_HYP_ALLOC: + ret = hyp_alloc_topup(&host_mc); + break; + default: + ret = -EINVAL; + } + + cpu_reg(host_ctxt, 1) = ret; + cpu_reg(host_ctxt, 2) = host_mc.head; + cpu_reg(host_ctxt, 3) = host_mc.nr_pages; +} + static void handle___tracing_load(struct kvm_cpu_context *host_ctxt) { DECLARE_REG(unsigned long, desc_hva, host_ctxt, 1); @@ -740,6 +765,7 @@ static const hcall_t host_hcall[] = { HANDLE_FUNC(__vgic_v3_restore_vmcr_aprs), HANDLE_FUNC(__vgic_v5_save_apr), HANDLE_FUNC(__vgic_v5_restore_vmcr_apr), + HANDLE_FUNC(__pkvm_hyp_topup), HANDLE_FUNC(__pkvm_host_share_hyp), HANDLE_FUNC(__pkvm_host_unshare_hyp), diff --git a/arch/arm64/kvm/pkvm.c b/arch/arm64/kvm/pkvm.c index a626978dc91f..d26e7435d34d 100644 --- a/arch/arm64/kvm/pkvm.c +++ b/arch/arm64/kvm/pkvm.c @@ -88,6 +88,33 @@ void __init kvm_hyp_reserve(void) hyp_mem_base); } +static int pkvm_hyp_topup(enum pkvm_topup_id id, unsigned long nr_pages) +{ + struct kvm_hyp_memcache mc; + struct arm_smccc_res res; + int ret; + + init_hyp_memcache(&mc); + ret = topup_hyp_memcache(&mc, nr_pages); + if (ret) + goto err; + + arm_smccc_1_1_hvc(KVM_HOST_SMCCC_FUNC(__pkvm_hyp_topup), id, mc.head, + mc.nr_pages, &res); + if (WARN_ON_ONCE(res.a0 != SMCCC_RET_SUCCESS)) { + ret = -EINVAL; + goto err; + } + + ret = res.a1; + mc.head = res.a2; + mc.nr_pages = res.a3; + +err: + free_hyp_memcache(&mc); + return ret; +} + static void __pkvm_destroy_hyp_vm(struct kvm *kvm) { if (pkvm_hyp_vm_is_created(kvm)) { @@ -599,6 +626,9 @@ static int pkvm_handle_hyp_req(struct pkvm_hyp_req *req) int ret = -EINVAL; switch (req->type) { + case PKVM_HYP_REQ_HYP_ALLOC: + ret = pkvm_hyp_topup(PKVM_TOPUP_HYP_ALLOC, req->mem.nr_pages); + break; } trace_kvm_handle_pkvm_hyp_req(req, ret); diff --git a/arch/arm64/kvm/trace_pkvm.h b/arch/arm64/kvm/trace_pkvm.h index 3966c111e3ad..493225e3282d 100644 --- a/arch/arm64/kvm/trace_pkvm.h +++ b/arch/arm64/kvm/trace_pkvm.h @@ -9,9 +9,11 @@ #define TRACE_SYSTEM kvm TRACE_DEFINE_ENUM(PKVM_HYP_NO_REQ); +TRACE_DEFINE_ENUM(PKVM_HYP_REQ_HYP_ALLOC); -#define PKVM_HYP_REQ_TYPES \ - { PKVM_HYP_NO_REQ, "NO_REQ" } +#define PKVM_HYP_REQ_TYPES \ + { PKVM_HYP_NO_REQ, "NO_REQ" }, \ + { PKVM_HYP_REQ_HYP_ALLOC, "HYP_ALLOC" } TRACE_EVENT(kvm_handle_pkvm_hyp_req, TP_PROTO(struct pkvm_hyp_req *req, int ret), -- 2.55.0.229.g6434b31f56-goog