When nested paging is enabled in VMCB12, copy the (cached and validated) VMCB12 g_pat to VMCB02. Fixes: 15038e147247 ("KVM: SVM: obey guest PAT") Signed-off-by: Jim Mattson --- arch/x86/kvm/svm/nested.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/x86/kvm/svm/nested.c b/arch/x86/kvm/svm/nested.c index 43429399993c..21d8db10525d 100644 --- a/arch/x86/kvm/svm/nested.c +++ b/arch/x86/kvm/svm/nested.c @@ -605,8 +605,10 @@ void nested_vmcb02_compute_g_pat(struct vcpu_svm *svm) if (!svm->nested.vmcb02.ptr) return; - /* FIXME: merge g_pat from vmcb01 and vmcb12. */ - svm->nested.vmcb02.ptr->save.g_pat = svm->vmcb01.ptr->save.g_pat; + if (nested_npt_enabled(svm)) + svm->nested.vmcb02.ptr->save.g_pat = svm->nested.ctl.g_pat; + else + svm->nested.vmcb02.ptr->save.g_pat = svm->vmcb01.ptr->save.g_pat; } static void nested_vmcb02_prepare_save(struct vcpu_svm *svm, struct vmcb *vmcb12) -- 2.51.2.1041.gc1ab5b90ca-goog