]> git.ipfire.org Git - thirdparty/kernel/linux.git/commit
KVM: arm64: Correctly identify executable PTEs at stage-2
authorOliver Upton <oupton@kernel.org>
Tue, 2 Jun 2026 16:59:01 +0000 (09:59 -0700)
committerMarc Zyngier <maz@kernel.org>
Fri, 5 Jun 2026 13:07:57 +0000 (14:07 +0100)
commit17f073f78fc43280891ecde8f8ec3f84f98bb37c
tree1cee89ee69d1c7e0303435970264254657165213
parent49b32ddb87a3a109afecea89e55d70f73956b8bc
KVM: arm64: Correctly identify executable PTEs at stage-2

KVM invalidates the I-cache before installing an executable PTE on
implementations without DIC. Unfortunately, support for FEAT_XNX
broke this check as KVM_PTE_LEAF_ATTR_HI_S2_XN was expanded to a
bitfield.

Fix it by reusing kvm_pgtable_stage2_pte_prot() and testing the abstract
permission bits instead.

Fixes: 2608563b466b ("KVM: arm64: Add support for FEAT_XNX stage-2 permissions")
Reported-by: Sashiko (gemini/gemini-3.1-pro-preview)
Signed-off-by: Oliver Upton <oupton@kernel.org>
Reviewed-by: Wei-Lin Chang <weilin.chang@arm.com>
Link: https://patch.msgid.link/20260602165901.52800-3-oupton@kernel.org
Signed-off-by: Marc Zyngier <maz@kernel.org>
Cc: stable@vger.kernel.org
arch/arm64/kvm/hyp/pgtable.c