From: Sean Christopherson Date: Sat, 15 Feb 2025 01:06:08 +0000 (-0800) Subject: KVM: x86: Don't inject PV async #PF if SEND_ALWAYS=0 and guest state is protected X-Git-Tag: v6.15-rc1~195^2~10^2~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b9595d1ddef883f538563c779fff2151ee040aeb;p=thirdparty%2Flinux.git KVM: x86: Don't inject PV async #PF if SEND_ALWAYS=0 and guest state is protected Don't inject PV async #PFs into guests with protected register state, i.e. SEV-ES and SEV-SNP guests, unless the guest has opted-in to receiving #PFs at CPL0. For protected guests, the actual CPL of the guest is unknown. Note, no sane CoCo guest should enable PV async #PF, but the current state of Linux-as-a-CoCo-guest isn't entirely sane. Fixes: add5e2f04541 ("KVM: SVM: Add support for the SEV-ES VMSA") Link: https://lore.kernel.org/r/20250215010609.1199982-2-seanjc@google.com Signed-off-by: Sean Christopherson --- diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 263ab2ec6f712..3d84a79583b12 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -13387,7 +13387,7 @@ static bool kvm_can_deliver_async_pf(struct kvm_vcpu *vcpu) return false; if (vcpu->arch.apf.send_user_only && - kvm_x86_call(get_cpl)(vcpu) == 0) + (vcpu->arch.guest_state_protected || !kvm_x86_call(get_cpl)(vcpu))) return false; if (is_guest_mode(vcpu)) {