• Paolo Bonzini's avatar
    KVM: nSVM: prepare guest save area while is_guest_mode is true · d2df592f
    Paolo Bonzini authored
    Right now, enter_svm_guest_mode is calling nested_prepare_vmcb_save and
    nested_prepare_vmcb_control.  This results in is_guest_mode being false
    until the end of nested_prepare_vmcb_control.
    
    This is a problem because nested_prepare_vmcb_save can in turn cause
    changes to the intercepts and these have to be applied to the "host VMCB"
    (stored in svm->nested.hsave) and then merged with the VMCB12 intercepts
    into svm->vmcb.
    
    In particular, without this change we forget to set the CR0 read and CR0
    write intercepts when running a real mode L2 guest with NPT disabled.
    The guest is therefore able to see the CR0.PG bit that KVM sets to
    enable "paged real mode".  This patch fixes the svm.flat mode_switch
    test case with npt=0.  There are no other problematic calls in
    nested_prepare_vmcb_save.
    
    Moving is_guest_mode to the end is done since commit 06fc7772
    ("KVM: SVM: Activate nested state only when guest state is complete",
    2010-04-25).  However, back then KVM didn't grab a different VMCB
    when updating the intercepts, it had already copied/merged L1's stuff
    to L0's VMCB, and then updated L0's VMCB regardless of is_nested().
    Later recalc_intercepts was introduced in commit 384c6368
    ("KVM: SVM: Add function to recalculate intercept masks", 2011-01-12).
    This introduced the bug, because recalc_intercepts now throws away
    the intercept manipulations that svm_set_cr0 had done in the meanwhile
    to svm->vmcb.
    
    [1] https://lore.kernel.org/kvm/1266493115-28386-1-git-send-email-joerg.roedel@amd.com/Reviewed-by: default avatarSean Christopherson <seanjc@google.com>
    Tested-by: default avatarVitaly Kuznetsov <vkuznets@redhat.com>
    Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
    d2df592f
nested.c 33.7 KB