Commit 9cb0468d authored by Fuad Tabba's avatar Fuad Tabba Committed by Marc Zyngier
Browse files

KVM: arm64: Optimise away S1POE handling when not supported by host 



Although ID register sanitisation prevents guests from seeing the
feature, adding this check to the helper allows the compiler to entirely
eliminate S1POE-specific code paths (such as context switching POR_EL1)
when the host kernel is compiled without support (CONFIG_ARM64_POE is
disabled).

This aligns with the pattern used for other optional features like SVE
(kvm_has_sve()) and FPMR (kvm_has_fpmr()), ensuring no POE logic if the
host lacks support, regardless of the guest configuration state.

Signed-off-by: default avatarFuad Tabba <tabba@google.com>
Link: https://patch.msgid.link/20260213143815.1732675-3-tabba@google.com


Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
parent f66857ba

arch/arm64/include/asm/kvm_host.h

+2 −1
Original line number Diff line number Diff line
@@ -1616,7 +1616,8 @@ void kvm_set_vm_id_reg(struct kvm *kvm, u32 reg, u64 val); 
	(kvm_has_feat((k), ID_AA64MMFR3_EL1, S1PIE, IMP))



#define kvm_has_s1poe(k)				\

	(kvm_has_feat((k), ID_AA64MMFR3_EL1, S1POE, IMP))

	(system_supports_poe() &&			\

	 kvm_has_feat((k), ID_AA64MMFR3_EL1, S1POE, IMP))



#define kvm_has_ras(k)					\

	(kvm_has_feat((k), ID_AA64PFR0_EL1, RAS, IMP))