From patchwork Tue May 16 07:41:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 13242720 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 66D3DC77B7F for ; Tue, 16 May 2023 07:42:09 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.535009.832573 (Exim 4.92) (envelope-from ) id 1pypJo-0001YA-53; Tue, 16 May 2023 07:42:00 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 535009.832573; Tue, 16 May 2023 07:42:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pypJo-0001Y3-2R; Tue, 16 May 2023 07:42:00 +0000 Received: by outflank-mailman (input) for mailman id 535009; Tue, 16 May 2023 07:41:59 +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 1pypJn-0001Xt-4Z for xen-devel@lists.xenproject.org; Tue, 16 May 2023 07:41:59 +0000 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on20604.outbound.protection.outlook.com [2a01:111:f400:7e1a::604]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 22e09797-f3bd-11ed-b229-6b7b168915f2; Tue, 16 May 2023 09:41:58 +0200 (CEST) Received: from VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) by VI1PR04MB9810.eurprd04.prod.outlook.com (2603:10a6:800:1df::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6387.32; Tue, 16 May 2023 07:41:55 +0000 Received: from VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::e442:306f:7711:e24c]) by VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::e442:306f:7711:e24c%4]) with mapi id 15.20.6387.032; Tue, 16 May 2023 07:41:54 +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: 22e09797-f3bd-11ed-b229-6b7b168915f2 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gLpJfnqyJNH2BsjYz7bANMYnLyJXzDJDmLkWkdZOLOfN3l2kZce63GG6yYo1UC24G+dW0vJMiflomj+v4NNTxNLCy7bhAgdgwa/r3tI8qayn+GpS8Bs/a6U7N4EHqHxBfjsMD/pGhIPOaPUoLlOnFhd7/LUHZg59Fq0bvujKfUdwPEdej/Lex0lPkDdJzlHPlCtV+O5IdNM5ei17pd6E8omM5cNvKR5o0iDy8XT5D5AIwEJCJzDWLICrkJSGBrUjpk4Af8BwiTrXC8SFWFwVmIFx/uB5BTe1DQ5mnlPIp9tNY2jPJ8z7K+W/cyk9T9vG6nG74LypeYdaEVnTiGU+TQ== 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=ZITHlve6KzewL4/nVxygx6EqipDtPX6ixQIP0ctjoDI=; b=kMa/e6OpAfvd8/6N9wPGMOODwkxj+arv4y3lMAtVLfat9cEeoRHFx5j67wQh3SdVlRWZb7vkrTjtk7kvkS0DmWyqRr8pe4uNA0TiUcY8pJzrIH3pEb9qHXPRg9KBXHjcAqUEkFNCWstOX7Fh4Vr/KVgIxqgYnR8cyA51QYJ1lUs7C2X2NIZWjEOH0kOHh5YLFgd+XX54nFukmZNzAMLVOxx3mXSWvj1ZpLlXrlqa0dlOI/A9wNhvv9OKxuzZUlpofAfNYuo4Z0az0RNMxfBSyuxGrU1bAlmc4C6kFnrRZa1yC/vni1Rlazxe5r4boR713xfusb+/uZnN+IJOMaE2rw== 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=ZITHlve6KzewL4/nVxygx6EqipDtPX6ixQIP0ctjoDI=; b=NYpbA8MOiRJgXK3zgaToYQkRoitxTuQxrdw25VaZCDvPZD5qgaoRU8c5i6tsuMO8UBrs5tkSUi1i1PSlq0v78WWKxuw+AHdz49r6F5/my2fkfnQHH1Ug7RV/zNt8Wh2P1WdPPXf6x6gyU4+Q86QYuB4/4kOIPcpzqWwQaP2o/LGZSyIGuCUxDLOgs+b+lTMk2cQNN23U6OX6MsAxwRRp2i8n0G1JVTJgXCswGY3hYnQspsGVgMxAKJXTe7o7z9tCkamObrU5x7sH5D9cK4OEjAvmP5q030QQ69tKBNUx7uTQmfqRTjWctNKE7fEYt+wXUhxRCFECSoFy32dObksVMg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: Date: Tue, 16 May 2023 09:41:53 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.10.1 Subject: [PATCH v3 10/12] x86/shadow: make monitor table create/destroy more consistent 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: <184df995-e668-1cea-6f9f-8e79a1ffcbbd@suse.com> In-Reply-To: <184df995-e668-1cea-6f9f-8e79a1ffcbbd@suse.com> X-ClientProxiedBy: FR2P281CA0080.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:9a::13) To VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VE1PR04MB6560:EE_|VI1PR04MB9810:EE_ X-MS-Office365-Filtering-Correlation-Id: dbe1e6a5-356f-4983-1220-08db55e10545 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3pUdJ7oAV3RKkdmEUfSPKP+tFZ75X4FyIGPuWS3U+RnEp48KYSgujLaN8ZRxoplZMZO3l7zNMVHJB1w/sfy9oPHDvjVEyr4K6ko9k9/5gfCV1l7PrSC/unsOAmPMDW6zutwXX1lgx1CGpFr4gn8N00VfpHV+g7FTrFZcTjH3ionKeo7nbVuRARmWznBhSPwq1wgh1VZdD96Kvx6j6Z5B6AVk04MyDHHdNG/51ZGS2qyKkvzW/gezxm2fIxINTks857ATo6MFNQOrYCLH51PvVy/9ybCzmW/VGKHSXJnGqSLiT1O87rSqLCJbIXSHMbN+3UE+hGHlAIYIbpaTNK54AbPYwvtcsWW5bTOO6pwj8Kh/3IcwzmUPOHN2pzY0kL4c+UdUxwVl/JOH963uJuYWJFAtfBQrRCWa/HB5Y2sPk8WFOMPeOUEO9cZZUxf4eFr6DAWv0gMiFj+qwATEYFTlhMbmgEdRYQ64wZhB1T21wwytFK399mxuC/SGAYCIfpX0xEc5ynVXd7qiPHDkYSyvyd+OLGOFm0Jdp4pxSvK6a0hzVMJhWZyRN7u9TN2yhodfVK2rRMiUQaF6YgN5uE4I8MRdvA7+AujykSfwjUkwFBWmwD7VJP6OX45eUkfqJD3AW/pIhW1H+3/v8+fmpabIQQ== 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)(396003)(136003)(346002)(376002)(366004)(39860400002)(451199021)(26005)(83380400001)(5660300002)(4326008)(6916009)(6512007)(316002)(66556008)(66476007)(66946007)(6506007)(6486002)(31686004)(2616005)(186003)(36756003)(31696002)(478600001)(66899021)(54906003)(2906002)(38100700002)(86362001)(8676002)(41300700001)(8936002)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?0uDVz22p5cV5GoywSkSt4ljrJVa+?= =?utf-8?q?fsJ9Rrig8g+U41IOBWTinc4fYwMjd/RC+1IIP5dgRehRrJMUYGk3q5TwB6cgILsxj?= =?utf-8?q?OKIzHCM8OVopXjCTFnxbFYvmoOz0wz6NBD4o06ork516wIoM/Bzzac+dPBQaEGDVE?= =?utf-8?q?0sA/bxQeZxO79TroHFeiSqTMc3Din2wds2J/TzNQJS1KWMvof5ZIPm9n6W57JA5CU?= =?utf-8?q?AcEd0bjoRzyyCV/CWkLcP0GlWcQ56baveFzjWlZmx3AO0ZcyKzsnGY7rw5S/Z+GjD?= =?utf-8?q?9biLMKXri2L247e9xAcylhv8OPE2d+cAYztAQEb7x53uy7MeTHjdWoNjZKrXnH30u?= =?utf-8?q?3Q0+vGaXfX48EfQ/FRhzcGPs54yKnoJVQYVAbzHfUWmpgLsZWAXZbc4M1M6DPG7L8?= =?utf-8?q?6tW78S+2uVKXLI4YpNivktdQVXH8pITJQoRYmnl1LCgFkySHoiXaev5fQXyHUY6xc?= =?utf-8?q?DVRxl75Km0iV7dY7QBmccAQu1MWfzena7Ibw7smJRpf0rWZf9BdLrykRnY0QYi9pr?= =?utf-8?q?RfTg/tUAM0fQeNmaZhlvSJ0pxukcJh4qpWlLVqYyB3FcQC8ZPNrUoAssaCz+m5hPq?= =?utf-8?q?RX4f+Q42lt4poF2KnNFbYJLGQtW5k+KEhStviOigOnnVAvvyWB+RlNiT6lcodaI0T?= =?utf-8?q?/caED63jlYXa925L4bUQ68BBh+klPVf7Fri3rl5mTIkLEnNDq1MhvcOPAaLRJndmQ?= =?utf-8?q?Aw4818Kr8EH3R9IMXcd3BYCwDS7/QtNFwbHuw4pAzyuy/NExz8nnSPOQjsLIWWyiJ?= =?utf-8?q?/nuY1cKyXgr9dgzwbqU2URorPjeUZZZIsQvXHyzLzTUaroIpjfSFa2hPUtVPCAk2n?= =?utf-8?q?hEtCdzwLdKPbDIEluUXBNRznCo1P1xF0Tw1ywugiR5NRBsuumyelJn8sfqNPh2PSv?= =?utf-8?q?JOIRd/eLIBlNGTMDX8Xhyn4TgMHijUkjYkR1q5XZyf9kb8SAtYGQW8neijp2p4wnu?= =?utf-8?q?NJXHMn5+qcmXbqHrE5yTUBcZ7HFVBVPtgPSgPE9ih2MGRyeHG6EMInbgIJAMRzo8S?= =?utf-8?q?HMKu1AInm77aHuyhrjZcjO+Dt9Knq+29tdPWx4tCcoXTQODQfyjuqFHRdzrR+CL/F?= =?utf-8?q?Vp/OyI0EbanF81uhJDtD3espqWgS66djuioia02gFkaaNY+M9bHHfkc5mGYpY8LFy?= =?utf-8?q?ElJoI5/C1GUkAXRt7RHB2vh/IV0ao/Q40KY8Ajsz0Rew3OgiLOdBAvgFX47MEQX5x?= =?utf-8?q?cvpDeNgxkYjlJwNqPQUFXqAQQ2QYW+FK8eDC+0hGX8AKrlGIPAMBUY2BYcAf5QNji?= =?utf-8?q?/+f0fQRNUrr3ra9ZDJ2wGyVOpsPcdty5xCpXr0OMls/ILJUu5Izoe267sLiR1ZoSB?= =?utf-8?q?aAHod9xJ5bpMEAellzNk6rVCd1CuLMm1hZg6GU+HEfuXBfAEf684CAHb+O/3kDhw+?= =?utf-8?q?H1giVWXeXGhjunKHBpMHla85HMVIhTWSfTCFoxHkBawpJbg/CpQKUGK8anuhiTSnl?= =?utf-8?q?ZlSQr1m7zsqKmHpi37XtNe3io/RRl3oYuvteKBVZloXEjM4YeItFRgY2yRdJzbl0c?= =?utf-8?q?1VukmzT9pIEX?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: dbe1e6a5-356f-4983-1220-08db55e10545 X-MS-Exchange-CrossTenant-AuthSource: VE1PR04MB6560.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 May 2023 07:41:54.8543 (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: xJXm8nO9OFjeDqBkEBtFU+NJcgQLtMqWa2yKJwXVRETTgYABj83aFDzdhHOehVQqCFLw2YjH84jCTSMvJa60yQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB9810 While benign at present, it is still a little fragile to operate on a wrong "old_mode" value in sh_update_paging_modes(). This can happen when no monitor table was present initially - we'd create one for the new mode without updating old_mode. Correct this in two ways, each of which would be sufficient on its own: Once by adding "else" to the second of the involved if()s in the function, and then by setting the correct initial mode for HVM domains in shadow_vcpu_init(). Further use the same predicate (paging_mode_external()) consistently when dealing with shadow mode init/update/cleanup, rather than a mix of is_hvm_vcpu() (init), is_hvm_domain() (update), and paging_mode_external() (cleanup). Finally drop a redundant is_hvm_domain() from inside the bigger if() (which is being converted to paging_mode_external()) in sh_update_paging_modes(). Signed-off-by: Jan Beulich --- v2: Style adjustment. --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -119,9 +119,9 @@ void shadow_vcpu_init(struct vcpu *v) } #endif - v->arch.paging.mode = is_hvm_vcpu(v) ? - &SHADOW_INTERNAL_NAME(sh_paging_mode, 3) : - &SHADOW_INTERNAL_NAME(sh_paging_mode, 4); + v->arch.paging.mode = paging_mode_external(v->domain) + ? &SHADOW_INTERNAL_NAME(sh_paging_mode, 2) + : &SHADOW_INTERNAL_NAME(sh_paging_mode, 4); } #if SHADOW_AUDIT @@ -1801,7 +1801,7 @@ static void sh_update_paging_modes(struc sh_detach_old_tables(v); #ifdef CONFIG_HVM - if ( is_hvm_domain(d) ) + if ( paging_mode_external(d) ) { const struct paging_mode *old_mode = v->arch.paging.mode; @@ -1854,13 +1854,12 @@ static void sh_update_paging_modes(struc make_cr3(v, mmfn); hvm_update_host_cr3(v); } - - if ( v->arch.paging.mode != old_mode ) + else if ( v->arch.paging.mode != old_mode ) { SHADOW_PRINTK("new paging mode: %pv pe=%d gl=%u " "sl=%u (was g=%u s=%u)\n", v, - is_hvm_domain(d) ? hvm_paging_enabled(v) : 1, + hvm_paging_enabled(v), v->arch.paging.mode->guest_levels, v->arch.paging.mode->shadow.shadow_levels, old_mode ? old_mode->guest_levels : 0,