[PATCH v6 03/10] KVM: x86: nSVM: Cache and validate vmcb12 g_pat

[Jim Mattson]

When KVM_X86_QUIRK_NESTED_SVM_SHARED_PAT is disabled and nested paging is
enabled in vmcb12, validate g_pat at emulated VMRUN and cause an immediate
VMEXIT with exit code VMEXIT_INVALID if it is invalid, as specified in the
APM, volume 2: "Nested Paging and VMRUN/VMEXIT."

Fixes: 3d6368ef580a ("KVM: SVM: Add VMRUN handler")
Signed-off-by: Jim Mattson <jmatt...@google.com>
---
 arch/x86/include/asm/kvm_host.h |  2 +-
 arch/x86/kvm/svm/nested.c       | 17 +++++++++++++----
 arch/x86/kvm/svm/svm.h          |  1 +
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
index 0809d8f28208..0b4ab141feae 100644
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
@@ -2511,7 +2511,7 @@ int memslot_rmap_alloc(struct kvm_memory_slot *slot, 
unsigned long npages);
         KVM_X86_QUIRK_SLOT_ZAP_ALL |           \
         KVM_X86_QUIRK_STUFF_FEATURE_MSRS |     \
         KVM_X86_QUIRK_IGNORE_GUEST_PAT |       \
-        KVM_X86_QUIRK_VMCS12_ALLOW_FREEZE_IN_SMM       \
+        KVM_X86_QUIRK_VMCS12_ALLOW_FREEZE_IN_SMM |     \
         KVM_X86_QUIRK_NESTED_SVM_SHARED_PAT)
 
 #define KVM_X86_CONDITIONAL_QUIRKS             \
diff --git a/arch/x86/kvm/svm/nested.c b/arch/x86/kvm/svm/nested.c
index 32fa8e688c00..0ad1e0348492 100644
--- a/arch/x86/kvm/svm/nested.c
+++ b/arch/x86/kvm/svm/nested.c
@@ -410,7 +410,8 @@ static bool nested_vmcb_check_controls(struct kvm_vcpu 
*vcpu,
 
 /* Common checks that apply to both L1 and L2 state.  */
 static bool nested_vmcb_check_save(struct kvm_vcpu *vcpu,
-                                  struct vmcb_save_area_cached *save)
+                                  struct vmcb_save_area_cached *save,
+                                  bool check_gpat)
 {
        if (CC(!(save->efer & EFER_SVME)))
                return false;
@@ -445,6 +446,9 @@ static bool nested_vmcb_check_save(struct kvm_vcpu *vcpu,
        if (CC(!kvm_valid_efer(vcpu, save->efer)))
                return false;
 
+       if (check_gpat && CC(!kvm_pat_valid(save->g_pat)))
+               return false;
+
        return true;
 }
 
@@ -452,7 +456,8 @@ int nested_svm_check_cached_vmcb12(struct kvm_vcpu *vcpu)
 {
        struct vcpu_svm *svm = to_svm(vcpu);
 
-       if (!nested_vmcb_check_save(vcpu, &svm->nested.save) ||
+       if (!nested_vmcb_check_save(vcpu, &svm->nested.save,
+                                   l2_has_separate_pat(svm)) ||
            !nested_vmcb_check_controls(vcpu, &svm->nested.ctl))
                return -EINVAL;
 
@@ -562,6 +567,7 @@ static void __nested_copy_vmcb_save_to_cache(struct 
vmcb_save_area_cached *to,
 
        to->rax = from->rax;
        to->cr2 = from->cr2;
+       to->g_pat = from->g_pat;
 
        svm_copy_lbrs(to, from);
 }
@@ -1971,13 +1977,16 @@ static int svm_set_nested_state(struct kvm_vcpu *vcpu,
 
        /*
         * Validate host state saved from before VMRUN (see
-        * nested_svm_check_permissions).
+        * nested_svm_check_permissions). Note that the g_pat field is not
+        * validated, because (a) it may have been clobbered by SMM before
+        * KVM_GET_NESTED_STATE, and (b) it is not loaded at emulated
+        * #VMEXIT.
         */
        __nested_copy_vmcb_save_to_cache(&save_cached, save);
        if (!(save->cr0 & X86_CR0_PG) ||
            !(save->cr0 & X86_CR0_PE) ||
            (save->rflags & X86_EFLAGS_VM) ||
-           !nested_vmcb_check_save(vcpu, &save_cached))
+           !nested_vmcb_check_save(vcpu, &save_cached, false))
                goto out_free;
 
 
diff --git a/arch/x86/kvm/svm/svm.h b/arch/x86/kvm/svm/svm.h
index 0f0c08c5ce0c..3588f6d3fb9b 100644
--- a/arch/x86/kvm/svm/svm.h
+++ b/arch/x86/kvm/svm/svm.h
@@ -161,6 +161,7 @@ struct vmcb_save_area_cached {
        u64 isst_addr;
        u64 rax;
        u64 cr2;
+       u64 g_pat;
        u64 dbgctl;
        u64 br_from;
        u64 br_to;
-- 
2.53.0.1018.g2bb0e51243-goog