From: "Lorenzo Stoakes (ARM)" <ljs@kernel.org>
To: Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will@kernel.org>, Marc Zyngier <maz@kernel.org>,
Oliver Upton <oupton@kernel.org>,
Joey Gouly <joey.gouly@arm.com>,
Steffen Eiden <seiden@linux.ibm.com>,
Suzuki K Poulose <suzuki.poulose@arm.com>,
Zenghui Yu <yuzenghui@huawei.com>,
Paolo Bonzini <pbonzini@redhat.com>,
Jonathan Corbet <corbet@lwn.net>,
Mark Rutland <mark.rutland@arm.com>,
Fuad Tabba <fuad.tabba@linux.dev>,
Randy Dunlap <rdunlap@infradead.org>,
Christian Borntraeger <borntraeger@linux.ibm.com>,
Janosch Frank <frankja@linux.ibm.com>,
David Hildenbrand <david@kernel.org>,
Heiko Carstens <hca@linux.ibm.com>,
Vasily Gorbik <gor@linux.ibm.com>,
Alexander Gordeev <agordeev@linux.ibm.com>,
Sven Schnelle <svens@linux.ibm.com>,
Thomas Gleixner <tglx@kernel.org>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
Dave Hansen <dave.hansen@linux.intel.com>,
x86@kernel.org, "H. Peter Anvin" <hpa@zytor.com>,
Shuah Khan <skhan@linuxfoundation.org>,
Shuah Khan <shuah@kernel.org>
Cc: linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, kvmarm@lists.linux.dev,
kvm@vger.kernel.org, linux-doc@vger.kernel.org,
linux-kselftest@vger.kernel.org,
Jack Thomson <jackabt@amazon.com>,
Jack Thomson <jackabt.amazon@gmail.com>,
Alexandru Elisei <alexandru.elisei@arm.com>,
Vincent Donnefort <vdonnefort@google.com>,
"Aneesh Kumar K.V" <aneesh.kumar@kernel.org>,
Sean Christopherson <seanjc@google.com>,
Claudio Imbrenda <imbrenda@linux.ibm.com>,
Leo Soares Passos <Leo.Bras@arm.com>,
Wei-Lin Chang <weilin.chang@arm.com>,
linux-s390@vger.kernel.org,
"Lorenzo Stoakes (ARM)" <ljs@kernel.org>
Subject: [PATCH v4 00/14] KVM: arm64: Add KVM_PRE_FAULT_MEMORY support
Date: Wed, 23 Sep 2026 16:15:43 +0100 [thread overview]
Message-ID: <20260923-kvm-arm-prefault-v4-0-d4b0b4dfa8c3@kernel.org> (raw)
This series implements the KVM stage 2 page table pre-faulting feature for
arm64.
== Foundations ==
1. Providing a generic kvm_arch_pre_fault_allowed() hook.
This allows arm64 to reject an uninitialised vCPU from being specified on
pre-fault, avoiding loading a vCPU that is not correctly initialised yet.
2. Updating kvm_s2_fault_desc to independently store the exception syndrome
register (ESR) value, and updating all code paths to use this value
exclusively.
This is needed so we can later generate a synthetic fault to perform the
pre-faulting - we need to be sure the code doesn't grab an incorrect ESR
from elsewhere.
3. Updating kvm_s2_fault_desc to independently store the kvm_s2_mmu and
updating all code paths to use this value exclusively.
Similarly this is needed so we can generate a synthetic fault against the
canonical stage 2 MMU (it would make no sense for it to touch nested shadow
page tables) - we need to be sure that the code doesn't grab an incorrect
MMU from elsewhere.
4. Updating the abort paths which consume kvm_s2_fault_desc to also return
a kvm_s2_fault_result data structure.
To perform pre-faulting the code must know the granule size of what was
just walked. So the abort paths have to tell us what that was.
5. Pass walk flags to kvm_pgtable_get_leaf() to permit walking page tables
under the MMU read lock.
This is Jack's patch which allows the use of the KVM_PGTABLE_WALK_SHARED
flag to walk page tables under the MMU read lock.
Pre-faulting requires it to be able to work in parallel as specified by the
API. The read lock precludes page tables being torn down behind our back.
== Implementation ==
Pre-faulting is implemented in kvm_arch_vcpu_pre_fault_memory() whose job
is to pre-fault the stage 2 page tables which map a specific GPA (which,
for arm64, is the guest's IPA).
This function is called by kvm_vcpu_pre_fault_memory() for each GPA in the
range, which itself is ultimately invoked by userland via the
KVM_PRE_FAULT_MEMORY ioctl.
The implementation is simple - try to walk to the stage 2 page table
mapping the GPA - if unmapped, fault it in through a synthetic page fault.
pKVM is not supported regardless of whether the VM is protected or
not.
This is because pKVM instantiates vCPUs upon run, but pre-faulting is
typically performed before a vCPU is run. It would be confusing and
inconsistent to error out on non-running vCPUs but to pre-fault running
ones.
Additionally, in pKVM mode, the stage 2 page tables are owned by the
hypervisor rather than the host - the host can neither walk them nor
populate them directly, so it's not clear that the pre-fault mechanism
correctly maps onto pKVM.
== Credits ==
This series is based, with gratitude, on Jack Thomson's series and their
respins (links provided below) as well as the feedback he received.
The series includes Jack's v5 "KVM: arm64: Pass walk flags to
kvm_pgtable_get_leaf()" patch (verbatim bar a one-line rebase fixup) and
two of his test patches (with minor fixups), plus a nested pre-fault test
based on his.
Link: https://patch.msgid.link/20260612162354.73378-1-jackabt.amazon@gmail.com/
Link: https://patch.msgid.link/20260113152643.18858-1-jackabt.amazon@gmail.com/
Link: https://patch.msgid.link/20251119154910.97716-1-jackabt.amazon@gmail.com/
Link: https://patch.msgid.link/20251013151502.6679-1-jackabt.amazon@gmail.com/
Link: https://patch.msgid.link/20250911134648.58945-1-jackabt.amazon@gmail.com/
== Reviewer Notes ==
I synced with maintainers on this who asked me to take a look, as there hadn't
been progress on the series for some time.
Signed-off-by: Lorenzo Stoakes (ARM) <ljs@kernel.org>
---
v4:
* Added tags, thank you everybody! (dropped Oliver's from 1/14 as new code,
and Fuad's Tested-by tags as he hasn't tested the latest version yet).
* Reworked patch 1/14 to implement kvm_arch_pre_fault_allowed() to return
an error number and added x86, s390 implementations, as per Oliver.
* Made implementing kvm_arch_pre_fault_allowed() a requirement in 1/14 if
pre-fault enabled for arches, as per Sean.
* Updated 2/14 to move esr_abt_is_s1ptw() and esr_abt_is_exec_fault()
(which relies on it) into kvm_emulate.h as per Oliver.
* Updated 3/14 to use the ESR_ELx_EC() macro instead of a wrapper for it,
as per Oliver.
* Fixed 5/14 to gate the kvm_guest_s2_mapping allocation on s2fd->mmu,
as per Fuad.
* Made gmem_abort() skip kvm_prepare_memory_fault_exit() when pre-faulting
in 6/14, as per Fuad.
* Updated 10/14 to move the pKVM -EOPNOTSUPP check into the
kvm_arch_pre_fault_allowed() hook, as per Fuad.
* Extended pKVM reasoning in the 10/14 commit message, based on
discussions with Aneesh.
v3:
* Rebased on next, fixed up a new caller to kvm_pgtable_get_leaf() to
account for additional parameter passed.
* Adjusted: cover letter, added [ljs: ...] note to commit msg for 9/14 to
reflect the fixup.
* Introduced and wired up kvm_arch_vcpu_allow_pre_fault_memory() as a
separate commit at the start of the series, as per Oliver.
* Updated the pre-fault implementation to disallow uninitialised vCPU on
pre-fault as per Oliver, and updated cover letter to reflect it.
* Extended pKVM reasoning in cover letter, commit message.
https://lore.kernel.org/r/20260922-kvm-arm-prefault-v3-0-787bd3bc7e3f@kernel.org
v2:
* Split series - Added 1/13 for the esr.h helpers, 2/13 for converting
callers to use them, and move what was 1/8 to 3/13 to propagate
s2fd->esr, as per Marc.
* Made esr helpers __always_inline as per Marc.
* Renamed esr_trap_get_class() -> esr_get_ec() + dropped churn as per Marc.
* Updated 5/13 (was 3/8) to drop the kvm_s2_fault_result.mapped flag.
* Also updated 5/13 so abort handlers return -EAGAIN instead of swallowing, as
per Marc.
* Split implementation patch further -> topup_mmu_memcache() change to 6/13,
EHWPOISON change -> 7/13 and docs change -> 10/13, as per Marc.
* No longer mkyoung existing walked ranges, updated docs to reflect, as per
Marc.
* Eliminated s2fd->pre_fault as per Marc.
* Eliminated the redundant page table level in pre_fault_s2() as per Marc.
* Put the commit message for 9/13 on a diet as per Marc.
* Fixed up commit message for 11/13 (was 6/8) to correct reasoning about
exit-reason assert, as per Fuad.
* Simplified: nested test 13/13 (was 8/8), dropping the empty nested-S2
setup and using test_supports_el2() to handle NV=0 opt-out, as per
Wei-Lin and Fuad.
* Re-authored patch 13/13 to me as the changes are substantial enough to
require it. Updated commit message to give Jack credit for original.
https://lore.kernel.org/r/20260914-kvm-arm-prefault-v2-0-26fb47f74b73@kernel.org
v1:
https://lore.kernel.org/r/20260825-kvm-arm-prefault-v1-0-befe8947702e@kernel.org
---
Jack Thomson (3):
KVM: arm64: Pass walk flags to kvm_pgtable_get_leaf()
KVM: selftests: Enable pre_fault_memory_test for arm64
KVM: selftests: Add option for different backing in pre-fault tests
Lorenzo Stoakes (ARM) (11):
KVM: Allow architectures to disallow pre-fault
arm64: Add ESR fault helpers
KVM: arm64: Use ESR helpers in guest abort handling
KVM: arm64: Propagate and use esr in s2fd when handling guest aborts
KVM: arm64: Propagate and use mmu in s2fd when handling guest aborts
KVM: arm64: Propagate and use kvm_s2_fault_result on S2 fault
KVM: arm64: Size the stage-2 memcache from the fault MMU
KVM: arm64: Propagate EHWPOISON in kvm_s2_fault_pin_pfn()
KVM: arm64: Implement KVM_PRE_FAULT_MEMORY
Documentation: KVM: document arm64 KVM_PRE_FAULT_MEMORY
KVM: selftests: Add nested pre-fault test for arm64
Documentation/virt/kvm/api.rst | 19 +-
arch/arm64/include/asm/esr.h | 29 ++
arch/arm64/include/asm/kvm_emulate.h | 60 ++--
arch/arm64/include/asm/kvm_pgtable.h | 5 +-
arch/arm64/include/asm/kvm_pkvm.h | 2 +-
arch/arm64/kvm/Kconfig | 1 +
arch/arm64/kvm/arm.c | 1 +
arch/arm64/kvm/hyp/nvhe/mem_protect.c | 10 +-
arch/arm64/kvm/hyp/nvhe/mm.c | 2 +-
arch/arm64/kvm/hyp/pgtable.c | 5 +-
arch/arm64/kvm/mmu.c | 313 +++++++++++++++++----
arch/arm64/kvm/nested.c | 2 +-
arch/s390/kvm/s390/s390.c | 11 +-
arch/x86/kvm/mmu/mmu.c | 11 +-
include/linux/kvm_host.h | 1 +
tools/testing/selftests/kvm/Makefile.kvm | 2 +
.../selftests/kvm/arm64/nv_pre_fault_memory_test.c | 158 +++++++++++
.../testing/selftests/kvm/pre_fault_memory_test.c | 152 ++++++++--
virt/kvm/kvm_main.c | 10 +-
19 files changed, 646 insertions(+), 148 deletions(-)
---
base-commit: 23ddf997ab16b5f4aa9f948f5a68f5b35e4e398f
change-id: 20260815-kvm-arm-prefault-9bb411b6897d
Best regards,
--
Lorenzo Stoakes (ARM) <ljs@kernel.org>
next reply other threads:[~2026-09-23 15:16 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-23 15:15 Lorenzo Stoakes (ARM) [this message]
2026-09-23 15:15 ` [PATCH v4 01/14] KVM: Allow architectures to disallow pre-fault Lorenzo Stoakes (ARM)
2026-09-23 17:29 ` Sean Christopherson
2026-09-23 18:52 ` Fuad Tabba
2026-09-24 8:22 ` Lorenzo Stoakes (ARM)
2026-09-23 15:15 ` [PATCH v4 02/14] arm64: Add ESR fault helpers Lorenzo Stoakes (ARM)
2026-09-23 18:24 ` Fuad Tabba
2026-09-23 15:15 ` [PATCH v4 03/14] KVM: arm64: Use ESR helpers in guest abort handling Lorenzo Stoakes (ARM)
2026-09-23 18:23 ` Fuad Tabba
2026-09-23 15:15 ` [PATCH v4 04/14] KVM: arm64: Propagate and use esr in s2fd when handling guest aborts Lorenzo Stoakes (ARM)
2026-09-23 18:24 ` Fuad Tabba
2026-09-23 15:15 ` [PATCH v4 05/14] KVM: arm64: Propagate and use mmu " Lorenzo Stoakes (ARM)
2026-09-23 18:24 ` Fuad Tabba
2026-09-23 15:15 ` [PATCH v4 06/14] KVM: arm64: Propagate and use kvm_s2_fault_result on S2 fault Lorenzo Stoakes (ARM)
2026-09-23 18:25 ` Fuad Tabba
2026-09-23 15:15 ` [PATCH v4 07/14] KVM: arm64: Size the stage-2 memcache from the fault MMU Lorenzo Stoakes (ARM)
2026-09-23 15:15 ` [PATCH v4 08/14] KVM: arm64: Propagate EHWPOISON in kvm_s2_fault_pin_pfn() Lorenzo Stoakes (ARM)
2026-09-23 15:15 ` [PATCH v4 09/14] KVM: arm64: Pass walk flags to kvm_pgtable_get_leaf() Lorenzo Stoakes (ARM)
2026-09-23 15:15 ` [PATCH v4 10/14] KVM: arm64: Implement KVM_PRE_FAULT_MEMORY Lorenzo Stoakes (ARM)
2026-09-23 15:15 ` [PATCH v4 11/14] Documentation: KVM: document arm64 KVM_PRE_FAULT_MEMORY Lorenzo Stoakes (ARM)
2026-09-24 6:08 ` Fuad Tabba
2026-09-23 15:15 ` [PATCH v4 12/14] KVM: selftests: Enable pre_fault_memory_test for arm64 Lorenzo Stoakes (ARM)
2026-09-24 6:08 ` Fuad Tabba
2026-09-23 15:15 ` [PATCH v4 13/14] KVM: selftests: Add option for different backing in pre-fault tests Lorenzo Stoakes (ARM)
2026-09-24 6:08 ` Fuad Tabba
2026-09-24 8:28 ` Lorenzo Stoakes (ARM)
2026-09-23 15:15 ` [PATCH v4 14/14] KVM: selftests: Add nested pre-fault test for arm64 Lorenzo Stoakes (ARM)
2026-09-24 6:09 ` [PATCH v4 00/14] KVM: arm64: Add KVM_PRE_FAULT_MEMORY support Fuad Tabba
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260923-kvm-arm-prefault-v4-0-d4b0b4dfa8c3@kernel.org \
--to=ljs@kernel.org \
--cc=Leo.Bras@arm.com \
--cc=agordeev@linux.ibm.com \
--cc=alexandru.elisei@arm.com \
--cc=aneesh.kumar@kernel.org \
--cc=borntraeger@linux.ibm.com \
--cc=bp@alien8.de \
--cc=catalin.marinas@arm.com \
--cc=corbet@lwn.net \
--cc=dave.hansen@linux.intel.com \
--cc=david@kernel.org \
--cc=frankja@linux.ibm.com \
--cc=fuad.tabba@linux.dev \
--cc=gor@linux.ibm.com \
--cc=hca@linux.ibm.com \
--cc=hpa@zytor.com \
--cc=imbrenda@linux.ibm.com \
--cc=jackabt.amazon@gmail.com \
--cc=jackabt@amazon.com \
--cc=joey.gouly@arm.com \
--cc=kvm@vger.kernel.org \
--cc=kvmarm@lists.linux.dev \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=maz@kernel.org \
--cc=mingo@redhat.com \
--cc=oupton@kernel.org \
--cc=pbonzini@redhat.com \
--cc=rdunlap@infradead.org \
--cc=seanjc@google.com \
--cc=seiden@linux.ibm.com \
--cc=shuah@kernel.org \
--cc=skhan@linuxfoundation.org \
--cc=suzuki.poulose@arm.com \
--cc=svens@linux.ibm.com \
--cc=tglx@kernel.org \
--cc=vdonnefort@google.com \
--cc=weilin.chang@arm.com \
--cc=will@kernel.org \
--cc=x86@kernel.org \
--cc=yuzenghui@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®