From patchwork Wed Mar 22 09:37:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 13183758 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2904DC6FD1F for ; Wed, 22 Mar 2023 09:37:25 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.513264.794032 (Exim 4.92) (envelope-from ) id 1peuuD-0005Kk-NB; Wed, 22 Mar 2023 09:37:17 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 513264.794032; Wed, 22 Mar 2023 09:37:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1peuuD-0005Kb-K7; Wed, 22 Mar 2023 09:37:17 +0000 Received: by outflank-mailman (input) for mailman id 513264; Wed, 22 Mar 2023 09:37:16 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1peuuC-0004gG-1W for xen-devel@lists.xenproject.org; Wed, 22 Mar 2023 09:37:16 +0000 Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03on20609.outbound.protection.outlook.com [2a01:111:f400:fe1a::609]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 212db34b-c895-11ed-85db-49a42c6b2330; Wed, 22 Mar 2023 10:37:15 +0100 (CET) Received: from VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) by AS8PR04MB7526.eurprd04.prod.outlook.com (2603:10a6:20b:299::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.37; Wed, 22 Mar 2023 09:37:14 +0000 Received: from VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::154e:166d:ec25:531b]) by VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::154e:166d:ec25:531b%5]) with mapi id 15.20.6178.037; Wed, 22 Mar 2023 09:37:14 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 212db34b-c895-11ed-85db-49a42c6b2330 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XFvqM1KPxmtdbYXZqIDWhEjl+u3JlLZYGPxUL5a/FAe/RNe37xuwVCz6l0ynHNwSbWx+0yXfS29pdz+M9TMRpVMKRlBbzenxHKO+MD81HCsi0SmyEb23HTYwaQTtjUH1nhn9439XyruHe9ue+/9hFWyY7U9qBf5cEkuzvX81QswMHr5ELh29wNdBVGB6lDfiw260Pl3COJj3smsox0sGj00Bx5Ci50AGKUAv9s1hK05w9FqJzCBivWx68ielPWz4ARoko8CWsKhwojhFAhHMQ/fVBvfGAIDMOeKT7TSzhjujGCxtBNPCLU/GK6XfZy0BVRvyA1D9wjvpSuy/m+8Kkg== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=PgsxcZsHQjbNHsFKcOrDGaTeJBLRhJa3sv6jEIQVDaY=; b=Uwl8RRsesj6Qairbj6d0oPaeuxxjd6rimp8Md+m1FJEPaaMUH/PKnLGFItGqA2rQVL/C6xhBEwA5PG0pm31S3BFp18OWomjarwOHKR1gtmWHKCo0dK3hsfhFBi17z5sjJHwhFH+l2cujoFM29qpy1RCtyJhNUNngvzTtN/E6oXxKNDmY78aZI6rg1d3Rh7wNZ129dykH4rpw2/P56m+Xgj3RGKSz0UhLhtrk+HzZ98OP6+okBj3eIYxwvTRUBDWJ0DpJMxIkSu59gIHzIqvdX0xijnbLED6XGDs6BN4uqXBTe8RaxaRxcJYuP36L2LtQWwm2Z6CDTTVSRZQ9SZAhWQ== 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=PgsxcZsHQjbNHsFKcOrDGaTeJBLRhJa3sv6jEIQVDaY=; b=iw9ZssvLVdlscb8P9ZQM8BLWS7BtGEVDw+NXYWE3B+RbUT1q8uAwcdCPspDe93e03wvCP/9ii+0qf6q6Wt5F5mdwGS2/qH4MUHhrSUUrnDRyfVouZQM1IanhtF4P2QGSe9JcdHljj/f1bQX5EYCIoePZ5wv+V+xnqNmNEy+pd3CZ52Hjz/ypEjzczUafUD5Tl9+hJo57dqoJGuWM3iz+jaQIggJxqXWqvGJoPy36JBfbZuDcgpGFFjXD7wu8TqRzAGpPKm/gNm3DPlb/NYvxaf2XHa9ipqbWY4BDwGG0ZD950u/GX4xc1B0+3+OLjUnSt6fscf8qK3UH9ZAZHkNkgg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: Date: Wed, 22 Mar 2023 10:37:12 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.8.0 Subject: [PATCH 14/16] x86/shadow: "monitor table" is a HVM-only concept Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , Wei Liu , =?utf-8?q?Roger_Pau_Monn=C3=A9?= , George Dunlap , Tim Deegan References: In-Reply-To: X-ClientProxiedBy: FR0P281CA0136.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:96::10) To VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VE1PR04MB6560:EE_|AS8PR04MB7526:EE_ X-MS-Office365-Filtering-Correlation-Id: 07c9d617-39e3-43b8-3589-08db2ab904aa X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: uG8E1IUfvwhw1Uesqg447SrociDesXGcqF7L3UqfxXK9SbPqD0ielDckzwXxvsnTxNWV4r2HjCfaeisJ86h5C13ZLawpm1OjE86fdUdWlCt0pmOnZOddproKTX7TKhfsjyXIr2Xagk+wcSC7KJkFGNYxpgzlgLx6hx7Tc+b+V2ZyoKoJ93zRNDd+Yt2c790LFSoRno8WYfhux8OakE1Zy241dDH6wK+v8Hww4/pkRSM1gDnOHKSk7cW98Je7OrGwN+qYYpw72yGKZZb2KAJyEtM0BeDWuvnN90DGsDMThmzgKhHHT/im/Or++vdBVR8REuiu7RQQlu2iRVjQqlORzXrvMLtvDisiFa+6b4yZKxTNn8xBGyDWoQWj9KMIbWVIUyh1QxrAMn02xcWqvyU3g4YxelZyjQdZEyk7qU1bahcug9HWQ+Y6eRip1bWivIsQfD8GkthKBq3z4VkGG7X/1pdE99dLcYbCVhn84v4JtTxvAbQ4Yay7F7IyqW2qg8eqTD8BjwB/XRcmjOF4q8fdeeoQEjJsr5gU42UVHGgtOwXxsWVnUzg+dbKxF05eqxL7xsgNNonqetZET5ZbK6L9WsW+vLTNVwPLmY0JAA0NCqZvJr126jOadVFMC9oaA1863wmocVAkKuNr42pDc1idOa8DKT6gr3TA699JT6Xh/w6xmhromZGTUpaAf4iwl5rClquGiTu2v/2n8HfxRfvIEzThjfj+zM6Gob1QV9/ySKM= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VE1PR04MB6560.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230025)(366004)(346002)(39860400002)(396003)(376002)(136003)(451199018)(5660300002)(41300700001)(86362001)(38100700002)(8936002)(31696002)(36756003)(2906002)(4326008)(6486002)(478600001)(2616005)(186003)(6512007)(26005)(6506007)(54906003)(8676002)(31686004)(316002)(66946007)(66556008)(66476007)(6916009)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?CgC1tivebYcRqqw/2JCZhcCX9Plk?= =?utf-8?q?lVEpOsXkVsnAG6E0X/GN+HiZVdNyalhE1DkM3EFDPIxtVrc4fBdFOFTQJIg7X2hB+?= =?utf-8?q?B1A7cBECxQ1QQXWdI9MXG4gQ6aPX1qkus6aF5ziUc2UI8W8Tze0KtC6hQg/A+kqpL?= =?utf-8?q?NwyoTP/+IQ7PkcZsJk4bQgDBghn+X4HOjwrXUbTrLdcaOh3yhs1Uf5RQumdyct1t6?= =?utf-8?q?rABkhGCTFd+s9AE93WqPLvMNteeTPatpBr0Y66JWccxHpazVKQZyt8vqDZhWPUrpL?= =?utf-8?q?oJGIc+D2W4OcQFobnFVpkYOZ0OCJS0swLCekwHTGpQOpE4afkPTdgpN+aIIMsHaCF?= =?utf-8?q?DvsmrrdJELrjl2XQOMu42NFjPRppHri6t6Ih33jnSp+SGKpHRqDWoQX+Hsx0hFGd/?= =?utf-8?q?m25ck3db4KbnzstH0661M79USWb2nG9+jtkWRqk7m7Y5qQtDD3MwF4ftRtaMW1gAp?= =?utf-8?q?8q7h4+Ujz4N+6wpB2114hNgpK+dre6mH+RZ1BNhtPR3CasxwR1rtXWFB2hAQrSiNJ?= =?utf-8?q?6G7IMYE9/AMioBLMjv+Vn1cU6vRbqMYS8cMXk2SZ/An3IPd5SKs5n1MBfh5zy/FQm?= =?utf-8?q?bSAeAGbdcsn5yE5LQCNJXMrHvKV78dqCXBWP9ISu6i7bq4avNEQmvsjvNQ2xDwoK0?= =?utf-8?q?wi5oBoAnf7flMSz/NT2/q3nB8Z5EtO0gs+4jVYTwEG/4zGOC0rmNOt4Krxq5Fh9Tu?= =?utf-8?q?k7wp9Bq2PfWg43smEo8fHm7cK31GXT7WcP1m/jN5BxiBPzPvXNRCViX566y6PVfx5?= =?utf-8?q?L1jfvwo92tYDVpA3bkeQThCXO1/yVz3Q+1Z2zs9ZHKZOTftui3Tgv8UhgkQfUpOWv?= =?utf-8?q?TFoUZxgEqrB3W3Mf3Qfijj8W4hYq1DgIpCP076eqRDMzNdpKLyrsEUc27szsLLbEs?= =?utf-8?q?prLuekH91L85M0IYsuN2G05OLrHjBhRPaxjEjPx1M9Lv7xxc/us44BQdUmLSoJ+Iy?= =?utf-8?q?sLbNQxTqWmOopmOngWjyem+CAu/CJzIueUk3rvetm6IVyDuwg9LVvh4u7ZGckpoH7?= =?utf-8?q?Y7DjxLw9wyFjn/YzNym8Q6closSYGiLW92aNxAFm1U2silbm5awYdaaDN7ibBxVKx?= =?utf-8?q?CQ/2fDV+hx3B0KRO6VfgI332wIc8t/JezfM4wr7Dn9t0qnKLeVS7FGbHu+lyr9LKX?= =?utf-8?q?/J0CKIELQOS4BHclXTbUk32QrxOWA9TvY7Wc5UeK06JB197yLF5NCIe7wQBLWn3cj?= =?utf-8?q?uQBJ/CesVbwdr434hVbS07hMdrS9UY9WjEq0oVTBCOMpI7cay7u0Ko7O8otmdsavZ?= =?utf-8?q?J84LAfp4zb32kI1/qobCIybnhIVJkdOm6SMRbUzmp/UKm6BGJV5by9RSI0X+wmsF9?= =?utf-8?q?cSymc7vevgAiSxxzPzOSSkdAYE9KWzBx9jgumuCEiwXxHPZ1/MphonV7entpFuT/J?= =?utf-8?q?icXzgKuUb5kAUanGVmlSm8PN8A2Shzx/K09YI79w6CqcE6guJEuaL10s9WcuONBSQ?= =?utf-8?q?7+0421mh5pAWvITTKXR6FOeGHPtdy00wlItItHzWt2VRvjPBd9SaH0uZpJF/0H86r?= =?utf-8?q?zF2/CUJ/pZDz?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 07c9d617-39e3-43b8-3589-08db2ab904aa X-MS-Exchange-CrossTenant-AuthSource: VE1PR04MB6560.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Mar 2023 09:37:14.0043 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: CIC3/JJsPUSh53OFuXQjaGfR1NkXjDNp8JmtMlTZD1K5xB9NkIReFVDGSHRVcGZnlWnQPcAm1wPrv2/ZoSarfg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB7526 It looks like in the combination of aff8bf94ce65 ('x86/shadow: only 4-level guest code needs building when !HVM') and 0b841314dace ('x86/shadow: sh_{make,destroy}_monitor_table() are "even more" HVM- only') I didn't go quite far enough: SH_type_monitor_table is also effectively unused when !HVM. The assertion early in sh_destroy_shadow() can have the type dropped altogether: it shouldn't make it here in the first place. Pages of this type are freed directly from sh_destroy_monitor_table() only. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -1190,7 +1190,6 @@ void sh_destroy_shadow(struct domain *d, ASSERT(t == SH_type_fl1_32_shadow || t == SH_type_fl1_pae_shadow || t == SH_type_fl1_64_shadow || - t == SH_type_monitor_table || (is_pv_32bit_domain(d) && t == SH_type_l4_64_shadow) || (page_get_owner(mfn_to_page(backpointer(sp))) == d)); --- a/xen/arch/x86/mm/shadow/private.h +++ b/xen/arch/x86/mm/shadow/private.h @@ -205,8 +205,7 @@ extern void shadow_audit_tables(struct v #define SH_type_l4_64_shadow 6U /* shadowing a 64-bit L4 page */ #define SH_type_max_shadow 6U #define SH_type_p2m_table 7U /* in use as the p2m table */ -#define SH_type_monitor_table 8U /* in use as a monitor table */ -#define SH_type_unused 9U +#define SH_type_unused 8U #endif #ifndef CONFIG_PV32 /* Unused (but uglier to #ifdef above): */