Re: [PATCH 05/28] KVM: x86/mmu: remove SPTE_EPT_*

[mlevitsk]

On Tue, 2026-05-05 at 21:52 +0200, Paolo Bonzini wrote:
> spte.h is already including vmx.h, use the constants it defines.
> 
> Tested-by: David Riley <d.riley@xxxxxxxxxxx>
> Signed-off-by: Paolo Bonzini <pbonzini@xxxxxxxxxx>
> ---
>  arch/x86/kvm/mmu/spte.h | 8 ++------
>  1 file changed, 2 insertions(+), 6 deletions(-)
> 
> diff --git a/arch/x86/kvm/mmu/spte.h b/arch/x86/kvm/mmu/spte.h
> index 317b9cd1537c..bc02a2e89a31 100644
> --- a/arch/x86/kvm/mmu/spte.h
> +++ b/arch/x86/kvm/mmu/spte.h
> @@ -57,10 +57,6 @@ static_assert(SPTE_TDP_AD_ENABLED == 0);
>  #define ACC_USER_MASK    PT_USER_MASK
>  #define ACC_ALL          (ACC_EXEC_MASK | ACC_WRITE_MASK | ACC_USER_MASK)
>  
> -/* The mask for the R/X bits in EPT PTEs */
> -#define SPTE_EPT_READABLE_MASK 0x1ull
> -#define SPTE_EPT_EXECUTABLE_MASK 0x4ull
> -
>  #define SPTE_LEVEL_BITS 9
>  #define SPTE_LEVEL_SHIFT(level) __PT_LEVEL_SHIFT(level, SPTE_LEVEL_BITS)
>  #define SPTE_INDEX(address, level) __PT_INDEX(address, level, SPTE_LEVEL_BITS)
> @@ -73,8 +69,8 @@ static_assert(SPTE_TDP_AD_ENABLED == 0);
>   * restored only when a write is attempted to the page.  This mask obviously
>   * must not overlap the A/D type mask.
>   */
> -#define SHADOW_ACC_TRACK_SAVED_BITS_MASK (SPTE_EPT_READABLE_MASK | \
> -   SPTE_EPT_EXECUTABLE_MASK)
> +#define SHADOW_ACC_TRACK_SAVED_BITS_MASK (VMX_EPT_READABLE_MASK | \
> +   VMX_EPT_EXECUTABLE_MASK)
>  #define SHADOW_ACC_TRACK_SAVED_BITS_SHIFT 52
>  #define SHADOW_ACC_TRACK_SAVED_MASK (SHADOW_ACC_TRACK_SAVED_BITS_MASK << \
>   SHADOW_ACC_TRACK_SAVED_BITS_SHIFT)

Makes sense,

Reviewed-by: Maxim Levitsky <mlevitsk@xxxxxxxxxx>
Best regards,
	Maxim Levitsky