KVM: x86: dump_vmcs should consider only the load controls of EFER/PAT

When deciding whether to dump the GUEST_IA32_EFER and GUEST_IA32_PAT
fields of the VMCS, examine only the VM entry load controls, as saving
on VM exit has no effect on whether VM entry succeeds or fails.

Suggested-by: Sean Christopherson <seanjc@google.com>
Signed-off-by: David Edmondson <david.edmondson@oracle.com>
Message-Id: <20210318120841.133123-4-david.edmondson@oracle.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
index c5882a66f11c804c07b7c8765bdf03818329ede8..7329fd19d6e13a800eb6a981f51c4a023d578782 100644 (file)
--- a/arch/x86/kvm/vmx/vmx.c
+++ b/arch/x86/kvm/vmx/vmx.c
@@ -5771,11 +5771,9 @@ void dump_vmcs(void)
        vmx_dump_sel("LDTR:", GUEST_LDTR_SELECTOR);
        vmx_dump_dtsel("IDTR:", GUEST_IDTR_LIMIT);
        vmx_dump_sel("TR:  ", GUEST_TR_SELECTOR);
-       if ((vmexit_ctl & VM_EXIT_SAVE_IA32_EFER) ||
-           (vmentry_ctl & VM_ENTRY_LOAD_IA32_EFER))
+       if (vmentry_ctl & VM_ENTRY_LOAD_IA32_EFER)
                pr_err("EFER= 0x%016llx\n", vmcs_read64(GUEST_IA32_EFER));
-       if ((vmexit_ctl & VM_EXIT_SAVE_IA32_PAT) ||
-           (vmentry_ctl & VM_ENTRY_LOAD_IA32_PAT))
+       if (vmentry_ctl & VM_ENTRY_LOAD_IA32_PAT)
                pr_err("PAT = 0x%016llx\n", vmcs_read64(GUEST_IA32_PAT));
        pr_err("DebugCtl = 0x%016llx  DebugExceptions = 0x%016lx\n",
               vmcs_read64(GUEST_IA32_DEBUGCTL),