x86/p2m-pt: fix off by one in entry check assert
PATCH 1/1 x86/p2m-pt: fix off by one in entry check assert
The MMIO RO rangeset overlap check is bogus: the rangeset is inclusive so the passed end mfn should be the last mfn to be mapped (not last + 1).
Fixes 6fa1755644d0 ('amd/npt/shadow: replace assert that prevents creating 2M/1G MMIO entries')
Signed-off-by Roger Pau Monné <[email protected]>
--- xen/arch/x86/mm/p2m-pt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
xen/arch/x86/mm/p2m-pt.c +1 -1
@@ -552,7 +552,7 @@ static void check_entry(mfn_t mfn, p2m_type_t new, p2m_type_t old,if ( new == p2m_mmio_direct )ASSERT (!mfn_eq (mfn,INVALID_MFN ) && !rangeset_overlaps_range (mmio_ro_ranges,mfn_x (mfn), -mfn_x (mfn) + (1UL << order))); +mfn_x (mfn) + (1UL << order) -1 ));else if (p2m_allows_invalid_mfn (new) || new == p2m_invalid || new == p2m_mmio_dm )ASSERT (mfn_valid (mfn) ||mfn_eq (mfn,INVALID_MFN ));
Signature · 1 line
2.43.0
Quoted 6 lines · Roger Pau Monne
The MMIO RO rangeset overlap check is bogus: the rangeset is inclusive so the passed end mfn should be the last mfn to be mapped (not last + 1).
Fixes 6fa1755644d0 ('amd/npt/shadow: replace assert that prevents creating 2M/1G MMIO entries')Signed-off-by Roger Pau Monné <[email protected]>
Reviewed-by George Dunlap <[email protected]>