From nobody Sat Jun 13 07:31:48 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=citrix.com); dmarc=pass(p=reject dis=none) header.from=citrix.com ARC-Seal: i=2; a=rsa-sha256; t=1781187741; cv=pass; d=zohomail.com; s=zohoarc; b=HyD4I9B+uUicP7UidnJq4+gc5aH4rchrmzzkSwbDxSIMQOq63hHuUf3QMguXai1VTWfYyoaOLMCFkC+rwZ1c1DQUI5bDZ7eYEBuieBNoIEf6jFFO1C6FHYhA8RqK03YL2N1Ayv44JzdbnpCNozc/1yjaVLneIMlFrtJyNQeggyo= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1781187741; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=w8o7/s7koCPnxEkhlH28JSJXfj8ZLAGi46hUfnB7CrM=; b=gg1bq21SIRLdZX8ISJAff5rCDjhdqhf2IMuGvrwPAn69FVaIhg3cWk8EmLvk8PJo9klJ8HoJXqyfj6onIIm82O0J3xomiMTiPUYUlX0jXy5nm1Bbb5/nmlVVQf/k5Dh+bbDW761H8zodHuHY5AkvzhnFvGcKDZXMmVSnXFnHQIU= 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=citrix.com); dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1781187741260858.9677657848854; Thu, 11 Jun 2026 07:22:21 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1335629.1597817 (Exim 4.92) (envelope-from ) id 1wXgIK-0003a9-6x; Thu, 11 Jun 2026 14:22:08 +0000 Received: by outflank-mailman (output) from mailman id 1335629.1597817; Thu, 11 Jun 2026 14:22:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wXgIK-0003a2-4C; Thu, 11 Jun 2026 14:22:08 +0000 Received: by outflank-mailman (input) for mailman id 1335629; Thu, 11 Jun 2026 14:22:07 +0000 Received: from mx.expurgate.net ([194.145.224.20]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wXgIJ-0003Zq-6E for xen-devel@lists.xenproject.org; Thu, 11 Jun 2026 14:22:07 +0000 Received: from mx.expurgate.net (helo=localhost) by mx.expurgate.net with esmtp id 1wXgII-004jwn-CZ for xen-devel@lists.xenproject.org; Thu, 11 Jun 2026 16:22:06 +0200 Received: from [10.42.69.10] (helo=localhost) by localhost with ESMTP (eXpurgate MTA 0.9.1) (envelope-from ) id 6a2ac482-bab6-0a2a0a5309dd-0a2a450ae9fc-38 for ; Thu, 11 Jun 2026 16:22:06 +0200 Received: from [40.107.209.17] (helo=PH8PR06CU001.outbound.protection.outlook.com) by tlsNG-4011c0.mxtls.expurgate.net with ESMTPS (eXpurgate 4.56.1) (envelope-from ) id 6a2ac48a-56b3-0a2a450a0019-286bd111a96b-3 for ; Thu, 11 Jun 2026 16:22:05 +0200 Received: from CH7PR03MB7860.namprd03.prod.outlook.com (2603:10b6:610:24e::14) by MW4PR03MB6868.namprd03.prod.outlook.com (2603:10b6:303:1b8::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.92.12; Thu, 11 Jun 2026 14:21:59 +0000 Received: from CH7PR03MB7860.namprd03.prod.outlook.com ([fe80::f5ba:35df:1c9f:b343]) by CH7PR03MB7860.namprd03.prod.outlook.com ([fe80::f5ba:35df:1c9f:b343%4]) with mapi id 15.21.0113.013; Thu, 11 Jun 2026 14:21:59 +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" Authentication-Results: eu.smtp.expurgate.cloud; dkim=pass header.s=selector1 header.d=citrix.com header.i="@citrix.com" header.h="From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=lqhBMSVpYxgOK8QmS/MZtjydpQj5KYjOT5KWwbmKc7Kqw/qcMtXomjEqrBEiVBzzuP04Dc4K4EAJOju7pdO136ABnceUbhFyBefVAr92TpIt1j0UZohVuKGj9tk0j98yOgHWAcHqtyS6BGHzqKctHDt3/6BxC0cFUIkC2MVEkg4NYgYHG/hgEvp9GIxNKL2i3oYCQj/Se3qd9OQP5Vrr4QWrDOH7M+BP+Qv+FzbBwiis2oRWeVyDS8jxPoGQWlPO9dpv9BDKfOfxjSGU02WHB1YI8k2fUsr/IUbNvIYt6O9aXKOBnvvXnmFnYIgQICLZ0WmS/IpiSFmhU4XuBKatsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=w8o7/s7koCPnxEkhlH28JSJXfj8ZLAGi46hUfnB7CrM=; b=NwH1Pplzu+Nn1KlYMGfLzzlzDXOuBDtLVKdKU1yl4yDJnPREx3USXXEzyriIB/aVwrnWmaPWgzgDafWd7GqmEsDiEOhT1Nzcoinuc5bALUDOpke+QWtPCOaMn1va4izKJ7ChArTo1PGxFzuS3/BqpLJAiDYK8kdJ6MiXQawRbtnvr728TrbS/6MEsFy8lgxpbqnPnBNWX8wv7eYenVEeKyKKtyQt8TIElZK/Bcj+5yb0mDi1yAhXcgJZ6uUzzIC9V4JFki5PjdtsCe5ks6AUMfkM/9PqTINeB7ncCSi/Nt6mbPQ8zcprM0Qb6pMrUjKCRQGkJp72idkuV4keQFYCnA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=citrix.com; dmarc=pass action=none header.from=citrix.com; dkim=pass header.d=citrix.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=w8o7/s7koCPnxEkhlH28JSJXfj8ZLAGi46hUfnB7CrM=; b=qewjLxUsEabcN3xZs4b89cl4fFyubVTri0wqjDsvUlc7JLhDbM4rmGN+8kWbxTfPjOQY5aJIAOUYwdVeZx+SeE0OwtOcC7bC314xqhd7ewOiDnqUR5G/kZsN6PFUeUhJG1X+42ClrMwKT10JGC8RbO6zB69UP6z4+PCWuFaeD3Q= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=citrix.com; From: Roger Pau Monne To: xen-devel@lists.xenproject.org Cc: Oleksii Kurochko , Jason Andryuk , Jan Beulich , Andrew Cooper , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Teddy Astie Subject: [PATCH for-4.22 v2] xen/x86: Change stub page allocation/free Date: Thu, 11 Jun 2026 16:21:54 +0200 Message-ID: <20260611142154.64525-1-roger.pau@citrix.com> X-Mailer: git-send-email 2.53.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: IA4P220CA0012.NAMP220.PROD.OUTLOOK.COM (2603:10b6:208:558::17) To CH7PR03MB7860.namprd03.prod.outlook.com (2603:10b6:610:24e::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH7PR03MB7860:EE_|MW4PR03MB6868:EE_ X-MS-Office365-Filtering-Correlation-Id: 16ff0c55-8db4-419c-0cf1-08dec7c4cc77 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|23010399003|376014|366016|18002099003|56012099006|11063799006; X-Microsoft-Antispam-Message-Info: qIml6B84rzXD3EVw/ED98OqIuqk1pvBp7q162488RqmRcpR62dZSBEz2+11Pt8Zv6Dj5GrNtSsBlOzziL4G3H7hs1wW5WybHhcQJhlls0LmnsEh8RZ05Ku4mX2NLcKLjtypCR9w5/0t6aZs2tA01R8ayVdT/ARRpnAff5L3zf6SyMIp2IVh4lMtvANJ7uh4CDNWDozM6p679bP86TptDj4hXyssBQtrXhE2lph78t9GPx3LFQ+wiS79wb1KYolt8M8odtzH6QERYwpH68rrlocTmVvqSLlNgylQ05NMwrKPfxqnkubVtQDl6d/gG6fCM9OKq0HDq4kbAhN4Gxm9i37u4sESnYZIzLu2oDMOdYJ1+NHZ6Alo5zAHCTaNngbfvmtj+oDZ9PFFMg5gBkRlCDSHKnsXv5ncRNXUYLwQ2YraMlQWv6FXr6fO0Fz470Sth/mlwvqIfSMtxB3EBXJm2CiGJehbvT7a3Bz9pV7tqmYgJhMkvaY0Dlz18GcqtbZumwByrBhbFs07xWMq+q5ccVZHE/kFwn/qcj870o44Eal7lv7WoXc64EBDT/mYD5q/tSzC9yL5Z35m8IYPqyfpFY5jynbG8oHyQcmAd5WyraxmBz8DnpADxI5GxP3birLCRgl/LYCaFNo11AE3kkDuFJVpZUEBbQ/tPuBVI0X3iJHwsgFJEfrgepd9N13F/zjva X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH7PR03MB7860.namprd03.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(23010399003)(376014)(366016)(18002099003)(56012099006)(11063799006);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?b0dzL05JU015WmxhYmErb29jU3hFVENDKzVoVXAvQWlXWE5Kb004N2RzSWM3?= =?utf-8?B?MzZFUUhhcVhEcmpsSHd5YW8xcXRhWHlOSHltRUNhMWZNRVhKaWZWRURaUEJr?= =?utf-8?B?ZVY5Z0k4QmJRSStISGszR1F3UllaZ1Q2bVp3TVlja2hwQUFKTGFQckJDMGph?= =?utf-8?B?U0x6ZGZIN2NUMm1xSDlGeWNVMjFBS0YvYmVvMGJieHdEaUNwbFVTUEhCb0do?= =?utf-8?B?b1FST0tNRVNHVVVuWFJqSXZ6NWVKS2xMUER0M20vS0RoOEdoUVIreDZYV2l2?= =?utf-8?B?bDFybDQ3WFhxQWVSQjJzRmo2Sk5xdG9HcGhYUWpsQTZvaFZnY3ZEVk5uWkFW?= =?utf-8?B?TjJyTFh1L1F6enJFRXZyVzJ2MWFJbjM4MDBpbE9BeVdPLy9GWFBpZDdLRVRH?= =?utf-8?B?ejJJa3JDK202dVRmaVBRRzRmUE40ZklNeVpYYTlmL2MvWG9jR2RiR1FmbGlJ?= =?utf-8?B?enhhSXlEUWVpcWptMG5Fell2Ymt2dTJ3NFdxazRBcVBSTGJqU2d6eWFuWHk2?= =?utf-8?B?blJjZDdiL3RqWTdZZGthZW0xUFlxeUZ1TElFa1U2TTZHYTkzeDdOaVRsbzFs?= =?utf-8?B?QTBkVzhQaEhhSE9sNHZmV1hGRUhaZEVPTXY0MEtNdlVLRjAxSm13RTlWUkww?= =?utf-8?B?eGQ1elBHZG5xVGxWZVRrYitMakZYYmtKSmdvVnpPdWUyTWx5d3lWMERIZ0VP?= =?utf-8?B?bitKNHY4eTdZZVQwLzcxbndNVHdHS01PdlJGU0x3TW5NRFcxTloxTlI2Yk9z?= =?utf-8?B?ejBqNU5qY3RNVFRRVkVNMzdwMWEreXVHcUlLV09hdnI5Wnh1SzRxUndKenB4?= =?utf-8?B?a25QRk1SbTFQRmxENlBJNkFxOXY1N05DdHFqd2d4endxVTNWTnNETEZyUEdU?= =?utf-8?B?UEx3akdodGtiQ29kTzF0RUtvaXZLSkhxazNweExzOGtTVnBHR3Fud0hxcG9K?= =?utf-8?B?MENjT3ZNV2NHMktLeG5uczRuTzA5THBwMHR1cU8wNDRLSWYwTzBqQ3U5eDdJ?= =?utf-8?B?bzVobXlkQmJOeFdzaDNTOXRwTHNCb1l4TmFObjlVTGNSSmhIeU13RkpKK1lI?= =?utf-8?B?eCtiaUZpR1pDUEdSRXA2NWMxZWhPRkIvUGJiN3JkRW9jOEU5VVVDL0V6dUN1?= =?utf-8?B?TXl3cW8vVkc3YUl6RlBXcC9Fckc5SXdOQ094cENiMUpyM3FVNWpUNWJYaDE1?= =?utf-8?B?WVJVNTVRV0Qwemp1SWZmdXJwclFocDZpYy93T2lWMEQ5eFUrSXNZQTNpUStu?= =?utf-8?B?OVdIVkJ0b3pLWk5YdE5CM1JnUnlEWGVTamlQSklzWE56MTgxNE9SWmQ1WW1T?= =?utf-8?B?RlJKdE00Y0NQa2FXa0pXd01QN2hBSVNNazcrRXl4QW9JVk1RTTJSRUkvR0Np?= =?utf-8?B?TEwxeHJXcWltOVg4d2t1MjJWUU9sMzV5S3QyYm02eS9pbmo4STlJbExScDB2?= =?utf-8?B?c2RiTGJwKzJ2MGtud0Y0ZHkvenZhTXBLWENJaCtVSG1XSEFJNTFacmxmUDM3?= =?utf-8?B?QUxiTDBLMlVLTjZrNkJlVmpYRDNXVisyS2haQUo2MFRnZWxYUzhJaDU4NmtK?= =?utf-8?B?Rk4wRUh6bGlEcVozdEI2ZUFPazNLeFdvcEZveFA0b0VENy9EUVA4SEZ6b0Q2?= =?utf-8?B?UlZ5c0VoVlJ1M0VVQm4xMkZVY05DZlJvVmZ4RW55R3g3eFNGa0ZOYzFTM0J1?= =?utf-8?B?d0tSZGxtcCtDQ0lKRCt0TEJ2L2FlOXZoMlhEMngzMmpXVHY5RWZ1T2ZNeDV1?= =?utf-8?B?T2FKanhHblpKTTV2dHZFVXhsd3ZkbzlnZnFYekFTaXduVWJ0bFJLZXFrUFJF?= =?utf-8?B?VllNQ0d5SE4xd0VjMmtNRGZnTWRHZUd3UTNXR2lwTlJNellIYW5tM2xIQml1?= =?utf-8?B?WXZoUVBCNkJqZ2JaOFVhWVIrT0o5TVFkOUZOeGVvMXdJY1Y0cnRFVmVEcllM?= =?utf-8?B?aW5XN3A3Mmt4d29xQW9aOUlPZ1FzR2trTjRoV0dEODZDdjR1eUFPcmh1bHdG?= =?utf-8?B?NzFtTEFaZW5FMEpHTlNybDRzczRERklCV2hZNWZzbGY1RXdabFpTM3hyM3VG?= =?utf-8?B?SWVuOEpKQVRiakNuS3JHMWtLdU9qQUJGTVFzK1hid1I3SGhRNmF2TUdFUzR4?= =?utf-8?B?c0llaDl3K0FabWpLZnEvL2E3SGdSTTRkaXNXYnczRWEyRjZPMER5d1o1UExP?= =?utf-8?B?QnkyMEgyblpOcWhLWkdiUVhMOVdlZWd4M1l3KzVUeWNETHRFSmVvS3I3aXV3?= =?utf-8?B?MXlmbU9FbzBOa0NOOXdVM09VUi9jd2pKMXJSaU16RXFKTDlrZ3oxd056aUNv?= =?utf-8?B?Ulk2RlhRVkJvKzhSeGpwUkptR294SktIZndDZk5EM2F6NkdDVi9rQT09?= X-OriginatorOrg: citrix.com X-MS-Exchange-CrossTenant-Network-Message-Id: 16ff0c55-8db4-419c-0cf1-08dec7c4cc77 X-MS-Exchange-CrossTenant-AuthSource: CH7PR03MB7860.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jun 2026 14:21:59.3020 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 335836de-42ef-43a2-b145-348c2ee9ca5b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: us8s5Gs7sHdzuYTZol9DazDMTEqg1t8wSn6ylfCh3R4XKGLmL3uvmpjM+6ZNw8xzIX2cpsWzFEpJ43J5EV7wfA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR03MB6868 X-purgate-ID: tlsNG-4011c0/1781187726-7DF838B7-C18BB2F6/0/0 X-purgate-type: clean X-purgate-size: 7740 X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1781187744248158500 From: Jason Andryuk Today the inline tracking of the stub page is problematic. 0xcc is used to indicate unused, but it is also a "clear value." A !CONFIG_PV build with smt=3D0 will bring up CPU0, bring up CPU1, bring down CPU1, and free the in-use stub page. CPU0 or subsequent onlined CPUs can write to the re-used page. The new approach uses a global, CPU-indexed dynamically allocated array of stub addresses. However, to handle NUMA aware allocations, we cannot allocate all the memory in advance because of the NUMA dependency. Take advantage of the fact that Xen will attempt to contiguously pack CPUs on the same NUMA node (see normalise_cpu_order()), and on CPU bringup use the same stubs page the previous CPU did if suitable. Note the code would still function properly even if CPUs from NUMA nodes are not contiguously packed, it just consumes more memory. stub pages are no longer freed. They remain referenced in the global CPU-indexed array and are re-used if the CPU is re-onlined. The stubs array doesn't have an explicit lock. During boot it's accessed single threaded. During runtime, &cpu_add_remove_lock serializes access. Fixes: 7a66ac8d1633 ("x86: move syscall trampolines off the stack") Signed-off-by: Jason Andryuk Signed-off-by: Roger Pau Monn=C3=A9 Reviewed-by: Jason Andryuk Tested-by: Jason Andryuk --- xen/arch/x86/include/asm/stubs.h | 2 +- xen/arch/x86/setup.c | 4 +- xen/arch/x86/smpboot.c | 92 +++++++++++++++++--------------- 3 files changed, 50 insertions(+), 48 deletions(-) diff --git a/xen/arch/x86/include/asm/stubs.h b/xen/arch/x86/include/asm/st= ubs.h index a520928e9a50..467551136a2a 100644 --- a/xen/arch/x86/include/asm/stubs.h +++ b/xen/arch/x86/include/asm/stubs.h @@ -32,6 +32,6 @@ struct stubs { }; =20 DECLARE_PER_CPU(struct stubs, stubs); -unsigned long alloc_stub_page(unsigned int cpu, unsigned long *mfn); +void init_stub(void); =20 #endif /* X86_ASM_STUBS_H */ diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 4192edf635b6..0253d22c349d 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -2089,9 +2089,7 @@ void asmlinkage __init noreturn __start_xen(void) =20 init_idle_domain(); =20 - this_cpu(stubs.addr) =3D alloc_stub_page(smp_processor_id(), - &this_cpu(stubs).mfn); - BUG_ON(!this_cpu(stubs.addr)); + init_stub(); =20 bsp_traps_reinit(); /* Needs stubs allocated, must be before presmp_in= itcalls. */ =20 diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c index d8fd71ffab37..f0c104b9f072 100644 --- a/xen/arch/x86/smpboot.c +++ b/xen/arch/x86/smpboot.c @@ -20,6 +20,7 @@ #include #include #include +#include =20 #include #include @@ -641,41 +642,62 @@ static int do_boot_cpu(int apicid, int cpu) return rc; } =20 -#define STUB_BUF_CPU_OFFS(cpu) (((cpu) & (STUBS_PER_PAGE - 1)) * STUB_BUF_= SIZE) +/* Dynamically allocated, indexed by CPU. Store physical address of stubs= . */ +static paddr_t *__ro_after_init stubs; =20 -unsigned long alloc_stub_page(unsigned int cpu, unsigned long *mfn) +static bool assign_stub_page(unsigned int cpu) { unsigned long stub_va; - struct page_info *pg; + paddr_t addr =3D stubs[cpu]; =20 - BUILD_BUG_ON(STUBS_PER_PAGE & (STUBS_PER_PAGE - 1)); - - if ( *mfn ) - pg =3D mfn_to_page(_mfn(*mfn)); - else + if ( addr =3D=3D INVALID_PADDR ) { - nodeid_t node =3D cpu_to_node(cpu); - unsigned int memflags =3D node !=3D NUMA_NO_NODE ? MEMF_node(node)= : 0; + nodeid_t nid =3D cpu_to_node(cpu); =20 - pg =3D alloc_domheap_page(NULL, memflags); - if ( !pg ) - return 0; + /* + * Attempt to use the same page as the previous CPU if possible, + * otherwise allocate a new one. + */ + if ( cpu && nid =3D=3D cpu_to_node(cpu - 1) && + PAGE_OFFSET(stubs[cpu - 1] + STUB_BUF_SIZE) ) + addr =3D stubs[cpu - 1] + STUB_BUF_SIZE; + else + { + struct page_info *pg =3D alloc_domheap_page(NULL, MEMF_node(ni= d)); =20 - unmap_domain_page(memset(__map_domain_page(pg), 0xcc, PAGE_SIZE)); + if ( !pg ) + return false; + unmap_domain_page(memset(__map_domain_page(pg), 0xcc, PAGE_SIZ= E)); + addr =3D page_to_maddr(pg); + } + stubs[cpu] =3D addr; } =20 stub_va =3D XEN_VIRT_END - FIXADDR_X_SIZE - (cpu + 1) * PAGE_SIZE; - if ( map_pages_to_xen(stub_va, page_to_mfn(pg), 1, + if ( map_pages_to_xen(stub_va, maddr_to_mfn(addr), 1, PAGE_HYPERVISOR_RX | MAP_SMALL_PAGES) ) - { - if ( !*mfn ) - free_domheap_page(pg); - stub_va =3D 0; - } - else if ( !*mfn ) - *mfn =3D mfn_x(page_to_mfn(pg)); + return false; =20 - return stub_va; + per_cpu(stubs.mfn, cpu) =3D PFN_DOWN(addr); + per_cpu(stubs.addr, cpu) =3D stub_va + PAGE_OFFSET(addr); + return true; +} + +void __init init_stub(void) +{ + const unsigned int num_cpus =3D num_present_cpus(); + unsigned int i; + + ASSERT(!stubs); + stubs =3D xvmalloc_array(typeof(*stubs), num_cpus); + if ( !stubs ) + panic("Unable to allocate stub array\n"); + + for ( i =3D 0; i < num_cpus; i++ ) + stubs[i] =3D INVALID_PADDR; + + if ( !assign_stub_page(0) ) + panic("Unable to initialize BSP stub region\n"); } =20 void cpu_exit_clear(unsigned int cpu) @@ -990,19 +1012,12 @@ static void cpu_smpboot_free(unsigned int cpu, bool = remove) { mfn_t mfn =3D _mfn(per_cpu(stubs.mfn, cpu)); unsigned char *stub_page =3D map_domain_page(mfn); - unsigned int i; =20 - memset(stub_page + STUB_BUF_CPU_OFFS(cpu), 0xcc, STUB_BUF_SIZE); - for ( i =3D 0; i < STUBS_PER_PAGE; ++i ) - if ( stub_page[i * STUB_BUF_SIZE] !=3D 0xcc ) - break; + memset(stub_page + PAGE_OFFSET(stubs[cpu]), 0xcc, STUB_BUF_SIZE); unmap_domain_page(stub_page); destroy_xen_mappings(per_cpu(stubs.addr, cpu) & PAGE_MASK, (per_cpu(stubs.addr, cpu) | ~PAGE_MASK) + 1); per_cpu(stubs.addr, cpu) =3D 0; - per_cpu(stubs.mfn, cpu) =3D 0; - if ( i =3D=3D STUBS_PER_PAGE ) - free_domheap_page(mfn_to_page(mfn)); } =20 if ( IS_ENABLED(CONFIG_PV32) ) @@ -1041,10 +1056,9 @@ void *cpu_alloc_stack(unsigned int cpu) static int cpu_smpboot_alloc(unsigned int cpu) { struct cpu_info *info; - unsigned int i, memflags =3D 0; + unsigned int memflags =3D 0; nodeid_t node =3D cpu_to_node(cpu); seg_desc_t *gdt; - unsigned long stub_page; int rc =3D -ENOMEM; =20 if ( node !=3D NUMA_NO_NODE ) @@ -1092,18 +1106,8 @@ static int cpu_smpboot_alloc(unsigned int cpu) memcpy(per_cpu(idt, cpu), bsp_idt, sizeof(bsp_idt)); disable_each_ist(per_cpu(idt, cpu)); =20 - for ( stub_page =3D 0, i =3D cpu & ~(STUBS_PER_PAGE - 1); - i < nr_cpu_ids && i <=3D (cpu | (STUBS_PER_PAGE - 1)); ++i ) - if ( cpu_online(i) && cpu_to_node(i) =3D=3D node ) - { - per_cpu(stubs.mfn, cpu) =3D per_cpu(stubs.mfn, i); - break; - } - BUG_ON(i =3D=3D cpu); - stub_page =3D alloc_stub_page(cpu, &per_cpu(stubs.mfn, cpu)); - if ( !stub_page ) + if ( !assign_stub_page(cpu) ) goto out; - per_cpu(stubs.addr, cpu) =3D stub_page + STUB_BUF_CPU_OFFS(cpu); =20 rc =3D setup_cpu_root_pgt(cpu); if ( rc ) --=20 2.53.0