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 361ED3659F6 for ; Fri, 24 Apr 2026 08:49:16 +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=1777020562; cv=none; b=bVRakcGvwa21eo94Yhu2gnNr2u+/ywpn5dpsEG8SsmHM+XWy8/v8ixyhUf8Q5+77tgJARhPYQZiKKl4djW91kT233jdZIqKrSc4EAVR2SzUT1SC6qT+eRIQw6FajmXvY+3c9UYwe+6SxExfpwTD7wFuSusKEpCxXiOwc+ffGruU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777020562; c=relaxed/simple; bh=BZlWZl/8o8OWASVcp9+fdkbKr43zVFREwf1BJ/L7wFs=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=LgLJf0ZraUTOJrD1AcYiu5mnDSMV1+xunvJMj5tRPR6ue7UK4IaSrw2x6AIQn+gXRaPXWQkpr4ppNBzwQNLiYgzQY3DB3whFEKtr35azk8COmg5+jYbeUZUWnhLsKxwuF6+iHZ3UYG+DF576fncBZF0i4pht824Uxq6jjB4+ZDo= 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=BXM/X0/b; 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--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="BXM/X0/b" Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-48a55ecc249so29617965e9.1 for ; Fri, 24 Apr 2026 01:49:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1777020555; x=1777625355; 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=YXnZx3UxHBTbHH5XMnk/ieS8KZZEW34YA9EEjoorokI=; b=BXM/X0/bM8/Hyn1ziCN21mqocwu7/+YPvRLeaN1Op5m2cc1DvcUEn7nO8ukHN13mQI 2J77zogIBJeW+aV5sxH7R7Z8Xit1xpynMsab4ApJlBXXXeHA6R0hLi1+CEcZLkYxxsyy kSv4jwdyPJfCt0ZW0LcWj8O4JyehVHtd0ykp7WrCfkXobw1WNzu0OdAUimtpl8QYdmDy EZXFh8lg54xmsx+mhiZsc59GvmlAeNJqQt0YbZVP6OBrsHVLZMCLVTHStrDjG1tJXjUK okSw/GwlalURQAmkDxGE2fgLIbUhlcRcatUbvXKcR3eVq/XlGM2pnpSVVtmEtdFdGc/S Ebtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777020555; x=1777625355; 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=YXnZx3UxHBTbHH5XMnk/ieS8KZZEW34YA9EEjoorokI=; b=JG0qJVV+93hoUJQofF7eJsJlSdKdLkJREVrAnHFPei7HEbKkJamyQ9CGNcf89i9e/6 S9zr008hchd2Ml5zHDHRApkA3tpzysrkv8BjIpGjZ3r7+O202mCHzWmHy+C92bcKccbM H9BGThxgHfEGSrCNYLmtqtQR43UMYsvqtgWi9I0Bf2Wde7fSpsH9+EswXQKIlWdOieP0 0zkibWtLjSIE/yS00yHGyX1GJCqf1NGwstpBDXQi4xQEdVwnfyZJJ0PtH91CHmKk0Ojm UckHxvzNCHt/BoFX2uXGN3rHiDodo3AsRqzbEPqxcKiIuQoiciAvOxJM56KB7FvtfIe1 WJFQ== X-Forwarded-Encrypted: i=1; AFNElJ8abAbmq48/f5TByFbYKBiw/VFyNt7jQUmviQ6xAkOw9DoHy17qAxxWzI3EgQvAjtKHp0/3m+UURwU2upQ=@vger.kernel.org X-Gm-Message-State: AOJu0YzDItjCi2kPIJ5fyeLKdRaBnyYmQgMJJKtDu+r4zzXhR0AUgI8V EFApYMnnVJJdKswBsNFzKhdGGht8ooVOm6m0rbSwOyiDpIw0MlDPRrqbS6oYwRWJnHLh+9QZRhq KKQ== X-Received: from wmmu12.prod.google.com ([2002:a05:600c:cc:b0:489:1d25:1a63]) (user=tabba job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:c177:b0:486:fb0b:ad79 with SMTP id 5b1f17b1804b1-488fb78129emr400550495e9.20.1777020554656; Fri, 24 Apr 2026 01:49:14 -0700 (PDT) Date: Fri, 24 Apr 2026 09:49:07 +0100 In-Reply-To: <20260424084908.370776-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: <20260424084908.370776-1-tabba@google.com> X-Mailer: git-send-email 2.54.0.rc2.544.gc7ae2d5bb8-goog Message-ID: <20260424084908.370776-6-tabba@google.com> Subject: [PATCH 5/6] KVM: arm64: Fix pin leak and publication ordering in __pkvm_init_vcpu() From: Fuad Tabba To: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: tabba@google.com, catalin.marinas@arm.com, will@kernel.org, maz@kernel.org, oupton@kernel.org, qperret@google.com, suzuki.poulose@arm.com, joey.gouly@arm.com, yuzenghui@huawei.com Content-Type: text/plain; charset="UTF-8" Two bugs exist in the vCPU initialisation path: 1. If a check fails after hyp_pin_shared_mem() succeeds, the cleanup path jumps to 'unlock' without calling unpin_host_vcpu() or unpin_host_sve_state(), permanently leaking pin references on the host vCPU and SVE state pages. Extract a register_hyp_vcpu() helper that performs the checks and the store. When register_hyp_vcpu() returns an error, call unpin_host_vcpu() and unpin_host_sve_state() inline before falling through to the existing 'unlock' label. 2. register_hyp_vcpu() publishes the new vCPU pointer into 'hyp_vm->vcpus[]' with a bare store, allowing a concurrent caller of pkvm_load_hyp_vcpu() to observe a partially initialised vCPU object. Ensure the store uses smp_store_release() and the load uses smp_load_acquire(). While 'vm_table_lock' currently serialises the store and the load, these barriers ensure the reader sees the fully initialised 'hyp_vcpu' object even if there were a lockless path or if the lock's own ordering guarantees were insufficient for nested object initialization. Fixes: 49af6ddb8e5c ("KVM: arm64: Add infrastructure to create and track pKVM instances at EL2") Reported-by: Ben Simner Co-developed-by: Will Deacon Signed-off-by: Will Deacon Signed-off-by: Fuad Tabba --- arch/arm64/kvm/hyp/nvhe/pkvm.c | 38 ++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/arch/arm64/kvm/hyp/nvhe/pkvm.c b/arch/arm64/kvm/hyp/nvhe/pkvm.c index 7ed96d64d611..e7496eb85628 100644 --- a/arch/arm64/kvm/hyp/nvhe/pkvm.c +++ b/arch/arm64/kvm/hyp/nvhe/pkvm.c @@ -266,7 +266,8 @@ struct pkvm_hyp_vcpu *pkvm_load_hyp_vcpu(pkvm_handle_t handle, if (hyp_vm->kvm.created_vcpus <= vcpu_idx) goto unlock; - hyp_vcpu = hyp_vm->vcpus[vcpu_idx]; + /* Pairs with smp_store_release() in register_hyp_vcpu(). */ + hyp_vcpu = smp_load_acquire(&hyp_vm->vcpus[vcpu_idx]); if (!hyp_vcpu) goto unlock; @@ -860,12 +861,30 @@ int __pkvm_init_vm(struct kvm *host_kvm, unsigned long vm_hva, * the page-aligned size of 'struct pkvm_hyp_vcpu'. * Return 0 on success, negative error code on failure. */ +static int register_hyp_vcpu(struct pkvm_hyp_vm *hyp_vm, + struct pkvm_hyp_vcpu *hyp_vcpu) +{ + unsigned int idx = hyp_vcpu->vcpu.vcpu_idx; + + if (idx >= hyp_vm->kvm.created_vcpus) + return -EINVAL; + + if (hyp_vm->vcpus[idx]) + return -EINVAL; + + /* + * Ensure the hyp_vcpu is initialised before publishing it to + * the vCPU-load path via 'hyp_vm->vcpus[]'. + */ + smp_store_release(&hyp_vm->vcpus[idx], hyp_vcpu); + return 0; +} + int __pkvm_init_vcpu(pkvm_handle_t handle, struct kvm_vcpu *host_vcpu, unsigned long vcpu_hva) { struct pkvm_hyp_vcpu *hyp_vcpu; struct pkvm_hyp_vm *hyp_vm; - unsigned int idx; int ret; hyp_vcpu = map_donated_memory(vcpu_hva, sizeof(*hyp_vcpu)); @@ -884,18 +903,11 @@ int __pkvm_init_vcpu(pkvm_handle_t handle, struct kvm_vcpu *host_vcpu, if (ret) goto unlock; - idx = hyp_vcpu->vcpu.vcpu_idx; - if (idx >= hyp_vm->kvm.created_vcpus) { - ret = -EINVAL; - goto unlock; + ret = register_hyp_vcpu(hyp_vm, hyp_vcpu); + if (ret) { + unpin_host_vcpu(host_vcpu); + unpin_host_sve_state(hyp_vcpu); } - - if (hyp_vm->vcpus[idx]) { - ret = -EINVAL; - goto unlock; - } - - hyp_vm->vcpus[idx] = hyp_vcpu; unlock: hyp_spin_unlock(&vm_table_lock); -- 2.54.0.rc2.544.gc7ae2d5bb8-goog