[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH] x86/PV: account for 32-bit Dom0 in mark_pv_pt_pages_rdonly()'s ASSERT()s
- To: Jan Beulich <jbeulich@xxxxxxxx>, "xen-devel@xxxxxxxxxxxxxxxxxxxx" <xen-devel@xxxxxxxxxxxxxxxxxxxx>
- From: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
- Date: Fri, 20 Aug 2021 10:13:30 +0100
- Arc-authentication-results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=citrix.com; dmarc=pass action=none header.from=citrix.com; dkim=pass header.d=citrix.com; arc=none
- Arc-message-signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Tym9z1Vq0nvOKwiPamxTmho0cNMuab8J76H/8UwHZr8=; b=fgXhPtU25PJ1nPvlWrAnMyHqx4gO/kuZGngm8llZE1aiSSVkayCpr7E1ohag+BXTst2MlLGiOi0qkfnOLqbFaQX5Xtf24K/5TCABFS2RNFy2P3nVbPP4rERSzYXJXG2UsYRepach+E+6Wk6AjeJSieJyeBYwQ5G5ol3UA/5QEL6IyT5Er/EgcEP0ymZi1aa8CKJjoF3LTls3MbjEH55lpIoLQnCBGobQPyV0E08arG4SPElU2t9nmqEs+jO8FnVCUzgNppeUXp4wJss63g39GRbT/nxx2/6RYN2p7pCCOOs5z3eHbUJb6kGnF6xUJeJmCEac+x/6lhpjuCO3TORpmA==
- Arc-seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WDixxePfLFQKkV8pLYlgcQhW96p8oOLkr3HpZVYcusg3dLrTsuratTg2rWQow9FDY3Q0vHF7DjiNuAjAkN2xeumlbNnl0yTuYEd3nONS64AvG0WPKtxW3MX4T3TLr8YMzBnOvW1puwSfx5iwcmFin/k0VX7DzoWc/gsInZzBAoPz+YKQbs9XaDOdhaBUxuYxqPTELNiY2MLix8ySR8U64uFTsoYmgShhhSCDpe6XhMIV71hsOTMabdvP+DToqOOIsoKYwCbWuEC2h2zpp3onparoLA8G3f1T55BpqNjA9JtpldfYYbV3EX4X9KzvWbTbnvED2Ul9v0MIXBiHlIdtuA==
- Authentication-results: esa2.hc3370-68.iphmx.com; dkim=pass (signature verified) header.i=@citrix.onmicrosoft.com
- Cc: Wei Liu <wl@xxxxxxx>, Roger Pau Monné <roger.pau@xxxxxxxxxx>
- Delivery-date: Fri, 20 Aug 2021 09:13:46 +0000
- Ironport-hdrordr: A9a23:Kqu/bqzf7xgylZOnj190KrPwIr1zdoMgy1knxilNoH1uHvBw8v rEoB1173DJYVoqNk3I++rhBEDwexLhHPdOiOF6UItKNzOW21dAQrsSiLfK8nnNHDD/6/4Y9Y oISdkbNDQoNykZsfrH
- Ironport-sdr: k3Nd3+xIyO4TZir7rt0UEMqr+va4gHX1V/6soL9n3yclZfIwlhzHfm6TjbBdQ4cv6I58NwctDc j9xTO3fClFyIZqRwo6l+bS+dcRHEsUZ3e2eMZBrBO9qQvGpj/BA60QfJ3zBT7tgDrHzc+0UiW7 qwUAAxvrFs0dKauYndclXNvv+V+mDt1JSe8KMtt2FHKmNVdYsXTlZIVrhiYGOqzSAddzMuAIVB 1uGWJP8PbdxEfdQekDM5b6Uugli2X/IYg5HkJCtDvdXlsYuubIzEW6RhjeyfIKya9g8xoW2zI0 zXgp4fgZutlt08JJmrdAecr/
- List-id: Xen developer discussion <xen-devel.lists.xenproject.org>
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 <jbeulich@xxxxxxxx>
>
> --- 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;
>
|
