lkml.org 
[lkml]   [2021]   [Jun]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH 06/10] KVM: SVM: tweak warning about enabled AVIC on nested entry
From
Date
On 23/06/21 13:29, Maxim Levitsky wrote:
> It is possible that AVIC was requested to be disabled but
> not yet disabled, e.g if the nested entry is done right
> after svm_vcpu_after_set_cpuid.
>
> Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com>
> ---
> arch/x86/kvm/svm/nested.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/x86/kvm/svm/nested.c b/arch/x86/kvm/svm/nested.c
> index dca20f949b63..253847f7d9aa 100644
> --- a/arch/x86/kvm/svm/nested.c
> +++ b/arch/x86/kvm/svm/nested.c
> @@ -505,7 +505,7 @@ static void nested_vmcb02_prepare_control(struct vcpu_svm *svm)
> * Also covers avic_vapic_bar, avic_backing_page, avic_logical_id,
> * avic_physical_id.
> */
> - WARN_ON(svm->vmcb01.ptr->control.int_ctl & AVIC_ENABLE_MASK);
> + WARN_ON(kvm_apicv_activated(svm->vcpu.kvm));
>
> /* Copied from vmcb01. msrpm_base can be overwritten later. */
> svm->vmcb->control.nested_ctl = svm->vmcb01.ptr->control.nested_ctl;
>

Queued, thanks.

Paolo

\
 
 \ /
  Last update: 2021-06-23 23:53    [W:0.148 / U:0.060 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site