| Message ID | 20230815213533.548732-9-seanjc@google.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | VM: SVM: Honor KVM_MAX_VCPUS when AVIC is enabled | expand |
У вт, 2023-08-15 у 14:35 -0700, Sean Christopherson пише: > WARN if KVM attempts to allocate a vCPU's AVIC backing page without an > in-kernel local APIC. avic_init_vcpu() bails early if the APIC is not > in-kernel, and KVM disallows enabling an in-kernel APIC after vCPUs have > been created, i.e. it should be impossible to reach > avic_init_backing_page() without the vAPIC being allocated. > > Signed-off-by: Sean Christopherson <seanjc@google.com> > --- > arch/x86/kvm/svm/avic.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/x86/kvm/svm/avic.c b/arch/x86/kvm/svm/avic.c > index 522feaa711b4..3b2d00d9ca9b 100644 > --- a/arch/x86/kvm/svm/avic.c > +++ b/arch/x86/kvm/svm/avic.c > @@ -300,7 +300,7 @@ static int avic_init_backing_page(struct kvm_vcpu *vcpu) > return 0; > } > > - if (!vcpu->arch.apic->regs) > + if (WARN_ON_ONCE(!vcpu->arch.apic->regs)) > return -EINVAL; > > if (kvm_apicv_activated(vcpu->kvm)) { As I said I prefer this to be folded with patch that adds the avic_init_backing_page(). Best regards, Maxim Levitsky
diff --git a/arch/x86/kvm/svm/avic.c b/arch/x86/kvm/svm/avic.c index 522feaa711b4..3b2d00d9ca9b 100644 --- a/arch/x86/kvm/svm/avic.c +++ b/arch/x86/kvm/svm/avic.c @@ -300,7 +300,7 @@ static int avic_init_backing_page(struct kvm_vcpu *vcpu) return 0; } - if (!vcpu->arch.apic->regs) + if (WARN_ON_ONCE(!vcpu->arch.apic->regs)) return -EINVAL; if (kvm_apicv_activated(vcpu->kvm)) {
WARN if KVM attempts to allocate a vCPU's AVIC backing page without an in-kernel local APIC. avic_init_vcpu() bails early if the APIC is not in-kernel, and KVM disallows enabling an in-kernel APIC after vCPUs have been created, i.e. it should be impossible to reach avic_init_backing_page() without the vAPIC being allocated. Signed-off-by: Sean Christopherson <seanjc@google.com> --- arch/x86/kvm/svm/avic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)