From nobody Thu Apr 2 20:25:31 2026 Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) (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 5BC9D30E85D for ; Thu, 26 Mar 2026 17:50:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774547406; cv=none; b=ua1SJ4lNLwpysnAue6wNBu5HYmZon5MBg5bJj0Ml5v+302jzZN/GC+XOsYVZs5pMXz/Ad57ih65dYqQJTPyWjB9oDXBmF764YH8vffcMnfDY4an4ahVHQccqh3J1AP4/kHaHhYxNd4i0ss3KBY75g0upM04sMYLsMlyXpUOXvos= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774547406; c=relaxed/simple; bh=tZ12QRR3FmdWK+NRPEzhTArwt9NG+814P1E0pPf9rCg=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=K27VQX8NdV2+Y0SmnY90PzxAJR0LSgC+R64uJAsShiZQ49+C8s3L2Ls4+DrFodp9H3wjrek8nsXZAZmY9E0wiyjxbPkCxpVOVL5902m9Ql2aY4054Z5Y5LYYijhs00hzej+1h503uNpzgzNTjO6O07MzquhdE6UgogORhujQh3k= 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=YEj/gFP5; arc=none smtp.client-ip=209.85.216.74 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="YEj/gFP5" Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-354bc535546so1413726a91.3 for ; Thu, 26 Mar 2026 10:50:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1774547403; x=1775152203; 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=/9d4uR3KG2j2870MKAm/vuBsQJvgm3m57WemQ0F9xCY=; b=YEj/gFP5cZnjK3nOOLceGPQlyqsnCT/PM3r+hdPDrWNio75hh3HugLZNJFDl66NPZA u/pe29ytxd95U6cL2oXxBxGXOjuOFV/v94zE8e/cr8AsaeElNG12HGTPCSqzZX+Rk1qB 3rjCQlJ3G5vaamxPFFur5EuIMuArvQDOW/Qf9+o5/nyW1fPcXAfKvlHwGzzM2x7Mwljv Mmut2jiiObt4f20A5C7pkS9v3KjZjVScieUT5jbp2zbdkpoBsIxagNvfNTYIwZWlLnd7 T1y0MvQhcmiPI1GdqkOFfe0zIPWWl5saEH3tlKkD3IzeC7qyGbYTL+bW4JWhpBVlAwFD VOmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774547403; x=1775152203; 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=/9d4uR3KG2j2870MKAm/vuBsQJvgm3m57WemQ0F9xCY=; b=W55KCdlcmC8LOFMzSPWhrWKXW62TKbuLSp5aldAlZDJ10RsMAOoml9sNE+K4jf1/Hu KMbnpSAS3jRl29Zt5SugfaSnfcH5DGYFM05WwKwe64iBsJAc+4W+HZogeYBfIEgTjeh9 m/r65f8qhzYIplJYie4f4EkcCC0xS9/bAc5zvZn8ruHvl/8JstOPPZaAOUeDTZny+n78 xD2Ftkfxxu5rhINlhHiUSPJjBb4J++0x0cJ8S2HHTgC+aOUp5NmbcrMu87MQ5NOBIqwm houPHjSg+JYmMza/y+Pf2lXngbUeYQ+lx3/POoFT0+TFln5/7hv5Rx6OHyqn/g2LlwgF kRkA== X-Forwarded-Encrypted: i=1; AJvYcCVwdH8lS89akKZzWdEjpMEJ0KI1gnYqF8+KXWDM5fiRLD73a65Oq/dnwpj39CqekH7PN/3IWT5tTZf5xjs=@vger.kernel.org X-Gm-Message-State: AOJu0YwA+WEBiv9R4ReK9tgLw3yS5v+DTvBkb3AJpnyQYFDrYn9KGn8c Q0noSTCkmoekpmZnOQEBojiE1Tx9kMa8XTArJ73GtfNMIWILu7Pp+tNJXiRxB/pJRyHfc/ovLl3 VEzkv/vQg7NQzuw== X-Received: from pjbbb10.prod.google.com ([2002:a17:90b:8a:b0:35c:2d1e:7123]) (user=jmattson job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90a:fc45:b0:340:25f0:a9b with SMTP id 98e67ed59e1d1-35c0ddaa96emr7892201a91.33.1774547402493; Thu, 26 Mar 2026 10:50:02 -0700 (PDT) Date: Thu, 26 Mar 2026 10:49:20 -0700 In-Reply-To: <20260326174944.3820245-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: <20260326174944.3820245-1-jmattson@google.com> X-Mailer: git-send-email 2.53.0.1018.g2bb0e51243-goog Message-ID: <20260326174944.3820245-3-jmattson@google.com> Subject: [PATCH v6 02/10] KVM: x86: nSVM: Clear VMCB_NPT clean bit when updating hPAT from guest mode From: Jim Mattson To: Paolo Bonzini , Jonathan Corbet , Shuah Khan , Sean Christopherson , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , kvm@vger.kernel.org, linux-doc@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 5ff01d2ac85e..32fa8e688c00 100644 --- a/arch/x86/kvm/svm/nested.c +++ b/arch/x86/kvm/svm/nested.c @@ -697,7 +697,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 bool nested_vmcb12_has_lbrv(struct kvm_vcpu *vcpu) diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c index d2ca226871c2..af808e83173e 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -2979,10 +2979,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 67aa5d34332e..0f0c08c5ce0c 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.1018.g2bb0e51243-goog