Commit 6537565f authored by Marc Zyngier's avatar Marc Zyngier Committed by Oliver Upton
Browse files

KVM: arm64: Adjust EL2 stage-1 leaf AP bits when ARM64_KVM_HVHE is set 



El2 stage-1 page-table format is subtly (and annoyingly) different
when HCR_EL2.E2H is set.

Take the ARM64_KVM_HVHE configuration into account when setting
the AP bits.

Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20230609162200.2024064-13-maz@kernel.org


Signed-off-by: default avatarOliver Upton <oliver.upton@linux.dev>
parent cff3b5cf

arch/arm64/kvm/hyp/pgtable.c

+4 −2
Original line number Diff line number Diff line
@@ -21,8 +21,10 @@ 


#define KVM_PTE_LEAF_ATTR_LO_S1_ATTRIDX	GENMASK(4, 2)

#define KVM_PTE_LEAF_ATTR_LO_S1_AP	GENMASK(7, 6)

#define KVM_PTE_LEAF_ATTR_LO_S1_AP_RO	3

#define KVM_PTE_LEAF_ATTR_LO_S1_AP_RW	1

#define KVM_PTE_LEAF_ATTR_LO_S1_AP_RO		\

	({ cpus_have_final_cap(ARM64_KVM_HVHE) ? 2 : 3; })

#define KVM_PTE_LEAF_ATTR_LO_S1_AP_RW		\

	({ cpus_have_final_cap(ARM64_KVM_HVHE) ? 0 : 1; })

#define KVM_PTE_LEAF_ATTR_LO_S1_SH	GENMASK(9, 8)

#define KVM_PTE_LEAF_ATTR_LO_S1_SH_IS	3

#define KVM_PTE_LEAF_ATTR_LO_S1_AF	BIT(10)