KVM: arm64: nv: Even more VNCR fixes
Subsystems (3)
Oliver Upton
maintainerv3 cover KVM: arm64: nv: Even more VNCR fixes
Addressing most of the issues that came up with v2. Of note, I left Sashiko's (valid) feedback about HWPOISON PFNs not signalling userspace unaddressed because it requires untangling the return code mess a bit. That and the bugs fixed in this series are quite a bit worse :)
Applies to kvmarm/fixes.
v2 -> v3:
- Avoid evaluating permissions in case of early return / higher priority fault (Marc)
- Drop BUG_ON() from VNCR abort injetion path (Marc)
- Ensure is_gmem is always initialized (Sashiko)
- Return EINVAL for SEAs due to memory attribute mismatch, avoiding confusion with gmem memory fault exits (Sashiko)
Oliver Upton (5):
KVM: arm64: nv: Respect read-only PFN when mapping L1 VNCR
KVM: arm64: nv: Inject SEA if kvm_translate_vncr() can't resolve PFN
KVM: arm64: nv: Re-translate VNCR before injecting abort
KVM: arm64: nv: Inject SEA if guest VNCR isn't normal memory
KVM: arm64: nv: Mark VM as bugged for unexpected VNCR abort
arch/arm64/include/asm/kvm_nested.h | 8 ++ arch/arm64/kvm/at.c | 8 -- arch/arm64/kvm/nested.c | 164 ++++++++++++++-------------- 3 files changed, 91 insertions(+), 89 deletions(-)
base-commit: fcda30b134d262a1b1826555352bd7349051486e
Signature · 1 line
2.47.3
Oliver Upton
maintainerPATCH v3 1/5 KVM: arm64: nv: Respect read-only PFN when mapping L1 VNCR
KVM currently maps the L1 VNCR into the host stage-1 by relying entirely on the permissions of the guest stage-1. At the same time, it is entirely possible that the backing PFN is read-only (e.g. RO memslot), meaning that the L1 VNCR should use at most a read-only mapping.
Cache the writability of the PFN in the VNCR TLB and use it to constrain the resulting fixmap permissions. Promote VNCR permission faults to an SEA in the case where the guest attempts to write to a read-only endpoint. Conveniently, this also plugs a page leak found by Sashiko [*] resulting from the early return for a read-only PFN.
--- arch/arm64/kvm/nested.c | 36 ++++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 10 deletions(-)
arch/arm64/kvm/nested.c +26 -10
@@ -24,6 +24,7 @@ struct vncr_tlb {struct s1_walk_result wr;u64 hpa; +bool hpa_writable;/* -1 when not mapped on a CPU */ int cpu;
@@ -1401,7 +1402,7 @@ static int kvm_translate_vncr(struct kvm_vcpu *vcpu, bool *is_gmem)if (!*is_gmem) { pfn =__kvm_faultin_pfn (memslot, gfn, write_fault ?FOLL_WRITE :0 , &writable, &page); -if (is_error_noslot_pfn (pfn) || (write_fault && !writable)) +if (is_error_noslot_pfn (pfn))return -EFAULT ; }else { ret =kvm_gmem_get_pfn (vcpu->kvm, memslot, gfn, &pfn, &page,NULL );
@@ -1410,6 +1411,8 @@ static int kvm_translate_vncr(struct kvm_vcpu *vcpu, bool *is_gmem) write_fault, false, false);return ret; } + + writable = !(memslot->flags &KVM_MEM_READONLY ); } scoped_guard(write_lock, &vcpu->kvm->mmu_lock) {
@@ -1420,28 +1423,41 @@ static int kvm_translate_vncr(struct kvm_vcpu *vcpu, bool *is_gmem) vt->gva = va; vt->hpa = pfn <<PAGE_SHIFT ; + vt->hpa_writable = writable; vt->valid = true; vt->cpu =-1 ;kvm_make_request (KVM_REQ_MAP_L1_VNCR_EL2 , vcpu); -kvm_release_faultin_page (vcpu->kvm, page, false, vt->wr.pw); +kvm_release_faultin_page (vcpu->kvm, page, false, vt->wr.pw && vt->hpa_writable); } -if (vt->wr.pw) +if (vt->wr.pw && vt->hpa_writable)mark_page_dirty (vcpu->kvm, gfn);return 0 ; } -static void inject_vncr_perm (struct kvm_vcpu *vcpu) +static void handle_vncr_perm (struct kvm_vcpu *vcpu) {struct vncr_tlb *vt = vcpu->arch.vncr_tlb;u64 esr =kvm_vcpu_get_esr (vcpu); +u64 fsc; + +/* +* Promote to an external abort if the stage-1 permits writes but the +* HPA is read-only (e.g. RO memslot). +*/ +if (kvm_is_write_fault (vcpu) && vt->wr.pw && !vt->hpa_writable) + fsc = ESR_ELx_FSC_EXTABT; +/* +* Otherwise, inject a permission fault using the guest's translation +* level rather than the host's. +*/ +else + fsc =ESR_ELx_FSC_PERM_L (vt->wr.level); -/* Adjust the fault level to reflect that of the guest's */ esr &= ~ESR_ELx_FSC; - esr |=FIELD_PREP (ESR_ELx_FSC, -ESR_ELx_FSC_PERM_L (vt->wr.level)); + esr |=FIELD_PREP (ESR_ELx_FSC, fsc);kvm_inject_nested_sync (vcpu, esr); }
@@ -1475,7 +1491,7 @@ int kvm_handle_vncr_abort(struct kvm_vcpu *vcpu)return kvm_handle_guest_sea (vcpu);if (esr_fsc_is_permission_fault (esr)) { -inject_vncr_perm (vcpu); +handle_vncr_perm (vcpu); }else if (esr_fsc_is_translation_fault (esr)) {bool valid, is_gmem = false;int ret;
@@ -1523,7 +1539,7 @@ int kvm_handle_vncr_abort(struct kvm_vcpu *vcpu)break ;case -EPERM :/* Hack to deal with POE until we get kernel support */ -inject_vncr_perm (vcpu); +handle_vncr_perm (vcpu);break ;case 0 :break ;
@@ -1567,7 +1583,7 @@ static void kvm_map_l1_vncr(struct kvm_vcpu *vcpu) vt->cpu =smp_processor_id (); -if (vt->wr.pw && vt->wr.pr) +if (vt->hpa_writable && vt->wr.pw && vt->wr.pr) prot =PAGE_KERNEL ;else if (vt->wr.pr) prot =PAGE_KERNEL_RO ;
Signature · 1 line
2.47.3
[email protected]
AI reviewRe: [PATCH v3 1/5] KVM: arm64: nv: Respect read-only PFN when mapping L1 VNCR
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
Pre-existing issues:
- [High] KVM injects an External Abort instead of a Permission Fault when a guest accesses a read-only memslot via VNCR with guest stage-1 write protections. --
commit be3537f8a87d3f507b2b54b34084b37b1630155a
Author: Oliver Upton <[email protected]>
KVM: arm64: nv: Respect read-only PFN when mapping L1 VNCR
This commit updates KVM to cache the writability of the PFN in the VNCR TLB to constrain the resulting fixmap permissions. It also promotes VNCR permission faults to a Synchronous External Abort (SEA) when the guest attempts to write to a read-only endpoint.
Quoted 4 lines
arch/arm64/kvm/nested.c +0
-0
[ ... ]
arch/arm64/kvm/nested.c static int kvm_translate_vncr(struct kvm_vcpu *vcpu, bool *is_gmem) · line 1406
Quoted 7 lines
arch/arm64/kvm/nested.c +1
-1@@ -1401,7 +1402,7 @@ static int kvm_translate_vncr(struct kvm_vcpu *vcpu, bool *is_gmem)if (!*is_gmem) { pfn =__kvm_faultin_pfn (memslot, gfn, write_fault ?FOLL_WRITE :0 , &writable, &page); -if (is_error_noslot_pfn (pfn) || (write_fault && !writable)) +if (is_error_noslot_pfn (pfn))return -EFAULT ;
[Severity: High]
This is a pre-existing issue, but does this leak host memory configuration to the guest by incorrectly prioritizing an External Abort over a Permission Fault?
When a guest takes a VNCR write fault, this code unconditionally requests FOLL_WRITE from __kvm_faultin_pfn() without checking if the guest's stage-1 page tables actually permit writes (vt->wr.pw).
If the backing host memslot is read-only, __kvm_faultin_pfn() fails and KVM returns -EFAULT, which ultimately causes KVM to inject a guest External Abort (ESR_ELx_FSC_EXTABT). Architecturally, if the guest's stage-1 translation lacks write permission, the guest should receive a Stage-1 Permission Fault regardless of the host's physical memory permissions.
Could this cause unexpected guest panics if the guest OS relies on handling Permission Faults gracefully before the host RO mapping is enforced?
[ ... ]
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1
Oliver Upton
maintainerRe: [PATCH v3 1/5] KVM: arm64: nv: Respect read-only PFN when mapping L1 VNCR
Quoted 39 lines · On Fri, Jun 19, 2026 at 12:07:03AM +0000, [email protected] wrote:
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
Pre-existing issues:
- [High] KVM injects an External Abort instead of a Permission Fault when a guest accesses a read-only memslot via VNCR with guest stage-1 write protections. --commit
be3537f8a87d3f507b2b54b34084b37b1630155a
Author: Oliver Upton <[email protected]>
KVM: arm64: nv: Respect read-only PFN when mapping L1 VNCRThis commit updates KVM to cache the writability of the PFN in the VNCR TLB to constrain the resulting fixmap permissions. It also promotes VNCR permission faults to a Synchronous External Abort (SEA) when the guest attempts to write to a read-only endpoint.
Quoted 4 lines
arch/arm64/kvm/nested.c +0
-0[ ... ]
arch/arm64/kvm/nested.c static int kvm_translate_vncr(struct kvm_vcpu *vcpu, bool *is_gmem) · line 1406
Quoted 7 lines
arch/arm64/kvm/nested.c +1
-1@@ -1401,7 +1402,7 @@ static int kvm_translate_vncr(struct kvm_vcpu *vcpu, bool *is_gmem)if (!*is_gmem) { pfn =__kvm_faultin_pfn (memslot, gfn, write_fault ?FOLL_WRITE :0 , &writable, &page); -if (is_error_noslot_pfn (pfn) || (write_fault && !writable)) +if (is_error_noslot_pfn (pfn))return -EFAULT ;[Severity: High]
This is a pre-existing issue, but does this leak host memory configuration to the guest by incorrectly prioritizing an External Abort over a Permission Fault?When a guest takes a VNCR write fault, this code unconditionally requests
FOLL_WRITEfrom__kvm_faultin_pfn()without checking if the guest's stage-1 page tables actually permit writes (vt->wr.pw).
Quoted 8 lines
If the backing host memslot is read-only,
__kvm_faultin_pfn()fails and KVM returns-EFAULT, which ultimately causes KVM to inject a guest External Abort (ESR_ELx_FSC_EXTABT). Architecturally, if the guest's stage-1 translation lacks write permission, the guest should receive a Stage-1 Permission Fault regardless of the host's physical memory permissions.Could this cause unexpected guest panics if the guest OS relies on handling Permission Faults gracefully before the host RO mapping is enforced?
The goal here is to have a localized, stable-worthy fix to plug a nasty bug that allows the guest to bypass host permissions. A fix for the fault prioritization can be done later, ideally as part of a more significant cleanup to the whole VNCR handling.
A guest is far more likely to use normal memory (i.e. in a RW memslot) for the VNCR page anyway.
Thanks,
Oliver
Oliver Upton
maintainerPATCH v3 2/5 KVM: arm64: nv: Inject SEA if kvm_translate_vncr() can't resolve PFN
In reply to Oliver Uptonkvm_handle_vncr_abort() assumes that s1_walk_result conveys an abort when kvm_translate_vncr() returns -EFAULT. This is not always the case as it's possible to encounter 'late' failures on the output of S1 translation, e.g. a GFN outside of the memslots.
Fix it by preparing an external abort before returning from kvm_translate_vncr(). Get rid of the BUG_ON() in the fault injection path while at it.
--- arch/arm64/include/asm/kvm_nested.h | 8 ++++++++ arch/arm64/kvm/at.c | 8 -------- arch/arm64/kvm/nested.c | 10 ++++++---- 3 files changed, 14 insertions(+), 12 deletions(-)
arch/arm64/include/asm/kvm_nested.h +8 -0
@@ -388,6 +388,14 @@ struct s1_walk_result {bool failed; }; +static inline void fail_s1_walk (struct s1_walk_result *wr,u8 fst,bool s1ptw) +{ + wr->fst = fst; + wr->ptw = s1ptw; + wr->s2 = s1ptw; + wr->failed = true; +} +int __kvm_translate_va (struct kvm_vcpu *vcpu,struct s1_walk_info *wi,struct s1_walk_result *wr,u64 va); int __kvm_find_s1_desc_level(struct kvm_vcpu *vcpu, u64 va, u64 ipa,
arch/arm64/kvm/at.c +0 -8
@@ -11,14 +11,6 @@#include <asm/kvm_mmu.h> #include <asm/lsui.h> -static void fail_s1_walk (struct s1_walk_result *wr,u8 fst,bool s1ptw) -{ - wr->fst = fst; - wr->ptw = s1ptw; - wr->s2 = s1ptw; - wr->failed = true; -} -#define S1_MMU_DISABLED (-127)static int get_ia_size (struct s1_walk_info *wi)
arch/arm64/kvm/nested.c +6 -4
@@ -1395,15 +1395,19 @@ static int kvm_translate_vncr(struct kvm_vcpu *vcpu, bool *is_gmem) gfn = vt->wr.pa >>PAGE_SHIFT ; memslot =gfn_to_memslot (vcpu->kvm, gfn); -if (!memslot) +if (!memslot) { +fail_s1_walk (&vt->wr, ESR_ELx_FSC_EXTABT, false);return -EFAULT ; + } *is_gmem =kvm_slot_has_gmem (memslot);if (!*is_gmem) { pfn =__kvm_faultin_pfn (memslot, gfn, write_fault ?FOLL_WRITE :0 , &writable, &page); -if (is_error_noslot_pfn (pfn)) +if (is_error_noslot_pfn (pfn)) { +fail_s1_walk (&vt->wr, ESR_ELx_FSC_EXTABT, false);return -EFAULT ; + } }else { ret =kvm_gmem_get_pfn (vcpu->kvm, memslot, gfn, &pfn, &page,NULL );if (ret) {
@@ -1530,8 +1534,6 @@ int kvm_handle_vncr_abort(struct kvm_vcpu *vcpu)* Translation failed, inject the corresponding * exception back to EL2. */ -BUG_ON (!vt->wr.failed); - esr &= ~ESR_ELx_FSC; esr |=FIELD_PREP (ESR_ELx_FSC, vt->wr.fst);
Signature · 1 line
2.47.3
[email protected]
AI reviewRe: [PATCH v3 2/5] KVM: arm64: nv: Inject SEA if kvm_translate_vncr() can't resolve PFN
Thank you for your contribution! Sashiko AI review found 2 potential issue(s) to consider:
Thank you for your contribution! Sashiko AI review found 2 potential issue(s) to consider:
New issues:
- [High] Unhandled guest_memfd errors ignore prepared memory fault exits and inject malformed guest exceptions.
Pre-existing issues:
- [High] Host-side PFN resolution errors (e.g., SIGPENDING, HWPOISON) are silently converted into guest Synchronous External Aborts (SEA). --
commit 68bfda7f1617f64f7121c49b477f4cf4e33b2e10
Author: Oliver Upton <[email protected]>
KVM: arm64: nv: Inject SEA if kvm_translate_vncr() can't resolve PFN
This commit updates kvm_translate_vncr() to prepare an external abort when failing to resolve a PFN instead of returning -EFAULT and relying on kvm_handle_vncr_abort() to BUG_ON() or correctly guess the failure. It drops the BUG_ON() in the abort handler to safely inject the SEA.
Quoted 13 lines
arch/arm64/kvm/nested.c +3
-1@@ -1395,15 +1395,19 @@ static int kvm_translate_vncr(struct kvm_vcpu *vcpu, bool *is_gmem) gfn = vt->wr.pa >>PAGE_SHIFT ; memslot =gfn_to_memslot (vcpu->kvm, gfn); -if (!memslot) +if (!memslot) { +fail_s1_walk (&vt->wr, ESR_ELx_FSC_EXTABT, false);return -EFAULT ; + }
arch/arm64/kvm/nested.c static int kvm_translate_vncr(struct kvm_vcpu *vcpu, bool *is_gmem) · line 1410
Quoted 10 lines
arch/arm64/kvm/nested.c +3
-1*is_gmem =kvm_slot_has_gmem (memslot);if (!*is_gmem) { pfn =__kvm_faultin_pfn (memslot, gfn, write_fault ?FOLL_WRITE :0 , &writable, &page); -if (is_error_noslot_pfn (pfn)) +if (is_error_noslot_pfn (pfn)) { +fail_s1_walk (&vt->wr, ESR_ELx_FSC_EXTABT, false);return -EFAULT ; + }
[Severity: High]
This is a pre-existing issue, but does this improperly convert host PFN resolution errors into guest aborts?
If __kvm_faultin_pfn() encounters a pending host signal or poisoned memory, it can return KVM_PFN_ERR_SIGPENDING or KVM_PFN_ERR_HWPOISON. These are caught by is_error_noslot_pfn().
By calling fail_s1_walk() and returning -EFAULT here, kvm_handle_vncr_abort() will inject a Synchronous External Abort (SEA) into the guest instead of returning to userspace. Will this cause a simple host signal to randomly crash the VM and break host HWPOISON recovery?
[ ... ]
arch/arm64/kvm/nested.c int kvm_handle_vncr_abort(struct kvm_vcpu *vcpu) · line 1534
Quoted 6 lines
arch/arm64/kvm/nested.c +0
-2@@ -1530,8 +1534,6 @@ int kvm_handle_vncr_abort(struct kvm_vcpu *vcpu)* Translation failed, inject the corresponding * exception back to EL2. */ -BUG_ON (!vt->wr.failed); -
[Severity: High]
Does removing this BUG_ON() unmask an issue when kvm_gmem_get_pfn() fails with -EINVAL, -ENOENT, or -EACCES?
In kvm_translate_vncr(), if kvm_gmem_get_pfn() fails, it prepares a memory fault exit for userspace and returns the error code without calling fail_s1_walk().
Because kvm_handle_vncr_abort() lacks an 'if (is_gmem) return 0;' check for -EINVAL, -ENOENT, and -EACCES, it will fall through to the exception injection path below. Since vt->wr.fst is uninitialized (0), won't KVM ignore the prepared memory fault exit and inject a malformed exception (FSC=0) into the guest?
Quoted 3 lines
arch/arm64/kvm/nested.c +0
-0esr &= ~ESR_ELx_FSC; esr |=FIELD_PREP (ESR_ELx_FSC, vt->wr.fst);
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=2
Oliver Upton
maintainerPATCH v3 3/5 KVM: arm64: nv: Re-translate VNCR before injecting abort
In reply to Oliver UptonKVM faults in the VNCR page with FOLL_WRITE whenever the guest aborts for a write, similar to how a regular stage-2 mapping is handled. It is entirely possible that the guest reads from the VNCR before writing to it, in which case the PFN could only be read-only.
Invalidate the VNCR TLB and re-fetch the translation upon taking a VNCR abort, allowing the host mapping to be faulted in for write the second time around. Interestingly enough, this also satisfies the ordering requirements of FEAT_ETS2/3 between descriptor updates and MMU faults.
--- arch/arm64/kvm/nested.c | 111 +++++++++++++++------------------------- 1 file changed, 42 insertions(+), 69 deletions(-)
arch/arm64/kvm/nested.c +42 -69
@@ -1466,88 +1466,61 @@ static void handle_vncr_perm(struct kvm_vcpu *vcpu)kvm_inject_nested_sync (vcpu, esr); } -static bool kvm_vncr_tlb_lookup (struct kvm_vcpu *vcpu) -{ -struct vncr_tlb *vt = vcpu->arch.vncr_tlb; - -lockdep_assert_held_read (&vcpu->kvm->mmu_lock); - -if (!vt->valid) -return false; - -if (read_vncr_el2 (vcpu) != vt->gva) -return false; - -if (vt->wr.nG) -return get_asid_by_regime (vcpu,TR_EL20 ) == vt->wr.asid; - -return true; -} -int kvm_handle_vncr_abort (struct kvm_vcpu *vcpu) {struct vncr_tlb *vt = vcpu->arch.vncr_tlb;u64 esr =kvm_vcpu_get_esr (vcpu); +bool is_gmem = false; +bool perm; +int ret;WARN_ON_ONCE (!(esr & ESR_ELx_VNCR));if (kvm_vcpu_abt_issea (vcpu))return kvm_handle_guest_sea (vcpu); -if (esr_fsc_is_permission_fault (esr)) { -handle_vncr_perm (vcpu); - }else if (esr_fsc_is_translation_fault (esr)) { -bool valid, is_gmem = false; -int ret; - -scoped_guard (read_lock, &vcpu->kvm->mmu_lock) - valid = kvm_vncr_tlb_lookup(vcpu); - -if (!valid) - ret =kvm_translate_vncr (vcpu, &is_gmem); -else - ret = -EPERM ; +if (!esr_fsc_is_translation_fault (esr) && !esr_fsc_is_permission_fault (esr)) { +WARN_ONCE (1 ,"Unhandled VNCR abort, ESR=%llx\n" , esr); +return 1 ; + } -switch (ret) { -case -EAGAIN : -/* Let's try again... */ -break ; -case -ENOMEM : -/* -* For guest_memfd, this indicates that it failed to -* create a folio to back the memory. Inform userspace. -*/ -if (is_gmem) -return 0 ; -/* Otherwise, let's try again... */ -break ; -case -EFAULT : -case -EIO : -case -EHWPOISON : -if (is_gmem) -return 0 ; - fallthrough; -case -EINVAL : -case -ENOENT : -case -EACCES : -/* -* Translation failed, inject the corresponding -* exception back to EL2. -*/ - esr &= ~ESR_ELx_FSC; - esr |=FIELD_PREP (ESR_ELx_FSC, vt->wr.fst); + ret =kvm_translate_vncr (vcpu, &is_gmem); +switch (ret) { +case -EAGAIN : +/* Let's try again... */ +return 1 ; +case -ENOMEM : +/* +* For guest_memfd, this indicates that it failed to +* create a folio to back the memory. Inform userspace. +*/ +if (is_gmem) +return 0 ; +/* Otherwise, let's try again... */ +break ; +case -EFAULT : +case -EIO : +case -EHWPOISON : +if (is_gmem) +return 0 ; + fallthrough; +case -EINVAL : +case -ENOENT : +case -EACCES : +/* +* Translation failed, inject the corresponding +* exception back to EL2. +*/ + esr &= ~ESR_ELx_FSC; + esr |=FIELD_PREP (ESR_ELx_FSC, vt->wr.fst); -kvm_inject_nested_sync (vcpu, esr); -break ; -case -EPERM : -/* Hack to deal with POE until we get kernel support */ +kvm_inject_nested_sync (vcpu, esr); +break ; +case 0 : + perm =kvm_is_write_fault (vcpu) ? vt->wr.pw && vt->hpa_writable : vt->wr.pr; +if (!perm)handle_vncr_perm (vcpu); -break ; -case 0 : -break ; - } - }else { -WARN_ONCE (1 ,"Unhandled VNCR abort, ESR=%llx\n" , esr); +break ; }return 1 ;
Signature · 1 line
2.47.3
[email protected]
AI reviewRe: [PATCH v3 3/5] KVM: arm64: nv: Re-translate VNCR before injecting abort
Thank you for your contribution! Sashiko AI review found 3 potential issue(s) to consider:
Thank you for your contribution! Sashiko AI review found 3 potential issue(s) to consider:
New issues:
- [High] Guest Stage-1 permission faults on VNCR are incorrectly promoted to External Aborts when backed by a read-only memslot.
- [High] Removing the kvm_vncr_tlb_lookup() check introduces an infinite host CPU livelock for Write-Only guest VNCR mappings.
Pre-existing issues:
- [High] If kvm_gmem_get_pfn() returns -EINVAL, KVM drops the prepared userspace memory fault exit and injects a bogus nested exception. --
commit 51cca6668ae197c096ae8a70f22546dc1a8163be
Author: Oliver Upton <[email protected]>
KVM: arm64: nv: Re-translate VNCR before injecting abort
KVM faults in the VNCR page with FOLL_WRITE whenever the guest aborts for a write, similar to how a regular stage-2 mapping is handled. It is entirely possible that the guest reads from the VNCR before writing to it, in which case the PFN could only be read-only.
Invalidate the VNCR TLB and re-fetch the translation upon taking a VNCR abort, allowing the host mapping to be faulted in for write the second time around. Interestingly enough, this also satisfies the ordering requirements of FEAT_ETS2/3 between descriptor updates and MMU faults.
Quoted 4 lines
arch/arm64/kvm/nested.c +0
-0
[ ... ]
Quoted 1 line
arch/arm64/kvm/nested.c +0
-0@@ -1466,88 +1466,61 @@ static void handle_vncr_perm(struct kvm_vcpu *vcpu)
[ ... ]
Quoted 3 lines
arch/arm64/kvm/nested.c +3
-0+ ret =kvm_translate_vncr (vcpu, &is_gmem); +switch (ret) { +case -EAGAIN :
[ ... ]
Quoted 12 lines
arch/arm64/kvm/nested.c +12
-0+case -EFAULT : +case -EIO : +case -EHWPOISON : +if (is_gmem) +return 0 ; + fallthrough; +case -EINVAL : +case -ENOENT : +case -EACCES : +/* +* Translation failed, inject the corresponding +* exception back to EL2.
arch/arm64/kvm/nested.c static void handle_vncr_perm(struct kvm_vcpu *vcpu) · line 1518
Quoted 10 lines
arch/arm64/kvm/nested.c +5
-4+*/ + esr &= ~ESR_ELx_FSC; + esr |=FIELD_PREP (ESR_ELx_FSC, vt->wr.fst); -kvm_inject_nested_sync (vcpu, esr); -break ; -case -EPERM : -/* Hack to deal with POE until we get kernel support */ +kvm_inject_nested_sync (vcpu, esr); +break ;
[Severity: High]
This is a pre-existing issue, but if kvm_gmem_get_pfn() fails and returns -EINVAL, -ENOENT, or -EACCES, does this branch bypass the userspace exit?
If those errors are returned, they skip the is_gmem check because they bypass the fallthrough block above. Instead of returning to userspace, KVM handles them by injecting a nested exception back to the guest using an uninitialized or stale value in vt->wr.fst. Does this destroy the memory fault exit state and inject a bogus exception?
[ ... ]
Quoted 5 lines
arch/arm64/kvm/nested.c +0
-5-handle_vncr_perm (vcpu); -break ; -case 0 : -break ; - }
arch/arm64/kvm/nested.c static void handle_vncr_perm(struct kvm_vcpu *vcpu) · line 1526
Quoted 10 lines
arch/arm64/kvm/nested.c +4
-2- }else { -WARN_ONCE (1 ,"Unhandled VNCR abort, ESR=%llx\n" , esr); +case 0 : + perm =kvm_is_write_fault (vcpu) ? vt->wr.pw && vt->hpa_writable : vt->wr.pr; +if (!perm)handle_vncr_perm (vcpu); +break ; }return 1 ;
[Severity: High]
Does removing the -EPERM loop breaker introduce a host CPU livelock for Write-Only guest VNCR mappings?
If the guest configures a Write-Only mapping, kvm_map_l1_vncr() falls back to mapping it as PAGE_NONE. When the hardware accesses the fixmap, it triggers a Data Abort. KVM then traps and re-translates the mapping.
Because vt->wr.pw is true, the perm check evaluates to true, and KVM returns 1 to resume the guest instead of injecting a fault. The hardware will then fault again indefinitely.
[Severity: High]
Also, does calling kvm_translate_vncr() unconditionally request FOLL_WRITE on a write fault without verifying if the guest's own Stage-1 mapping actually permits writes?
In kvm_translate_vncr(), __kvm_faultin_pfn() is called with FOLL_WRITE if it's a write fault. If the host memslot happens to be read-only, __kvm_faultin_pfn() fails and returns -EFAULT.
This error bubbles up to the switch statement above, which injects an External Abort into the guest. Should the guest instead receive a Stage-1 Permission Fault if its own Stage-1 translation does not permit writes, regardless of the memslot permissions?
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=3
Oliver Upton
maintainerRe: [PATCH v3 3/5] KVM: arm64: nv: Re-translate VNCR before injecting abort
Quoted 20 lines · On Fri, Jun 19, 2026 at 12:00:33AM +0000, [email protected] wrote:
Quoted 5 lines
arch/arm64/kvm/nested.c +0
-5-handle_vncr_perm (vcpu); -break ; -case 0 : -break ; - }arch/arm64/kvm/nested.c static void handle_vncr_perm(struct kvm_vcpu *vcpu) · line 1526
Quoted 10 lines
arch/arm64/kvm/nested.c +4
-2- }else { -WARN_ONCE (1 ,"Unhandled VNCR abort, ESR=%llx\n" , esr); +case 0 : + perm =kvm_is_write_fault (vcpu) ? vt->wr.pw && vt->hpa_writable : vt->wr.pr; +if (!perm)handle_vncr_perm (vcpu); +break ; }return 1 ;[Severity: High]
Does removing the-EPERMloop breaker introduce a host CPU livelock for Write-Only guest VNCR mappings?
Quoted 7 lines
If the guest configures a Write-Only mapping,
kvm_map_l1_vncr()falls back to mapping it asPAGE_NONE. When the hardware accesses the fixmap, it triggers a Data Abort. KVM then traps and re-translates the mapping.Because
vt->wr.pwis true, the perm check evaluates to true, and KVM returns 1 to resume the guest instead of injecting a fault. The hardware will then fault again indefinitely.
Advertising NV2 to the VM should've been conditioned on hiding S1PIE because there's no way to fix this. As the access passes the guest permission check, we have no fault that can be injected for stage-1.
Quoted 5 lines
[Severity: High]
Also, does callingkvm_translate_vncr()unconditionally requestFOLL_WRITEon a write fault without verifying if the guest's own Stage-1 mapping actually permits writes?
Quoted 8 lines
In
kvm_translate_vncr(),__kvm_faultin_pfn()is called withFOLL_WRITEif it's a write fault. If the host memslot happens to be read-only,__kvm_faultin_pfn()fails and returns-EFAULT.This error bubbles up to the switch statement above, which injects an External Abort into the guest. Should the guest instead receive a Stage-1 Permission Fault if its own Stage-1 translation does not permit writes, regardless of the memslot permissions?
Again, this is below the bar of stable fixes (intent of this series).
Thanks,
Oliver
Oliver Upton
maintainerPATCH v3 4/5 KVM: arm64: nv: Inject SEA if guest VNCR isn't normal memory
In reply to Oliver UptonWhen constructing an L1 VNCR mapping, KVM unconditionally uses cacheable memory attributes, even if the underlying PFN isn't memory. This gets particularly hairy if the endpoint doesn't support cacheable memory attributes, potentially throwing an SError on writeback...
While KVM does permit cacheable memory attributes on certain PFNMAP VMAs, kvm_translate_vncr() isn't currently grabbing the VMA. So do the simpler thing for now and just reject everything that isn't memory.
--- arch/arm64/kvm/nested.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
arch/arm64/kvm/nested.c +11 -0
@@ -1419,6 +1419,17 @@ static int kvm_translate_vncr(struct kvm_vcpu *vcpu, bool *is_gmem) writable = !(memslot->flags &KVM_MEM_READONLY ); } +/* +* FIXME: This check is too restrictive as KVM allows cacheable memory +* attributes for PFNMAP VMAs that have cacheable attributes in host +* stage-1. +*/ +if (!pfn_is_map_memory (pfn)) { +kvm_release_faultin_page (vcpu->kvm, page, true, false); +fail_s1_walk (&vt->wr, ESR_ELx_FSC_EXTABT, false); +return -EINVAL ; + } + scoped_guard(write_lock, &vcpu->kvm->mmu_lock) {if (mmu_invalidate_retry (vcpu->kvm, mmu_seq)) {kvm_release_faultin_page (vcpu->kvm, page, true, false);
Signature · 1 line
2.47.3
Oliver Upton
maintainerPATCH v3 5/5 KVM: arm64: nv: Mark VM as bugged for unexpected VNCR abort
In reply to Oliver UptonKVM is unlikely to resolve an unexpected VNCR abort, meaning that returning to the guest will likely leave the vCPU stuck in an abort loop. Bug the VM and exit to userspace instead.
--- arch/arm64/kvm/nested.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/kvm/nested.c +2 -2
@@ -1491,8 +1491,8 @@ int kvm_handle_vncr_abort(struct kvm_vcpu *vcpu)return kvm_handle_guest_sea (vcpu);if (!esr_fsc_is_translation_fault (esr) && !esr_fsc_is_permission_fault (esr)) { -WARN_ONCE (1 ,"Unhandled VNCR abort, ESR=%llx\n" , esr); -return 1 ; +KVM_BUG (1 , vcpu->kvm,"Unhandled VNCR abort, ESR=%llx\n" , esr); +return -EIO ; } ret =kvm_translate_vncr (vcpu, &is_gmem);
Signature · 1 line
2.47.3
Quoted 8 lines · Oliver Upton
Addressing most of the issues that came up with v2. Of note, I left Sashiko's (valid) feedback about HWPOISON PFNs not signalling userspace unaddressed because it requires untangling the return code mess a bit. That and the bugs fixed in this series are quite a bit worse :)
Applies to kvmarm/fixes.
[...]
Applied to fixes, thanks!
[1/5] KVM: arm64: nv: Respect read-only PFN when mapping L1 VNCR
commit: 2684e02bac41c5220f6c1ab2bdcc957b71812977
[2/5] KVM: arm64: nv: Inject SEA if kvm_translate_vncr() can't resolve PFN
commit: 9f3e83345a56280efffe235c65593c7e544c0fcc
[3/5] KVM: arm64: nv: Re-translate VNCR before injecting abort
commit: bb645aa0a4caeaf7f9cd32e9a948594d434c1a8f
[4/5] KVM: arm64: nv: Inject SEA if guest VNCR isn't normal memory
commit: 4bd7dbe0b2243e6aa735cae4d5e1ff988b30b2a6
[5/5] KVM: arm64: nv: Mark VM as bugged for unexpected VNCR abort
commit: 265b58aba51b6aaaad81678fbc57fcdb2d4ed480Cheers,
M.
Signature · 1 line
Without deviation from the norm, progress is not possible.