From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f73.google.com (mail-pj1-f73.google.com [209.85.216.73]) (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 7932F42883F for ; Fri, 6 Feb 2026 19:14:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.73 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770405292; cv=none; b=K7e185zGdznM3y3q4maopUbeM/Qig3BsZntJ7b8Aall4GJ+JjdSGj+AXa61VWo1Bo0Etw5u6XTbNVAPme/6gDYj0ut8WnY1QCK1kMrvV97zCzbu9qswUNxqUj8+bw6NT5yEkplCd1Cb6FKwnFV9fuWQlTkZQzCx41O1F67Wkovk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770405292; c=relaxed/simple; bh=XDqbaL/+ZwoNANIBsWT9QQUJxMyPsyI1W2EXJqKiKlQ=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=MtqWRf225dU5xTHNpn5I+xs1uL74LGz3XRzBBiXBwrG6GAbNKga/LcLSxoyW8X51SLkH6ocdCK3p7zMUh27JfK9mEhgUWS2qHJe14dDNvUmJpc222fxNpYsb458TM2/NOsQcRQpJk9D0GS1KVbEHrGIiJIPKJlYXet5sW2I5hM4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=tMkCePIV; arc=none smtp.client-ip=209.85.216.73 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--seanjc.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="tMkCePIV" Received: by mail-pj1-f73.google.com with SMTP id 98e67ed59e1d1-3545cc84ab1so4945385a91.0 for ; Fri, 06 Feb 2026 11:14:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1770405292; x=1771010092; 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=tSxSO9gGa5ljx02Wj2q4xRxhtqlPATJqyadJe+h3DJk=; b=tMkCePIVQUQTj38p5+kZI4K/uAvpp54JOVT0lZVG04A4QZ8lHnoTSnQrZPq/cqunQf mxgOGbrypPCM6k2Fgandd2vwBDuO0PetkIwdjVhCRuh/oRpWaDPD4cVjvmWtyxoki0aN kcblFRRqy7FwByT8rFFHIGYjRtCME3A9fBxETFnu5938st2RNiM52GASFrD87c9ES/k4 09TsqsyeJQBtbWrgRq+0H/kPOhwsQnNBXcwyY5hclHj5PxruRVLkYVzBCLhkX8pDIKiU MGbatxNkz2YSLj1Ui4okgYBHnVQqdtl23VI8CcyFwEC5XbgrT4+OosbNiy+dxuirwHgl M6AA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770405292; x=1771010092; 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=tSxSO9gGa5ljx02Wj2q4xRxhtqlPATJqyadJe+h3DJk=; b=voSVg6JCDPKgZi/JzUFK7aA4BLUEXY8nnkvpbdiSGrim95Xm2Y9UGXQeUHYLxim48C CYFlmFtvc7n1f7YEZCSn7n+4Wd8FvZyXYFHUaS/MT3wtpKxyMIFsQY8tH84GEbHoNwA2 xgo37rLgPkYcH6XJ5xN70ieeu7avrQK9brOggHnby9snw1oMy3+B3pz34XBCECx6+TQ5 0wwS6siZ0eCW3yEbtaD+wtKt8BkUOwcz3cvxkoCurvEyGxOO4/JKVeKwg4qHlx0lk6aD Bg65RXqO33V0MDdMzQ3HmfYvyFeCStiDbl2GQcKwli3YkyR3I92FWpeJw9wHzB1Nrhr0 EqlA== X-Forwarded-Encrypted: i=1; AJvYcCV2eAQ6qVTa1VnZcT9EW8MXOMj4sCL1wN+hyIldiggNT43uoU5IJR69iRVE2jLZZO5C3m8zZW5vaFUV4CA=@vger.kernel.org X-Gm-Message-State: AOJu0Yy09u+1iXg5oZb8NyIg6aW3K2S/Q21mCykTelBkLyIK88W9L5+I iN5JqMgEGY2NOk/WaT+sPKrLKkTNl8EKGkDYxozZ7ip1L//8fIFSGW6SpcuyEv2ha7uy2Mysq1K zJ5E6+Q== X-Received: from pjbkx12.prod.google.com ([2002:a17:90b:228c:b0:34e:b8c4:7cb5]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:5281:b0:354:9b26:cdf7 with SMTP id 98e67ed59e1d1-354b3bce641mr2873691a91.14.1770405291868; Fri, 06 Feb 2026 11:14:51 -0800 (PST) Date: Fri, 6 Feb 2026 11:14:50 -0800 In-Reply-To: <0468715595718af34a8a3551663cffa79dd3ce2e@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260205214326.1029278-1-jmattson@google.com> <20260205214326.1029278-4-jmattson@google.com> <0468715595718af34a8a3551663cffa79dd3ce2e@linux.dev> Message-ID: Subject: Re: [PATCH v3 3/8] KVM: x86: nSVM: Set vmcb02.g_pat correctly for nested NPT From: Sean Christopherson To: Yosry Ahmed Cc: Jim Mattson , 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 Content-Type: text/plain; charset="us-ascii" On Fri, Feb 06, 2026, Yosry Ahmed wrote: > February 6, 2026 at 10:23 AM, "Sean Christopherson" wrote: > > > if (svm->nested.vmcb12_gpa != svm->nested.last_vmcb12_gpa) { > > > new_vmcb12 = true; > > > @@ -656,6 +653,19 @@ static void nested_vmcb02_prepare_save(struct vcpu_svm *svm, struct vmcb *vmcb12 > > > svm->nested.force_msr_bitmap_recalc = true; > > > } > > > > > > + if (npt_enabled) { > > > + if (nested_npt_enabled(svm)) { > > > + if (unlikely(new_vmcb12 || > > > + vmcb_is_dirty(vmcb12, VMCB_NPT))) { > > > + vmcb02->save.g_pat = svm->nested.gpat; > > > + vmcb_mark_dirty(vmcb02, VMCB_NPT); > > > + } > > > + } else { > > > + vmcb02->save.g_pat = vcpu->arch.pat; > > > + vmcb_mark_dirty(vmcb02, VMCB_NPT); > > > + } > > > + } > > > > > To reduce indentation, how about this? There's a consistency check for > > nested_npt_enabled() vs. npt_enabled, so it's guaranteed to do the right thing. > > You mean the one that goes away after this patch: https://lore.kernel.org/kvm/20260115011312.3675857-16-yosry.ahmed@linux.dev/? Heh, still fine. All that matters is that nested_npt_enabled() can't be %true if npt_enabled is %false.