From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f201.google.com (mail-pg1-f201.google.com [209.85.215.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 23ECB3358B6 for ; Thu, 5 Feb 2026 21:43:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770327824; cv=none; b=JNQywFowHnQNM6wgfOVi9yYNXC1tdTMj7eKVcuOBqZTLVvGG7OViKGcdwB76cY+jN8ZCvMJcGAoAe2uShK4veFdMOxAvU4gGo+yoFRGTFTpJbC1YufQRRnTGi/XqN22OthTgk/dVnxB11PcrePqbRRtgW9u2snNR+YNfRftwjlI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770327824; c=relaxed/simple; bh=1D+Rg0RzamaZWrQGwQog0TMlHq2s25Z6R2jx9QWiAkk=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=YtDjFsmd37pOrhLbn7aLHq4HUGQjNC+6ZFVeFcQju++QwDk75iDndy/1gtxTKwlkdFvRz3poBOqe8eD14xLZY4Sc+NSCvItyhuWKliJZVHSikehQhZneVbLvjpWkL7m11pI4rZK4ARdiPkrTxlQlC4XZ6YsaDOIq8ajGSfY/wr8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--jmattson.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=CpJIfaxZ; arc=none smtp.client-ip=209.85.215.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--jmattson.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="CpJIfaxZ" Received: by mail-pg1-f201.google.com with SMTP id 41be03b00d2f7-c634b862fcfso843530a12.2 for ; Thu, 05 Feb 2026 13:43:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1770327823; x=1770932623; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=3S+CqfjZPLDswkTpiM7Jj+iI7z0lBAQUqin93RB1oEY=; b=CpJIfaxZ/QjO5cL/fD0sezoL1e2K0t8oPb/l7xJIBGsxBkSkiJOKkgkpXA401XJ2gs RWxVR8lMzQOF2ADHK08dRJ4aZqAaHoYg/d3YFWsXEBK3K99XaGOuUrPX+RsHlBiDfYyO Bw0z/9L4St6naokiO3BLcGKAAGAPCbZSUWlV6c0bD3oumrn9tVqSpYRocXLRwUzepDY3 Hd8e8QH/A9F7Y2k8wDcixZxj5tgo5SvInAU6D0YXUiX3qCssj/CNPf9MMIYHKZXHbJPt VRlp8M9IrZRa04wjdpi76veYyF9Ips4HkPUNn/IjlXoFdQARAVo8ZH4ZfJKlWt0lfA9u Uw1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770327823; x=1770932623; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=3S+CqfjZPLDswkTpiM7Jj+iI7z0lBAQUqin93RB1oEY=; b=v5V36qxmtjRyCx7lkKQxdyswlGAUY9OL8OIUEI9WdBxe/KjfS474gatScHncdnMlVY mvk9Ds14qZ8dbAGkJeltUbiU8DoNotR5d0SnIxD1WJRWsDplhbeqVF1pRJwioayiYIM2 qudnIGNdjeKso1dxAfjyHN5PEYNnEEAch6yQsMILFRnCOHkH7LaIEr9yAaXXdRLVgygm 61TTedt5vBUOZe1Zt88pF1J7pp2om4aqZfi8lUBNoj0YbbFP4h5cWs+WQeR7zlirto7Q GNT91zMUPFGBZhRPQjhjRQOcPYFten5+dE0oeD7BS+ZPEsh7bB1/WCtg0I2TOlgLOl7B 3i2w== X-Forwarded-Encrypted: i=1; AJvYcCW7MhZ6rJR/Swi3kTZwgA4ttFEZpbOb4HFV308Eznytu5DSsp7oakAWmMM4sAtUZCY9gK9PMfpzikJWL6G+hzU=@vger.kernel.org X-Gm-Message-State: AOJu0YymAdyk837s2VXMPi05n2ZQkI2zXA3F4a2ewNPKPgexcd/n/mga 03zkuN7an0JhsYmBzfKE311vBJ4gdezRfdAf3TuW7pxNU6xNAu8Qf+9Kack6EzvRWP8znxLv7Qf 2nOLv+WursWuYMQ== X-Received: from pgbdo4.prod.google.com ([2002:a05:6a02:e84:b0:c63:53c3:c03a]) (user=jmattson job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:3c8e:b0:341:d5f3:f1ac with SMTP id adf61e73a8af0-393af0c8604mr331317637.41.1770327823550; Thu, 05 Feb 2026 13:43:43 -0800 (PST) Date: Thu, 5 Feb 2026 13:43:04 -0800 In-Reply-To: <20260205214326.1029278-1-jmattson@google.com> Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260205214326.1029278-1-jmattson@google.com> X-Mailer: git-send-email 2.53.0.rc2.204.g2597b5adb4-goog Message-ID: <20260205214326.1029278-5-jmattson@google.com> Subject: [PATCH v3 4/8] KVM: x86: nSVM: Redirect IA32_PAT accesses to either hPAT or gPAT From: Jim Mattson To: Sean Christopherson , Paolo Bonzini , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Shuah Khan , kvm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, Yosry Ahmed Cc: Jim Mattson Content-Type: text/plain; charset="UTF-8" When the vCPU is in guest mode with nested NPT enabled, guest accesses to IA32_PAT are redirected to the gPAT register, which is stored in vmcb02->save.g_pat. Non-guest accesses (e.g. from userspace) to IA32_PAT are always redirected to hPAT, which is stored in vcpu->arch.pat. This is architected behavior. It also makes it possible to restore a new checkpoint on an old kernel with reasonable semantics. After the restore, gPAT will be lost, and L2 will run on L1's PAT. Note that the old kernel would have always run L2 on L1's PAT. Fixes: 15038e147247 ("KVM: SVM: obey guest PAT") Signed-off-by: Jim Mattson --- arch/x86/kvm/svm/nested.c | 9 --------- arch/x86/kvm/svm/svm.c | 34 ++++++++++++++++++++++++++++------ arch/x86/kvm/svm/svm.h | 17 ++++++++++++++++- 3 files changed, 44 insertions(+), 16 deletions(-) diff --git a/arch/x86/kvm/svm/nested.c b/arch/x86/kvm/svm/nested.c index 1ff2ede96094..08844bc51b3c 100644 --- a/arch/x86/kvm/svm/nested.c +++ b/arch/x86/kvm/svm/nested.c @@ -630,15 +630,6 @@ static int nested_svm_load_cr3(struct kvm_vcpu *vcpu, unsigned long cr3, return 0; } -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_set_vmcb_gpat(svm->nested.vmcb02.ptr, svm->vmcb01.ptr->save.g_pat); -} - static void nested_vmcb02_prepare_save(struct vcpu_svm *svm, struct vmcb *vmcb12) { bool new_vmcb12 = false; diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c index 08f145eb9215..b62c32c3942d 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -2852,6 +2852,20 @@ static int svm_get_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info) case MSR_AMD64_DE_CFG: msr_info->data = svm->msr_decfg; break; + case MSR_IA32_CR_PAT: + /* + * When nested NPT is enabled, L2 has a separate PAT from L1. + * Guest accesses to IA32_PAT while running L2 target L2's gPAT; + * host-initiated accesses always target L1's hPAT for backward + * and forward KVM_GET_MSRS compatibility with older kernels. + */ + WARN_ON_ONCE(msr_info->host_initiated && vcpu->wants_to_run); + if (!msr_info->host_initiated && is_guest_mode(vcpu) && + nested_npt_enabled(svm)) + msr_info->data = svm->nested.gpat; + else + msr_info->data = vcpu->arch.pat; + break; default: return kvm_get_msr_common(vcpu, msr_info); } @@ -2935,13 +2949,21 @@ static int svm_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr) break; case MSR_IA32_CR_PAT: - ret = kvm_set_msr_common(vcpu, msr); - if (ret) - break; + if (!kvm_pat_valid(data)) + return 1; - svm_set_vmcb_gpat(svm->vmcb01.ptr, data); - if (is_guest_mode(vcpu)) - nested_vmcb02_compute_g_pat(svm); + /* + * When nested NPT is enabled, L2 has a separate PAT from L1. + * Guest accesses to IA32_PAT while running L2 target L2's gPAT; + * host-initiated accesses always target L1's hPAT for backward + * and forward KVM_SET_MSRS compatibility with older kernels. + */ + WARN_ON_ONCE(msr->host_initiated && vcpu->wants_to_run); + if (!msr->host_initiated && is_guest_mode(vcpu) && + nested_npt_enabled(svm)) + svm_set_gpat(svm, data); + else + svm_set_hpat(svm, data); break; case MSR_IA32_SPEC_CTRL: if (!msr->host_initiated && diff --git a/arch/x86/kvm/svm/svm.h b/arch/x86/kvm/svm/svm.h index 42a4bf83b3aa..a0e94a2c51a1 100644 --- a/arch/x86/kvm/svm/svm.h +++ b/arch/x86/kvm/svm/svm.h @@ -590,6 +590,22 @@ static inline bool nested_npt_enabled(struct vcpu_svm *svm) return svm->nested.ctl.nested_ctl & SVM_NESTED_CTL_NP_ENABLE; } +static inline void svm_set_gpat(struct vcpu_svm *svm, u64 data) +{ + svm->nested.gpat = data; + svm_set_vmcb_gpat(svm->nested.vmcb02.ptr, data); +} + +static inline void svm_set_hpat(struct vcpu_svm *svm, u64 data) +{ + svm->vcpu.arch.pat = data; + if (npt_enabled) { + svm_set_vmcb_gpat(svm->vmcb01.ptr, data); + if (is_guest_mode(&svm->vcpu) && !nested_npt_enabled(svm)) + svm_set_vmcb_gpat(svm->nested.vmcb02.ptr, data); + } +} + static inline bool nested_vnmi_enabled(struct vcpu_svm *svm) { return guest_cpu_cap_has(&svm->vcpu, X86_FEATURE_VNMI) && @@ -816,7 +832,6 @@ void nested_copy_vmcb_control_to_cache(struct vcpu_svm *svm, void nested_copy_vmcb_save_to_cache(struct vcpu_svm *svm, struct vmcb_save_area *save); void nested_sync_control_from_vmcb02(struct vcpu_svm *svm); -void nested_vmcb02_compute_g_pat(struct vcpu_svm *svm); void svm_switch_vmcb(struct vcpu_svm *svm, struct kvm_vmcb_info *target_vmcb); extern struct kvm_x86_nested_ops svm_nested_ops; -- 2.53.0.rc2.204.g2597b5adb4-goog