[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] x86/PV: account for 32-bit Dom0 in mark_pv_pt_pages_rdonly()'s ASSERT()s
- To: "xen-devel@xxxxxxxxxxxxxxxxxxxx" <xen-devel@xxxxxxxxxxxxxxxxxxxx>
- From: Jan Beulich <jbeulich@xxxxxxxx>
- Date: Fri, 20 Aug 2021 08:22:45 +0200
- Arc-authentication-results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.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=flwBwBVXfU+MlPOnrWXz/2YdNax8UTXGznjYRY1Ujb0=; b=TSWv97OlHG4MgBzYwjKc9+1ZEMqn1J3CJPnLxc6UwWZqtMV8H7UKmjt7Cw/mILFPLnuBZy8UR1f7zWtFfmoN8cipv0/Gzzm8Qy/R47/2WUWyt9OsO6R/SSVYC7nnRFrJXJYS8E8D50fMS9o3IMX9f17qSzf+uvbjKJe04xDaYKitSABYf4+YxJMvy7BSbH1QJQgW65exwn0pkYHzk+GUYcWbHR0m6OUfgtZsPngCoE7VgETFbceBZH9owY1wH2krDg76hly2btUnLEpeoinKzpKKv9HT+TmKcj2yxDcCmo2eJIRMyI8+NN9ipYmZ54/6YCSzrWSkfxfvZeOIW8hNPQ==
- Arc-seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=H6e3Ne/wOiQN1crXTyVB7sAB8rNbgne9sqSZhl9Mn+njbq4J5tSubH12xIAobpUaZc+DL62L2TR4RgTpO0jsCGtiuUfdSjx3t8btzirXJ/ZAOKMBxEGvUHwzihl4mUJK2ml1+G7Z7sZ5ArG9vBI2pf796NItOKwS5lQv453ZF9B1XExDQnMW8yOcoc/ExdzLQorBGTlBvBSq9BbsPnNM0MjQ+ZYinwhuNlM/k1xjbQ3dMFmkvya6CpBHvYJBZiLfFQWx4i68Pz8AJO6aqtxnLM6mMbE6A68W5enoGr99Iye7NTEsRev95A+Wf+kS9v3UmNHD6211/3A2qtgLt4NWeQ==
- Authentication-results: citrix.com; dkim=none (message not signed) header.d=none;citrix.com; dmarc=none action=none header.from=suse.com;
- Cc: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>, Wei Liu <wl@xxxxxxx>, Roger Pau Monné <roger.pau@xxxxxxxxxx>
- Delivery-date: Fri, 20 Aug 2021 06:22:58 +0000
- List-id: Xen developer discussion <xen-devel.lists.xenproject.org>
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
*/
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;
|
