From nobody Thu Apr 2 20:14:49 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 742FE3A0E99 for ; Thu, 26 Mar 2026 18:17:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774549060; cv=none; b=nPjw7kgKVVUTFvbg6oFp2z555Jb/7Va+UqmJiQs1L3z8NjpCNF/Wu32asDyQ5N+JZCefGeiHajXSpNmFjJe60XcfaofUN9Zer44s6yZFVEfrBItw52OQhiMB3UM+HOJc3GvddPa0sGw219bZdIdfDvR2j2D8JhLwicyfJTFzPm4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774549060; c=relaxed/simple; bh=7JemvNNoOufT8khf9NIwCsgFBjTJIPEeSZZYRInFR38=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hSEtSEhPmjbgvBmyz13pkPzWeQGfWGS/Tcuuw2E9MzkziEpNIAfvy/P6UcdCyR4Qg4Xg7wK56jJ+Vgvyo2+ZGQ4nSofxW3jhgk4i7kDAhK8WDb6hDO1Gw+IjFXd5vBt7y/UK6dKIjnAMiSseBWFXLO1K6+XBqPfGqgFHTXqf5Tc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=harqfMUo; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=EEtcTRgQ; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="harqfMUo"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="EEtcTRgQ" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1774549057; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wIHJPa1WNIV5ql1TvVIKEU7DKhOmL9oCEIdtc3rKxnQ=; b=harqfMUoJ5H62n5uw0PSH/McPo1bo3+3uPS6eKIgXpNzKdhtNTcHR/CcVeDtcbeXwpJO9g /Iau90lWHGXgFUWiAtF9KXuSjHT2lN1+0z1pBgr1Ck+3BwMcIicxD5sajI5kBu+Gp2SvoF 3+4DJbdjljNmcboQljPkRV/kwZrKqhA= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-636-uGl9zYUFPtmEvtJG8XFp5w-1; Thu, 26 Mar 2026 14:17:36 -0400 X-MC-Unique: uGl9zYUFPtmEvtJG8XFp5w-1 X-Mimecast-MFC-AGG-ID: uGl9zYUFPtmEvtJG8XFp5w_1774549055 Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-43b86de58d9so1042207f8f.0 for ; Thu, 26 Mar 2026 11:17:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1774549054; x=1775153854; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=wIHJPa1WNIV5ql1TvVIKEU7DKhOmL9oCEIdtc3rKxnQ=; b=EEtcTRgQpDXVYuAf9xFIglvbUt+LmlAFW/UvthUkj6zZbQqiSpsCDIRx40dT5fGvT3 kUc7/osjXa+bYuiPqeVhopqjAp1TuJOKn0sdTtsVe9umGDTMRJlTpZkB46507NcUtZEM SAqIlbBp70EaBVrUflkw5+F8Tn1TOISGDOEPRCCtZny9PQad8LyApqSTL5IVZxz50825 b3uqZhBSfivOkvYqYwZ/RyJkX8lcdpJR5puv0S3so4hNFrtwzMrYAg1qlrfvc1CQCoyQ 5yUf4tYI5CoAmwmR2UNgdq6zyGYEXnoIUi1O6NPGzClhIfI6VJW2XFu3DoELMXkpWzV2 SPBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774549054; x=1775153854; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=wIHJPa1WNIV5ql1TvVIKEU7DKhOmL9oCEIdtc3rKxnQ=; b=FJZY2TR5Cde6MT/nb6xfwCqIChmj8Hz/X6wE6cmrvCiWll84KYr4FCH7DlcS27hgEz AG6bgHNvlfawNZSUwqalrJ8ufajkl14UwgPgBGWNt8B1h1YK4gYal9elOPV96jqg2T73 9ZA3blgKd862e40PvGhm/7d+x423vDFcv0mm904qNV/ETAAucOa9ml7GLw4qQaGnC+J7 TAezoqbglJ/wn9IojiFF6kRLpFfZyTSoHG3Ui3R1YBURZ2Nkw2aO4lRzkZU0WHfy+TVs yx9Oh9wdv7m+Rx670jyrlrR66XBy6mSZD6Hrn25uE4CXsJL1CokDVVM1bQtCUKstKp8X ffxA== X-Gm-Message-State: AOJu0YwrvO8y/1OYLuEjE9EqHxxNKKdr+V77bpKzySq/YKCFFZroRawr gk9hrWACLkbnsNoM4AvpS670AC4ojqz5PBxGB2drGgrQGe2SeiMAcSe77MfgzuvJx1Z0EJCnEaH g1ufmRKiZNjVW/fgaFnvpstROT3T6rV8ouLItjbVF59P9rb08ZzfogZQ5OfQtvpcoQrwgr2EWXu N1h885f7F/BCRAia3YTRxbUA+PXizJgtHuM976145Ddgp80La75w== X-Gm-Gg: ATEYQzxetaGeUyJnwp4Th9byzm1IDUnBJN3ggZC5cV/0gqhoUjteu5dn6GRDGBC83BG FD+yZnwWbcYziCb1yqWwcRsDDVivZP2ewH+FDm84PVPdn+u11N0qoa302mUq7NBxWzXg3zdQTMF mkn9MorEpfV9Vtzq+JuzEuACLDBqaDjNU67y626GCLgxFSW+CzmgIMHoD5DJxpzeTZU5b+zwAWH f8u9CG/Wl7lpP8yURkLLPAOs5dSkz8+9DXtzc70YjBuitGTxwPOsmNr7u3eluhh9/9/CRRD1ZoQ UGfvcWauC2SyzGY19zh/fyEB0IKBlpRrU6jl7R5khv1XlDW/fNaKd4fxt3bIIvhn2YkBpn6oIys EG7uG/WrZiswtmScci3EOIv47yxmSgVUf7oKaIU0coeQF8R+ZsGEEmzc2RNKZieRC89+VeV+pWF x+7QpPYObKNqBT22Bcfm+WK9k4 X-Received: by 2002:a05:6000:220b:b0:43b:8023:8b2 with SMTP id ffacd0b85a97d-43b88a25a22mr13537251f8f.45.1774549054324; Thu, 26 Mar 2026 11:17:34 -0700 (PDT) X-Received: by 2002:a05:6000:220b:b0:43b:8023:8b2 with SMTP id ffacd0b85a97d-43b88a25a22mr13537159f8f.45.1774549053644; Thu, 26 Mar 2026 11:17:33 -0700 (PDT) Received: from [192.168.10.48] ([151.49.85.67]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43b91942e52sm9561389f8f.9.2026.03.26.11.17.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Mar 2026 11:17:32 -0700 (PDT) From: Paolo Bonzini To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: Jon Kohler , Nikunj A Dadhania , Amit Shah , Sean Christopherson , Marcelo Tosatti , Kai Huang Subject: [PATCH 03/24] KVM: x86/mmu: free up bit 10 of PTEs in preparation for MBEC Date: Thu, 26 Mar 2026 19:17:01 +0100 Message-ID: <20260326181723.218115-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260326181723.218115-1-pbonzini@redhat.com> References: <20260326181723.218115-1-pbonzini@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Jon Kohler Update SPTE_MMIO_ALLOWED_MASK to allow EPT user executable (bit 10) to be treated like EPT RWX bit2:0, as when mode-based execute control is enabled, bit 10 can act like a "present" bit. Likewise do not include it in FROZEN_SPTE. No functional changes intended, other than the reduction of the maximum MMIO generation that is stored in page tables. Cc: Kai Huang Signed-off-by: Jon Kohler Message-ID: <20251223054806.1611168-4-jon@nutanix.com> Signed-off-by: Paolo Bonzini --- arch/x86/include/asm/vmx.h | 2 ++ arch/x86/kvm/mmu/spte.h | 20 +++++++++++--------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/arch/x86/include/asm/vmx.h b/arch/x86/include/asm/vmx.h index 7fdc6b787d70..59e3b095a315 100644 --- a/arch/x86/include/asm/vmx.h +++ b/arch/x86/include/asm/vmx.h @@ -549,10 +549,12 @@ enum vmcs_field { #define VMX_EPT_ACCESS_BIT (1ull << 8) #define VMX_EPT_DIRTY_BIT (1ull << 9) #define VMX_EPT_SUPPRESS_VE_BIT (1ull << 63) + #define VMX_EPT_RWX_MASK (VMX_EPT_READABLE_MASK | = \ VMX_EPT_WRITABLE_MASK | \ VMX_EPT_EXECUTABLE_MASK) #define VMX_EPT_MT_MASK (7ull << VMX_EPT_MT_EPTE_SHIFT) +#define VMX_EPT_USER_EXECUTABLE_MASK (1ull << 10) =20 static inline u8 vmx_eptp_page_walk_level(u64 eptp) { diff --git a/arch/x86/kvm/mmu/spte.h b/arch/x86/kvm/mmu/spte.h index 28086fa86fe0..4283cea3e66c 100644 --- a/arch/x86/kvm/mmu/spte.h +++ b/arch/x86/kvm/mmu/spte.h @@ -96,11 +96,11 @@ static_assert(!(EPT_SPTE_MMU_WRITABLE & SHADOW_ACC_TRAC= K_SAVED_MASK)); #undef SHADOW_ACC_TRACK_SAVED_MASK =20 /* - * Due to limited space in PTEs, the MMIO generation is a 19 bit subset of + * Due to limited space in PTEs, the MMIO generation is an 18 bit subset of * the memslots generation and is derived as follows: * - * Bits 0-7 of the MMIO generation are propagated to spte bits 3-10 - * Bits 8-18 of the MMIO generation are propagated to spte bits 52-62 + * Bits 0-6 of the MMIO generation are propagated to spte bits 3-9 + * Bits 7-17 of the MMIO generation are propagated to spte bits 52-62 * * The KVM_MEMSLOT_GEN_UPDATE_IN_PROGRESS flag is intentionally not includ= ed in * the MMIO generation number, as doing so would require stealing a bit fr= om @@ -111,7 +111,7 @@ static_assert(!(EPT_SPTE_MMU_WRITABLE & SHADOW_ACC_TRAC= K_SAVED_MASK)); */ =20 #define MMIO_SPTE_GEN_LOW_START 3 -#define MMIO_SPTE_GEN_LOW_END 10 +#define MMIO_SPTE_GEN_LOW_END 9 =20 #define MMIO_SPTE_GEN_HIGH_START 52 #define MMIO_SPTE_GEN_HIGH_END 62 @@ -133,7 +133,8 @@ static_assert(!(SPTE_MMU_PRESENT_MASK & * and so they're off-limits for generation; additional checks ensure the = mask * doesn't overlap legal PA bits), and bit 63 (carved out for future usage= ). */ -#define SPTE_MMIO_ALLOWED_MASK (BIT_ULL(63) | GENMASK_ULL(51, 12) | GENMAS= K_ULL(2, 0)) +#define SPTE_MMIO_ALLOWED_MASK (BIT_ULL(63) | GENMASK_ULL(51, 12) | \ + BIT_ULL(10) | GENMASK_ULL(2, 0)) static_assert(!(SPTE_MMIO_ALLOWED_MASK & (SPTE_MMU_PRESENT_MASK | MMIO_SPTE_GEN_LOW_MASK | MMIO_SPTE_GEN_HIGH_MAS= K))); =20 @@ -141,7 +142,7 @@ static_assert(!(SPTE_MMIO_ALLOWED_MASK & #define MMIO_SPTE_GEN_HIGH_BITS (MMIO_SPTE_GEN_HIGH_END - MMIO_SPTE_GEN_H= IGH_START + 1) =20 /* remember to adjust the comment above as well if you change these */ -static_assert(MMIO_SPTE_GEN_LOW_BITS =3D=3D 8 && MMIO_SPTE_GEN_HIGH_BITS = =3D=3D 11); +static_assert(MMIO_SPTE_GEN_LOW_BITS =3D=3D 7 && MMIO_SPTE_GEN_HIGH_BITS = =3D=3D 11); =20 #define MMIO_SPTE_GEN_LOW_SHIFT (MMIO_SPTE_GEN_LOW_START - 0) #define MMIO_SPTE_GEN_HIGH_SHIFT (MMIO_SPTE_GEN_HIGH_START - MMIO_SPTE_GEN= _LOW_BITS) @@ -217,10 +218,11 @@ extern u64 __read_mostly shadow_nonpresent_or_rsvd_ma= sk; * * Only used by the TDP MMU. */ -#define FROZEN_SPTE (SHADOW_NONPRESENT_VALUE | 0x5a0ULL) +#define FROZEN_SPTE (SHADOW_NONPRESENT_VALUE | 0x1a0ULL) =20 -/* Frozen SPTEs must not be misconstrued as shadow present PTEs. */ -static_assert(!(FROZEN_SPTE & SPTE_MMU_PRESENT_MASK)); +/* Frozen SPTEs must not be misconstrued as shadow or MMU present PTEs. */ +static_assert(!(FROZEN_SPTE & (SPTE_MMU_PRESENT_MASK | + VMX_EPT_RWX_MASK | VMX_EPT_USER_EXECUTABLE_MASK))); =20 static inline bool is_frozen_spte(u64 spte) { --=20 2.53.0