From nobody Sun Apr 5 21:16:09 2026 Received: from mail-pg1-f202.google.com (mail-pg1-f202.google.com [209.85.215.202]) (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 E0A1F23EA99 for ; Tue, 24 Feb 2026 00:55:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771894513; cv=none; b=Us2DHGVt89LScAAsMeE3ZFJqgBbEzZpK0keC5XKa/i2ytGH6h1Khq2qvQPBeECSvAK+ovNscIDNpyEKnkmUtruf86VyDXVhgCSboSiDgzAbt8n4tdc+LxZWi3DdUmknaSACi6byyaqMS/LfAno2i3hdBeyep4UVkxZulKOWAyfE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771894513; c=relaxed/simple; bh=TQRcrEIl6abnDAXke8DKVdrifugyEhen44qHWS2JWko=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=VSQxN/D+s+1PjX51bsmTvrziC6LMm5Nzm83Kh5W5PPkgu1+CELPtFv8EqS3+xs9FbbzKaLD0rcSITkVgNsGDZMf3CyUiIbUS+NSNJUo6SYRvy0qU38vh8i/KnUWnfOVj24k4VefoVlUFTl+EpF7qfdfeYLl0PhOlBD4krlYqyj0= 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=LljgwJk6; arc=none smtp.client-ip=209.85.215.202 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="LljgwJk6" Received: by mail-pg1-f202.google.com with SMTP id 41be03b00d2f7-c6fd07933aaso2892759a12.0 for ; Mon, 23 Feb 2026 16:55:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1771894511; x=1772499311; 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=46KB3RR4mRrf56rBPul9rnuklFPMftSM5I4pNmsZc58=; b=LljgwJk6s7fQtgtV2VRhVCdo68iSoRUJeDQX3XN/Ty3re8A6yMOO9FPG1P0c06uhZB IbUU6QBAhAGoFyXQuwGRHR/RKdbTxCRkmdIFIaz8HLRRIuEBy4NmDlXOzSt5+reetMgk mQKcIO3BDa1g4OrmhIhiE+NJNVNuEvHGlvTeicrmMYBO8s70D6mf+q0Oowk4hhidUFgo 8OK0ns9eS9ggZLFafC+JpJWOeQeRZIGqlRUvua2svE4pmD+XPLkZvnMOYrZIkU/GApZ9 yl5f/Pmip+xPk61Th232XEMkPLN/vYMTCUT39a9nPz76wCzU7auoazorRpnZp7FSqdM4 1JKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771894511; x=1772499311; 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=46KB3RR4mRrf56rBPul9rnuklFPMftSM5I4pNmsZc58=; b=XLU9HCCO72iqO4OqGnS9VczB9MRXGDKA8eN5TOfLfp79oG5LR984t+8LttyOYXYhvF CJHgsjxAbP65Uo4APGjkYJaz+jcyZPFBuxhT1184R81uqSgP34VANUoYKriUPjiiY9YK NXoJ4ig6OQGLNXfrDW6P5+L2lcQtdeunGk2RVNKQEesSDYG8kyPNbdn5Lrg2gFP7KjLz cgsRS0onI9JSI3cCABRK/D2JnnRPvhfCJE9UgjNgtE4eudPIhMyu+E9f2NFyCMuagK/b krrRswl1uCjMD2utndBenH9HzeEck/2bpSYZQhjSLhqIuXzQ/15Lm9X+yhVZXg8iBbka /GDg== X-Forwarded-Encrypted: i=1; AJvYcCVCcQIV3zjEtrDo97IB//url/WMjL3ePAHecy4nIxnQF1eIlwlcR1hXkfsZjyjAKHtfG8Z+/cr7bVT6J2c=@vger.kernel.org X-Gm-Message-State: AOJu0Yw9oPdC6jwvzbQP4bmM33rjKuJiOtjBYuB6Ui8Hb4RKi6+GD8RP izF/Cp8dQJJ67/MSSAJyMdkIAi2XLs+9rvffzAHDD2wfHY9sL9d5DAisOIwA///poMCLlh2Wz1B TOFCpPkTW5q2ONg== X-Received: from pgww26-n2.prod.google.com ([2002:a05:6a02:2c9a:20b0:c6d:df0e:dbb2]) (user=jmattson job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a21:6f02:b0:366:14ac:e207 with SMTP id adf61e73a8af0-39545fe3c40mr7926670637.69.1771894511049; Mon, 23 Feb 2026 16:55:11 -0800 (PST) Date: Mon, 23 Feb 2026 16:54:40 -0800 In-Reply-To: <20260224005500.1471972-1-jmattson@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260224005500.1471972-1-jmattson@google.com> X-Mailer: git-send-email 2.53.0.371.g1d285c8824-goog Message-ID: <20260224005500.1471972-3-jmattson@google.com> Subject: [PATCH v5 02/10] KVM: x86: nSVM: Clear VMCB_NPT clean bit when updating hPAT from guest mode 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-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" When running an L2 guest and writing to MSR_IA32_CR_PAT, the host PAT value is stored in both vmcb01's g_pat field and vmcb02's g_pat field, but the clean bit was only being cleared for vmcb02. Introduce the helper vmcb_set_gpat() which sets vmcb->save.g_pat and marks the VMCB dirty for VMCB_NPT. Use this helper in both svm_set_msr() for updating vmcb01 and in nested_vmcb02_compute_g_pat() for updating vmcb02, ensuring both VMCBs' NPT fields are properly marked dirty. Fixes: 4995a3685f1b ("KVM: SVM: Use a separate vmcb for the nested L2 guest= ") Signed-off-by: Jim Mattson --- arch/x86/kvm/svm/nested.c | 2 +- arch/x86/kvm/svm/svm.c | 3 +-- arch/x86/kvm/svm/svm.h | 6 ++++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/arch/x86/kvm/svm/nested.c b/arch/x86/kvm/svm/nested.c index d80b1bde6630..b72a1f3c4144 100644 --- a/arch/x86/kvm/svm/nested.c +++ b/arch/x86/kvm/svm/nested.c @@ -707,7 +707,7 @@ void nested_vmcb02_compute_g_pat(struct vcpu_svm *svm) return; =20 /* FIXME: merge g_pat from vmcb01 and vmcb12. */ - svm->nested.vmcb02.ptr->save.g_pat =3D svm->vmcb01.ptr->save.g_pat; + vmcb_set_gpat(svm->nested.vmcb02.ptr, svm->vmcb01.ptr->save.g_pat); } =20 static void nested_vmcb02_prepare_save(struct vcpu_svm *svm) diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c index be9d562fabde..6c41f2317777 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -2924,10 +2924,9 @@ static int svm_set_msr(struct kvm_vcpu *vcpu, struct= msr_data *msr) if (ret) break; =20 - svm->vmcb01.ptr->save.g_pat =3D data; + vmcb_set_gpat(svm->vmcb01.ptr, data); if (is_guest_mode(vcpu)) nested_vmcb02_compute_g_pat(svm); - vmcb_mark_dirty(svm->vmcb, VMCB_NPT); 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 8f9e6a39659c..9850ed01e16e 100644 --- a/arch/x86/kvm/svm/svm.h +++ b/arch/x86/kvm/svm/svm.h @@ -439,6 +439,12 @@ static inline bool vmcb12_is_dirty(struct vmcb_ctrl_ar= ea_cached *control, int bi return !test_bit(bit, (unsigned long *)&control->clean); } =20 +static inline void vmcb_set_gpat(struct vmcb *vmcb, u64 data) +{ + vmcb->save.g_pat =3D data; + vmcb_mark_dirty(vmcb, VMCB_NPT); +} + static __always_inline struct vcpu_svm *to_svm(struct kvm_vcpu *vcpu) { return container_of(vcpu, struct vcpu_svm, vcpu); --=20 2.53.0.371.g1d285c8824-goog