KVM: arm64: Use correct accessor to parse stage-1 PTEs
PATCH 1/1 KVM: arm64: Use correct accessor to parse stage-1 PTEs
hyp_get_page_state() is used with pKVM to retrieve metadata about a page by parsing a hypervisor stage-1 PTE. However, it incorrectly uses a helper which parses *stage-2* mappings. Ouch.
Luckily, pkvm_getstate() only looks at the software bits, which happen to be in the same place for stage-1 and stage-2 PTEs, and this all ends up working correctly by accident. But clearly, we should do better.
Fix hyp_get_page_state() to use the correct helper.
--- arch/arm64/kvm/hyp/nvhe/mem_protect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/kvm/hyp/nvhe/mem_protect.c +1 -1
@@ -516,7 +516,7 @@ static enum pkvm_page_state hyp_get_page_state(kvm_pte_t pte)if (!kvm_pte_valid (pte))return PKVM_NOPAGE ; -return pkvm_getstate (kvm_pgtable_stage2_pte_prot (pte)); +return pkvm_getstate (kvm_pgtable_hyp_pte_prot (pte)); } static int __hyp_check_page_state_range(u64 addr, u64 size,
Signature · 1 line
2.38.0.135.g90850a2211-goog
Quoted 9 lines · Quentin Perret
hyp_get_page_state()is used with pKVM to retrieve metadata about a page by parsing a hypervisor stage-1 PTE. However, it incorrectly uses a helper which parses *stage-2* mappings. Ouch.Luckily,
pkvm_getstate()only looks at the software bits, which happen to be in the same place for stage-1 and stage-2 PTEs, and this all ends up working correctly by accident. But clearly, we should do better.[...]
Applied to fixes, thanks!
[1/1] KVM: arm64: Use correct accessor to parse stage-1 PTEs
commit: 6853a71726b6f5930b4450889faf02e8f1cfe35c
Cheers,
M.
Signature · 1 line
Without deviation from the norm, progress is not possible.