From patchwork Thu Mar 30 11:32:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 13193993 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 BAACAC6FD1D for ; Thu, 30 Mar 2023 11:32:47 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.516662.801153 (Exim 4.92) (envelope-from ) id 1phqWB-0005KT-Dh; Thu, 30 Mar 2023 11:32:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 516662.801153; Thu, 30 Mar 2023 11:32:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1phqWB-0005KK-Ac; Thu, 30 Mar 2023 11:32:35 +0000 Received: by outflank-mailman (input) for mailman id 516662; Thu, 30 Mar 2023 11:32:34 +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 1phqWA-0002FN-1n for xen-devel@lists.xenproject.org; Thu, 30 Mar 2023 11:32:34 +0000 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on20610.outbound.protection.outlook.com [2a01:111:f400:7e1b::610]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 8fdf046c-ceee-11ed-85db-49a42c6b2330; Thu, 30 Mar 2023 13:32:33 +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:32:32 +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:32:32 +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: 8fdf046c-ceee-11ed-85db-49a42c6b2330 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Gh/ofto/1gHJ02qlDvJj6RD30SdIKBaldip+atea+Z4sxd41vbYa3PR8L79arSc1uphxUiW6C/t7bEmAlRoKQvvtUbG6YgazjSj0dntfl6w5z0gxCjbaqTpi6DGJBHhN4cPSBRAsthZqC40Io8s0J2L0KJ40LSO2dKHKcOUM1NQQbpasjK6CdxMt4WhiIDdPMU+EQODqySVTVlZJ8WvlBv7zsAzHym2mSdcd8GUb4YBsnOgutSCDG83ip5QhW7B6coN9uBIMVRv1Ew7R+QEek9Zh7HHohmnJ0pblLSh+qfvY6WxJTRU22ks2qP/6V9AOMMig07o+mv7Gde2dwCu6XQ== 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=X1l2fkRqRJiGKZyq0x1zbIscrbjHpZaIQjMcBMuPrbQ=; b=SDgh5ofhCzXCC3CvMd+3OGGiwuLTQtQrzDEfE81XBWe7BNvQ22uKi97miKVHm+/VShFr4KkakwHDS8ClmCJoFlLYLG38A3HrkMI67XkKDML7tQoJ+rvsGog4SlGHmHRpKALHBgRl7ViseXGjnrFj53O7pC1T3ufoFBfBmZvlzy7mmZMXVCYDVJLfPBqHEHZeyLPlsWRSmZi8JknDefRQFXbonZYQu7P0rvV49TAjT4KffGmWILWvQoGXPHoq95kd08pwkh+RyhmA2T4uAbQ+3A5xKpziYCuuxzIxWOTnbG1kK0b02HO63v9QWtgW8awkQk3IDSbc/++wN5echwWAPA== 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=X1l2fkRqRJiGKZyq0x1zbIscrbjHpZaIQjMcBMuPrbQ=; b=3XjdHwsOJQGis5sxBnLb53b5XroEG1UtxOHMa4aBXdf+kl5En/0ffCGWbZGgb2Ws8VqU4841LJ6ia2+1RwutyjrY3lWQOV8h17G7//nYLscEF9/fJ1RZ2OlHMz5Kwn6Xkks75PJufk25dPRUIE/hZaky33FObxvkJ9gNE1NOSQIttmiy1tfuz9ZhQ/ywSZWyrHY53KlfyjiZBrEm8F4xVuWtnY5+9nranWbR4zXhs0OWfc97jJ/zRxoDC82fNTJMzDBT/RzNamsi0d5+WHNd2Qoer7t45ANvoibU7ggyE3Nrnvl2sUS7uh+mRmTU+Hh8t6kmu1UFuKlJGqSZN6ZA9g== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: <9d53c403-da7e-8a56-516e-b5f8151d2707@suse.com> Date: Thu, 30 Mar 2023 13:32:30 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.9.0 Subject: [PATCH v2 13/13] x86/shadow: adjust monitor table prealloc amount 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: FR2P281CA0110.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:9c::20) 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: cdf2c7b0-1bbb-4eb3-b60a-08db3112736c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PXKUekEv+9+Ds7SnzPL4yL+yIQdKbslb0Vr73af1hYc1CCViBpnQCTysYeyKubmaY7+u76r+W4t3u7uCg5QnKAV/tU1RK0+kLS8Ecoq7TbP+eC6GO52x1bxtTNXR22/cPXf8LCXHPj4Q5haD6NoW35j5H3XTm1Jq+zF81zArvWSPEhq/4lssNd/3y7K4xQxUbEwohy01cp+GwgdYtXg0a8FyqVqlEL3OL0CHhJY7zZMEc8vbR7yaKj25P0/u8PIE135uJS6G3bOtcssAjwgcVfrRf5oQGSegsY+XFpPPcwzQjISFMllpmT9frD0ylR7x94JmPbneE2hbzA663g/Ydi3lLOy8DMAYc73jOSoHIW9uVBYOWTxK3g7bXjs1U7JiyMFF+HKh4E8w59/r/jK/l0n9aoPW1janS4ddw8UKA1BrvpZecfNzsdZ5S9fT4g609+qITY+nskE13RejjbBuopYik1K2LidqRqh0tcv7JDkfF0mLrTcOVg+EnqvfJuhFeoLdk86lLxniWlRVpSdaS94dBCCJI/BcqHtt6rioCFxFddCwDuQMsYLnSz5mPz8Q6zjrPApLFjkNlIcwDg+iG4auT4HsxHI1p3pq4j+KNk7dQFxn0rStgXq+2gPTwhxezo3Q73e964JNXg5egzkwFQ== 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?TTyfrRYL8TrGkTr4tH4yBUAgDCGL?= =?utf-8?q?BmrAv7maQgLH5CONqq8nRIRU5+yOnntlK0Hs/Ct0F2S3jK7wNp/4PB1lcHfIqziV+?= =?utf-8?q?FzLREVBkLFjAgj6yXKDesVWYTw4lBzYYoWq/775AkR+gS15rx41rQgZGIWKhAXKHA?= =?utf-8?q?w+EO12w/y+t2ltxhFudtSmiZiwqfPAzJAtqLLdBVQckHSRfBsY1+bINMbLE1GqGOG?= =?utf-8?q?IP7ORlxHnbr1lavrvoIOJYZdSj6650GZBc7M20pgf99X7QHvjVUSZf5PGqzlU/gEB?= =?utf-8?q?saLcv9lmntD4mUbaaHHNDlW3FvI1+5pqRMqIE0p8D87fT2vZlz0SCaSWwjEVY6BSC?= =?utf-8?q?3frNabIg7UEYJ2JrzZmC8sTsOLGjgR3dLk4CqFtD/V2Gz5Rjjb98eQD9LZ0G4uXG9?= =?utf-8?q?TG/tiTZLzi1VuURlrMLYubK1yUL9mVVeHg3JUojOrJZPw1dQ59wOH1s3EC2YNDza+?= =?utf-8?q?3mlQodLjWHaZIomgEj6QRSh2gTqJBieurCJ4qbNz7ZpS4de98M6a+U7WBgmIJ3/0J?= =?utf-8?q?BHEZoiRaublZQpYLt4wIu1GoOlun3RxGg7GvlS4sb3Vl/NySI7Xom1uusUCVazZPo?= =?utf-8?q?6ctVdLHhpAue5pDQb6k3aUBVVFlYTgpkC1xY6s06cR41mUN+c9TePmHjClrfOx00b?= =?utf-8?q?xRy1Hfl5XIsBpEmL3HbGPCdr3n3Uc1fWjmA4dVBZ8c3y3rH0unZHIvvhnh1dmF/j+?= =?utf-8?q?MoyqeJocFx20eCnrMgj8w0rafjj/klIqSUAX40TZzL1Csf3PqyBRdTmxrjky8K92V?= =?utf-8?q?YuRjQNt48obKpJ85yyIDmyAEcHAwt/wk603p4EZAzSzDdETu2Yq7tCdY7VtsDfukX?= =?utf-8?q?cIWVwJuuLyJ49Of8J8iQbIApbHHxHOzvNZphYqfGvD/QhmclWWulwREr4LPAakagy?= =?utf-8?q?AEIfmxcaBK9xryt7v3TLWK67viSbJ7PnQtD1Bk5lkv48Z/fcAYB+TiLvBzqmGj/P8?= =?utf-8?q?AlDSgaKIBmx1Ab8RhBHsrhzm6M+0mMBDvaIpnd8ZxZRnQ42kjaYw2Pcw22YgeNfrX?= =?utf-8?q?F552keWWXMfe0Y30yJtq54y39U1IQNSQfSY4vBclvvlFo/GLQc5H1nzF7zWS4P7es?= =?utf-8?q?iunZYneLPoe5JzaKhAmzUEaDOL4fA7E7e5GFJoPpKgddV6xdm/mHbEgnRmK4B50da?= =?utf-8?q?ey+3+cSr30cL3yVn3K9H/X9zptxdtAXotFoTs+3MBtYRP/JqwmqWC8jSJ5npe1fef?= =?utf-8?q?pUIW+l/NOtZ4NFLbx9Td9IIPRfi1RYY3gkVOH4Unpi0/GXDoA/CerhYs7eWsDJCK0?= =?utf-8?q?jYdam2DrKpq1u5wXQeI4fV6bEX66JSzk+YmxrPEhhczV7sntbMOwf1sCfqoH/wMbA?= =?utf-8?q?D/WJWHTKi3rXhVpGrvrTPJ9AJY+5n0XeuXngiht0Mw8aGy4gQ+Bn3cnVGDmZmrRgy?= =?utf-8?q?63jJHL3Sdu76CcA7J6JvAXmuiwPjq0ckeTXH0oFYc/FqcmTTBBqq3e41/9Ha5BSK/?= =?utf-8?q?zUNQd+Zj3+NwpCxvP2oG/a76qUGP2CdkWKkWps60UO1IE2KSBdSRNgrsQ9PL2M5kZ?= =?utf-8?q?FVcTKeZcHehy?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: cdf2c7b0-1bbb-4eb3-b60a-08db3112736c 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:32:31.9872 (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: Nra8okp7oP/4xp1ofcR+glPqXrCweXrXZ4az4PviL4/+BEtvgNikhqFrvDON2gBoJssbW9tDICxGiuJsQFkLeQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8980 While 670d6b908ff2 ('x86 shadow: Move the shadow linear mapping for n-on-3-on-4 shadows so') bumped the amount by one too little for the 32-on-64 case (which luckily was dead code, and hence a bump wasn't necessary in the first place), 0b841314dace ('x86/shadow: sh_{make,destroy}_monitor_table() are "even more" HVM-only'), dropping the dead code, then didn't adjust the amount back. Yet even the original amount was too high in certain cases. Switch to pre-allocating just as much as is going to be needed. Signed-off-by: Jan Beulich --- a/xen/arch/x86/mm/shadow/hvm.c +++ b/xen/arch/x86/mm/shadow/hvm.c @@ -738,7 +738,7 @@ mfn_t sh_make_monitor_table(const struct ASSERT(!pagetable_get_pfn(v->arch.hvm.monitor_table)); /* Guarantee we can get the memory we need */ - if ( !shadow_prealloc(d, SH_type_monitor_table, CONFIG_PAGING_LEVELS) ) + if ( !shadow_prealloc(d, SH_type_monitor_table, shadow_levels < 4 ? 3 : 1) ) return INVALID_MFN; m4mfn = shadow_alloc(d, SH_type_monitor_table, 0);