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 3F8843A2575 for ; Fri, 1 May 2026 11:21:57 +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=1777634518; cv=none; b=eX0hRg4apGzmMPESFdT5a62QyLallq+Yny8sMrtUIOp5mQ4uDQPecVPVmrJx08q7KAh/TS8nZpYkkXLBxNy1uDYXrz1XFwBslfpHCKS1KsUAUe2Iuo2k1DIMLEflrqUgJY3zxECg04e+CpnQjFN4KqIitatpibrHc7ikKmTp+ug= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777634518; c=relaxed/simple; bh=WNOrRSdjW6v3MCflD6MesgXjVe7HTEIv6WOiAqLeuXs=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=eIg6jL/S7azFH/mTZMh7VK7Za2iW3enRt1+D7vL5vSj0Q2yiJ/eLCsxKlE9uj9o7e5WBHR1pv0X58OZ+oXcLnBZd7b97nWsOePst7oPcf0JiO8heOdv9z6TSQ+X5a52XULsvyGh0gjacW+dvNP+okJf2sr+u9lnjPlkeWRU4qu4= 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=ZEiGNOFx; 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="ZEiGNOFx" Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-4837bfcfe0dso19975345e9.1 for ; Fri, 01 May 2026 04:21:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1777634516; x=1778239316; 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=aYwcKF+O9BRV6I0nh/EUmrDeLL0Ut6fk04SddS0PCXg=; b=ZEiGNOFxmeyWksOgyCaEDkowsKSIiloV/zAB44LYxbnkp2L3yLXjOyGTNb0zGZa2iY EgwRpsBxRBD7uYziDYXDeuR4wgJBIe+QrLN0NVzI5iXOOWzFYe83Up3p75mBimwjhwa5 xgj+WOTQrZvRR4sYKhTQzWNtVqW0T22DuXo1DkOxN9rLLKu4TeNsVJawN6vQmQnNamk3 c21HwxU+7mythsHQkSC4YGNw9qUfaNGpp4KLbN/BgkMDjr9EyaPFaHeTq643qZQbiUBg RexycvPhm4vWM5KcZpZ8oK83rGIJxmswZVh998L/wcUSDPltyTcDIcl/kz9noXY6oWTV WfsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777634516; x=1778239316; 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=aYwcKF+O9BRV6I0nh/EUmrDeLL0Ut6fk04SddS0PCXg=; b=jyG5S6fh0zCTkg+8j4bBA4dss1Cwgbl88OJoFAX/YNERUk4M9EiM7iAxhpU4d2c/O+ r3kc/xmRDqTmBqPIs8pQx7orSRqxFg8JpNMtr/gX4ac32BZR0lxVVdB474GEfXIO5i6K L+JfYg+omR5TDFPHlWW4hCJbj8/75zkgMwAEIBtzKMgCFxC9kEdZzyX4/EnP6SqY9NQM pJ+y9jYYoB+u/3+UFhdBmieLu5M5mLYygjlKArEvSwJrbV9jsCzDxh+TUwwvy3ulmSku AJP+96wZxELLf4hCv6VA0XU4CpqBaPZX//jNwDZT8wZ0NmkM+RHsU7o0J3sIs3/CZhyT 6spQ== X-Forwarded-Encrypted: i=1; AFNElJ/N1k/v0lzrVd/GaLZc3qhu6lVwvgVt1oD5uelgZwcDtVWVnKG6pqz49xx3861IpR5k9xrfcB0r+IrGudM=@vger.kernel.org X-Gm-Message-State: AOJu0YyBMUDs5Dc6Ln6q5szu11jm2v0hsnpPMAEgSOD5t87bbkCX9/RH lTL+CKMPLz9Q+OjoYuruw5YoW5NA3l8n6TcdtYiGS4Eg4Hp8gJuyYGgep9CHbQnoizD1r/JCyY1 pbw== X-Received: from wmog7.prod.google.com ([2002:a05:600c:3107:b0:488:a71c:cf48]) (user=tabba job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:4594:b0:48a:52f2:a0f1 with SMTP id 5b1f17b1804b1-48a8444fac4mr110930795e9.18.1777634515632; Fri, 01 May 2026 04:21:55 -0700 (PDT) Date: Fri, 1 May 2026 12:21:47 +0100 In-Reply-To: <20260501112149.2824881-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: <20260501112149.2824881-1-tabba@google.com> X-Mailer: git-send-email 2.54.0.545.g6539524ca2-goog Message-ID: <20260501112149.2824881-5-tabba@google.com> Subject: [PATCH v2 4/6] KVM: arm64: Seed pkvm_ownership_selftest vcpu memcache From: Fuad Tabba To: maz@kernel.org, oliver.upton@linux.dev Cc: james.morse@arm.com, suzuki.poulose@arm.com, yuzenghui@huawei.com, qperret@google.com, vdonnefort@google.com, tabba@google.com, catalin.marinas@arm.com, will@kernel.org, yaoyuan@linux.alibaba.com, linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-kernel@vger.kernel.org, stable@vger.kernel.org Content-Type: text/plain; charset="UTF-8" The hypercall handlers call pkvm_refill_memcache() to top up the hyp_vcpu memcache before invoking __pkvm_host_{share,donate}_guest(). pkvm_ownership_selftest invokes those functions directly with a static selftest_vcpu that has an empty memcache. Seed selftest_vcpu's memcache from the prepopulated selftest pages, leaving the remainder for selftest_vm.pool. Required by the memcache-sufficiency pre-check added in the following patches. Assisted-by: Gemini:gemini-3.1-pro review-prompts Signed-off-by: Fuad Tabba --- arch/arm64/kvm/hyp/nvhe/pkvm.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/arch/arm64/kvm/hyp/nvhe/pkvm.c b/arch/arm64/kvm/hyp/nvhe/pkvm.c index 7ed96d64d611..deee7947d694 100644 --- a/arch/arm64/kvm/hyp/nvhe/pkvm.c +++ b/arch/arm64/kvm/hyp/nvhe/pkvm.c @@ -751,16 +751,30 @@ static struct pkvm_hyp_vcpu selftest_vcpu = { struct pkvm_hyp_vcpu *init_selftest_vm(void *virt) { struct hyp_page *p = hyp_virt_to_page(virt); + unsigned long min_pages, seeded = 0; int i; selftest_vm.kvm.arch.mmu.vtcr = host_mmu.arch.mmu.vtcr; WARN_ON(kvm_guest_prepare_stage2(&selftest_vm, virt)); + /* + * Mirror pkvm_refill_memcache() for the share/donate pre-checks; + * the selftest invokes those functions directly and would + * otherwise see an empty memcache. + */ + min_pages = kvm_mmu_cache_min_pages(&selftest_vm.kvm.arch.mmu); + for (i = 0; i < pkvm_selftest_pages(); i++) { if (p[i].refcount) continue; p[i].refcount = 1; - hyp_put_page(&selftest_vm.pool, hyp_page_to_virt(&p[i])); + if (seeded < min_pages) { + push_hyp_memcache(&selftest_vcpu.vcpu.arch.pkvm_memcache, + hyp_page_to_virt(&p[i]), hyp_virt_to_phys); + seeded++; + } else { + hyp_put_page(&selftest_vm.pool, hyp_page_to_virt(&p[i])); + } } selftest_vm.kvm.arch.pkvm.handle = __pkvm_reserve_vm(); -- 2.54.0.545.g6539524ca2-goog