From nobody Mon Feb 9 15:26:38 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=2; a=rsa-sha256; t=1660290357; cv=pass; d=zohomail.com; s=zohoarc; b=WBeXpyzgiyNVUnH3OBvjxbZs7Fj32tFCGQG337YrYO6jWMLD8TBkvYqHXnLo26N7D3/B2Kga8ox7Qs+011o4bS0vn8vWMZlREjy8aQ0QeoWfi+xt99M04uct/DXHF7VwWp8o2f3n70EfFrzc/fPTEGX7JbRdALW7DEQrJxmytTg= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1660290357; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=wMkmvOzz2gve8PQhJ5TEoDWHfH+EBc0eAdwOWdZ75oc=; b=oJv64k69x1m1R8388UAsaKaCnyJGt0dnjl6sBZtM2hQnkTNBa5ex8XPVuYOrLlDlQPB2uwIT/1jA5mVCHci/P/ymoyVpIEPbVeXbwz+rXz5s6zN8JVsCn53Kxc2uvCzN1r9xiLoCMTjKz07zCm2Hl5CatF4h/kvsSXdU67O4lsY= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1660290357405247.50382950243568; Fri, 12 Aug 2022 00:45:57 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.385375.620997 (Exim 4.92) (envelope-from ) id 1oMPMR-0001gr-Dy; Fri, 12 Aug 2022 07:45:39 +0000 Received: by outflank-mailman (output) from mailman id 385375.620997; Fri, 12 Aug 2022 07:45:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oMPMR-0001gi-At; Fri, 12 Aug 2022 07:45:39 +0000 Received: by outflank-mailman (input) for mailman id 385375; Fri, 12 Aug 2022 07:45:38 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oMPMP-00012b-Qy for xen-devel@lists.xenproject.org; Fri, 12 Aug 2022 07:45:38 +0000 Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-eopbgr10081.outbound.protection.outlook.com [40.107.1.81]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id c0dd67ef-1a12-11ed-924f-1f966e50362f; Fri, 12 Aug 2022 09:45:36 +0200 (CEST) Received: from VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) by DU2PR04MB8646.eurprd04.prod.outlook.com (2603:10a6:10:2dd::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5504.25; Fri, 12 Aug 2022 07:45:35 +0000 Received: from VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::2d5d:bae0:430f:70ad]) by VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::2d5d:bae0:430f:70ad%4]) with mapi id 15.20.5525.010; Fri, 12 Aug 2022 07:45:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version 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: c0dd67ef-1a12-11ed-924f-1f966e50362f ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hGvgD2r6ZNAfYasNMrXQBINNYU87OJrAmodE7FeFl41+oIiIc7EXcc8OI8sZHiXKcJNV+LJG4YohiVCLPwZT0IJIjIC/8KruTN2U+mpp40JDbNRA/Owo+lfH7g2xb4Pyma5KTxcpJS511oYO6332EmSgrUlAYAkopOQldak2ezPJ2Wszx3sRhkEQ9OYdvXweYHKfK8bZyd+A2xltZ5CJ7XA8wHsqaizNhmhch1ChZ9HP08wrAlBkAbhH00Z2+yqvtecpDm24Y4GIXLTQgeI2NLcIva2E8SgyKjPf4KZV9o2ek1q/lUd/vlmqbCHJCzeqZucfiNt/1hmQQ9uSHJq7FA== 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=wMkmvOzz2gve8PQhJ5TEoDWHfH+EBc0eAdwOWdZ75oc=; b=VpuzxLIjEz/ne8+SPoVeomw9e+1jLbOYkbSns1YwrWLwXhH+f8f7mmiWzPjBx/QhYte2+i1dqjFRjKzWXzBFz0LG/prhwkyq+menlkon0ik4jB3pRD4H/+lx1xr67tUelHFnJV2t+Ug11AgoSc8rnNupXEdgJOfVYLcFM/hps5YcRoR1x6T9olcONTTs/bttnwNv8tmCvb1SFnibTmMK6mC6AofWgiyvoqh57cF7BUUODtNRuxvGc8iYqqAx3Twcq5o98j0JlAjqUC6XdzUCxNBlYo2IU45ixXnkAcog7mrP4M0+ZCCrVSDbEvujtljSu3U0xcWKX9Z+df47FQIiKA== 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=wMkmvOzz2gve8PQhJ5TEoDWHfH+EBc0eAdwOWdZ75oc=; b=lPi2lAe8UhE/VSDInXcSScwRdTImiWAXPwwTvQlNPnyVKsNS34DyKPHzRm1JeUfcpuyKZIGrM9GIkXy0jw65L6mIs1Y8jFbdjNOY2W1tuRspapCugZdsYvhCnpPC4P8fyP9DfUxaorwLiao9wxcVWsjFvALYI2ZzAyqyZbqDFJRXysua782gceymVPgv4uq2+bD87d1QU1tN8CCptc0rbeATwXXuWw6nyes04ImGg9RH7PHL1WDupFRitYU5+UTismpK9BGdsxL/dPj4r2JGeCB8xctPXevMuuvGJz/PLrZJhlveGE2m8ERBQD+KoqVrJF+rvMhtoNGPReG3E7tiMw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: Date: Fri, 12 Aug 2022 09:45:33 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.12.0 Subject: [PATCH v3 4/4] x86/P2M: allow 2M superpage use for shadowed guests Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , George Dunlap , Tim Deegan References: <1522137d-cfa9-22e5-64e8-b1795ddbce21@suse.com> In-Reply-To: <1522137d-cfa9-22e5-64e8-b1795ddbce21@suse.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: FR0P281CA0105.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a9::20) To VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 318036f0-2e04-4fa0-803f-08da7c36a43d X-MS-TrafficTypeDiagnostic: DU2PR04MB8646:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mZnERGyHS3czO3rCsIL8JtEGYkIQtibNakxWUScwOTj8/mlX+/sIeZezcvpmv/xjVvYVHZ50KWVBz1w30+DclRxyd4dfksyeJTCxL4eDEwOKVSLcYkrtCA5HE7LR9Sh2UD/rqYV86wZg7D0nz7nK0WP6vuGKp3T1dcCDZpXRcX+qdA7yykStDLS3R/7WamE8nfcPPx7ilhRlepzYIPdUhxeNH4h+3jO8cHzN2V16E//HWhu+vQ8vjZnE0AIdqD2P4Rgzn2z8C9xC8gB5ySqi2awCk4onBEu7xLLfCQkUpX13+RQd2wtOy8ijnI+1WYrC2nYVqWIONpr/NMmxQtcBjmGNzeKZfeVvl8bhtZRY3JomD1G9y2ddwZSOZBb0fzPhTnqwz9MbflOCB5lQUkxQqpeAxFrKXw6LNtjW86h9XUzFO1MlesCC9gzZAct7n9H++jaaSyCHszJEsby2i/pPTbjG3g3vci4caQZD8h/eDx57iQww0hgl0RH7Lb0a6Nz/2XfxfOe8C6ZmZ+c1PiglhosDGkD63+ueRsnB5M7wRDQpfj4Ig7SSOGyhiVoheZ1OQN93jvjlhyfXl40q7FIUceKG8bi9Fnn+6aMOG6dOw2/o6FyXTW0gL1e+ajvjS5g1hHqSjKFxN9K1VNyx1b2nKmOGRn6gI6zbgQ5Ad6zqn5hCW1FbOv84+p+I2y+2oFZkPcRH5m9yEIzGKtHcIl4J6XGRmsCpTGJiSZQq87kIjb8PNxlj7BowrUEJGr0d0E7cGxW1LkMWscmz6WW0fuugWmkKTGveSTepS4ojN/9xmO8+fIczZ2aK+w5AYs/dD7PIOkiITn2Io8nRJs5Fps7Xzw== 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:(13230016)(376002)(39860400002)(136003)(346002)(396003)(366004)(6506007)(8936002)(26005)(6512007)(54906003)(6916009)(2616005)(5660300002)(41300700001)(6486002)(86362001)(31686004)(36756003)(478600001)(186003)(31696002)(83380400001)(316002)(2906002)(38100700002)(4326008)(66476007)(66946007)(66556008)(8676002)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?TlpMNHlvbzhvNGtMOUQ3QmN5d0tFNm9URVR5QVh0dnBma29nMkt3OVFqYWNO?= =?utf-8?B?eFN1U3ozSzZNMElFeTZ4ZHhyMGZlVmoxMnZJblVvbUpvVnlRQmhDdG9zbXhW?= =?utf-8?B?R2xuT2tEVnJ4V0ZSalNTa1RuandnL1VPSzEvZjVGUEsyL3luU0NHaENQTjd1?= =?utf-8?B?WFd6NWpLYUIzRzdGa3RYVWU1Q0lQNmVuOVdHelBWSkJjdUhxZTdSNmI2T2tC?= =?utf-8?B?TGNPMDNhSzJ5WWxyTUpLVHNXY0trUEEzd1FKSlhRVXYxdTlvVnV0WkRLcTVK?= =?utf-8?B?NStCd3dodERCeFc5YlRxVVFTSzRnM1Q1UGFBcjJwU2pLMFU3SHdOOGRpZDlu?= =?utf-8?B?RXNkRjBEaTV4R3haaWZWOTkwMnVVMWJoTGErQ1Y5L2ZNbFUvcGFxd2U3bzZx?= =?utf-8?B?MGpNTDdnLzhFcGZzZm52d0cvNytGR2g5WS9WeEZRd3NiMjBkckg1cFpGYjZH?= =?utf-8?B?S1Z5OEtWRU54QnRpSkFXcGd0NDkydzkrRXFrSkQrS3ZEeDdXWGo1NHY4VlBW?= =?utf-8?B?cm4wVlRUWjcwSXZGQk10RnZTYVJ1U2c1VisvZVo5YVl1TzRtKzM5Sjd0TTdx?= =?utf-8?B?UUxySGVWTExMOEgvMXhHc2V6N1Ewa0srcEFwTmZNemQwaEFHWUlDTGR0WmlT?= =?utf-8?B?Y3JyUkU3eUtPbXVxQjFyc1FZVWFRb0R3VWRvWHVqVXpmYk1FY3hXcmNFcUk1?= =?utf-8?B?RXhWUFRkeWtRZ3dYRVlrakNVZ05SOWZ5endBRlBQVW80NHVQb2N4QVpTaGhN?= =?utf-8?B?aXZpVzJ6YjVBbXdHRWZTRzNOVTMwMW5rRktkWE5MMml2L1ZFMURZNCsvaVBG?= =?utf-8?B?dWtqbVV1VEJXaE4xOVJ5WTdEQkZBNnBOMWxiV3A2V1hXTThLa2IxbnpBajNy?= =?utf-8?B?UXVRZGpMVkxLYlNoNHcyOW1ZbHJMM2JsYXY2SklKbkFtMS9WN0I5d29CSUtV?= =?utf-8?B?bzF0aEpaWVlpOWVHQmxXdlMyREQ5RjNKRVJJaHRYTzhKN096dTBQZkFBZDRD?= =?utf-8?B?dkxndEtCY1pLN2VaSE5QWWhpSnhlODJFc1p5VmN3WEFWRHJ6ci9qc1RDTjly?= =?utf-8?B?bHFWVTFtRVBKWG9QSjJqazZ3ZlI3b1IzczlOdHVGRlNkdVduUTdTV3B1dmVo?= =?utf-8?B?Rmd1dWJ3OUhzU0IrQUk1Q3BKUTR4SUhLYWVOTUpvT292Y1NSdWhRblJidGRM?= =?utf-8?B?U2RmdHpDTDJlTUwvTExRVy9udWh2UXZ4aEtvSnJPUkZJSEt2c21vOHl5QzJX?= =?utf-8?B?M0R2Tm5VNktUQzArMDRpOVhxU2ludHZJdmFkajNsczNOWG1HVmpXOWdoTGpa?= =?utf-8?B?Y2J6TkNiYjBIMFdzZmRRZlZtN1Y2dTZ0N2lqR2lBbWhQV25IVXE0a0xaNnFJ?= =?utf-8?B?Zzh5UGdrS0VpRWY4REhvZkVWS0h2K1QrdVR3ZSttd3llUEFXVzA4YzhvUjVL?= =?utf-8?B?eFZLK3hxaXZEWHlLSXBoY2F3V1VoSGIya2gzeUNzbGdsZFl6cXRpd1Zmelh0?= =?utf-8?B?VzViQmZRQ3Ria0MyYVlMMEEyQkZ3aldDYlZ6NFFDZm1JZFh5MTB5Zm8vemZR?= =?utf-8?B?bk9GRFFkSEU3d05WWVRFZmJraXBYSmNWelJXSDVNNGxpekJURkdHbXdDQjMy?= =?utf-8?B?blQwSGhRdkw0RStUeXFoVHh3YmdqV2ROU002V2JrQ1BRcTF1elJWaGJBWVp0?= =?utf-8?B?VDNiWTJvTjBLZnEzTDBZcWs2NWdPZHV0NTRTRE9xQ0pBK281WC8rWkdUSGs1?= =?utf-8?B?N01oQjZBVlZHY0FoekNOaGtjdkd2dXc0L0U4Tkc1MCtnc3FrUWRvdXV3dlBm?= =?utf-8?B?SGw1VGFDL25qVGpWVUc4NVkxb2I0dnF2dityaTVVeHZaOHUxOEU0ZTFoTzc4?= =?utf-8?B?dmRUMWF5U0E5YmhMREI1RU5uaTdtQVZPem8zRjc4alMwR21KYjdGM2FrUDFY?= =?utf-8?B?SGx6NFNodlpxcEluaElUT3FpV1cxeFRsUm03MitBYlhPa0U2MW1pd0cwcjI4?= =?utf-8?B?eDNYQkNhbFM5dEV1VXE2ck9BUEVrV0FCcjFLZXdWbjVDdlJlNmk4ZEZTb25o?= =?utf-8?B?QnJhTWJncTFOc1lYS092aWRoSzRkQ0d4NWRFRzVxUm14Mi95c0dEYklNcWhG?= =?utf-8?Q?OCGl1eP0w3oXw0P/aUP2CHqxv?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 318036f0-2e04-4fa0-803f-08da7c36a43d X-MS-Exchange-CrossTenant-AuthSource: VE1PR04MB6560.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2022 07:45:35.3012 (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: G9s0/V8ZjsnIAj0wfQpmEN9dv2+8j0SswHwMY60jwnDZdrOe/n27WYpubOPJPa5S83ks9mD87HAmHQKcAwu5sw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2PR04MB8646 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1660290359985100001 Content-Type: text/plain; charset="utf-8" For guests in shadow mode the P2M table gets used only by software. The only place where it matters whether superpages in the P2M can be dealt with is sh_unshadow_for_p2m_change(): The table is never made accessible to hardware for address translation, and the only checks of _PAGE_PSE in P2M entries in shadow code are in this function (all others are against guest page table entries). That function has been capable of handling them even before commit 0ca1669871f8a ("P2M: check whether hap mode is enabled before using 2mb pages") disabled 2M use in this case for dubious reasons ("potential errors when hap is disabled"). While doing this, move "order" into more narrow scope and replace the local variable "d" by a new "hap" one. Signed-off-by: Jan Beulich --- v2: Extend description. --- Strictly speaking "fn_mask" could also be "unsigned int"; I wasn't sure whether changing that would cause objections. While at least sh_unshadow_for_p2m_change() presently relies on this behavior, it is somewhat odd (and inefficient) for p2m_set_entry() to split even non-present mappings. --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -403,28 +403,22 @@ struct page_info *p2m_get_page_from_gfn( int p2m_set_entry(struct p2m_domain *p2m, gfn_t gfn, mfn_t mfn, unsigned int page_order, p2m_type_t p2mt, p2m_access_t p= 2ma) { - struct domain *d =3D p2m->domain; + bool hap =3D hap_enabled(p2m->domain); unsigned long todo =3D 1ul << page_order; - unsigned int order; int set_rc, rc =3D 0; =20 ASSERT(gfn_locked_by_me(p2m, gfn)); =20 while ( todo ) { - if ( hap_enabled(d) ) - { - unsigned long fn_mask =3D !mfn_eq(mfn, INVALID_MFN) ? mfn_x(mf= n) : 0; - - fn_mask |=3D gfn_x(gfn) | todo; - - order =3D (!(fn_mask & ((1ul << PAGE_ORDER_1G) - 1)) && - hap_has_1gb) ? PAGE_ORDER_1G : - (!(fn_mask & ((1ul << PAGE_ORDER_2M) - 1)) && - hap_has_2mb) ? PAGE_ORDER_2M : PAGE_ORDER_4K; - } - else - order =3D 0; + unsigned long fn_mask =3D (!mfn_eq(mfn, INVALID_MFN) ? mfn_x(mfn) = : 0) | + gfn_x(gfn) | todo; + unsigned int order =3D (!(fn_mask & ((1ul << PAGE_ORDER_1G) - 1)) = && + hap && hap_has_1gb) + ? PAGE_ORDER_1G + : (!(fn_mask & ((1ul << PAGE_ORDER_2M) - 1)) = && + (!hap || hap_has_2mb)) + ? PAGE_ORDER_2M : PAGE_ORDER_4K; =20 set_rc =3D p2m->set_entry(p2m, gfn, mfn, order, p2mt, p2ma, -1); if ( set_rc )