From nobody Sun Dec 14 08:06:53 2025 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=epam.com); dmarc=pass(p=quarantine dis=none) header.from=epam.com ARC-Seal: i=2; a=rsa-sha256; t=1764343372; cv=pass; d=zohomail.com; s=zohoarc; b=ZSZi4SBGfq5hzwwdYt55o+aDUOb7g845+J1Qpw0U0UiPYSjU5Ba/oT9CiHYAl+oir6hl6ypi/kQeFoSxw9oaxd85ACFQgILrwaO45Z0Sctj69AEN5Uwq+j2lU7ui8mPjBrQJxUMdlqyK3ZZk6udiUsKNLfmVgLKgoUsh19F39q8= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764343372; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=fhllEEdN8c/THLolcCsFuYa7Q16LQxiDOFaDDhoCu58=; b=FCU609qPWDmDCf1vX2FW6UGBG7oOS3psFmViGYKowf1BWAJY02Zg18HNnzj9UWjMBfx8gDkCOa9sZf42XQFvPh49/txaq1foQ0LRephfrHXKjd3/+Y/vLVvqKx0zIXIodyy8VZU3omrbnGouXFbA4TozDOTVCqqW6JHf/GWUOvg= 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=epam.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 1764343372959904.7086192514645; Fri, 28 Nov 2025 07:22:52 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.1174944.1499870 (Exim 4.92) (envelope-from ) id 1vP0Im-0006ea-Eg; Fri, 28 Nov 2025 15:22:28 +0000 Received: by outflank-mailman (output) from mailman id 1174944.1499870; Fri, 28 Nov 2025 15:22:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vP0Im-0006eT-Bv; Fri, 28 Nov 2025 15:22:28 +0000 Received: by outflank-mailman (input) for mailman id 1174944; Fri, 28 Nov 2025 15:22:26 +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 1vP0Ik-0006eN-9J for xen-devel@lists.xenproject.org; Fri, 28 Nov 2025 15:22:26 +0000 Received: from AM0PR02CU008.outbound.protection.outlook.com (mail-westeuropeazlp170130006.outbound.protection.outlook.com [2a01:111:f403:c201::6]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 0a2cc5ac-cc6e-11f0-980a-7dc792cee155; Fri, 28 Nov 2025 16:22:23 +0100 (CET) Received: from AM6PR03MB4600.eurprd03.prod.outlook.com (2603:10a6:20b:6::31) by AS2PR03MB10087.eurprd03.prod.outlook.com (2603:10a6:20b:62e::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9366.14; Fri, 28 Nov 2025 15:22:20 +0000 Received: from AM6PR03MB4600.eurprd03.prod.outlook.com ([fe80::ec82:849c:dc0b:f6d4]) by AM6PR03MB4600.eurprd03.prod.outlook.com ([fe80::ec82:849c:dc0b:f6d4%4]) with mapi id 15.20.9366.009; Fri, 28 Nov 2025 15:22:20 +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: 0a2cc5ac-cc6e-11f0-980a-7dc792cee155 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=jUfr7MrdpJBOQeqvzWuzq+iBEOgazMgG3NcJwgcy5CoSmmMZ4wug0aCn4XpyxM0ou9ib6EGl6qX6EixVOlSo9ELpNsuaywTOIySXeR0KqYtaCzYc5PV1QYm89430fbT/BLvaDqt08ZQjOHKCewPrDaK0t4qqHLDXKwANTFrhWLIVH8uLrJ2Ftef5Iqdb8RoysQfkH9krnzciO54L+jiGfNe3r7MR+HpuuHHJojRBJQdt/k5sFaYZbLG+TPaee6EiVj10xk8UBOW+9XGjD6uq8Xji9jkTKUGS/O0JDpjPpZfST5d5/d0J7v+v4YGkoemZXoi3awfSqrXN6Mf3Ts+kbA== 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=fhllEEdN8c/THLolcCsFuYa7Q16LQxiDOFaDDhoCu58=; b=OLx/e2Y/iknm6F+e/5PqYXMjGgkGuK7Ito3P1kQqIK/KBALc5ERyrKgGl+Yq4QYQB8/RnN4SpWm1AJfm6Zd8t1AgFLOKRmrDfdxgni2FhjUVz+XdkPpol39CReQZENW+y0xX2Aq59BQpOPsqirjOYsR99nkNYJlKkW4GeC/jJg5sxJP2HJY8dFOIY6Bq2QCJ6/mMl78Q3CvnfBc3JO3hZHyO6STb8KT3lEN0x/9AlB4cM1l0Srcw2B/7XnxQ7CytnTOlpwMoXFOLxnT3NtaX4JSI38PQmwYe6dXkl5L4lh+2cGKvkG3ffLV7AKJbR1S3M88cykTFs5begjILy3UVaw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=epam.com; dmarc=pass action=none header.from=epam.com; dkim=pass header.d=epam.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=epam.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=fhllEEdN8c/THLolcCsFuYa7Q16LQxiDOFaDDhoCu58=; b=EzWzbibh6e+cspO6HQd+Bgjwnxm6xoTIZwZelnMb/k8fJgJ8vI1Ga5A3mFORnuHJ3d/TxKXdmz4WeknYk8nB71pZabINBG1w6KJHSf7yh8EsNcKUZ7JpAIizUidvp//cmfTxX0VjjfFpeinneVYPPJKNcGIIBSKZoSBZdC2WKhF0S8ViFr6xYYQDhwlNAuOBGsry7MM/eokDIbSnQ0NjeDFKwqNp3RqgyzOyog6Krgla5GUALtq6kotLHrtJzJyh/z3QmndVChHZ3no3DN58pQorJw/SGmOX8Xx3oZzptHBx8CSOmQ3oI5ATt7D3P/Z95MZHyUkm/IxEWcQcMvwBnw== From: Grygorii Strashko To: "xen-devel@lists.xenproject.org" CC: Grygorii Strashko , Stefano Stabellini , Julien Grall , Bertrand Marquis , Michal Orzel , Volodymyr Babchuk , Timothy Pearson , Alistair Francis , Bob Eshleman , Connor Davis , Oleksii Kurochko , Jan Beulich Subject: [PATCH v3 1/3] arm/ppc/riscv: drop unused domain_set_alloc_bitsize() macro Thread-Topic: [PATCH v3 1/3] arm/ppc/riscv: drop unused domain_set_alloc_bitsize() macro Thread-Index: AQHcYHrKJo3fQNjNOEm0i3u+ucdXcw== Date: Fri, 28 Nov 2025 15:22:20 +0000 Message-ID: <20251128152218.3886583-2-grygorii_strashko@epam.com> References: <20251128152218.3886583-1-grygorii_strashko@epam.com> In-Reply-To: <20251128152218.3886583-1-grygorii_strashko@epam.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=epam.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: AM6PR03MB4600:EE_|AS2PR03MB10087:EE_ x-ms-office365-filtering-correlation-id: 23721e61-7608-40ad-31f4-08de2e91ec92 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0;ARA:13230040|7416014|376014|366016|1800799024|38070700021; x-microsoft-antispam-message-info: =?iso-8859-1?Q?yrF75vEESpNIOSNaLPAUaZ/R5kRubxv6e69bSoAoOe/B2Ff/M8Qt1N6qez?= =?iso-8859-1?Q?LfZdHO8rZZrrxd9ocmy1dZoAqQmA9U3ydm19rrd8hUoGmfhZX5kdhugXce?= =?iso-8859-1?Q?o03mQwm89yJyODP+0/rfBxcDfozYp8tNxeJeh4Y4e1+0mRDuz5juTXWoYo?= =?iso-8859-1?Q?OSS20Td1qSqM5hPtTE6OvdPKM+guTMd67PGzHAT9MrXKzv/GWtahbsm/IN?= =?iso-8859-1?Q?WSWuWF5coy93/Z3Px3ELkez2j+X2r1giApZuuiYDOw2w0Eau9lnSt0uqyN?= =?iso-8859-1?Q?JFs8xhZN4juGbFGbjqfPkRzkd40fG+xI2VzgbVOSG42ZDE3678HfKt0ulW?= =?iso-8859-1?Q?944NXBGo3cFRA3qFXhR6PZqyDE6Iw1eZxO2sQo8yi0CiEdz1utTn5VZ/6z?= =?iso-8859-1?Q?zPLo8Gm1N+PBUAhiTfhYeEJVkgw9rYz0ZLFpZtRnNacIXcRdOmZmhIknox?= =?iso-8859-1?Q?IaxfKuH8ecHGxlwTch1xo9rJFBZlOGLjpxB9UXO1tFrPcsMLY1QjqA0Zh0?= =?iso-8859-1?Q?/Iuwyb5/zDcN7WyenGy0eyNCJ6CupkpVq2RqpfUVAOpRfQMo2MrgQHIAYU?= =?iso-8859-1?Q?5DDKIWt4jUHG8ICIiCYYTuXWs/EJJi7ZRDXhYykr0qkdxUHJ/fVTDXY3Wh?= =?iso-8859-1?Q?Y0Je0jgg1xo4iVlM0dQry6MXQ+9WL8OyHVFQW1H1cXGLBfmHhwUukoT2o7?= =?iso-8859-1?Q?7sqioWyiSBmCrDiH1e8qyVDtmJhgVAOFvukC5FB5epLsVK7fJUvdhkc3Av?= =?iso-8859-1?Q?O2tsp2YgYKBmzDBGWAiXJH71dH9lUmyXJsVJP1eyFFoHhRfEg33WaQGGS/?= =?iso-8859-1?Q?4BOEHVyXa63fLyk6AUZvpybBIPD+uSbDXFzHAt7ayKL87D6wj9uRnXuF7Z?= =?iso-8859-1?Q?go3XuKHd90uh19aBra05ubWJAB2UHtPhqYb7aJX1ynTOFn/IvIlE63j/1A?= =?iso-8859-1?Q?dscBuiT2Mit6ood3ZNYZFwo6PlBuZ992tpwFOsdNiWR1f813QzMi0gTKEw?= =?iso-8859-1?Q?9QYjXy4D2YKydkjj+qqhGkyIIYry7HMBYZf5lmqW0d4GpPw6Ml4OBDg0Lz?= =?iso-8859-1?Q?YFQ7+HGg8xFds0VBicutXJFSt55wFhwlC6J3JT7xxo4fFGrNrYBFRFAvRC?= =?iso-8859-1?Q?AlHWBiHiNvOFMoidRvUSX8aPWVRc7DUldLTXd8em4ebO1FxGHIm+MfgsmT?= =?iso-8859-1?Q?7bouuyYmJzmtQNhlOGBdgBvLh885pvRW3+YELcLkXCWVhVrPNrqAx7x5WP?= =?iso-8859-1?Q?uAZyKKyZn19w43twdd7Z1yMkHj4GSOCUxi7mCxRpe+FDPTHAwsDS8cP+PM?= =?iso-8859-1?Q?sJGftwchb3NPdTSvJ2t9tF0TFBg202dDAb8TaZOCEqB1E+gTZil9oeCv6p?= =?iso-8859-1?Q?qoBkm5wIGYypiBP41ZDBTNwoyjQkKKRXp02195jDqKwPyK90C3FahcfnxH?= =?iso-8859-1?Q?Zgdl26eZcegRuedOvz/PWS7rjtjExOHXyP15pqgiF6EigU+YDusJK+QAfs?= =?iso-8859-1?Q?rFgkBmwNcnZzJAcYfq0nRyfeycqJKxS78LKZKMpYSc/TqSaioJo0CP85LP?= =?iso-8859-1?Q?bov6WlogvG826wUfGxgEFOvMhN4Q?= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM6PR03MB4600.eurprd03.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(7416014)(376014)(366016)(1800799024)(38070700021);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?Q?fNmTnK05ZT6kDiDqqUUX/F+Uv3xLy8ELk8+Es0CeBqykOTOqbmW3LVVogK?= =?iso-8859-1?Q?lfUn3ZKzzOt3hHmMfaX3XcrukJSVCIGIksH/iWM/ENykH/ESxv/yPxnER0?= =?iso-8859-1?Q?5bcBbYNR534rF8oiqRHFSnu+O9hoKgqFhAjnzmmPO9HdEffxXwBUlIkIrm?= =?iso-8859-1?Q?5L/kKyTT5Qv2t+wvC3bGrtnWKGlTEGDyZ8eGK+eOo+ULbI8EFmFUoZbhU2?= =?iso-8859-1?Q?H6UgqruzqO8X5F0R9B2VUA0f9a6b2shqRYfPRumSgGRnIeo/Dqjks8cY+Q?= =?iso-8859-1?Q?GHqX4o2m8hdYdpwkKNe1GQ5bqdxte2VJSelZJLM69+gCOxqPSv8GXIAR2t?= =?iso-8859-1?Q?QKVe/GLWhbBFZngAHJwsxdKaiuDyaemY2MJ9PKatBtuhmQDq1eY9vGDfq8?= =?iso-8859-1?Q?qctJ4wtXnbBVg8JhFWGxIg4R9iMMns8XORyjRfOpdPW5ZunBY2LnH7ul6P?= =?iso-8859-1?Q?7jdoWoLfj81wNCuJhfIYTvbvFLD5kOgtQRYvD8RY64rjGlp0zHf6S9dKQM?= =?iso-8859-1?Q?gtUs/5+QtmpMHmtVuTbXTLQihxitdt7nyfztoQj739mBNeindM7DYzHF3N?= =?iso-8859-1?Q?HQ9s9lcBgveEpTV1bM/L3WDrdrtvOa/ePG/Qla7/wu/L3Qgpt2Z5+X905F?= =?iso-8859-1?Q?q4xG4PdCCDA1iToN0+5vPiN2SQf75QkX/jyby1K+QNtxxO3MfIcwXM+9R7?= =?iso-8859-1?Q?F41Nv6C5FsIjpXNNBiTMtgsQQt/F6axt+xg5ZD7ymD9eLI9GGpMvR3EVt7?= =?iso-8859-1?Q?ILnyR+bfNJKNPoqcTTWKQTBJg7sG0y4P6Qx0p5omHxa12RRQ5J9BIPWImB?= =?iso-8859-1?Q?zXYCVruJFXbGov167dhaSNfzkdiV3s9Mnylh/nq7p8AMF2JEETTzLkWOGd?= =?iso-8859-1?Q?mD/Ca5phW0/DndSNi+cARV9r/VSWtbA4jP9yIx6gj00ocspGSd3x2JPdwV?= =?iso-8859-1?Q?vXzdWxbOSrORRNVPs9urjyK4TjyeE7KmPdR2cSrI/xjLbwlhyF6aGAXayj?= =?iso-8859-1?Q?Brsohq6ApXk43G5XhF6hJhWTVZehJ0Cs/GbMly9UpF/H6WFfg4nyRS/CDU?= =?iso-8859-1?Q?JXpEDOG888+lF6mPy0J+tOuK2HAT80eIOnHFGNF4dNeAYUuVIER+DD6D9C?= =?iso-8859-1?Q?/BQNjOeR7MYvQanJCwTRqI69WJGyuGgL/E0bdYpr+Di7es42O1FwGpJB4v?= =?iso-8859-1?Q?TVXIZB09Wcpw8lvr1Pr0gMqS5cYLSQ56l9Gp5wUlJ75zLRwq5WgF71O2w8?= =?iso-8859-1?Q?rZ54mnz3v9KUR2O2vopS41N63SBAcnCSSb5TwKUg49DkMKrrhzuleoygh9?= =?iso-8859-1?Q?ee+uBN43q8IHwqKWs92tz6/es7R0D7tQ1bhgfnfGmstTmokO2e3akLjVXI?= =?iso-8859-1?Q?QsNAaOgAerr3NcbSwGckgJ47ap8E1q7qH8DuA4nvYPz3TLhm8laHlAg+OW?= =?iso-8859-1?Q?55JQxAEFtCai3AI+Q5kMjelR+3wgfKxlVn5W3i6hcP6kyV/OoxLKlaysOD?= =?iso-8859-1?Q?WYVoMmaNL/cTWIDYaKO0NYOkjOtUtK5OGPdcKBuln+qbLGNqIpgjQimiFG?= =?iso-8859-1?Q?fu3DhuUlrvg4yXSS0HHpOeZ5AVr3yDpQ5+EdheIs2TRcyJNdaPnp7FC1hm?= =?iso-8859-1?Q?kSSWOY81FqbbwG6dW3YhINVXz89I8Nu6gDxV0AY3xTBL969ADHunVv8A?= =?iso-8859-1?Q?=3D=3D?= Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: epam.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: AM6PR03MB4600.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 23721e61-7608-40ad-31f4-08de2e91ec92 X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Nov 2025 15:22:20.7186 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b41b72d0-4e9f-4c26-8a69-f949f367c91d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: BEO8ZkYPt7Fwp2XeF3AU/LDc8b6wlGc41srWfkoncKzj47RWW74SR2zTb72ey9MToDyBFYSMDgs7JFpLUImXbUHIK9DTj0YoSUD0SDx4O2o= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS2PR03MB10087 X-ZohoMail-DKIM: pass (identity @epam.com) X-ZM-MESSAGEID: 1764343373403019200 Content-Type: text/plain; charset="utf-8" From: Grygorii Strashko The domain_set_alloc_bitsize() is x86 PV32 specific and not used by other arch or common code, so remove it. Signed-off-by: Grygorii Strashko Acked-by: Jan Beulich Acked-by: Michal Orzel Reviewed-by: Luca Fancellu #arm --- v3: no changes, added tag xen/arch/arm/include/asm/mm.h | 1 - xen/arch/ppc/include/asm/mm.h | 1 - xen/arch/riscv/include/asm/mm.h | 1 - 3 files changed, 3 deletions(-) diff --git a/xen/arch/arm/include/asm/mm.h b/xen/arch/arm/include/asm/mm.h index f702f4a0d676..4c6cc64aa7ba 100644 --- a/xen/arch/arm/include/asm/mm.h +++ b/xen/arch/arm/include/asm/mm.h @@ -313,7 +313,6 @@ struct page_info *get_page_from_gva(struct vcpu *v, vad= dr_t va, /* Arch-specific portion of memory_op hypercall. */ long arch_memory_op(int op, XEN_GUEST_HANDLE_PARAM(void) arg); =20 -#define domain_set_alloc_bitsize(d) ((void)0) #define domain_clamp_alloc_bitsize(d, b) (b) =20 unsigned long domain_get_maximum_gpfn(struct domain *d); diff --git a/xen/arch/ppc/include/asm/mm.h b/xen/arch/ppc/include/asm/mm.h index a33eeec43bd6..e478291fdf55 100644 --- a/xen/arch/ppc/include/asm/mm.h +++ b/xen/arch/ppc/include/asm/mm.h @@ -96,7 +96,6 @@ static inline struct page_info *virt_to_page(const void *= v) /* TODO: implement */ #define mfn_valid(mfn) ({ (void) (mfn); 0; }) =20 -#define domain_set_alloc_bitsize(d) ((void)(d)) #define domain_clamp_alloc_bitsize(d, b) (b) =20 #define PFN_ORDER(pfn_) ((pfn_)->v.free.order) diff --git a/xen/arch/riscv/include/asm/mm.h b/xen/arch/riscv/include/asm/m= m.h index 9283616c0224..11e9f26bf0a5 100644 --- a/xen/arch/riscv/include/asm/mm.h +++ b/xen/arch/riscv/include/asm/mm.h @@ -292,7 +292,6 @@ static inline bool arch_mfns_in_directmap(unsigned long= mfn, unsigned long nr) /* TODO: implement */ #define mfn_valid(mfn) ({ (void)(mfn); 0; }) =20 -#define domain_set_alloc_bitsize(d) ((void)(d)) #define domain_clamp_alloc_bitsize(d, b) ((void)(d), (b)) =20 #define PFN_ORDER(pg) ((pg)->v.free.order) --=20 2.34.1 From nobody Sun Dec 14 08:06:53 2025 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=epam.com); dmarc=pass(p=quarantine dis=none) header.from=epam.com ARC-Seal: i=2; a=rsa-sha256; t=1764343371; cv=pass; d=zohomail.com; s=zohoarc; b=USAaa4LcElQ3NqdD9rsA4S1J6pO73It/4aDmIoCRnveK9vgDOCpEQSkOdSfdl4Xu7mIyfQRzpkW7F9Z5A9ZH+RTX8I5BG/XG0DNR0+gYKy0FgTePwhIN39oj615pzeTGFMoDlHZzjM5UQWrPE30aLSsSjQqDH14pqJShyiihYGs= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764343371; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=hPhlpPQO+kk9DvnzI2NKX1j+ZgUlHCbYfuwZsB6QEdU=; b=b5GtE4b1t+K7gLJGAs0PB8rm0Ww1XnXMWN4FyU6UOu40+4KWPNNq9yTSXhtiq016sq01D7fRxXkzHefYmdzSO3Fv8FnOG6gtsuwc8D3NDke3FCAc2Snj5OKjLhYp6/eIN6UiPG1mVWCpurrMYq+rFTwC7AKFLYd4KiH3YrCCuq0= 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=epam.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 1764343371915979.4563492352719; Fri, 28 Nov 2025 07:22:51 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.1174945.1499881 (Exim 4.92) (envelope-from ) id 1vP0In-0006s2-NX; Fri, 28 Nov 2025 15:22:29 +0000 Received: by outflank-mailman (output) from mailman id 1174945.1499881; Fri, 28 Nov 2025 15:22:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vP0In-0006rv-JI; Fri, 28 Nov 2025 15:22:29 +0000 Received: by outflank-mailman (input) for mailman id 1174945; Fri, 28 Nov 2025 15:22:28 +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 1vP0Im-0006eN-RI for xen-devel@lists.xenproject.org; Fri, 28 Nov 2025 15:22:28 +0000 Received: from AM0PR02CU008.outbound.protection.outlook.com (mail-westeuropeazlp170130006.outbound.protection.outlook.com [2a01:111:f403:c201::6]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 0c490793-cc6e-11f0-980a-7dc792cee155; Fri, 28 Nov 2025 16:22:27 +0100 (CET) Received: from AM6PR03MB4600.eurprd03.prod.outlook.com (2603:10a6:20b:6::31) by AS2PR03MB10087.eurprd03.prod.outlook.com (2603:10a6:20b:62e::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9366.14; Fri, 28 Nov 2025 15:22:21 +0000 Received: from AM6PR03MB4600.eurprd03.prod.outlook.com ([fe80::ec82:849c:dc0b:f6d4]) by AM6PR03MB4600.eurprd03.prod.outlook.com ([fe80::ec82:849c:dc0b:f6d4%4]) with mapi id 15.20.9366.009; Fri, 28 Nov 2025 15:22:21 +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: 0c490793-cc6e-11f0-980a-7dc792cee155 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=JdWAR796qRNOlTs3VUZFHWd1n+M7HDMfdLXx+lKJcdmUIZlSmaVEM3DGPqr+o/JGk/rmkIoBDL7fuGObN47Pgz2CWV9IGUBlZlew9ms+QQr6oG0XbwhHjV47cE3lHmmdpMUHUTeiuJmPQr2Fp9ioPTtjEtVpWw401nZyAcO6Hpzda2UP6eUQ5GJa3555zXKiA09iMca0Awn5mhvu8bqfBJuJu63nMRsablMGo4PyOz76PQ3stHAgXca2uQNudqiyXy4MSHy3dMmuDUSQfy0atqH4boqxQR03Jv/sH9NYBFZ2uYAeMHMSvvynQ8V1pRcMphJSUJTIZu4ylEhW56Zqhw== 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=hPhlpPQO+kk9DvnzI2NKX1j+ZgUlHCbYfuwZsB6QEdU=; b=DIEC5KgzMDkOCSFeNndPFoLKqN3CF/yrhpKF+pYpVHAsB+dsO7vdkGArXnbf02Jh22WS9Fq2EvpymNhXOUOdyyHEkEUzuKDP3TMBLahi/Pn2gUlAI2VyTMaKKfDeEcyXlpyhPASkMSHY2sm0lGBf4g0tGWVsUIAefAskWm9r+A9L0vcWWWq7eEVxldjtNk0WK33kSB0tpjr3DoFAiEyTFG5o1AL974TqX/4iyVqbbA2+QbaTBxSVQwSvZNsb8bA9mCsuPho+HgdCY7Ym4AcrIOOOfOa3yhVbCqaNXkPDtANVdoqghbSDEmfE0RUMBDkknvJHSsUIUqt5+nMtDAHJfw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=epam.com; dmarc=pass action=none header.from=epam.com; dkim=pass header.d=epam.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=epam.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=hPhlpPQO+kk9DvnzI2NKX1j+ZgUlHCbYfuwZsB6QEdU=; b=ApvzqVNCguL6W+rd9Sn1tCm1E7d233ozo4yEJnE7MmzWjzA8ffmjsZJOiYCI6Y1x0/qVGBwQZ/mwA5tpwxxc3ib9nSyLFC4tQQ3G94iXvUtPgdJUP6zYzDP+NdQ0ikWhALQP7MdUnT0D5Jl/cVOywsOfSl6PS+bqdEFP4ZHOkzkahn4i3FrnH7ySe/6isImTZfsqqgP3ZwOfNEf7XHCTlWkAjb15xl//7JwrZW+5oSaM7gC4DuzkPNHkHp3g8wvr8GI9Ga96ITEuVETHzJ92CqbPU3F5GvBFGnrIV8KyFz8G5RDkkDuUBg2NDCrIhYSnEnWSxOT1vb/8vXwb0LrAnw== From: Grygorii Strashko To: "xen-devel@lists.xenproject.org" CC: Grygorii Strashko , Stefano Stabellini , Julien Grall , Bertrand Marquis , Michal Orzel , Volodymyr Babchuk , Andrew Cooper , Anthony PERARD , Jan Beulich , =?iso-8859-1?Q?Roger_Pau_Monn=E9?= , Timothy Pearson , Alistair Francis , Bob Eshleman , Connor Davis , Oleksii Kurochko Subject: [PATCH v3 2/3] xen/mm: add generic domain_clamp_alloc_bitsize() macro Thread-Topic: [PATCH v3 2/3] xen/mm: add generic domain_clamp_alloc_bitsize() macro Thread-Index: AQHcYHrKI/DuZxtTF0mX/NaGMgBzNg== Date: Fri, 28 Nov 2025 15:22:21 +0000 Message-ID: <20251128152218.3886583-3-grygorii_strashko@epam.com> References: <20251128152218.3886583-1-grygorii_strashko@epam.com> In-Reply-To: <20251128152218.3886583-1-grygorii_strashko@epam.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=epam.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: AM6PR03MB4600:EE_|AS2PR03MB10087:EE_ x-ms-office365-filtering-correlation-id: f4241c1f-e2cb-4f3b-217f-08de2e91ecfa x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0;ARA:13230040|7416014|376014|366016|1800799024|38070700021; x-microsoft-antispam-message-info: =?iso-8859-1?Q?kqxYjPgdjrqO53B/JH2oj+/s5AGYWt69SI6z4rDfqDE4tAk0x65fQnhbWu?= =?iso-8859-1?Q?ZYR/lEhqIriSdK6PDuVQFsJ9KLO4ESjxT6ktTyuvn0Nq3gpVqvTFsNiYEX?= =?iso-8859-1?Q?smuPO4JliP5aLMmboBJlxCfjnLMvfSCIt7IlkShYBAUXMnGPyoSmhxMbDI?= =?iso-8859-1?Q?7FX4/KKNN7RxBis32RXZ2BeP1mIfhpkj4T8pRZEcvRbwtsbG6oR4GFIiPl?= =?iso-8859-1?Q?eE4Wkn6E8DmhsXMv+WdMzN9PgtCBJCR6e+/CReisDJ2/HCuzsJFvXKwEGR?= =?iso-8859-1?Q?9mIE19QvoYuBtEGzw6CbXa0ZIsvc7vu7qdBvECW7Qh9IJRa1vUUWRrPSiL?= =?iso-8859-1?Q?/IfA1en/NOa6fnnvRP6jNoW+2lz9YxAanylUa55qYTJwWODXaQ65buzsT3?= =?iso-8859-1?Q?boYm5n8B1skG5/zWHKJS+OGiLrjFDa6Q7jbzcmuNAFm/UALHt+S0TdSKtE?= =?iso-8859-1?Q?ck3Wsz8ijg2PQFHKdB7X/pfaS9dcm5xjt8BdTeiL/K4A6bX8ORJxT5i5Ii?= =?iso-8859-1?Q?jB1Hwy5Y7ZXVr2nCm9ZizQWddFcBKxLKLjnSuC4WjW1lDRqXOCUWHelbjh?= =?iso-8859-1?Q?GEBoqytjje9iUwhoRBpQlmDzsa6ZUVHYDAtKzJV7zMxJLVex2nxR7Qgu7G?= =?iso-8859-1?Q?M8EMuVuPTVuEmrfCfgf6dcEQXjxe3LSjoQ7Hkv4P8VCy2H8eGyDGglCK+o?= =?iso-8859-1?Q?7y9WJoI/GMH8BFFG7JIP44CcfgsH83vQESDR7EfW3I0/WzrfFW2b2wm58Y?= =?iso-8859-1?Q?XLWhr6lMWhmFZ4JtdQM3daASIfJnNdhgd5uPeoW+CJsKfsYjfsSHonIehY?= =?iso-8859-1?Q?kUJt7pHYN1vOgSMzvAf0TgqGzHpZ+owWsiMdqacrjMvlCIf7RbOpGpaaRL?= =?iso-8859-1?Q?J4DBhMXjpY/lGIlY7dt15PtO5lT43KiJYUO4JIzqeo1G5snnDC3U0ysRCq?= =?iso-8859-1?Q?fxSzCzfDf4SSwg9lcMebb8uq0WohP/QZKC5fc8lD1oYQvME2S/wmk/a3a/?= =?iso-8859-1?Q?KH5bMBR1YGpHrYqW4QMQLVXob/pSHsmt1x31svotwojkc4EZZJV3IeNnWV?= =?iso-8859-1?Q?dqwVJzsuVIz10af7AmdpF8f/WcVNLodIYG73F64PdnicqOc2UecDY9zjuS?= =?iso-8859-1?Q?s6IlSMOxA2JFkuUk+TwgtyHBfdjV8UMzf/T8xqiAjC48K8FjevhWrL/ClZ?= =?iso-8859-1?Q?yMo4aIP46g4b1ziqL+NN6HCHGiKikTbY8S1x7yA53N9W4SLFM4PmkBjoAy?= =?iso-8859-1?Q?VftnwD8gdZZXk8XgapVQHzVUHCRitg1OZLyHBS7h1w2BKzx48QrOWsk80x?= =?iso-8859-1?Q?2bFxlgo5+YNLHxcMlg86uvEHN35PxraifTGoXgNCy6BGpRLHN/0f/whgyN?= =?iso-8859-1?Q?z9CqYESr7ajMf4bx4dmJ6i7fOWHeWewzDarL9y7U6YXc94WU4YuIYqWNP0?= =?iso-8859-1?Q?QtwnEVMw80CAjHmm2OLpEj/NA+OOiq2e+cr+mo8FlMAOVXrSaJzAIwJcZN?= =?iso-8859-1?Q?lbmHaqAAjN5oAg2TTCpI4L2TDcauTt1oxYOoBEqhhHKRvwZeYOHQgYwbVa?= =?iso-8859-1?Q?45hDlVmhcxEIY9z9AepzPguGvjDY?= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM6PR03MB4600.eurprd03.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(7416014)(376014)(366016)(1800799024)(38070700021);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?Q?tT1cz13hGC5lVzqwTSY8lWk+BjUX3wNjnGmOj8DuXKFROetrkold/BOMmr?= =?iso-8859-1?Q?+/GtxX3N2fV3Qjo4U6QciUpnxKFYBVwEI1qPo1SpkJC6xeFfl44WDMsNRl?= =?iso-8859-1?Q?R/uvYAIp+n46+ldiMB1IE075qAcHmTSfqyucxTMAC9JjsPwtK97WDk+Sng?= =?iso-8859-1?Q?rVzPNBpOmwE4C8D20HT4te19692e+eFs2JKYe4icxiHbb5fnyG2fKA4dmR?= =?iso-8859-1?Q?7iyZVOfBPa0niDkb/B8WYK/fZwPpvUxcANpSxvbNVZHtbRWevbWEJ0FB2O?= =?iso-8859-1?Q?+Y1njIcaTgkxZ15jOl8wD1PYIlnES3BniWAIZ6nuVA8ejxREc/jr2igUm5?= =?iso-8859-1?Q?dCr9rPYLbcQ20s+uDw1uS5Qc9YiP0xhHQeAYVUtjZZut/H+Zy3GQZiZZgj?= =?iso-8859-1?Q?pAkmJnW4n/iWqKUF+A73cjJqFxhJZFfMrVuzoHcasXQVnvT2GiYOE9rBxL?= =?iso-8859-1?Q?dasLKGmw1RaLNARnPbyh37SAx2BVoZuiXDzZslvGrO2GKtoqNSsc9c5G59?= =?iso-8859-1?Q?JTE28HSPSe2EomNyA/8iHtSiIFDrWZ/u8uXQTknpN1meVOUvvUjIOI/yRI?= =?iso-8859-1?Q?o3K7ew7IC9ETYLlid32HuOt4ZTwKnrn2MEsFhKkK2OF93LnB8kzt6+gGzB?= =?iso-8859-1?Q?iOkZwPPMOsjczbJeYiAqLbdslRsXHVhDWk/+9/GdTEMDWe5vBMO/UutFaK?= =?iso-8859-1?Q?Iqah0RFNsruUtUWbgfSDxgWbr5cnFZBWovSTpnxvhdk5/kuM3j1lR4aCJX?= =?iso-8859-1?Q?umZBhV45PYrcN0ScNo+HO7hNySdPLlk1TbGixkMn80l/PUYZ5WQ8oGtxat?= =?iso-8859-1?Q?kblAH+G4tskz+dZfmUqXv89JtVI+D1hLn94h1DNA3qaJtvOK0w/g1PruNR?= =?iso-8859-1?Q?e79gT2KC/+OO9Y0jclDXNbMI8VoxuBuMRpE30wx3W2hDPrkR0EHQCqAVLx?= =?iso-8859-1?Q?AUKRwhMGdzgSgl03L+vpgVrrU6Jcd38Qw4T2iL6TqJQy2vJCRCTHpFOIG4?= =?iso-8859-1?Q?wqlSya9aWlT6qgV7vbqjQFVFIAUKBl6wqkUJzvQUds4Am/4gFhTqjczQRp?= =?iso-8859-1?Q?8eWrCGv8sJ0gFfYvQdi7Vup6RIAvhwUb4qU9h4oR4PEOLhPn6Vn/CgtcN1?= =?iso-8859-1?Q?2l+RbYjsH5AQMUBm+0Dt7QORHnRb+hBQkIKYRUfCUe16bxoVgWZobKS3h+?= =?iso-8859-1?Q?+FiN2aZglPfVoCUa7jzVHYoRNvLX1WazwfwQCZj5Gyr6YOKHJQ+W8wo1o9?= =?iso-8859-1?Q?SPJV4DIOBAyhTRpYt0uSKqhcEHI4cXiHIMteMvKbGeKM1DBSKjMZb6dduO?= =?iso-8859-1?Q?10bSuUH3uNWGeLv24nZSL7fhESmuLMjmYGhridpvv3RqqDUR+fBYPuq2/0?= =?iso-8859-1?Q?mCu4akesSsY1mKpjsjFspAUuFAXrRHcfXCx9xkpZ5tv0MRK0JQosXLGcgc?= =?iso-8859-1?Q?yLk5DtWUtI5F2PiY7v+rSMR3KGScBNG5aA5rTTVjpTqYt8JblUu4oRyTG+?= =?iso-8859-1?Q?7AQ1B6nu84TNotZcMuK7w2W02Go3sirJwywmpZw+0qLMoMEZ7XA0doiAUI?= =?iso-8859-1?Q?BJL0WCDM6lDUlXDY3GbyFwH1N65aCPf6DKVoSn3cWBqnGk4EmbE1dEzPcM?= =?iso-8859-1?Q?7Nyt8l2LwsD/npp8CjWbaJM42k25ygpnR/sAl0irfCndVyKounZp67RA?= =?iso-8859-1?Q?=3D=3D?= Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: epam.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: AM6PR03MB4600.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f4241c1f-e2cb-4f3b-217f-08de2e91ecfa X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Nov 2025 15:22:21.4116 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b41b72d0-4e9f-4c26-8a69-f949f367c91d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: oItp5ybrO3uTXT+yrHnp8keNXEyZFyWM1q+Pt6E2HpOoxrGZphqohWzd1zz0nr1z5qLCXoW+X+2sTXFkKaNgionh5uD8iGIqAz7c43FheZo= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS2PR03MB10087 X-ZohoMail-DKIM: pass (identity @epam.com) X-ZM-MESSAGEID: 1764343373432019200 Content-Type: text/plain; charset="utf-8" From: Grygorii Strashko Add generic domain_clamp_alloc_bitsize() macro and clean up arch specific defines. Signed-off-by: Grygorii Strashko Acked-by: Jan Beulich Acked-by: Michal Orzel Reviewed-by: Luca Fancellu #arm --- v3: no changes, added tag xen/arch/arm/include/asm/mm.h | 2 -- xen/arch/ppc/include/asm/mm.h | 2 -- xen/arch/riscv/include/asm/mm.h | 2 -- xen/arch/x86/include/asm/mm.h | 1 + xen/include/xen/mm.h | 4 ++++ 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/xen/arch/arm/include/asm/mm.h b/xen/arch/arm/include/asm/mm.h index 4c6cc64aa7ba..ec2d2dc5372a 100644 --- a/xen/arch/arm/include/asm/mm.h +++ b/xen/arch/arm/include/asm/mm.h @@ -313,8 +313,6 @@ struct page_info *get_page_from_gva(struct vcpu *v, vad= dr_t va, /* Arch-specific portion of memory_op hypercall. */ long arch_memory_op(int op, XEN_GUEST_HANDLE_PARAM(void) arg); =20 -#define domain_clamp_alloc_bitsize(d, b) (b) - unsigned long domain_get_maximum_gpfn(struct domain *d); =20 /* Release all __init and __initdata ranges to be reused */ diff --git a/xen/arch/ppc/include/asm/mm.h b/xen/arch/ppc/include/asm/mm.h index e478291fdf55..91c405876bd0 100644 --- a/xen/arch/ppc/include/asm/mm.h +++ b/xen/arch/ppc/include/asm/mm.h @@ -96,8 +96,6 @@ static inline struct page_info *virt_to_page(const void *= v) /* TODO: implement */ #define mfn_valid(mfn) ({ (void) (mfn); 0; }) =20 -#define domain_clamp_alloc_bitsize(d, b) (b) - #define PFN_ORDER(pfn_) ((pfn_)->v.free.order) =20 struct page_info diff --git a/xen/arch/riscv/include/asm/mm.h b/xen/arch/riscv/include/asm/m= m.h index 11e9f26bf0a5..e5ea91fa4d0c 100644 --- a/xen/arch/riscv/include/asm/mm.h +++ b/xen/arch/riscv/include/asm/mm.h @@ -292,8 +292,6 @@ static inline bool arch_mfns_in_directmap(unsigned long= mfn, unsigned long nr) /* TODO: implement */ #define mfn_valid(mfn) ({ (void)(mfn); 0; }) =20 -#define domain_clamp_alloc_bitsize(d, b) ((void)(d), (b)) - #define PFN_ORDER(pg) ((pg)->v.free.order) =20 extern unsigned char cpu0_boot_stack[]; diff --git a/xen/arch/x86/include/asm/mm.h b/xen/arch/x86/include/asm/mm.h index 08153e6d6fa2..17ca6666a34e 100644 --- a/xen/arch/x86/include/asm/mm.h +++ b/xen/arch/x86/include/asm/mm.h @@ -621,6 +621,7 @@ extern int memory_add(unsigned long spfn, unsigned long= epfn, unsigned int pxm); =20 void domain_set_alloc_bitsize(struct domain *d); unsigned int domain_clamp_alloc_bitsize(struct domain *d, unsigned int bit= s); +#define domain_clamp_alloc_bitsize(d, bits) domain_clamp_alloc_bitsize(d, = bits) =20 unsigned long domain_get_maximum_gpfn(struct domain *d); =20 diff --git a/xen/include/xen/mm.h b/xen/include/xen/mm.h index b968f47b87e0..426362adb2f4 100644 --- a/xen/include/xen/mm.h +++ b/xen/include/xen/mm.h @@ -641,4 +641,8 @@ static inline void put_page_alloc_ref(struct page_info = *page) } } =20 +#ifndef domain_clamp_alloc_bitsize +#define domain_clamp_alloc_bitsize(d, bits) ((void)(d), (bits)) +#endif + #endif /* __XEN_MM_H__ */ --=20 2.34.1 From nobody Sun Dec 14 08:06:53 2025 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=epam.com); dmarc=pass(p=quarantine dis=none) header.from=epam.com ARC-Seal: i=2; a=rsa-sha256; t=1764343381; cv=pass; d=zohomail.com; s=zohoarc; b=AFsOWVll8e33LTUKMoIsuzz4AbKHd7K2KQ1dabDUKJWeN99T+do/ESMAWJqogthfHiNO4Gm+NldHMLg5Ew3uqx8IuRmYaZGHHJhwed30QkCHc49eVbwFxfpUjykVAf7AWOFsR33HHACebb8uaz5sEqg7n+1yjzuq4Ko7KE9oPSo= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764343381; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=0tD4HZxi7jTmnmsP0GYxaGrHKc3EJbTUhiaZg1ZgjwY=; b=EsCcvcgtkHfHdxJl7drzn1mWvIIukY92tLMBbvCqo0v9FO20KxdOn1QXXsKtLgFALBk7u8LU4EiHtYdigxTuBizyJH89Pu5EzdkYXW8Kl2Eo9mI8U8ti7CFrbkGCBqvhSVxNMPM54Uo6TJg4S0gz3pte5uo0TyU02I63K0J/1Ig= 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=epam.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 1764343381964574.4858824902881; Fri, 28 Nov 2025 07:23:01 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.1174947.1499900 (Exim 4.92) (envelope-from ) id 1vP0Ir-0007L8-9N; Fri, 28 Nov 2025 15:22:33 +0000 Received: by outflank-mailman (output) from mailman id 1174947.1499900; Fri, 28 Nov 2025 15:22:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vP0Ir-0007L1-6V; Fri, 28 Nov 2025 15:22:33 +0000 Received: by outflank-mailman (input) for mailman id 1174947; Fri, 28 Nov 2025 15:22:31 +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 1vP0Ip-0006eN-Qv for xen-devel@lists.xenproject.org; Fri, 28 Nov 2025 15:22:31 +0000 Received: from AM0PR02CU008.outbound.protection.outlook.com (mail-westeuropeazlp170130006.outbound.protection.outlook.com [2a01:111:f403:c201::6]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 0dff3549-cc6e-11f0-980a-7dc792cee155; Fri, 28 Nov 2025 16:22:30 +0100 (CET) Received: from AM6PR03MB4600.eurprd03.prod.outlook.com (2603:10a6:20b:6::31) by AS2PR03MB10087.eurprd03.prod.outlook.com (2603:10a6:20b:62e::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9366.14; Fri, 28 Nov 2025 15:22:21 +0000 Received: from AM6PR03MB4600.eurprd03.prod.outlook.com ([fe80::ec82:849c:dc0b:f6d4]) by AM6PR03MB4600.eurprd03.prod.outlook.com ([fe80::ec82:849c:dc0b:f6d4%4]) with mapi id 15.20.9366.009; Fri, 28 Nov 2025 15:22:21 +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: 0dff3549-cc6e-11f0-980a-7dc792cee155 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=jGz7F9vy1LaVdK4lfQSdHh2jqnoIcRtK7WQHYSQHy3SClF0c1s2atj9y/ItuEy5C5H3KLBP48XGrMcdS1qbKqdpP/NH0BV+sjm6yKhBanBsWmqr2+Vp6vrJM6KiMLlIjMCQFzToeCx7LszpBtBuwftVItjBuy6iuN+uh5jZ+fH51zHOMjNFB/YD1r54LZ/EkOwnm8e3W/4C13HO4vsraXXEfFm1kKUBaOfqGyCOeiO+W3GvKiWQAjaMGKEzXK64jA5y+t9yZxJUr7/O8K8xZCrg7hKxVwMsBWhVsAuTDeqbFtgFsdAh6ZlhV19YWyqvlDx7RhPYCIic4EWiI9/qpdA== 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=0tD4HZxi7jTmnmsP0GYxaGrHKc3EJbTUhiaZg1ZgjwY=; b=Ws13GKOxTXstdafS5C1AN1vIo6sg+Yqv6XMQdzUAuOmnhcAjpq5CKCi14utlSbUWnt1Qp9N/pmH/dSTwJCsfbjbJ8XpnrDjOZAIHHgg3nnsSa9SI/Lu6qMOtLqAVQnm78Jhm6REmbEaY05ThDtaS6cnGlV+uW86hYbPQ/5lw0bp8FHaHCJvucS86j6Yb0gfvH/0vbiNEmlfmLHiq2AlYL8e5cej1Yj9DyTCqkQCMgtiDiGece+tHUNpkYisWR+Eiw+ufCzaaJQTBTSFHgek8qOW9fQ1M/C+2WcHDwmyjqoBlhjsKzS3pn+pIUXN9we5QXBTmy9o8JX7KeHJ/nlPwtQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=epam.com; dmarc=pass action=none header.from=epam.com; dkim=pass header.d=epam.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=epam.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=0tD4HZxi7jTmnmsP0GYxaGrHKc3EJbTUhiaZg1ZgjwY=; b=ffXIAWO1xApV+/zKi8kJV4BcEyBIfgXl1Y3w0N9EAzffJ8N11Wd1KG4BCSLL2AQr8oZ9bTBAVFayLjBw0xKSrTyg71KBV/oBWCyIU/lgn5kaaoxQLv1FapVhR2fCu4723GatU7MQU3735EWHeQ7lB5TSK0fMIeM0hJGVY/840CeVLwIMi2D9GLo43621uHO6qQwY2/7Qf2PUp+ETxdxLLe3Gi4Cokqx7b/TPMBP2YKk0jFNSrtFziSj3qkJyJ8uNEvQFqgQHiTwJtnBYGDXf5m8HhXAj2588j/cjyFuP/HASUcnPeOSmfGgtNBI24HWuc1BDveNuWejr8017fIXQpA== From: Grygorii Strashko To: "xen-devel@lists.xenproject.org" CC: Grygorii Strashko , Jan Beulich , Andrew Cooper , =?iso-8859-1?Q?Roger_Pau_Monn=E9?= Subject: [PATCH v3 3/3] xen/x86: move d->arch.physaddr_bitsize field handling to pv32 Thread-Topic: [PATCH v3 3/3] xen/x86: move d->arch.physaddr_bitsize field handling to pv32 Thread-Index: AQHcYHrKMY8RaksHyUKCNstHynUmRA== Date: Fri, 28 Nov 2025 15:22:21 +0000 Message-ID: <20251128152218.3886583-4-grygorii_strashko@epam.com> References: <20251128152218.3886583-1-grygorii_strashko@epam.com> In-Reply-To: <20251128152218.3886583-1-grygorii_strashko@epam.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=epam.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: AM6PR03MB4600:EE_|AS2PR03MB10087:EE_ x-ms-office365-filtering-correlation-id: a59c69e0-25d3-48fa-e58f-08de2e91ed3c x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0;ARA:13230040|376014|366016|1800799024|38070700021; x-microsoft-antispam-message-info: =?iso-8859-1?Q?9jo2/GPyYpzUapaSUU5qXmNRNxM99m5F7CJjTGMWPaggMTp2Gxt4kcV6Cm?= =?iso-8859-1?Q?H4FpFFajMbi90P5tsMZCpx+x0ddCyT/jQm/ZDVkBboLlm6KPWe8u2qoSIK?= =?iso-8859-1?Q?HKcWrVizzhb7DJzxOEQmJxz9QzZTb7iOv7MdxrMqC1jYsiB2I0D3SSxW0x?= =?iso-8859-1?Q?3Db88w0ZadPQ5P7Fi3wXMscZvJy2G7p6gYbPDlWLWgWO7MbTBGU9WdsAqh?= =?iso-8859-1?Q?5zfUiSYiFHCSzgCn2cxRKVm6ru9g1KhdMdRC1mnNr3xN9pgd94QlhcMHs1?= =?iso-8859-1?Q?OI8Yq+nQ+0BSZ8KZehtgn8EbCgVBwwSdagcAd1Zaief4mSX4EazJGGWQCN?= =?iso-8859-1?Q?KYfbAYTrIpdWagGj+LX+swavMZjgiqbwVB9pqcJVrDHWxSrfVlP471qy2L?= =?iso-8859-1?Q?PKEOW/+YX7epjEaGBRBxeGCLJuaO4iPyEGCSHP7090W5+uPkugpLNoltzw?= =?iso-8859-1?Q?SoXwEygb2bEYD+cQVsBlmVv0G3BQR8UMqLyxCnzdK6Hde/GCyfcZjBeUwj?= =?iso-8859-1?Q?1Hzyd3Rf/AcZiYOwm70ARXc8R2KbE+FqA1tNPQyprZakcZtCHCoI0RxktF?= =?iso-8859-1?Q?0GXh7GRjnK08hNJEtJ1XRUH6YIUy9FJK7REIFDjjKJBdBNo7TtkYjoJspW?= =?iso-8859-1?Q?h65oNwfOsg1TPklfMcpdJCZsr0c5fCpNEAIOl7JQgsBmNZGllMKeVaQIbn?= =?iso-8859-1?Q?pOxU4ODo1IpXZkmqFWN4SYYYeFIwfnKxcZiptZLtQOZEYscln7uVd8LEnI?= =?iso-8859-1?Q?B6paGHLDdqgeKZmEHoJK0IdQDlsAm8y2tjXKDw2RZr3RMs7fIPRdRVGNDi?= =?iso-8859-1?Q?N/YvIv1HvtL8HuF7lAlM/+dszTuel2zRlulFftui9Lg44NZLkYseUw61y2?= =?iso-8859-1?Q?+lJyU17xrQN1dRMGtYDShTZE4oIc4JtQM69bRFpoScvYQRWSDvuG48BudK?= =?iso-8859-1?Q?hbPMSK9bcHJY+naQLK7WpkHER+eMe8v0z5GBE3c8BHTinCgsXUSn2iReAg?= =?iso-8859-1?Q?Pc/t0VEdNK9+aj6esLUqZPX0X4ahpYBYMNQBKT5D76QHejZwqghuKN/0jw?= =?iso-8859-1?Q?4jTA6fpID9oprxvpIBArgWHEJwlNn4arLxFIKzFF4SGZDCx5kKQ7j0Ezuk?= =?iso-8859-1?Q?SGbBf9X1jcL7iyluoVwNxetTPyQP/M6lsP3C+Z4hUo+pUp/1CI9MQrg3/F?= =?iso-8859-1?Q?EYdBhNUllVsr4kCoRSaKgIbQqD1owqKoobEI/hQ5ylGLJBC7xVdMjf9N1I?= =?iso-8859-1?Q?3Idv7BNzn5dVog7ceFxWTgIEpYlh3Q1IyDcFZUFQKd7PglSbWEAepI5OBg?= =?iso-8859-1?Q?nH0F6FATidjKdUub9ZgQ6Njfe14qYegmbtJ4ZUd2tCXnu3J3BqUDJpspKD?= =?iso-8859-1?Q?rZBMBYzBNEdn8xxGpwfeonneTIMcRrPFABmbfJ0Oe1DAct39rocOcTHTZD?= =?iso-8859-1?Q?bhlxI4giMKxAUTCHl0Gx38frgmPbENxbw+8+MsD/8Wfe20jrusGc9SNxYg?= =?iso-8859-1?Q?8PJWv9WalE2dFjd7Bdzk5e6O/w8ncIkNMSNFWqc8s4vWpnBICpwBiC3e8H?= =?iso-8859-1?Q?nZN9w1QKnqAm0Z03pNGJKR0We23b?= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM6PR03MB4600.eurprd03.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(366016)(1800799024)(38070700021);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?Q?qL774CDbx4YDn5kKZtPnPrn6XSPdByi0Om8tYOL88kcUAoRpiwG0WPhaIf?= =?iso-8859-1?Q?Wo/+iQINJOVy1FXsRkHS/y0SDPGUe7cIln5/fsSfyUMlEitFLTPCVtyUgv?= =?iso-8859-1?Q?emVypRlS3Qfa2lhmDbjF1GFtZRteud6V0ZwkiWLwhK+BI+YKHFaZRxbHJV?= =?iso-8859-1?Q?+rRnBgU/xTgtyooudatuQGFSmvE0wvNsSJWEK1YlmGFibPVH9f1ogW+/Tf?= =?iso-8859-1?Q?/VJ8hHuIMPGtV7LIkSPKizNNM5Za8O2EcHjSNxhf1vRwnxUt6+RvnfGjeW?= =?iso-8859-1?Q?QYIDODPDHva7WMCT1lWz82yKGW31GjmIB09+IcGoFvmGq1vrOl2U3Yvxxd?= =?iso-8859-1?Q?THCw5S6k6aXKOp4YeprjMWBw1250HUPtMhgMrKUfJObRe3aUnnRftx7jWQ?= =?iso-8859-1?Q?Dq4irTaQ49EaKXtDuHeXjSDOQnuyjVoZBNaUJseZfZ2Rlk9OmhfYrRoDiQ?= =?iso-8859-1?Q?Lj4prvke4jGwfg09qrnlkZPnRgpl7Svhuq+ipPuacJQ0pM9y1WwK5MqLRZ?= =?iso-8859-1?Q?rrLNFdnukOFdUpieiL/5+Hy6fDtqw9BrF7qWNtfMUh5pc1kTaflnK/J3+B?= =?iso-8859-1?Q?YdTqg1J4RuElYpd9c2hSLLmsT2J0NdXdKmHnJMyA3nrk2GF3/JUZle5G17?= =?iso-8859-1?Q?yUJQAbFXkFEyzlSk5RbtOwMi7UYphUxE7SeTZdAnzs+QrTr8QOkDQxYyzU?= =?iso-8859-1?Q?PCVQcyNUL5OySQPagWTD7hdNQO8hTIly/w9RpQPj/ZLm6QhtcdsIl4sFXT?= =?iso-8859-1?Q?oAvFegyii1Rt+1jpqQwGTDs4sueNiFsVM7idk3ZVM88n5hYsIT/zr6CLIL?= =?iso-8859-1?Q?X4zQPp0Ui80v/5b7fqazktu6iIQM+ZokHINIryIOJJxYhfSuCycdWsBp4P?= =?iso-8859-1?Q?munB63AUCL0tKUpiA4O2kmb4kcZZuzoRlYgO5GTpvn3agUxZxiTSmWuM5K?= =?iso-8859-1?Q?lmL0ZR3FzGUhKz2kJFBVQUwLDya5XdWImfqCgEnT5Q/wDyNUgqbczXlItk?= =?iso-8859-1?Q?DeyZmZx0xEv0YrgJc4ZH0aMJnWDWTXt8KV63Ho03ReNj1N6l/9jvdx1JMP?= =?iso-8859-1?Q?8ofvuaXYvQS4vPEkfmXlotvs2SYVD3At1SBG+dd3fBtuZE5Cn+ouhVPYMS?= =?iso-8859-1?Q?2e3jYSmmLXvJ+nU8wFsq0yQ5RQnNQvxFM7df3y3OxU07tdaIE2HxhQgITo?= =?iso-8859-1?Q?BSVvHr7eDldO/0q/Gv29BrnRd0Lq/3EPaMzLiJeJu0wnBp4auMgYex3DqS?= =?iso-8859-1?Q?s0RFWR0OCyhcD6J3UyYm0dRhHFFs2T+k8VJMA9xrq8GegBAC4j71ka3Tt0?= =?iso-8859-1?Q?BraWcqJTZ2j8BQr4kVdfDFAGANAjwu+iyVj4wRlujRanY/5oWmqajI9lwq?= =?iso-8859-1?Q?07e2EXv04y+nk/AFX609B6LoAfPW2SZ0p4K4fwfI0ZPZDuokg5hnQ4AnCN?= =?iso-8859-1?Q?TFxkqmd1asC6VMPBH/0aD82RgZzYcKbKj/bOqo1EXUWrPpzlCa6pFU18i6?= =?iso-8859-1?Q?TF8l4HDnqG5NPO1BLVlvqtItcfwpDk8NHWFY+c8g0b8ba/+60kKTubzSu2?= =?iso-8859-1?Q?Z0jfKJQ/BQnKK0bdXwYUCFVSUuoQe3dK96NSkI67uLIQ7g8Vt/7ZTmLP6N?= =?iso-8859-1?Q?oa3ma4ofrqoKLE8Dm7U39nDz8B7gWSfQiDxrHoYK7QK8UlgU7Zbm81yQ?= =?iso-8859-1?Q?=3D=3D?= Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: epam.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: AM6PR03MB4600.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a59c69e0-25d3-48fa-e58f-08de2e91ed3c X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Nov 2025 15:22:21.8276 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b41b72d0-4e9f-4c26-8a69-f949f367c91d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: bw260g9f59EEhIhsJJWceJSLPheJ+HCLxwzuprhdTxpXqUe+A+9VYSLo3OwTBLg/PXJM15DKe7WDGlESCu3qFOkcIWh6B1RFBfZBAdAkndI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS2PR03MB10087 X-ZohoMail-DKIM: pass (identity @epam.com) X-ZM-MESSAGEID: 1764343383399019200 Content-Type: text/plain; charset="utf-8" From: Grygorii Strashko The d->arch.physaddr_bitsize field is used only by PV32 code, so: - move domain_set_alloc_bitsize() function into PV32 code and inline it into switch_compat() - move domain_clamp_alloc_bitsize() function into PV32 code and convert to macro - move d->arch.physaddr_bitsize field under PV32 ifdef into struct pv_domain Signed-off-by: Grygorii Strashko --- changes in v3: - domain_set_alloc_bitsize() inlined. Note change of condition to "(MACH2PHYS_COMPAT_NR_ENTRIES(d) < max_page)" - domain_clamp_alloc_bitsize() convert to macro xen/arch/x86/include/asm/domain.h | 8 +++++--- xen/arch/x86/include/asm/mm.h | 9 ++++++--- xen/arch/x86/pv/dom0_build.c | 7 +++++-- xen/arch/x86/pv/domain.c | 6 +++++- xen/arch/x86/x86_64/mm.c | 20 -------------------- 5 files changed, 21 insertions(+), 29 deletions(-) diff --git a/xen/arch/x86/include/asm/domain.h b/xen/arch/x86/include/asm/d= omain.h index 5df8c7825333..6cdfdf8b5c26 100644 --- a/xen/arch/x86/include/asm/domain.h +++ b/xen/arch/x86/include/asm/domain.h @@ -276,6 +276,11 @@ struct pv_domain =20 atomic_t nr_l4_pages; =20 +#ifdef CONFIG_PV32 + /* Maximum physical-address bitwidth supported by this guest. */ + unsigned int physaddr_bitsize; +#endif + /* Is a 32-bit PV guest? */ bool is_32bit; /* XPTI active? */ @@ -316,9 +321,6 @@ struct arch_domain unsigned int hv_compat_vstart; #endif =20 - /* Maximum physical-address bitwidth supported by this guest. */ - unsigned int physaddr_bitsize; - /* I/O-port admin-specified access capabilities. */ struct rangeset *ioport_caps; uint32_t pci_cf8; diff --git a/xen/arch/x86/include/asm/mm.h b/xen/arch/x86/include/asm/mm.h index 17ca6666a34e..a308a98df2a4 100644 --- a/xen/arch/x86/include/asm/mm.h +++ b/xen/arch/x86/include/asm/mm.h @@ -619,9 +619,12 @@ void __iomem *ioremap_wc(paddr_t pa, size_t len); =20 extern int memory_add(unsigned long spfn, unsigned long epfn, unsigned int= pxm); =20 -void domain_set_alloc_bitsize(struct domain *d); -unsigned int domain_clamp_alloc_bitsize(struct domain *d, unsigned int bit= s); -#define domain_clamp_alloc_bitsize(d, bits) domain_clamp_alloc_bitsize(d, = bits) +#ifdef CONFIG_PV32 +#define domain_clamp_alloc_bitsize(d, bits) = \ + (((d) && (d)->arch.pv.physaddr_bitsize) = \ + ? min_t(uint32_t, (d)->arch.pv.physaddr_bitsize, (bits)) = \ + : (bits)) +#endif =20 unsigned long domain_get_maximum_gpfn(struct domain *d); =20 diff --git a/xen/arch/x86/pv/dom0_build.c b/xen/arch/x86/pv/dom0_build.c index 21158ce1812e..94f7976e819f 100644 --- a/xen/arch/x86/pv/dom0_build.c +++ b/xen/arch/x86/pv/dom0_build.c @@ -626,8 +626,10 @@ static int __init dom0_construct(const struct boot_dom= ain *bd) initrd_mfn =3D paddr_to_pfn(initrd->start); mfn =3D initrd_mfn; count =3D PFN_UP(initrd_len); - if ( d->arch.physaddr_bitsize && - ((mfn + count - 1) >> (d->arch.physaddr_bitsize - PAGE_SHIFT)= ) ) + +#ifdef CONFIG_PV32 + if ( d->arch.pv.physaddr_bitsize && + ((mfn + count - 1) >> (d->arch.pv.physaddr_bitsize - PAGE_SHI= FT)) ) { order =3D get_order_from_pages(count); page =3D alloc_domheap_pages(d, order, MEMF_no_scrub); @@ -650,6 +652,7 @@ static int __init dom0_construct(const struct boot_doma= in *bd) initrd->start =3D pfn_to_paddr(initrd_mfn); } else +#endif { while ( count-- ) if ( assign_pages(mfn_to_page(_mfn(mfn++)), 1, d, 0) ) diff --git a/xen/arch/x86/pv/domain.c b/xen/arch/x86/pv/domain.c index 9c4785c187dd..d58e4e213e5c 100644 --- a/xen/arch/x86/pv/domain.c +++ b/xen/arch/x86/pv/domain.c @@ -254,7 +254,11 @@ int switch_compat(struct domain *d) goto undo_and_fail; } =20 - domain_set_alloc_bitsize(d); + if ( MACH2PHYS_COMPAT_NR_ENTRIES(d) < max_page ) + d->arch.pv.physaddr_bitsize =3D + /* 2^n entries can be contained in guest's p2m mapping space */ + fls(MACH2PHYS_COMPAT_NR_ENTRIES(d)) - 1 + PAGE_SHIFT; + recalculate_cpuid_policy(d); =20 d->arch.x87_fip_width =3D 4; diff --git a/xen/arch/x86/x86_64/mm.c b/xen/arch/x86/x86_64/mm.c index d4e6a9c0a2e0..8eadab7933d0 100644 --- a/xen/arch/x86/x86_64/mm.c +++ b/xen/arch/x86/x86_64/mm.c @@ -1119,26 +1119,6 @@ unmap: return ret; } =20 -void domain_set_alloc_bitsize(struct domain *d) -{ - if ( !is_pv_32bit_domain(d) || - (MACH2PHYS_COMPAT_NR_ENTRIES(d) >=3D max_page) || - d->arch.physaddr_bitsize > 0 ) - return; - d->arch.physaddr_bitsize =3D - /* 2^n entries can be contained in guest's p2m mapping space */ - fls(MACH2PHYS_COMPAT_NR_ENTRIES(d)) - 1 - /* 2^n pages -> 2^(n+PAGE_SHIFT) bits */ - + PAGE_SHIFT; -} - -unsigned int domain_clamp_alloc_bitsize(struct domain *d, unsigned int bit= s) -{ - if ( (d =3D=3D NULL) || (d->arch.physaddr_bitsize =3D=3D 0) ) - return bits; - return min(d->arch.physaddr_bitsize, bits); -} - static int transfer_pages_to_heap(struct mem_hotadd_info *info) { unsigned long i; --=20 2.34.1