From nobody Thu Apr 2 20:25:30 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 C8E0E423A7A for ; Thu, 26 Mar 2026 17:50:12 +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=1774547415; cv=none; b=T0qOP1s3ku+ugT1tfJSkdszCsSZdK+0QHlxswtVRclosMv9jxUFcAi1YGgJaIclir0r2MTc/8BnpUrkG54GZ0gxXetMaNAIOE46NlzXnk1LXROs9BigCTkEdYHhL5qk8Px9QqdIf6vffT9X9bjb0+DvQ23nHmW4xxMXc2DIUG9c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774547415; c=relaxed/simple; bh=Y9rMXPhwhSPq2CcDwI9mgpPoQnii2Yurx3TfkOypRiU=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=nrZF0fycrKT8Q6UtgDimcnpasctB9Wo9LcDMoBS4xtIn/skRJCtowkn5kkfU8CMLzZ5xUAhlOLlGAReJlA4KSU4V2HgF9KjsvGgmbB7shwl3hErEJRh17kCpTiM3gSdyJgpEUNnl6TvYH9iSR1yaIp7mhFVa1kmzfCWTc9J11cQ= 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=Pkwfwd50; 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="Pkwfwd50" Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-35c12a3bbb9so1553010a91.3 for ; Thu, 26 Mar 2026 10:50:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1774547411; x=1775152211; 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=Jfn2M6k7bFpE7gypyjWrhFKs9Q/vfTaHTPk+frkTN9U=; b=Pkwfwd50S7d58+AQ4f3JKRAZCtl3E0VEqrqDH+eHc5x+6Av6VPxYRATHZ/gB7jNiUC SQpCPP7WernkPLo6fj4BSXJcpXhtKPrARPfX7/AJz4u8jR7C8NG31Lmolq+irL3aouBP Tx33Q+m0vnTSLocBonGLVBGRfiOe1H/2s4s8zxqtamw6zRd66M1sktLfowbXGnb6+K+y srn3w4DIdCdQpK9GhSXaC75IKXBGUuMCkcyHZ+Y09nWofZsAUfWeG1oWKUctMPH56cQL h/hvvLXEg+We3LLx1iEvSme7PIZrbtVsA7/L9HYO8PJH+OZBsMZzFhhtLe0BA5m02s9a VY/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774547411; x=1775152211; 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=Jfn2M6k7bFpE7gypyjWrhFKs9Q/vfTaHTPk+frkTN9U=; b=c8Xg3v2WsXSg7IPh0CStF4h34iec3921O+xh0ES9P1vxg21nUD2wHo++Apr9okpTRR Bg5jbfm37tqvLq6pM6w5sfkWu3oftTCrXQJBEB2XEc2WRPNgBevFuhgr4pFauVl/bBZC /WJv3fdP512mHRg0BtYCeuzKjy70tJmZX4VZQS3ZEG6FaVH0A3fgXzFNw/dLKfoexdcd vo6e1ybVokk0jMnI7/crcckUzOjRjpIVbv71PDeyKyWBQQhDfCtlPmJCb6OCz3M+Ts1+ MMtNpzgKwzwLajT8+kRZWs8xEtxGU4wPG42mvBVCxlrmzWbOu19/3uxrfUk2u3ITCHl0 Tzmg== X-Forwarded-Encrypted: i=1; AJvYcCWilm+C5+rC+Al7RNmrzFBDUBDtTzaWbn3igqqoHQiP1TGHIudOdCUPbguqxZSnMXk8Sja1I/q+CyPXejQ=@vger.kernel.org X-Gm-Message-State: AOJu0YwiwXa2hUOKTCLOFrB3i9SnBhg8j7CZ4XcXGKVWbGsGQUFVEM13 nOpErseYAAHcrsyInsQOml33DNnVOtjHDU0PKOPVNxJHvwEGw+n2F9lQ7K+IgEJkP+2JqUh6yKO MvIvyl3ZZ71W8lA== X-Received: from pjbco11.prod.google.com ([2002:a17:90a:fe8b:b0:35b:9314:520d]) (user=jmattson job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:2809:b0:356:22ef:57ba with SMTP id 98e67ed59e1d1-35c0dce8c1bmr8443122a91.7.1774547411019; Thu, 26 Mar 2026 10:50:11 -0700 (PDT) Date: Thu, 26 Mar 2026 10:49:25 -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-8-jmattson@google.com> Subject: [PATCH v6 07/10] KVM: x86: nSVM: Save gPAT to vmcb12.g_pat on VMEXIT 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" According to the APM volume 3 pseudo-code for "VMRUN," when nested paging is enabled in the vmcb, the guest PAT register (gPAT) is saved to the vmcb on emulated VMEXIT. When KVM_X86_QUIRK_NESTED_SVM_SHARED_PAT is disabled and the vCPU is in guest mode with nested NPT enabled, save the vmcb02 g_pat field to the vmcb12 g_pat field on emulated VMEXIT. Fixes: 15038e147247 ("KVM: SVM: obey guest PAT") Signed-off-by: Jim Mattson --- arch/x86/kvm/svm/nested.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/x86/kvm/svm/nested.c b/arch/x86/kvm/svm/nested.c index 14063bef36f1..26bc33322a87 100644 --- a/arch/x86/kvm/svm/nested.c +++ b/arch/x86/kvm/svm/nested.c @@ -1242,6 +1242,9 @@ static int nested_svm_vmexit_update_vmcb12(struct kvm= _vcpu *vcpu) vmcb12->save.dr6 =3D svm->vcpu.arch.dr6; vmcb12->save.cpl =3D vmcb02->save.cpl; =20 + if (l2_has_separate_pat(svm)) + vmcb12->save.g_pat =3D vmcb02->save.g_pat; + if (guest_cpu_cap_has(vcpu, X86_FEATURE_SHSTK)) { vmcb12->save.s_cet =3D vmcb02->save.s_cet; vmcb12->save.isst_addr =3D vmcb02->save.isst_addr; --=20 2.53.0.1018.g2bb0e51243-goog