From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ed1-f73.google.com (mail-ed1-f73.google.com [209.85.208.73]) (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 6AA51345CCD for ; Fri, 19 Jun 2026 07:07:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.73 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781852849; cv=none; b=iL5PvqBPwW6SU3jOLPE6a1XIohekoQnuUXzq0/pjoSwq1nWDHqBlPyrHsShx4MuCR1wkcAUYTncyfjTgGlgiQRqRH6ej3Ix0IcxvUwLINwb2G1vTBp+gAtgU8+FxGjJWN5+vePR7jVO7HMLWljVfIOlTawgluiSiWFL7FshzF6c= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781852849; c=relaxed/simple; bh=BZ3bxurJBOF4Xe5fK3RqTc48q2YtrMKRyNLoR9ECWUk=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=A/mEf1cZCTTXrC3+rMeVHzZu4NVwwv5fz5YlFzD2Bp+vsHF0HhKpdqWA88l4h5JcFjgGd6/P2QXVAa1ZabaAU/ntfdcQvlSY20MdvvvsA9DghuL7mkm3eUuF9LIpCiQ5SE3kv0pQC+laXfnymi7Kwglv/qQqY3B+oFSj/kLO3UA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--tabba.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=RZpntHFF; arc=none smtp.client-ip=209.85.208.73 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--tabba.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="RZpntHFF" Received: by mail-ed1-f73.google.com with SMTP id 4fb4d7f45d1cf-69681505eabso828837a12.2 for ; Fri, 19 Jun 2026 00:07:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1781852847; x=1782457647; 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=9tQfxVsIaeS+jOhIrhpINETdsAt58seT+ojTMVLuce4=; b=RZpntHFF1gFtgI3XGc+GjROkC/aHNxWJp8KjXLBY75ooxTYsRV8hpNwnzfSFCtv1T6 Vn5BjNw7FX2N3fpyEuLSHPiYXZxWMoo7sXzZ14DlnI1BDroJJILVLfpghZIvY2Q260/V rLLwM7mNApzfytRKXOKDH7GTL2dtseDinDCBnTYvgkEaJt+3TApMK5IPGvHNHy+woSr2 OmxQVq8hv5YVM//2MWev6rnobxBvRx62e+2IB1nlhIkVUE8ivB/qK8A+BTWmf4evLvfC /JlKYPeVaZljlYv3rMD+DHtnpbhaqGDHLwJFz4DsnEc6SOWlnOZpYuihgVeNr7Aaj2ou Uvug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781852847; x=1782457647; 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=9tQfxVsIaeS+jOhIrhpINETdsAt58seT+ojTMVLuce4=; b=agBqy79COzZJWcEuMW0cQg+XBTaMMIhR9tpMtYyd7RyOgzw4mY4cGssZrlxfWue+Ja qfAgatXAXFLhA9msQzbtR7cEU2oJNum+psbLkgj1eZWIoIWaxRJZLtU344WQUx7dOJ7j a83ge9R0f4bzjL9f4KFR2KejWUKNyxBpTVuMmptDBjW1sospR3WCgKjNTRD04odtZHc3 D60QiLHjJtwwFBP/1CxGP0tGe+l3XSVGukfJUybfR/7JAb9sUYsmwPiSZhllZ4a06YcC ogIpohEpiDuNtktDnDEydgYKasCTfE0N4qFeQ1f1MyrCEYdObAdl5CXVtdu6aqaqWJBo mh2g== X-Forwarded-Encrypted: i=1; AFNElJ+9r+wQlVAEBk3aeovZeGlxoo6LVX2Ph+KaZrweTNmajwMxeHOGbLiBnKx7KCilj6r/0aHXPVPszi9lbXw=@vger.kernel.org X-Gm-Message-State: AOJu0YzzPExfksuRVJtGY/JuDt7zpJ200jBkc+1GUUvjawCoHBWpiWSx 36YEaYR7y3OVQ8XV6ww7SYYnrr0aEZgq8EE+VWoEsnvvroin+eUg19P19803OeDWl/AquwJoayk 8/w== X-Received: from edds9.prod.google.com ([2002:a05:6402:5209:b0:673:4f43:5f4b]) (user=tabba job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6402:4589:b0:67f:e9d0:d819 with SMTP id 4fb4d7f45d1cf-696e521d903mr1212311a12.22.1781852846765; Fri, 19 Jun 2026 00:07:26 -0700 (PDT) Date: Fri, 19 Jun 2026 08:07:16 +0100 In-Reply-To: <20260619070719.812227-1-tabba@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260619070719.812227-1-tabba@google.com> X-Mailer: git-send-email 2.55.0.rc0.738.g0c8ab3ebcc-goog Message-ID: <20260619070719.812227-6-tabba@google.com> Subject: [PATCH v2 5/8] KVM: arm64: Add host and hypervisor vCPU lookup primitives From: Fuad Tabba To: Marc Zyngier , Oliver Upton , kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Catalin Marinas , Will Deacon , Joey Gouly , Steffen Eiden , Suzuki K Poulose , Zenghui Yu , Vincent Donnefort , Quentin Perret , Sebastian Ene , Hyunwoo Kim , Fuad Tabba Content-Type: text/plain; charset="UTF-8" From: Marc Zyngier The nVHE hypervisor repeatedly resolves a host vCPU into the EL2 address space and validates that the loaded hyp vCPU matches it, with that logic open-coded in each handler. Add __get_host_hyp_vcpus() and the get_host_hyp_vcpus() macro, which translate the host vCPU into the hypervisor's address space and, when pKVM is enabled, also return the loaded hyp vCPU if it matches. If pKVM is enabled but the loaded hyp vCPU does not correspond to the requested host vCPU, both the host and hyp vCPU are returned as NULL. Convert handle___kvm_vcpu_run() to use it. No functional change intended. Signed-off-by: Marc Zyngier Co-developed-by: Fuad Tabba Signed-off-by: Fuad Tabba --- arch/arm64/kvm/hyp/nvhe/hyp-main.c | 52 ++++++++++++++++++++++-------- 1 file changed, 38 insertions(+), 14 deletions(-) diff --git a/arch/arm64/kvm/hyp/nvhe/hyp-main.c b/arch/arm64/kvm/hyp/nvhe/hyp-main.c index 1d01c6e547f5..8923f594c264 100644 --- a/arch/arm64/kvm/hyp/nvhe/hyp-main.c +++ b/arch/arm64/kvm/hyp/nvhe/hyp-main.c @@ -212,14 +212,45 @@ static void handle___pkvm_vcpu_put(struct kvm_cpu_context *host_ctxt) pkvm_put_hyp_vcpu(hyp_vcpu); } -static void handle___kvm_vcpu_run(struct kvm_cpu_context *host_ctxt) +static struct kvm_vcpu *__get_host_hyp_vcpus(struct kvm_vcpu *arg, + struct pkvm_hyp_vcpu **hyp_vcpup) { - DECLARE_REG(struct kvm_vcpu *, host_vcpu, host_ctxt, 1); - int ret; + struct kvm_vcpu *host_vcpu = kern_hyp_va(arg); + struct pkvm_hyp_vcpu *hyp_vcpu = NULL; if (unlikely(is_protected_kvm_enabled())) { - struct pkvm_hyp_vcpu *hyp_vcpu = pkvm_get_loaded_hyp_vcpu(); + hyp_vcpu = pkvm_get_loaded_hyp_vcpu(); + if (!hyp_vcpu || hyp_vcpu->host_vcpu != host_vcpu) { + hyp_vcpu = NULL; + host_vcpu = NULL; + } + } + + *hyp_vcpup = hyp_vcpu; + return host_vcpu; +} + +#define get_host_hyp_vcpus(ctxt, regnr, hyp_vcpup) \ + ({ \ + DECLARE_REG(struct kvm_vcpu *, __vcpu, ctxt, regnr); \ + __get_host_hyp_vcpus(__vcpu, hyp_vcpup); \ + }) + +static void handle___kvm_vcpu_run(struct kvm_cpu_context *host_ctxt) +{ + struct pkvm_hyp_vcpu *hyp_vcpu; + struct kvm_vcpu *host_vcpu; + int ret; + + host_vcpu = get_host_hyp_vcpus(host_ctxt, 1, &hyp_vcpu); + + if (!host_vcpu) { + ret = -EINVAL; + goto out; + } + + if (unlikely(hyp_vcpu)) { /* * KVM (and pKVM) doesn't support SME guests for now, and * ensures that SME features aren't enabled in pstate when @@ -231,23 +262,16 @@ static void handle___kvm_vcpu_run(struct kvm_cpu_context *host_ctxt) goto out; } - if (!hyp_vcpu) { - ret = -EINVAL; - goto out; - } - flush_hyp_vcpu(hyp_vcpu); ret = __kvm_vcpu_run(&hyp_vcpu->vcpu); sync_hyp_vcpu(hyp_vcpu); } else { - struct kvm_vcpu *vcpu = kern_hyp_va(host_vcpu); - /* The host is fully trusted, run its vCPU directly. */ - fpsimd_lazy_switch_to_guest(vcpu); - ret = __kvm_vcpu_run(vcpu); - fpsimd_lazy_switch_to_host(vcpu); + fpsimd_lazy_switch_to_guest(host_vcpu); + ret = __kvm_vcpu_run(host_vcpu); + fpsimd_lazy_switch_to_host(host_vcpu); } out: cpu_reg(host_ctxt, 1) = ret; -- 2.55.0.rc0.738.g0c8ab3ebcc-goog