Skip to content

KVM: arm64: Fix handling of S1PTW S2 fault on RO memslots

Marc Zyngier kvm kvmarm linux-arm-kernel stable 2 versions – New

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest3 patches 0 repliesNew
  2. v13 patches 16 repliesSuperseded

Patches in v2 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/3KVM: arm64: Fix S1PTW handling on RO memslotsarch/arm64/include/asm/kvm_emulate.h+20 -20 replies
2/3KVM: arm64: Document the behaviour of S1PTW faults on RO memslotsDocumentation/virt/kvm/api.rst+8 -00 replies
3/3KVM: arm64: Convert FSC_* over to ESR_ELx_FSC_*arch/arm64/include/asm/esr.h arch/arm64/include/asm/kvm_arm.h arch/arm64/include/asm/kvm_emulate.h +3 more+33 -360 replies

Reviews trailers per patch

2 of 3 patches have a Reviewed-by or Acked-by.

PatchOliver UptonArd Biesheuvel
1/3R-b R-b Regression-tested-by
2/3R-b
3/3

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v2 thread

Cover letter [PATCH v2 0/3] KVM: arm64: Fix handling of S1PTW S2 fault on RO memslots

Recent developments on the EFI front have resulted in guests that simply won't boot if the page tables are in a read-only memslot and that you're a bit unlucky in the way S2 gets paged in... The core issue is related to the fact that we treat a S1PTW as a write, which is close enough to what needs to be done. Until to get to RO memslots.

The first patch fixes this and is definitely a stable candidate. It splits the faulting of page tables in two steps (RO translation fault, followed by a writable permission fault -- should it even happen). The second one documents the slightly odd behaviour of PTW writes to RO memslot, which do not result in a KVM_MMIO exit. The last patch is totally optional, only tangentially related, and randomly repainting stuff (maybe that's contagious, who knows).

The whole thing is on top of v6.1-rc2.

I plan to take this in as a fix shortly.

	M.

* From v1:

- Added the documentation patch

- Dropped the AF micro-optimisation, as it was creating more confusion, was hard to test, and was of dubious value

- Collected RBs, with thanks

Marc Zyngier (3):
KVM: arm64: Fix S1PTW handling on RO memslots
KVM: arm64: Document the behaviour of S1PTW faults on RO memslots
KVM: arm64: Convert FSC_* over to ESR_ELx_FSC_*

 Documentation/virt/kvm/api.rst          |  8 +++++
 arch/arm64/include/asm/esr.h            |  9 ++++++
 arch/arm64/include/asm/kvm_arm.h        | 15 ---------
 arch/arm64/include/asm/kvm_emulate.h    | 42 ++++++++++++++++++-------
 arch/arm64/kvm/hyp/include/hyp/fault.h  |  2 +-
 arch/arm64/kvm/hyp/include/hyp/switch.h |  2 +-
 arch/arm64/kvm/mmu.c                    | 21 +++++++------
 7 files changed, 61 insertions(+), 38 deletions(-)
Signature · 1 line
2.34.1