On 20/08/2021 07:22, Jan Beulich wrote:
> Clearly I neglected the special needs here, and also failed to test the
> change with a debug build of Xen.
>
> Fixes: 6b1ca51b1a91 ("x86/PV: assert page state in mark_pv_pt_pages_rdonly()")
> Signed-off-by: Jan Beulich <[email protected]>
>
> --- a/xen/arch/x86/pv/dom0_build.c
> +++ b/xen/arch/x86/pv/dom0_build.c
> @@ -67,7 +67,7 @@ static __init void mark_pv_pt_pages_rdon
> */
^ this comment needs adjusting too.
Presumably this is because PGT_pae_xen_l2 is logically part of the type?
~Andrew
> ASSERT((page->u.inuse.type_info & PGT_type_mask) >=
> PGT_l1_page_table);
> ASSERT((page->u.inuse.type_info & PGT_type_mask) <=
> PGT_root_page_table);
> - ASSERT(!(page->u.inuse.type_info & ~PGT_type_mask));
> + ASSERT(!(page->u.inuse.type_info & ~(PGT_type_mask |
> PGT_pae_xen_l2)));
>
> /* Read-only mapping + PGC_allocated + page-table page. */
> page->count_info = PGC_allocated | 3;
>
