Commit 8f366ae6 authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini

KVM: x86/mmu: Tweak auditing WARN for A/D bits to !PRESENT (was MMIO)

Tweak the MMU_WARN that guards against weirdness when querying A/D status
to fire on a !MMU_PRESENT SPTE, as opposed to a MMIO SPTE.  Attempting to
query A/D status on any kind of !MMU_PRESENT SPTE, MMIO or otherwise,
indicates a KVM bug.  Case in point, several now-fixed bugs were
identified by enabling this new WARN.
Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Message-Id: <20210225204749.1512652-22-seanjc@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent edea7c4f
...@@ -211,6 +211,11 @@ static inline bool is_mmio_spte(u64 spte) ...@@ -211,6 +211,11 @@ static inline bool is_mmio_spte(u64 spte)
likely(shadow_mmio_value); likely(shadow_mmio_value);
} }
static inline bool is_shadow_present_pte(u64 pte)
{
return !!(pte & SPTE_MMU_PRESENT_MASK);
}
static inline bool sp_ad_disabled(struct kvm_mmu_page *sp) static inline bool sp_ad_disabled(struct kvm_mmu_page *sp)
{ {
return sp->role.ad_disabled; return sp->role.ad_disabled;
...@@ -218,13 +223,13 @@ static inline bool sp_ad_disabled(struct kvm_mmu_page *sp) ...@@ -218,13 +223,13 @@ static inline bool sp_ad_disabled(struct kvm_mmu_page *sp)
static inline bool spte_ad_enabled(u64 spte) static inline bool spte_ad_enabled(u64 spte)
{ {
MMU_WARN_ON(is_mmio_spte(spte)); MMU_WARN_ON(!is_shadow_present_pte(spte));
return (spte & SPTE_TDP_AD_MASK) != SPTE_TDP_AD_DISABLED_MASK; return (spte & SPTE_TDP_AD_MASK) != SPTE_TDP_AD_DISABLED_MASK;
} }
static inline bool spte_ad_need_write_protect(u64 spte) static inline bool spte_ad_need_write_protect(u64 spte)
{ {
MMU_WARN_ON(is_mmio_spte(spte)); MMU_WARN_ON(!is_shadow_present_pte(spte));
/* /*
* This is benign for non-TDP SPTEs as SPTE_TDP_AD_ENABLED_MASK is '0', * This is benign for non-TDP SPTEs as SPTE_TDP_AD_ENABLED_MASK is '0',
* and non-TDP SPTEs will never set these bits. Optimize for 64-bit * and non-TDP SPTEs will never set these bits. Optimize for 64-bit
...@@ -235,13 +240,13 @@ static inline bool spte_ad_need_write_protect(u64 spte) ...@@ -235,13 +240,13 @@ static inline bool spte_ad_need_write_protect(u64 spte)
static inline u64 spte_shadow_accessed_mask(u64 spte) static inline u64 spte_shadow_accessed_mask(u64 spte)
{ {
MMU_WARN_ON(is_mmio_spte(spte)); MMU_WARN_ON(!is_shadow_present_pte(spte));
return spte_ad_enabled(spte) ? shadow_accessed_mask : 0; return spte_ad_enabled(spte) ? shadow_accessed_mask : 0;
} }
static inline u64 spte_shadow_dirty_mask(u64 spte) static inline u64 spte_shadow_dirty_mask(u64 spte)
{ {
MMU_WARN_ON(is_mmio_spte(spte)); MMU_WARN_ON(!is_shadow_present_pte(spte));
return spte_ad_enabled(spte) ? shadow_dirty_mask : 0; return spte_ad_enabled(spte) ? shadow_dirty_mask : 0;
} }
...@@ -250,11 +255,6 @@ static inline bool is_access_track_spte(u64 spte) ...@@ -250,11 +255,6 @@ static inline bool is_access_track_spte(u64 spte)
return !spte_ad_enabled(spte) && (spte & shadow_acc_track_mask) == 0; return !spte_ad_enabled(spte) && (spte & shadow_acc_track_mask) == 0;
} }
static inline bool is_shadow_present_pte(u64 pte)
{
return !!(pte & SPTE_MMU_PRESENT_MASK);
}
static inline bool is_large_pte(u64 pte) static inline bool is_large_pte(u64 pte)
{ {
return pte & PT_PAGE_SIZE_MASK; return pte & PT_PAGE_SIZE_MASK;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment