From patchwork Thu Mar 30 11:31:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 13193992 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 18A3AC761A6 for ; Thu, 30 Mar 2023 11:31:56 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.516658.801143 (Exim 4.92) (envelope-from ) id 1phqVQ-0004eC-4C; Thu, 30 Mar 2023 11:31:48 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 516658.801143; Thu, 30 Mar 2023 11:31:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1phqVQ-0004e5-1A; Thu, 30 Mar 2023 11:31:48 +0000 Received: by outflank-mailman (input) for mailman id 516658; Thu, 30 Mar 2023 11:31:46 +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 1phqVO-0002FN-O5 for xen-devel@lists.xenproject.org; Thu, 30 Mar 2023 11:31:46 +0000 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on20600.outbound.protection.outlook.com [2a01:111:f400:7e1b::600]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 73e58b8f-ceee-11ed-85db-49a42c6b2330; Thu, 30 Mar 2023 13:31:46 +0200 (CEST) Received: from VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) by AS8PR04MB8980.eurprd04.prod.outlook.com (2603:10a6:20b:42f::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6254.21; Thu, 30 Mar 2023 11:31:42 +0000 Received: from VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::154e:166d:ec25:531b]) by VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::154e:166d:ec25:531b%6]) with mapi id 15.20.6222.033; Thu, 30 Mar 2023 11:31:42 +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: 73e58b8f-ceee-11ed-85db-49a42c6b2330 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=I2o04hZTFoDpTSL4zM6urm9xv17de54SzbPTwFFd6FinuLMsdRTQ+u8xiW8ghFJBQy8Y+CVhJF/rlwPvpiu9Fs9julzu9hHwMDIeLhFCEeay+QSHRgTpylrmMPofJrJ9xkYzrEJI1751IVNEHGq8zNPdpfx25A/pKMHOq+0JzBXe8/YYJ+PA6IMjmIoIaFej79dMsocsTarFzRJOpL8GS4uDO11RbSf5jMWYoFjJ1a5a4xnuuXEMQ08RpnuODUVG+oW6IcPVsrmmlmNZdUloI0MTJFE7keNuvwFmUn2dFG+DburkjaLeV00nUNViMchTmMg1Sbj9AchxbmL1T3RtEw== 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=RpugR2creDQpmbTfh0GSUcRY9SEocvRjzcrAYXp5z+A=; b=MJ4dAyMSyDS7NOsmr0GfPUNHjyPG5Hw54A4ODtrLSBbllyfkiqQKs4340kAXNkbWhaV88dt/CfMX4ePqaPbugt0jwjF6qbE7ZN3PSm1OWCS7TehtBuHg7pXADLI+VF2MDSdbkFMpKBCDoCkPESvT6t610fUvgm3uRxVAeilOs9T+uxCjCY/chqAXxdWDF8UDuQFNB17W67XqHk7/xSAavhGqw0BvYUM4lQX5PgzeT3r9ZYf1fhIN42spWZJ1rlUraMgcTWvMsedAaXAnFqn6e6neCAzFgXai6jpz98FwXYgO9zyIl6yJHPkQzbaOZrLymwRQijbIYBbn8cumtAlcFw== 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=RpugR2creDQpmbTfh0GSUcRY9SEocvRjzcrAYXp5z+A=; b=PBtMUD2Y/3r/ezkaYWXao3GhiZzn3fxdKH+oy4a2xazwjdyl69S7eGRrsuVabM/TFZtm4GRg9YWW84DzuDnSKtyOyejQMpHJEThy3bzp8rt8Qxk5Umg8RJGwVlZhQLkyhe1LUEXi9qfQB+yonFIXKK872L+RCCHBh+5rI47tqe9FQlCr3tZeoZL4oHKXTo3N8ALIrm3fwFqmNh5SC4bB9yDgmCFZCaSBjManCExjoYwbt6TCwdInLJ6oGaD9N1AN8K9auO9iQMFE+VQtRd9qUixbTWiKpgr/Qkl8szIUq5GgnsOqdi0PEVWCCMOV9G7uWaUN0ycRUGoKWmjPZ0iz2Q== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: <354658dc-35f5-1322-a1a7-da44d0d2b0f8@suse.com> Date: Thu, 30 Mar 2023 13:31:41 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.9.0 Subject: [PATCH v2 12/13] 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: FR2P281CA0119.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:9d::15) To VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VE1PR04MB6560:EE_|AS8PR04MB8980:EE_ X-MS-Office365-Filtering-Correlation-Id: ea24e251-c833-4649-2837-08db3112561e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MJe2KzOXMMhONTIYdGoBnV7EJQ3rJwZAEdm4+mgebBCbNkbB18cIQ6AAtYFgwHrPFU+wun5PGNo9rm/SN8/RUkiZZxyXMNA/k8LWveVcDtvpMYh1YzFHAiZoGa71yyEDDpqkUruiMVPUcohem8rICJzr8Ix6hBYcMQ0mgCaVKUrSqD2BszO0kvvSdyq1ihhlXt4os5l5CSKn0w2mGOygn49+5vYPhsZC0491OuArIfxAynyAF4HowEzh9RbT5mrUmJXiuNx/0tFFdVc4b0DjLqekeYTZrNrkpsPd2CAHj2OfX5fBCu5eZ8wR5T35353FX/GiuWeW+TnjwqiGyYljYRbai7xupcjwDQ4ETxTWo0Gt/36orycgRDlwEhq7QFIxg1dxDVbeuCj1UyynUFtP29WgVbqpXwLoDrEPTEMmo2DA1dohjIjBg6H9axb3untG/P/CuPlCGDOKUiR0j6+KEAhL3lVzFq/NMS4HcxBPnQI6TxFIJbQO/BtxNVLK2nKF91sFqyxGHJZcXekdU1fMSmvkbV+e6BAX6O/YBWQ+MaUQ4aW2cDW1wzC04V5utfgyLICHRSZmiWSJwzOiZuOTNSISPq70H1qdHHFI9mJhoAAgina/SgesCGmLexS+00DcU5x8oiWd5SJYh+Eq3Z/SYA== 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:(13230028)(136003)(396003)(346002)(366004)(376002)(39860400002)(451199021)(5660300002)(31686004)(8936002)(2906002)(8676002)(4326008)(66946007)(6512007)(66556008)(66476007)(54906003)(316002)(6916009)(36756003)(6486002)(2616005)(478600001)(26005)(6506007)(186003)(41300700001)(86362001)(31696002)(38100700002)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?XoCVeRMHYud7NCV0W8LjQhRufzZo?= =?utf-8?q?Eje05ys808GODQdkjqYfaohkUDVmtsvqnRNzPHsFBiCPfyWYivDrepD5k9ia+4auW?= =?utf-8?q?V4WzWNyu1R+CZKAmnkIufSWIcr5NQefU9xOU1qV8VZtG2FXddqe3BAfHbUCURru9C?= =?utf-8?q?R9w5J5EAWhK01vvb99kMuisKdqfSJmMmbquxrbtgY3pEhcTYOODPxJuKdIb4uBGOQ?= =?utf-8?q?P3H1r6HcnxdXbyBgco7QMrjjzuBIMTrzrVCGQlXcJGumGcF2ga1hu6XwhYfbqDhvE?= =?utf-8?q?3I24lE9zBjlMQ/tS5G2zj6NKdETgLzwpQEKuloq9HsXZhenlWdzWhZS+6A8LeJi3f?= =?utf-8?q?KfE8Fn5530b1HgENhKhJ912HckoIJfQjLsAjwDd4i87iK2UunLbR7bxRmz0vRuZlU?= =?utf-8?q?KBm86Fikmo/UN+xbcS/7mldNEOq0Wk4SO7Z7XyhACu7xaT1qkYPWiPE8+jjrb558K?= =?utf-8?q?KIwxmecXyriiWnCTNGlQnLAbjsPPfFcSUcqas8379HzltqfGxLrTDfFQISp5iC2V7?= =?utf-8?q?Hy5Uaqtsx1FP5oQKmphJV+TBor6PI1Pww3cmWddgJOM2Y5cNA+PLHXleT71X5tQA2?= =?utf-8?q?YKffuBTkJOqa1orHCFe61siB0XCkQ25garlotz1HhKIUmLxSe3g99Xd68lveo1U0Z?= =?utf-8?q?3L6ngfvRM+FVfpZjqQ2pf0kmgbA3OHJVPGrUvdEpxMk+KyNo0h/+Tlk0/GlxNRcPb?= =?utf-8?q?QaC5XQ2kBonxUwPSbJFC+s1P2tvAPrreczlxUwpPIuSTIjin1aIdg+v4+UkkXPDMH?= =?utf-8?q?Bn/zk08gm5SIKLvFdD88Qtpwho5CKHxAuDXkG4P/YFtbmV/f7Gwqp4Ap0tNWCdMat?= =?utf-8?q?kSpjF0nf7c1tna9AXL2Z9zAWlIWj2+x038UVhocmafmX6gEr273AK0AV2Weyux93N?= =?utf-8?q?hfNuXiusuZTCxQ8fqOm50DiFBsAZAJdAyJeboDvnwDnm/h4fYymfr/a/KjwEV683Q?= =?utf-8?q?5y2cR+UpgsLB26iGnz7lVrNNFOg833VcZtpTqn26OQ/3HaCgvLm5em41or93w6cfH?= =?utf-8?q?kU+1eFCHk0TKZu/ws0B0FBeGrMv8LG86PiI7U7jc7v1KQ1RvT7cTvovM3gxWo2K+I?= =?utf-8?q?LTMWStmiA+pd9AGOilBBNgDVOLRB2XPMTZXARq4YZ5yvQsOiEt/GRcc7OJE172uY0?= =?utf-8?q?3H48k0BZ2O+iPxR2Ga7GtVLcfQ4FGrysd4l2MMRlEPJ+7wm0uqjY6s2+qGzZfZSov?= =?utf-8?q?4BX1osK1gmIU71c1H0RiRbk2DhI4uARFyPd9npielcpfhlSCUtRfbK0aznCSp6KjQ?= =?utf-8?q?EgPM5TjB2qxmKhZbD12ZjjOR4nYgcsJ1dRdJOChSLMepPmHV/3pf1Fz68jrqNlcLy?= =?utf-8?q?7u0RXepxoSVb3wUGF4niuPOHywnpHcFcORBbVR+ZY8DJ/gW9MWUnZy2XXPEAbxfu0?= =?utf-8?q?/BJD+XXZEOAbyt/RnOX/cTeHZJiqOLWOdBLZ6D+mbp0BXl2CJAzjV3WkzBmil6q0T?= =?utf-8?q?0Ib90RYABA5NvhYzGIYjCG3aSZfmtqDSq+R/SU6I6hXiHbNnTyCcac1lx/7k3doff?= =?utf-8?q?NZhuRoCMOPmm?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: ea24e251-c833-4649-2837-08db3112561e X-MS-Exchange-CrossTenant-AuthSource: VE1PR04MB6560.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Mar 2023 11:31:42.8178 (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: 2grHUIOVSnqm2zAGrySE86Gky9ltNwd7kbkQiocudmBPEq+GE9v3Ss0YYmqVOkxft9pW/JkB/rQ4OjeAVaL9Mw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8980 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): */