From nobody Tue May 7 00:10:41 2024 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=1639129228; cv=pass; d=zohomail.com; s=zohoarc; b=FxQ0JEGFTKaoZn95woSLBzUiMOn5+l5HXr4GT08OFDcn67THHeKROqrOpT/v9qMNW2f9p6fS94QNUOiwkzJ0OKDF7Qio+mKInzNXp2NGMzRTqQRCjew1k17Df/cDSQGX0aJPAtShbjY/Zbpq9DIF/fBivRPZPRjVjQqTdRndfVc= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1639129228; 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=nQbHxo+SG7zXc0WpjqfjCW7hun4rktAxwnnAypfq9w8=; b=B9lmszpSlQhSfikCEswwYcociw6bl5Mx0fjvuYqEkBxfPeZ5Im0faFo/o97y5CWHCGFprCyatFUr0eeafJPHDke+E1WlwCWyWttbKIBMZi9jHKRqKFntxM2baOFEAS1JJxH0bECnGAEqUs51Xh2x3bgbLNtlhF+wyaHmHGfQwaM= 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 1639129228960488.75986651023914; Fri, 10 Dec 2021 01:40:28 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.243666.421556 (Exim 4.92) (envelope-from ) id 1mvcNn-0000C9-Ak; Fri, 10 Dec 2021 09:40:03 +0000 Received: by outflank-mailman (output) from mailman id 243666.421556; Fri, 10 Dec 2021 09:40:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvcNn-0000C0-6h; Fri, 10 Dec 2021 09:40:03 +0000 Received: by outflank-mailman (input) for mailman id 243666; Fri, 10 Dec 2021 09:40:02 +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 1mvcNm-0008SI-Fc for xen-devel@lists.xenproject.org; Fri, 10 Dec 2021 09:40:02 +0000 Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.111.102]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 2551e253-599d-11ec-a831-37629979565c; Fri, 10 Dec 2021 10:40:01 +0100 (CET) Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01lp2057.outbound.protection.outlook.com [104.47.0.57]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-40-GYnaKQCEO5uwIFwvOui8Qw-1; Fri, 10 Dec 2021 10:40:00 +0100 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) by VI1PR04MB5325.eurprd04.prod.outlook.com (2603:10a6:803:60::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.21; Fri, 10 Dec 2021 09:39:57 +0000 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::5951:a489:1cf0:19fe]) by VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::5951:a489:1cf0:19fe%6]) with mapi id 15.20.4755.024; Fri, 10 Dec 2021 09:39:57 +0000 Received: from [10.156.60.236] (37.24.206.209) by AS8PR04CA0008.eurprd04.prod.outlook.com (2603:10a6:20b:310::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.17 via Frontend Transport; Fri, 10 Dec 2021 09:39:56 +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: 2551e253-599d-11ec-a831-37629979565c DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1639129201; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=nQbHxo+SG7zXc0WpjqfjCW7hun4rktAxwnnAypfq9w8=; b=dMWyyVtgdncU1XGXXLA7fHm+RdVecL/Hs2gWc0ahwlRJ310/bf6gxlhziH+XRJKinMvrvX b5JD/jl+GyU0+8Jy8U5u0Rdag0UIZCkF1N5L88Pu/oU9IDu+GyBxma9ReefhMkARHTJKzo 5PnN3/GwR1ZAn5aSniBVa8zOmkkuv7E= X-MC-Unique: GYnaKQCEO5uwIFwvOui8Qw-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jvb9SjtqNm+73m7UPu624dGUJHV7WA7/IaB303mWKvUOi30Umc7B1kmqOk+PiBwLLiZCEHCWU+uinj7YCXlpomw0LgJ7VQ6Tw02NIISYJreJxEjH09xhByWgITZB3NLl2b/RiZKHIXIbohs9OaGlj4I9YjB/82qHGcIByvLUrGRztN25jY92bntC5y9Vq/SCt3z10EpQfqy7qoHsK5WkkiDRgGAM598YO60mH7er71WH3hMvb+KwDP5rcXmf0IZ2UWjJMovclui9u008q2JBIvuM3s1Q6pB3Xo10tkt8QWMwVOBnFR75s9rkABVJHcL94xhI5m9pl3pQTdwou7mLKQ== 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=nQbHxo+SG7zXc0WpjqfjCW7hun4rktAxwnnAypfq9w8=; b=kW1zSbcpjDlW4j9XfeKz6MqmJ48wMeFNz//z5i0qs1ZG9/0DGE8q/XYYgB900CNxoFXEpr6dpY+FG6efjvIduORArLcQLMo/4xzcX82np3AiV3sUAa1RIWztxfqwriCbPGT79wgDausvy5v/bICQgKhkTeZHSb7yM/e7l+W/Z8h78G/Q6s++QgxtWEQD/U2dPeG7G3wrHUBTtkK2xXZZidKgu5xzTMKGhQoflJRSXG7hLHlMFpE43nixnLWti5wzz5xzP8CvJ9AvijbBc92QngaSWb3StTlmRoNvl9T0+zwGuGgcTuM7a/ju5NH9ScXfLA+buH8/wqE9n5oIoB/CwQ== 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 Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: <6d2d29ca-0495-5029-afc8-7248f462db06@suse.com> Date: Fri, 10 Dec 2021 10:39:55 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.3.2 Subject: [PATCH v2 1/2] mm: introduce INVALID_{G,M}FN_RAW Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , George Dunlap , Julien Grall , Stefano Stabellini , Wei Liu References: <9725c93e-c227-f29f-07a4-65e383bb7858@suse.com> In-Reply-To: <9725c93e-c227-f29f-07a4-65e383bb7858@suse.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AS8PR04CA0008.eurprd04.prod.outlook.com (2603:10a6:20b:310::13) To VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a661d899-186b-46ff-1ac1-08d9bbc10759 X-MS-TrafficTypeDiagnostic: VI1PR04MB5325:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3826; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: tWeAP6AIzSDp16yRsvHgDyp4CZTcacv/7OFE3BrIUggRgeLEg/aXrktR+d1tg0sCbYmGayrsQmSdIBTz/OS0u7pYxe5ICR6vigUn2WWEkhU1A/NuVbtdrJW5B/fWDLpno1Shzu12Z7XmOEr/HHHhqzIVwNzf+QZ6zo8xvjMaaaeRkz022fnday1l3CW0vAUbHP9hG7mCnpv8ni59buST1FuTPWRbPUGvWhfynIkSdz0KqfBRQ2wN8C2mRx6weXEzx2W8Tn5//oHVcYaCWhjvhAIy96bDp14qU9sIe9PvRKosxlaXRibyJ9Zc0GMcDU1Kn3e/tIRZK9tRxgfhs1Y1CwNhLVQMxltwyM47GnRTBeQdfZzQtX8HJ4ENhWNzPSf73jAO+YfrpSoJLsC04gL5JhkU48ATSeGlbmhr7kpgKCL0dXJX3gCY/hyUhuO427q2riOXlJRXtcTDhxfrIAuqiRSUYUDHHD4LByNZ2bEQcgTZe10pBgE0c7b7vmtIyrdT48r8Ggo8m4lD/HLke4VSStPAvnTdFQkHbaGZbElu4Cw1FFtlq6ft1mrYYuo5M/uelagCjVsIorOEJkqvtEyHT+VQndc6Pt2XMExPFvCIdIlcbAjRn1hR1w5jbnonZ4kcvCPxF/f/+UX6BdeBWPwOFPbegJrJVcArnW7+l//L7dpCR91RHooVIXkp/ZGpuwuxpzliHwFxXWYaOT7iqd6o78avtk6YTPvnx/PzBkU0Ffn79K6tgqfNbDqkcubIPNMeHtYX1k5WZNrV51f6vP9BeGWihM52WrR7QURSnLrCH/2gqhx0NxoyUUmvzLbbrSeHWLUtOqZiRYFGrM+6J2pq0A== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR04MB5600.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(6486002)(8676002)(8936002)(2616005)(956004)(66556008)(66476007)(31696002)(66946007)(966005)(26005)(508600001)(86362001)(2906002)(186003)(38100700002)(54906003)(6916009)(5660300002)(36756003)(16576012)(316002)(4326008)(31686004)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?Q0dGK2w2YzZxSDJPSHBlUDRTUU93ci9KNDNtVE9pcjFQQ3oxTlFGcFp0NUs5?= =?utf-8?B?V3F5VnozalNnNXcyYUdxZk5MZ2gwbGdGTDRhY2ZMekFSem10UTMwTVd6S0lX?= =?utf-8?B?SlhLOUZobTlWUEJnNC9pZ1ozWVZXNzE1aExGR1FDN0x0QkVLcVE4OGtMQ0Fq?= =?utf-8?B?eWRlSDRSRGFUSkd4QTVGUFhuSkJBT05kMmUwTnlSQ2Y3cUcxL0RJMHFXL0h6?= =?utf-8?B?VUViT1NGN1lMc0pHaVVKNFZWYUl2Nm10N0JvMFo3S0wrZU5MTTRZOVFqaWtY?= =?utf-8?B?akZTeE1MTFZxVk94NjltZkZ5dmNvWkd6bmNPU1o0aEFkVThNbDRXTkZud2dS?= =?utf-8?B?ZlpLd0lWa1lIcitwdFR0VzFPcjZrbFdpYjc0SVpsd2F6aHZzUW40aTU4SkdQ?= =?utf-8?B?YlFwS1g1RDNXRHZWWFBwSUFqUUhBVXkzYnlNS1ZhYndEOUlLZ2htZ09zc0pr?= =?utf-8?B?NzA2ZmhiUXRlZzZ0bzdFVDNYVE1XVEZPSlJGYXVDTTBoZlRhTXBLc2JCd29i?= =?utf-8?B?VFdqcTJJWFRXWG1FL29vcXFpS3ljVHVINEtNVXc4YU8wZ3FqVTM2L3JIMGdl?= =?utf-8?B?dkpFVWl3NkhrVWhKeXBuU3VWS3BEcWxmeEI5bGllSU1KWTR4dTNOaGtMWmFC?= =?utf-8?B?Mm5sRzNxT0ZGNFBsM0ZORlprYTJBb1RnYWZpRlRpT0RJaHgxakxrR3pQM1lh?= =?utf-8?B?RkdpUWNENDc4eGpkTlAzU2NGNHg1d25tdkMvNGpUTVI2ay80K2wyT3pGVkpW?= =?utf-8?B?d1YzOUlTbERJN01MZG4rNEtjbDlRVTRNNlEzTCt5emhNZCtwVGtkMnBWd1pU?= =?utf-8?B?cWRLbnBBWWdwaVNFSnpMaU84NE9scUlDc0RDYm4welNCdEZDaGVPN01zY0Z6?= =?utf-8?B?a2xIbEtqNzVXbWtjQ1pxZHB5azZEMnVVOTdFVlhoWEdyYWFwY3dERmJlaXI0?= =?utf-8?B?K3BkcW5ETytRRXdIaGFjalhiM0Fkd1FYaExEdWU0MmQxK2srMHQ2MkZudlJh?= =?utf-8?B?dHljbTBoeTdQa3Q5UFVMbHp3T2ZFL1RMQzVNOXpjcmF5SWt5UWNRcUx5aUJH?= =?utf-8?B?dFZxQWU2ODhNblQ1bWZvQUFEMFpsb1IvRWN0S0VoeTRPenNDOGU0QzZFSHF5?= =?utf-8?B?Uy9sU2FvN2NsRXFUVG8vUng0YkkxMUR5SmJxdVBrQ05JeTZ3cy9ub2RDaU9q?= =?utf-8?B?anJjbmF4L0tVT3VoMDAyb3Z1WUcxSnJIZEF0dUdTb3hwcG1GbHVjTEZiTm1T?= =?utf-8?B?QSs1SjIya1oxQi9SRHp0UG9VRXRUOW14bFBWRTRlYlZIdlRPK2JNWWlXUmFW?= =?utf-8?B?SGcyQzYxVHFLQWo3NHZYY1RJaHU1dGNIQ1JOUUxTQ3B6b3djenpYUGRmck9q?= =?utf-8?B?c2RBVVNyUXhCTEJKbTl2Q1BDbllXMExFSVJpZXFkUnhZQTZnZHpHd0JoMlpX?= =?utf-8?B?UVJtVWY1QTh2UU9oZ1E1R0pVUzhDMUtCRXVGWnhMeDVzZVpQQUpmaENWVWFW?= =?utf-8?B?L3hxTzRuN3lqZDU2MndkS1RXN05oZy9aRUxEeEowOVgwVHFiVkJEQnhvaFZK?= =?utf-8?B?R0tQZEpFUCtvWnNTSmdKZXMzVW1SWEcxVHF3SVljQVB4enFhVE9nd1BLYlox?= =?utf-8?B?R0VmbC9CWmVHRk5ya2t1L0tzVExLS25IdjJxUVlCTzhUUGpWcmRIS0Y0dHVY?= =?utf-8?B?YVl0WEx4Z1doYnpiWEduckxOWWdZWUpRb0dQT2o5Y1ZtdTJTUWczTmZXSXkx?= =?utf-8?B?RmxvUFFLdnowN0k3bFpwWm1MNnN6OVVESVNQZnA5SVdvaXc5Zm9wR242QUVx?= =?utf-8?B?bC84a1VkNU1rOVNjcVN2dEYrSFc4OUs1VGdka1phdFFkNFFiZFFtQkNKK0V6?= =?utf-8?B?K2IrQkNMNFBZVEJOeFF3aHA5NEJQajVXMFk1YmVGMGFRSWVYWVVxVlMrS0RY?= =?utf-8?B?OVUvdXpRZWV4c2ppWm9Vb3RlaTF5UVFySGJDd0ZINGY4QnMzK2ZnbG5WM2Nu?= =?utf-8?B?UmlHN2ZkdHRTTXBsREI2MkRSOGlmM0krb2M3ZTQzWnRuTWZsL1NSaEE5NkRl?= =?utf-8?B?em5IcHVQOHJvY2hheWcvaGphVlRpU1d3aWtxa0NMOHFkem1LTFNML2JOR3Jv?= =?utf-8?B?bFZOR3dVM1c5VzVNZUgxcitIQkhHcGJzdituVU1xVWlxeTFDbkJQMmhCdUpT?= =?utf-8?Q?rTftEKnTSAIdkIyIiR7l8Fg=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: a661d899-186b-46ff-1ac1-08d9bbc10759 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5600.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Dec 2021 09:39:57.6867 (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: IhuZy7DoPlcfAh9YyfluNT/2Lr6SlHMfDMEpgOLtFMrqXrZUN+Rj7lrr1JUbFX4r9nqAXVzd2yAeVA0wQ8K+MQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB5325 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1639129229527100001 Content-Type: text/plain; charset="utf-8" This allows properly tying together INVALID_{G,M}FN and INVALID_{G,M}FN_INITIALIZER as well as using the actual values in compile time constant expressions (or even preprocessor dirctives). Since INVALID_PFN is unused, and with x86'es paging_mark_pfn_dirty() being the only user of pfn_t it also doesn't seem likely that new uses would appear, remove that one at this same occasion. Signed-off-by: Jan Beulich Reviewed-by: Julien Grall Reviewed-by: Oleksandr Andrushchenko --- v2: New. --- a/xen/include/xen/mm-frame.h +++ b/xen/include/xen/mm-frame.h @@ -6,12 +6,13 @@ =20 TYPE_SAFE(unsigned long, mfn); #define PRI_mfn "05lx" -#define INVALID_MFN _mfn(~0UL) +#define INVALID_MFN_RAW (~0UL) +#define INVALID_MFN _mfn(INVALID_MFN_RAW) /* * To be used for global variable initialization. This workaround a bug * in GCC < 5.0. */ -#define INVALID_MFN_INITIALIZER { ~0UL } +#define INVALID_MFN_INITIALIZER { INVALID_MFN_RAW } =20 #ifndef mfn_t #define mfn_t /* Grep fodder: mfn_t, _mfn() and mfn_x() are defined above = */ @@ -44,12 +45,13 @@ static inline bool_t mfn_eq(mfn_t x, mfn =20 TYPE_SAFE(unsigned long, gfn); #define PRI_gfn "05lx" -#define INVALID_GFN _gfn(~0UL) +#define INVALID_GFN_RAW (~0UL) +#define INVALID_GFN _gfn(INVALID_GFN_RAW) /* * To be used for global variable initialization. This workaround a bug * in GCC < 5.0 https://gcc.gnu.org/bugzilla/show_bug.cgi?id=3D64856 */ -#define INVALID_GFN_INITIALIZER { ~0UL } +#define INVALID_GFN_INITIALIZER { INVALID_GFN_RAW } =20 #ifndef gfn_t #define gfn_t /* Grep fodder: gfn_t, _gfn() and gfn_x() are defined above = */ @@ -82,7 +84,6 @@ static inline bool_t gfn_eq(gfn_t x, gfn =20 TYPE_SAFE(unsigned long, pfn); #define PRI_pfn "05lx" -#define INVALID_PFN (~0UL) =20 #ifndef pfn_t #define pfn_t /* Grep fodder: pfn_t, _pfn() and pfn_x() are defined above = */ From nobody Tue May 7 00:10:41 2024 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=1639129258; cv=pass; d=zohomail.com; s=zohoarc; b=Gn9bi/VWaAA/N45CKFqpsfGuWU/gXBNI67ovcJqcqehygEUPH7J45FnHaNWC4gXDqSpUAKuT9mi6oQDflnSQR9T/hj7XGaJnrMvOIB/o8hlpBoB74VBkZzDBDERVP0KpCvyifRCE0mQbHzG6hNz2sGgwwVpdiIQUQWy0NSJelQY= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1639129258; 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=/ea6giwOa1Pf9wAAzmwlZGs6GybWSd+Ba6eO/po1jxw=; b=FQRf7IoHWiUcNaRAzDYWQk5R37XSql5GQbz8E5EkZ4rdodZ0cWgEugd328/bQpy/n5dLy3QcfqszCaGz8vrNHwH4735y579+SDcSaFLl/ZRk8BQuX9WhoAH4ZEt801aqyKSKRk3FCZPn7qkyFvoEOR7tBXIBWf4Nrz2NE0L7hqE= 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 1639129258786293.5071282630947; Fri, 10 Dec 2021 01:40:58 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.243669.421567 (Exim 4.92) (envelope-from ) id 1mvcOS-0001F6-IT; Fri, 10 Dec 2021 09:40:44 +0000 Received: by outflank-mailman (output) from mailman id 243669.421567; Fri, 10 Dec 2021 09:40:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mvcOS-0001Ez-FH; Fri, 10 Dec 2021 09:40:44 +0000 Received: by outflank-mailman (input) for mailman id 243669; Fri, 10 Dec 2021 09:40:43 +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 1mvcOR-0001En-BN for xen-devel@lists.xenproject.org; Fri, 10 Dec 2021 09:40:43 +0000 Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.109.102]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 3dbb2004-599d-11ec-a831-37629979565c; Fri, 10 Dec 2021 10:40:42 +0100 (CET) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04lp2055.outbound.protection.outlook.com [104.47.13.55]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-15-PlJ-ZA4CPXOzpmKLfSxNUQ-1; Fri, 10 Dec 2021 10:40:41 +0100 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) by VE1PR04MB6670.eurprd04.prod.outlook.com (2603:10a6:803:120::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.21; Fri, 10 Dec 2021 09:40:39 +0000 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::5951:a489:1cf0:19fe]) by VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::5951:a489:1cf0:19fe%6]) with mapi id 15.20.4755.024; Fri, 10 Dec 2021 09:40:39 +0000 Received: from [10.156.60.236] (37.24.206.209) by AS8PR04CA0012.eurprd04.prod.outlook.com (2603:10a6:20b:310::17) with Microsoft SMTP Server (version=TLS1_2, cipher=) via Frontend Transport; Fri, 10 Dec 2021 09:40:39 +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: 3dbb2004-599d-11ec-a831-37629979565c DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1639129242; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/ea6giwOa1Pf9wAAzmwlZGs6GybWSd+Ba6eO/po1jxw=; b=SgaH0Y0PmO/r7jp2WU9vPIbdILHgv7Tl3d9Q6MG9x/Q7GAEJZODklLZN0MKlMw7v6RdWMy v2VTUnzMoBxj554j9XOKMNMygXjYq3dY5hkOKdB8el1YRVu3P8o4y59YiW3VXQDcNeEfK2 sbGlhLDXhMaSQ0nuMqOuFEpSUNFIuFE= X-MC-Unique: PlJ-ZA4CPXOzpmKLfSxNUQ-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lfDvS4fYyVHJkG/cFhUOlN/AYsyXcZcoMpCEmszGEOHjtWXe/ukgoU0aFcRLrcheRC69nuEHuL3mL20GxZDF63PyYld9yIYRANWZ1hceuyIo+nko7IPfigwTskO2+nVVsWb7QvQo1RglEKywjiC4Dgv8Hng7jib4SGo10RQRK1iMEmg0HC6cb9vpjezvl4BW3M5ctceoqMjczbhS6p9N/Fk0/rc5dF3+sL/fEsnYkXyjAGsQBiEYxqJAGcWA5S3ZoBRznwPIfWVk08YjgYt34pVgFn+kCxM/dmnERBLZFfjP8xyULjIuDyA5MtB92pOSQlSfAGluFt83ok9GnbEnSg== 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=/ea6giwOa1Pf9wAAzmwlZGs6GybWSd+Ba6eO/po1jxw=; b=Bu2GzTWjo4y9TvZg5/rvkVT9NY7M9phaNVfRu/TdQP5jA0kCOiKGvK4I2CyEqySSZ97NYIqQ1CAls5g6R00YxF+N/z5yYdyx/SRq0T7sPFSu2xPRveZ9A4Fqt4AENfphVofZBAAfC6XLvkqWx+2MtiYbuUEC3ucB9UdmbA5VdW2UyeUXxXIMGGhz3BhgxD8rk1jLnNfhCFxXNTiX6JC2CSxLtaO4Pb+YKrHvqofXEPNCcjaXSFRDITMM1xUsSpt6v0mWNeqDOUWOUOOx8DkCnmHLy9nI04bQrUgeapTIjksX63U82+GrfzynJ/XaLuweCaJ+6MaABVt17fw1ckp4cA== 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 Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: <0b68ff3a-3c82-f800-4d20-17eded13163a@suse.com> Date: Fri, 10 Dec 2021 10:40:38 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.3.2 Subject: [PATCH v2 2/2] memory: XENMEM_add_to_physmap (almost) wrapping checks Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , George Dunlap , Julien Grall , Stefano Stabellini , Wei Liu References: <9725c93e-c227-f29f-07a4-65e383bb7858@suse.com> In-Reply-To: <9725c93e-c227-f29f-07a4-65e383bb7858@suse.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AS8PR04CA0012.eurprd04.prod.outlook.com (2603:10a6:20b:310::17) To VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 89b85327-3fd4-4e29-42d7-08d9bbc1205d X-MS-TrafficTypeDiagnostic: VE1PR04MB6670:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6108; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1E+N7cW7yLgAvHI2Ekh3YUXY0BzgZo8wt1ivCYQL8JRrHFcBrypjO/0Ac+jgZ6O0KZV+bCJ6S37TcqsBKEDgUX8xZawXUkbqpiQskIvg2c6BD9w6AMFMVTOKs3j2IjMY179eo85OtMBdur32nq3hkB7lFf+htv0s8PA0TwoxXHIYZbASKtMDHVZYkFFkWYhZe6Z8XmdtzMu2G9O0i2StKUbJiJYqXTAGma46oKeHAWovexUTtw2TZe93KzMfl8FF5SdOfF3r4xu+zH7CeN1FeXqcCXF+W1yEkZG2DqOcmLIHP5nMiYaIxEcJx0OjHDqPTs8nbc2QpZBqHS1yJ4WthxLQyx1d/m80gfVfawHa6HL+wUpnu+zHwowfyu9dDOb5qy6x9Iy6iEYty8YzPG/rtaTLCE4wasCwJyv7UOfQ63mAwDS6PROgmcTffYX7vKr819wKaBzzucXf/2+VNE4RuAQ17OIRcGfGqfXy7J00CT79GCvYYNU04PHMMbDZcb9TWPGYivacQaqni+cY+07O/XazF5klR+8RvdIdADewmO1cO6l0IuGUS2cYR9lHqMko8dbvuP0ext4BiOC9yrnuzB39J/+Ts6tMdFNYIyfUHkOmDhEjx7Gt/pCBriGu+BIm+492HEiRUtK2au4IOZsRIJMN2SbXNX9M7MQNFzuXp+uDum3+ePj7+0ADvz/L4hdan+CREWftpSXb17ErLH0w92mfleTS7zn7qTw4BE9yvtsRdSNfD0kvKVETx3Q4vCgv X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR04MB5600.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(16576012)(31686004)(83380400001)(38100700002)(54906003)(956004)(6486002)(31696002)(6916009)(8936002)(66556008)(2906002)(66476007)(66946007)(86362001)(316002)(4326008)(508600001)(36756003)(5660300002)(8676002)(26005)(2616005)(186003)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?MW9DUGt1ZGhyL0psd3d6TDlzTjNlRGpyV2xqb20zbWw0NHBYQzBCWUxxR1JB?= =?utf-8?B?Sjg4S0xXUndxdm5wWVNaL05Jam1SaTFONGlGRkNwWWQwYzZaV0U1ejlWd2sy?= =?utf-8?B?cXpNQ3lBVjEwbXRpWmk1T29VN0FUdzlZZHR0bVl3a01Ka3dBL2dzM01ueW8w?= =?utf-8?B?b0hBeGhSTGUzcStxRUhqOElVTE4wV3RxWTRCSVQ1bXJRNFA0NVB5WWtONk0x?= =?utf-8?B?VjFEcVFjUHhlaHFQSW9YdlRlbWVTNXhHWUxkbWpzUzd6Y2liaGNOQWVVRmVt?= =?utf-8?B?S0pteEczRVhqa2wxZmZ5WUNIU3ptM2VHUzgza3l3M043VG5UZE5HNEd6WGxZ?= =?utf-8?B?UlIxenV0MS9USEs1WTE4bXVFc3hIanBBRWZWNmRSbWdLWlFreUpESFdDdXU3?= =?utf-8?B?YWFNUzNhZVVZUlcxN3Nhd3pKYU9Rbkxsd3Jsbm1yb0wvcis0Vmx6WjJvTWVE?= =?utf-8?B?K3FHNk5NcEttSHpzRTkrVVdUQzZHOGg2eFRHTGhLUC8vVVh4ejhoQlEvV0Vq?= =?utf-8?B?UDd2YkcvMS9remM3K0NHQnFhUDdtNEhMRldwTWNBSTVSRGFZczNxZ0hER29I?= =?utf-8?B?OUx6Wmk0Y0RjSUgvN0NXOVZmcEFUUlJLUHNuY1VMMkkxUUFPUHVRYVRpbWJZ?= =?utf-8?B?R0VReUhobEVvc1hmdXBxN0crTnphbDBCTndJd0VCWGhTTjJKK1VuWWN1ZWx0?= =?utf-8?B?bHUvbGhIeW5IZldMamlDMmx2YkdXOGR4ZXJrSllTQXBUVjRhUWRadzNUTUhF?= =?utf-8?B?bmtYUXBva090RWNUdnFVM21YU3JweHFtcXBoUVpZd2pBK3JBY3NIemFGL2lv?= =?utf-8?B?NmNvUzZwbFZQZmx4M241eVFmYkJoV1JxZnBTdXdTQThLVVU2M1Y0M3FWNmhs?= =?utf-8?B?eDhtcFNYWm9aYkFoRXVPUndwY3ZVaXlKM2tZZVdqUzQrWGkyWDFCOWRFY1ZI?= =?utf-8?B?NGkwZkhPM0lCaEtmR0FJMi9HSlkrbm03UUVGbGExWTdpMzE4ek9LejA3T2gy?= =?utf-8?B?RXBxcHpSS09iN0M1cndHcVdIVWg4d0VvNVRreVF3VzBvQk1VYWxkMUFOejdh?= =?utf-8?B?cTRLN0svTEtoVlZFbjRIbW1FNlo0RHczcFY4cDdJK1J4ZW54c0FtbHFZSUhm?= =?utf-8?B?b0pHZFppdHJXNzRUbnJtUitZM1I2QjBqaC9GeW5lZ2pqMXBoNWcrRHhsS0xB?= =?utf-8?B?dG9ZWVRFMVdReHZhVitXaDNJTHZURXRDaXpEc2s1TytLbTFRSFZiUkIyU1FI?= =?utf-8?B?ZURWdUJEWCtxMWdETHJIZ1dEOURRTTF4Z09zaTYwcWVBbFVkSUN6KzBxcGhW?= =?utf-8?B?bFQ5TFdtMWJ1a25DMHQ0NkwzVEgxSVRWcDltdkdJc1hnL3FacklERk0rdVUy?= =?utf-8?B?N21UTFpHTU5DdTNSOElSZFdtT0RmOUJYazl0SUVHR0VGOGExUU9PK0hwRkoz?= =?utf-8?B?YkNScEdlZFlyd3B4SUFuQ0o4Wm15bWpBRDhFR0lNVDBDUmZVZHV2bDJoTUdK?= =?utf-8?B?TDRmSDZoTjk3d2FYYTc5V2VMS0RGQ3FnS0NZdm40K0NLQy9lbHpsa0lOVTZW?= =?utf-8?B?WG52dDMxM2NmZXV1TFd2eWVWUG1vekZsTjNtYmM3dlRKODUwQmM0WHFFUXBL?= =?utf-8?B?WnB5eXlwdVlFMXFxa25HM0hRcFNRcHdFdkhnYkNzTUw2aWM5a0ZqWnBtQXZ6?= =?utf-8?B?eWZkZ1E5b29IRitYWm05U2gxMDJCeDdiS2hwcGEwYUJRWW9Zc21LL1RraGI2?= =?utf-8?B?WWpBK0RnSDdaYnVQVkpXN3c5VU1kLyt2TmszYTNybm84T0N6dlJ5cXlrUW01?= =?utf-8?B?Y3NWWEd2SC9VYVd4WE9IZUlFa2xYd1k0R0dKYkdGMUtFckFKN1o2V1NKSjB3?= =?utf-8?B?NXFZL3MxN01TcjNOVXJkQXFtVHdZSlNNZ0xwc3FDQ21jNWlOVGJBSmc2N0pB?= =?utf-8?B?S1NJWncyK3JvczlxdzlSYnBHTndsZlhEdEUxRHVhTHJWaXRLZ01uV3JTVHF5?= =?utf-8?B?dW5nd1dKWVBtb05jRk01NGRzam1zeEJ0YmFxL0FNOUQxNFV2YlBmWktadk45?= =?utf-8?B?Tno1cDJBNzh5a2ZrYjNFY0E4ZTFGQmZVcDFHLzJEa3JteUFhZEs3azZ1UzVX?= =?utf-8?B?M0dBc1dJYng0YjBpaXgwK1M1dW82d3FXZU9EL2cyczl2ckl1VHpwT1pSN1k3?= =?utf-8?Q?5so9el1oKx2arbyJnj7rcAM=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 89b85327-3fd4-4e29-42d7-08d9bbc1205d X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5600.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Dec 2021 09:40:39.6600 (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: R2Tn/V4T8uEhYbl9GThh3loAnRBPP6zN2uacdche2V6jd1bBp9QxDGEtlmhQ3tCdDhzOhVbaS5AfUTJh55rvOw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB6670 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1639129259415100001 Content-Type: text/plain; charset="utf-8" Determining that behavior is correct (i.e. results in failure) for a passed in GFN equaling INVALID_GFN is non-trivial. Make this quite a bit more obvious by checking input in generic code - both for singular requests to not match the value and for range ones to not pass / wrap through it. For Arm similarly make more obvious that no wrapping of MFNs passed for XENMAPSPACE_dev_mmio and thus to map_dev_mmio_region() can occur: Drop the "nr" parameter of the function to avoid future callers appearing which might not themselves check for wrapping. Otherwise the respective ASSERT() in rangeset_contains_range() could trigger. Signed-off-by: Jan Beulich --- v2: Add comment to BUILD_BUG_ON(). Avoid transiently #define-ing _gfn() (by way of new prereq patch). --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -1479,7 +1479,7 @@ int xenmem_add_to_physmap_one( break; } case XENMAPSPACE_dev_mmio: - rc =3D map_dev_mmio_region(d, gfn, 1, _mfn(idx)); + rc =3D map_dev_mmio_region(d, gfn, _mfn(idx)); return rc; =20 default: --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -1357,19 +1357,18 @@ int unmap_mmio_regions(struct domain *d, =20 int map_dev_mmio_region(struct domain *d, gfn_t gfn, - unsigned long nr, mfn_t mfn) { int res; =20 - if ( !(nr && iomem_access_permitted(d, mfn_x(mfn), mfn_x(mfn) + nr - 1= )) ) + if ( !iomem_access_permitted(d, mfn_x(mfn), mfn_x(mfn)) ) return 0; =20 - res =3D p2m_insert_mapping(d, gfn, nr, mfn, p2m_mmio_direct_c); + res =3D p2m_insert_mapping(d, gfn, 1, mfn, p2m_mmio_direct_c); if ( res < 0 ) { - printk(XENLOG_G_ERR "Unable to map MFNs [%#"PRI_mfn" - %#"PRI_mfn"= in Dom%d\n", - mfn_x(mfn), mfn_x(mfn) + nr - 1, d->domain_id); + printk(XENLOG_G_ERR "Unable to map MFN %#"PRI_mfn" in %pd\n", + mfn_x(mfn), d); return res; } =20 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -4150,7 +4150,10 @@ int gnttab_map_frame(struct domain *d, u bool status =3D false; =20 if ( gfn_eq(gfn, INVALID_GFN) ) + { + ASSERT_UNREACHABLE(); return -EINVAL; + } =20 grant_write_lock(gt); =20 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -832,6 +832,9 @@ int xenmem_add_to_physmap(struct domain return -EACCES; } =20 + if ( gfn_eq(_gfn(xatp->gpfn), INVALID_GFN) ) + return -EINVAL; + if ( xatp->space =3D=3D XENMAPSPACE_gmfn_foreign ) extra.foreign_domid =3D DOMID_INVALID; =20 @@ -842,6 +845,18 @@ int xenmem_add_to_physmap(struct domain if ( xatp->size < start ) return -EILSEQ; =20 + if ( xatp->gpfn + xatp->size < xatp->gpfn || + xatp->idx + xatp->size < xatp->idx ) + { + /* + * Make sure INVALID_GFN is the highest representable value, i.e. + * guaranteeing that it won't fall in the middle of the + * [xatp->gpfn, xatp->gpfn + xatp->size) range checked above. + */ + BUILD_BUG_ON(INVALID_GFN_RAW + 1); + return -EOVERFLOW; + } + xatp->idx +=3D start; xatp->gpfn +=3D start; xatp->size -=3D start; @@ -962,6 +977,9 @@ static int xenmem_add_to_physmap_batch(s extent, 1)) ) return -EFAULT; =20 + if ( gfn_eq(_gfn(gpfn), INVALID_GFN) ) + return -EINVAL; + rc =3D xenmem_add_to_physmap_one(d, xatpb->space, extra, idx, _gfn(gpfn)); =20 --- a/xen/include/asm-arm/p2m.h +++ b/xen/include/asm-arm/p2m.h @@ -297,7 +297,6 @@ int unmap_regions_p2mt(struct domain *d, =20 int map_dev_mmio_region(struct domain *d, gfn_t gfn, - unsigned long nr, mfn_t mfn); =20 int p2m_insert_mapping(struct domain *d, gfn_t start_gfn, unsigned long nr, From nobody Tue May 7 00:10:41 2024 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=1643295222; cv=pass; d=zohomail.com; s=zohoarc; b=jyRK3IkgXSHKETVcB2Np7F8kzB7Cqc2JpsCHf80YT8wKrHRvGpF+3HSxsA9P8hTII4gku49ei89lam6vB8tshGlxOURP4IFDWfBNVJLUhAMtYKUKnxySOxgrRdAo83DQ5es1qYVLNRaXqIvU07TWlTu/hOUhtjRfJWPqy39we6g= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1643295222; 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=QXqEOApuhNTDDOQi+0lYzxh9XjWyCRDTmsHjLzOzlRQ=; b=hcTOCqis6k4QoSW8YRXS6PUPgtgYI4OYvTXJYQZiaPkePajlqGlYDLXM/qEkWl87UzLQqRhQi9mcQufh0hHoGsjAAnW1XLK/p6G2svNyH5HPqiIbp/ZkpMqZGzyXRYX/4qhKXYy6RyGALjqHuOwjiUc3QfgYdr2IZLfniHHz0iM= 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 1643295222966415.740054320741; Thu, 27 Jan 2022 06:53:42 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.261517.452905 (Exim 4.92) (envelope-from ) id 1nD69J-0007Pz-Nh; Thu, 27 Jan 2022 14:53:21 +0000 Received: by outflank-mailman (output) from mailman id 261517.452905; Thu, 27 Jan 2022 14:53:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1nD69J-0007Ps-Kq; Thu, 27 Jan 2022 14:53:21 +0000 Received: by outflank-mailman (input) for mailman id 261517; Thu, 27 Jan 2022 14:53:19 +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 1nD69H-0007Pl-O2 for xen-devel@lists.xenproject.org; Thu, 27 Jan 2022 14:53:19 +0000 Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.111.102]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id dd00e2ba-7f80-11ec-8eb8-a37418f5ba1a; Thu, 27 Jan 2022 15:53:18 +0100 (CET) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05lp2177.outbound.protection.outlook.com [104.47.17.177]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-16-g4NHsuWsO-GdL_7x8tglEQ-1; Thu, 27 Jan 2022 15:53:16 +0100 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) by AM7PR04MB7191.eurprd04.prod.outlook.com (2603:10a6:20b:11c::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.17; Thu, 27 Jan 2022 14:53:15 +0000 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::a1a4:21a6:8390:b5d5]) by VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::a1a4:21a6:8390:b5d5%5]) with mapi id 15.20.4930.017; Thu, 27 Jan 2022 14:53:15 +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: dd00e2ba-7f80-11ec-8eb8-a37418f5ba1a DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1643295198; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QXqEOApuhNTDDOQi+0lYzxh9XjWyCRDTmsHjLzOzlRQ=; b=WMSI0U155lKdxaBfWu9F1rVcGoiu3C+e3htPSk65+UecLk2c0pYMsmkSQvkHpvhY3BKzwr NcUmDM6ATCaGJUv9Ykl99W5lHFGIwxFoTkhVLdxBhb/GbCtS3IUaJspO3YUyT3ZQ7cAirO ZNU1a8BlR1+s/mJmlNRTzO+fVaz78HQ= X-MC-Unique: g4NHsuWsO-GdL_7x8tglEQ-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KlMd7QR8LotlPDEZtBvNkAoSmvfO0Hmt6s9M2XKuZOETYTkkKXKIchc5loDRiOduejHZLnNQWB/HjJdjKtiZbjHRt79rrEHvN9miMvUNAEUcLDikSFRG8GuFl1pkd4MXE/Mh81m+tACMGUBueQrsv2w3+f+40vzlyMkT9/NoIKDolasaB7rfwtuq7k86JCm+gRFhs9HMTVpji11/jm7TEd1tzUrcJB+YGoKzqAZcIDfs+qO17zZFPnsVEK0jgFFTvOvYdJD3/v7+JEM2OcE1r9EzDu6phiOBr7uXldjLGlUHVCrhm5axM3dPHNJut+QamQtJO5JJj5zly+s3t1EWqA== 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=QXqEOApuhNTDDOQi+0lYzxh9XjWyCRDTmsHjLzOzlRQ=; b=nJ2Tt5GZYKUxWb1udCTqOYyglaCa1M7/U7dPoML/hNUAPnZHLKqa7nDAX1XL2tPpAKd20QjTsWcBnyylrJaWwyh9K91zY7CITBsleuCaNLhrHvVdHc1uqoJyhOOmTVTZd3zeccAVe8fY0uRWchmdo2ui28V8wqY5nUdDD/rZ166st819s3Ez4C1Gf8diBj0f7OdZdC8T9pGrJgu2D881oD0l6o3wWVJdGCsrHdbsL908RpIdF6qTYOSaPaGqd1VQpwrLUoAv9kATDX6eR6fTnnvVFkKN3iRLPiKVr4y7mJ7n4KB54sWEbX8QqXqCGdSUt6sO1spEU1Q+iGqlJ5uBbw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: Date: Thu, 27 Jan 2022 15:53:14 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.5.0 From: Jan Beulich Subject: [PATCH v3] memory: XENMEM_add_to_physmap (almost) wrapping checks To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , George Dunlap , Julien Grall , Stefano Stabellini , Wei Liu References: <9725c93e-c227-f29f-07a4-65e383bb7858@suse.com> Content-Language: en-US In-Reply-To: <9725c93e-c227-f29f-07a4-65e383bb7858@suse.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AM6P191CA0100.EURP191.PROD.OUTLOOK.COM (2603:10a6:209:8a::41) To VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: faba302d-b965-41a4-03f4-08d9e1a4bf87 X-MS-TrafficTypeDiagnostic: AM7PR04MB7191:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6108; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PKFxfMyGaZHIDUODd5fDwzV3OSJpuz/zfubEYlSpK556cqyClbWXx7Y4nLNJ/gwFMXsLqck/VUZdrOENyETt6NTgTa7Q2yEqY6DUqsqTRPRcp4+RruoQq2z7eGyr4uwchgpw0fMsyCanfEI2LHd1KSTkBLKKGDT3RPBNXD/itomae71qo7qXLmn/St5yALrHOedKo63mQdbgsH3sswV2gdxePFxODxkeaqmsx2Ah5nBgWDKkth3HCkuRFVUMx70UQftbKc/CeFzpuZYpvMae6a4R1XtYZHuUyz/l4+pcR3RdvBAemEO7VsHF8G6jmS0PNAWudim89MuBOvwlvMNwPOqgP9T33yv30X3pIbaqYMFKw56KRVBA9dcb/JeDKPEhAQ7T4I98SoNnLb2xQDv1mV/vqzEtxOjNeBnA7lE8YJ3A+UrI47qVx1QiOl/idL0JB+DEttpqF9EGfDvLnjVbKbIe1gqrAriShvqzkWMi/8zdeDezAPU5Mmh3hc8dGZvvm0SkFLFwXVDnOwgVNIgFVOtFGI3PhmgXvC/znf2xxli/NFIb9XKMjjt05oUpKYBSWxRI5iLjK65QyUNFz5lFDFl0awUHQGGK6wKYxcYIUEjualSezuVYi2XgZ8X9TRzTrkRo/BYagmfLJBzLjgxrjUHEQLS6clOz03yg9cA31wO/+aUGlCaJdUnvE7EF/u6nXm3vDEfFzBfNnycTClrFgg3GlOXCAm/G0UN4eqnqhGDLmfx/RVT/Pxs3Q21xOQCM X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR04MB5600.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(83380400001)(6486002)(6916009)(316002)(508600001)(2616005)(54906003)(36756003)(31686004)(186003)(26005)(8936002)(5660300002)(66946007)(66556008)(31696002)(4326008)(6506007)(8676002)(6512007)(66476007)(38100700002)(86362001)(2906002)(45980500001)(43740500002)(20210929001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?ZHFla3JteEJZQjVWYU84LzJvS0Y2cjhQUURZMmVUcDVYNUpaQUREQTE2TVhD?= =?utf-8?B?V2U1ckV0b3FWSCs2RlJEa25PVDZxejBYclB0MzV4SEROazBBWXhBdDUvNlBZ?= =?utf-8?B?cjAvZkxmTzhXSmNkcm9nYU9LSW9yYjIrSnhUMW1PUDhBdmRSdUJCUmROVUxI?= =?utf-8?B?dUpCYnRBaEMway9YUkRoTXNHV0NPdXppNnlxTlhtbmJkWTl6eTc3ZXlVanhW?= =?utf-8?B?ZEJLMExPeXJJSDRIVWE0ZHk0NnhkYVdWSzZTc2RselN3YWJSQ1JVN05RYlhN?= =?utf-8?B?ZG1hTzF1cFJJcnMwUUI0RU9hOE40QzRxb2JKNXBjWnhiWTRGUnF2VzFvNHVy?= =?utf-8?B?RXdoQnpFdjRmenlsMm9sS0ZaaEI1ZVhDYTJFSTVrL2FWK21FcFYwb3IxcEpK?= =?utf-8?B?Nlc1VGlRVXVHYmtxYVNFUkpwSmtJUGZ0RGRQMHY1L3N5OUdESEZOVUJXajZP?= =?utf-8?B?c3N5VXM2alcySm96bzNRY0FlaEpwK3E3OFllZ0Fsa2N3d3pkcGdKeTFRMWxB?= =?utf-8?B?Ky9nWUJoVlkzcEZCbmUvcUFMVGR2ZWYzZFVvVGFiYXE5WmtIVVJINTVzVGVJ?= =?utf-8?B?Mk5zeUNJRlVZSkdVVjJjQlBrQ3B0dEVpRVBXdWNqbjJwS0cyNWw2OVVpNEc0?= =?utf-8?B?RDJwOUVVV01VYVdqM1pBbUdWbkZOSEg3blBIMWN6eU9lUG9BWUl1S3ZhZkhr?= =?utf-8?B?YXZEcGtOT0R6UzdiVk95cGZwRklpV281TkdwVkJQS0c3SkMvc1huMTV2Zm5G?= =?utf-8?B?cWR1NzBLc0UvM24xYnRCeGt5eVQ5WVNKZVFzbStQVEk4YW9MTy9wNXl3REFr?= =?utf-8?B?Sk9Mb0FhNGdpa1QvU0gwZ2JzUDUvN1g4R1dqaHdZaGtvZG9ENzB5TG00WW9Q?= =?utf-8?B?bzcxQkNtMlBNWXVGSTFMc29PVnBhZ3NxMlkyVGVkV2Ewdmh5a2ZPcHVFTFZy?= =?utf-8?B?R3ZJblZvOTNmQSs4anZVeThWNUM2WkoyNWJ2bFJHYkpGUGltY0lEcWg0aUY3?= =?utf-8?B?MEQ3c3FxQm1GclNJblRJM20zYVBhZ1dLNUNKRDRDekdMTHU2bFc5cmhQcUdX?= =?utf-8?B?WFlVcGVhdVpZY0hrZ1hpL3VacWJPdHBpYWd6WlgxMUFkWXNwOEdXMk5yNHFD?= =?utf-8?B?SEhUY1cxWlljcWhEM3FXVDZ5NVBEbFJJa1EzTGdwY0hqdEY2Z2NmTFRGSTky?= =?utf-8?B?bkJJYy94YWtOL3A1eEZueXhHSzlvQ2dHcUFOdG96MDlad3RFTFZ0elJhQ2cr?= =?utf-8?B?d1lnY3MvdFRmNmdnSy9kSngwWEpsaUVEbHJLMHBadFFOYlNKME1pYlRlcVVQ?= =?utf-8?B?b1NJRGY3aU1nVi9DR050ODcxZnJTM0NRWk9JQ0luL0orRGVSZFpqZ2Z3VTVp?= =?utf-8?B?aWE3ZUoyZGV4NUV1N1crVC92ZXRURS9OVTBoZndQY1BXNzN2OEVFVVJsanJQ?= =?utf-8?B?UlF0KzhUSWhNTW9Da1M3SGdDcE8zR3VWQk9icy9zSFJXNmZpUnFCbXdqTTZ0?= =?utf-8?B?Y2gwZGJSTnBwTlNwM3NoUmdLYnJobjN0eWxJYmg2RDYvbVQvSDByenVwRDha?= =?utf-8?B?VDFvWUIyTC9ad2ZNWjByRDVsb1BodXlqalNjNFFWOVRwNno0TmpVQ0I0U0s3?= =?utf-8?B?VVYvWjRzTzVNUEFsYWY4c0ZGQVYxeVg2ZVRFd3Y2bzNRZS9jbzl3N0doQWRz?= =?utf-8?B?bGcwZmJReVlJRnpMMDVDVCtVd0J1SXVmZHZEMUlpQ1hnV2xTcS8vdFVrNlBH?= =?utf-8?B?RzdSS2FXUDBUNi9mazZDMmdFS3BkeTc0cTdaczBBZ2FGMWp4Y1BGU3l0aEdB?= =?utf-8?B?VEFkOG8ySmo5ZFI5MnFJVktQT2ZPNWl0ZTdhSFM2cXlaNXF3YlB4M1M0dkMz?= =?utf-8?B?dGl6KzlpdGJ2TnNFYWJjbEtBY3FkdEN4SHJSZ1lleTc3bjg0cXpualUzUlEz?= =?utf-8?B?RXdyQVY5blBQa2NGSDkwaW9PRy9ZR3BFSWQ4VE9UYWVDdmNGVkJuc0RTWTU1?= =?utf-8?B?WFZBSEJubms3akdoeW5wZzBZY1VWZTZnWXhBY0krMFBiclpMVUFodnVJci9C?= =?utf-8?B?MUxrS0JKRTExTWU0RDlOME50ajlyRWFPSGxnQlVrZnNJdE5JQkF5TSt4Z2x5?= =?utf-8?B?S01xWnNzQkJ0d2NibkdUdzRsT1A3aE9raS9ISUg5ck15d2o2d0NleUoyNlM2?= =?utf-8?Q?+LCVTmvijOYTMaWOopSBBrk=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: faba302d-b965-41a4-03f4-08d9e1a4bf87 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5600.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jan 2022 14:53:15.5224 (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: zXPnw8rmJRQV2xmnYrJAFJoEKGE5ytQWGVGDAlGXH4s1r1BEmZu7tKY+kgJnuTr6u55CYmsN72SPepqncbElKQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR04MB7191 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1643295225069100001 Content-Type: text/plain; charset="utf-8" Determining that behavior is correct (i.e. results in failure) for a passed in GFN equaling INVALID_GFN is non-trivial. Make this quite a bit more obvious by checking input in generic code - both for singular requests to not match the value and for range ones to not pass / wrap through it. For Arm similarly make more obvious that no wrapping of MFNs passed for XENMAPSPACE_dev_mmio and thus to map_dev_mmio_region() can occur: Drop the "nr" parameter of the function to avoid future callers appearing which might not themselves check for wrapping. Otherwise the respective ASSERT() in rangeset_contains_range() could trigger. Signed-off-by: Jan Beulich Reviewed-by: Julien Grall --- v3: Rename function to map_dev_mmio_page(). v2: Add comment to BUILD_BUG_ON(). Avoid transiently #define-ing _gfn() (by way of new prereq patch). --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -1479,7 +1479,7 @@ int xenmem_add_to_physmap_one( break; } case XENMAPSPACE_dev_mmio: - rc =3D map_dev_mmio_region(d, gfn, 1, _mfn(idx)); + rc =3D map_dev_mmio_page(d, gfn, _mfn(idx)); return rc; =20 default: --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -1355,21 +1355,18 @@ int unmap_mmio_regions(struct domain *d, return p2m_remove_mapping(d, start_gfn, nr, mfn); } =20 -int map_dev_mmio_region(struct domain *d, - gfn_t gfn, - unsigned long nr, - mfn_t mfn) +int map_dev_mmio_page(struct domain *d, gfn_t gfn, mfn_t mfn) { int res; =20 - if ( !(nr && iomem_access_permitted(d, mfn_x(mfn), mfn_x(mfn) + nr - 1= )) ) + if ( !iomem_access_permitted(d, mfn_x(mfn), mfn_x(mfn)) ) return 0; =20 - res =3D p2m_insert_mapping(d, gfn, nr, mfn, p2m_mmio_direct_c); + res =3D p2m_insert_mapping(d, gfn, 1, mfn, p2m_mmio_direct_c); if ( res < 0 ) { - printk(XENLOG_G_ERR "Unable to map MFNs [%#"PRI_mfn" - %#"PRI_mfn"= in Dom%d\n", - mfn_x(mfn), mfn_x(mfn) + nr - 1, d->domain_id); + printk(XENLOG_G_ERR "Unable to map MFN %#"PRI_mfn" in %pd\n", + mfn_x(mfn), d); return res; } =20 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -4157,7 +4157,10 @@ int gnttab_map_frame(struct domain *d, u bool status =3D false; =20 if ( gfn_eq(gfn, INVALID_GFN) ) + { + ASSERT_UNREACHABLE(); return -EINVAL; + } =20 grant_write_lock(gt); =20 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -832,6 +832,9 @@ int xenmem_add_to_physmap(struct domain return -EACCES; } =20 + if ( gfn_eq(_gfn(xatp->gpfn), INVALID_GFN) ) + return -EINVAL; + if ( xatp->space =3D=3D XENMAPSPACE_gmfn_foreign ) extra.foreign_domid =3D DOMID_INVALID; =20 @@ -842,6 +845,18 @@ int xenmem_add_to_physmap(struct domain if ( xatp->size < start ) return -EILSEQ; =20 + if ( xatp->gpfn + xatp->size < xatp->gpfn || + xatp->idx + xatp->size < xatp->idx ) + { + /* + * Make sure INVALID_GFN is the highest representable value, i.e. + * guaranteeing that it won't fall in the middle of the + * [xatp->gpfn, xatp->gpfn + xatp->size) range checked above. + */ + BUILD_BUG_ON(INVALID_GFN_RAW + 1); + return -EOVERFLOW; + } + xatp->idx +=3D start; xatp->gpfn +=3D start; xatp->size -=3D start; @@ -962,6 +977,9 @@ static int xenmem_add_to_physmap_batch(s extent, 1)) ) return -EFAULT; =20 + if ( gfn_eq(_gfn(gpfn), INVALID_GFN) ) + return -EINVAL; + rc =3D xenmem_add_to_physmap_one(d, xatpb->space, extra, idx, _gfn(gpfn)); =20 --- a/xen/arch/arm/include/asm/p2m.h +++ b/xen/arch/arm/include/asm/p2m.h @@ -295,10 +295,7 @@ int unmap_regions_p2mt(struct domain *d, unsigned long nr, mfn_t mfn); =20 -int map_dev_mmio_region(struct domain *d, - gfn_t gfn, - unsigned long nr, - mfn_t mfn); +int map_dev_mmio_page(struct domain *d, gfn_t gfn, mfn_t mfn); =20 int p2m_insert_mapping(struct domain *d, gfn_t start_gfn, unsigned long nr, mfn_t mfn, p2m_type_t t);