From patchwork Mon Sep 11 06:38:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 13378819 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8D782EE57DF for ; Mon, 11 Sep 2023 06:38:52 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.599042.934274 (Exim 4.92) (envelope-from ) id 1qfaZA-0005iQ-13; Mon, 11 Sep 2023 06:38:36 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 599042.934274; Mon, 11 Sep 2023 06:38:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qfaZ9-0005iJ-U4; Mon, 11 Sep 2023 06:38:35 +0000 Received: by outflank-mailman (input) for mailman id 599042; Mon, 11 Sep 2023 06:38:35 +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 1qfaZ8-0005iD-Ul for xen-devel@lists.xenproject.org; Mon, 11 Sep 2023 06:38:34 +0000 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on20615.outbound.protection.outlook.com [2a01:111:f400:7e1a::615]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id d41b2491-506d-11ee-8784-cb3800f73035; Mon, 11 Sep 2023 08:38:34 +0200 (CEST) Received: from AS8PR04MB8788.eurprd04.prod.outlook.com (2603:10a6:20b:42f::21) by DB9PR04MB9889.eurprd04.prod.outlook.com (2603:10a6:10:4ef::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.30; Mon, 11 Sep 2023 06:38:30 +0000 Received: from AS8PR04MB8788.eurprd04.prod.outlook.com ([fe80::9d93:f481:7a9b:345d]) by AS8PR04MB8788.eurprd04.prod.outlook.com ([fe80::9d93:f481:7a9b:345d%5]) with mapi id 15.20.6768.029; Mon, 11 Sep 2023 06:38:30 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: d41b2491-506d-11ee-8784-cb3800f73035 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Rej/j+ttGNxbennkffBqXtGngTHoKx8d7v01k0FNUlmM8AkP6UxbzRROVkOXiA37X2FHK/quVONilcz4TYIx1vwmnpO8Swv3PNHAcrXXycE+qESvxJd/FnjrwFVT7PUTkU7L0yrI99uPthqg3uali5noG0708qBcq9SoUhbX/B1I+CYhJFjLiFPxfAYxc9Tp3tmBc6AhNvZoFAKaiYe0xzAS1oXht54bvZh4iiZAkPDaomw5V8hCvUBE4LlkPOLVs+o2xGuLcvePibpNHum34wKtNO1q2KwSWB9pDn8Eyu5fUUP6QJdfaetpDoLc44CjCMKZIp5hlyoZeIJA3kQWWA== 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=DFADsLsb1kDVyT8qTXZJEa8z+dCBZPheDsPwAKar0tI=; b=ZcBMW1LtTfdCK8YGwonELF/53/QJzmd2vrk/pGQ3KXvyrYIU/hXqVELeFD6Ojr1ZPaN5EkJouhOPxzGB6jO+OuomNz9MmVAyDsjWH0Lspbm13Gt90j8Y9+9rQblIxnxdbqeOg6MaSp/wgceqRdgho+EuktUqPNtTtXA9QOzAiaKcHmiTIpWF1GwJ4yCuUh7WZGAUIXMSRCiuMljLolwWyseGKvnaljgxO4EI10O+84kRCFXcwrp+EIHQ7w3ypeBXIY2F7U/ywIOZSsJWmrJ55Wwn87v8u5zDHnLkmE1682H2HHUtiPdfZidBAlBBf4tZkBpDJZCc4Kpy6yC5RxOUbg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=DFADsLsb1kDVyT8qTXZJEa8z+dCBZPheDsPwAKar0tI=; b=tuT+C1gSa0Ag7JUMexKVurn55frHjK0hH/kA2AD/tOkSdjLn7vPUAZ9On8BACeTtx8F5NIVeBCRqjcb1RgLVrOWxkrYC0ydVP1npmBGMmTsDLKofAdb69e23cWXmNFgxNMhv0i0lbAOrJGQz8hSOo+SiloXV8d4Eu6nT85eDe1dG2kGSS/4CQPlipypXX+s+07H9REBt7BUvi0DcmjXaljhjTHxoYbtbJ4O3H5Bgb8mNSh4mtXyrjVSjMkPtlb80KWrMw/UoQvJkOLMqNel1+GRTi9uLf1hm4qagc2wku/GSPjwQuJ5d38IqMn+4wP6GIiGGGJcaFVWh99fH/z94dQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: <9b5d517b-fbc0-d9ce-d6be-d4b8e3c0cc35@suse.com> Date: Mon, 11 Sep 2023 08:38:30 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.15.0 Content-Language: en-US To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , George Dunlap , Julien Grall , Stefano Stabellini , Wei Liu , Shawn Anastasio From: Jan Beulich Subject: [PATCH] include: make domain_page.h's stubs properly use type-unsafe MFN <-> virt helpers X-ClientProxiedBy: FR4P281CA0076.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:cd::20) To AS8PR04MB8788.eurprd04.prod.outlook.com (2603:10a6:20b:42f::21) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR04MB8788:EE_|DB9PR04MB9889:EE_ X-MS-Office365-Filtering-Correlation-Id: 2aa9abaf-9a02-4fd4-816c-08dbb291b66b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5g7b7RscvI30KbUT9JHX9Fjb6sDK6LYXOcxU8x+3G4Zh4mcE9S9QXxvuvMNjdoWKppup9hTxH6hCKd2sk7uDhag/UBt2npshsAR7W6lFsfYiDo903j7KT3k3nhnTyVN+GmaQ2AhXI2NcUz/xkK2njJrrSuYi4+VHdSXOpcEQEh0Ykf6+B1RDKSMAWiPUFvWJYJS7/Oi+jMCnRyJomXzbtWG2rzlyW+wR4PGeQRED+WIHBl6UjTX1Q0O4CVZj8LFobSwPFYityW954naXvIjZMzhxKTgI/AL4Zy21k5HyemGiRvzcgiOaQFQcIUatOy+Lr/1EiP641ab4pVwmxOnlyn7BAwtswdOqClCzrxZeKAwzuV7hvRFcRHijxHgGb9+6gkwvRHISjWD/Rbd3QAOiaeUv5euFO8/C1tAOBwUmlTHS8MRZBar4EanyLTDSgIeAlq8CYqLAzb3jIst3URnszH9eeM1D5heSdABm17R1GJ1guFI65klszeqysj6nAL+fONfJo6SOj8icQ78KSy4o7BtBbKqkKPYkLaSAxsQC/RuUwCDoV30mvC99lX8hKR1nVA3EuD/WkmwDYTm5mBj12qa7nNsSNpWKt06WAJrRZ6S3x366adKBimoaYg+RdXrEbp19ydPDNTtSelRgDeNWgA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AS8PR04MB8788.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(136003)(376002)(346002)(39850400004)(396003)(366004)(186009)(1800799009)(451199024)(31686004)(6486002)(6506007)(86362001)(36756003)(31696002)(38100700002)(2906002)(26005)(83380400001)(6512007)(478600001)(41300700001)(66476007)(8676002)(4326008)(8936002)(5660300002)(54906003)(316002)(6916009)(2616005)(66556008)(66946007)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?SS6uqRAVeWhz6jpEu2icor6LGNtG?= =?utf-8?q?ph+O65h/xjVa6IBCL3rAb7CyfiEc1JbIWaWMLcMvSoP2debIhyvLXtQo1Eilrt1GX?= =?utf-8?q?oXkRoEmscc58tfdKFmAIodzrTPVNDp/6UnT+olnrhS4tPU14N3GrdQtl+71FPL15a?= =?utf-8?q?qi5zM3BMJ5aLbhHEPOi1CglTA3860dzno97uQSKIT+732WMz1nOOMLNenKwdHNN1Z?= =?utf-8?q?XPAu7iwTwcrC5b/RSWUc0seaDKULABLySdfz+C43PUjQ3LrFVwwhn8ohLNTT8Z9aX?= =?utf-8?q?Tz9VqKZ5O6t2YWjZKH5uVwSOquJA/tdEwFFriUGg5SHSNhNkejJuhnkurkSy7ByJN?= =?utf-8?q?jf4Al96H3OjXFKFE9H3wwYsNFdGq6UTut82tYzrMMq8ZwNZJ4OGczYCoNLAXYP6Kb?= =?utf-8?q?N1Yyz8bbWmEE7OqTSEVd9607iU3iRw1VJzHIPJZnXuI907EfqNV1gfgPi+G0qjYdf?= =?utf-8?q?rsQ5GqbvJUfVBdkQOGqwoAphrppjQPsMcFIWCVGcfovUpX2Ryx/COisDAYhvZWsGV?= =?utf-8?q?RseKykrTtjBkEJeNBf/tD5ie47zokXHr3v+Y0HX3f9/wMI6Nb8b65PpZk8rYv2lkw?= =?utf-8?q?Gv9+v/B/2AyY9B2RFT7E89E3O2jgngivnbDcV1DKRLcAfSIl94fHtuZqFV3+UoABd?= =?utf-8?q?vmNdLFmVD/LPgNBJY4zwYLCSSR0wAZdvSqKWfeqteiMe1Q8lkFum1tTV0Ki0IvGwH?= =?utf-8?q?MBasuKV16lwdeMUCl9mkK8i5R45VtbpwPQMOqm/vtGVuuJJ0PA8kGOAr1xAJKPpFT?= =?utf-8?q?yWkEVJI59b6Ero8UehFiwD0X6VEEmCBq4xm9TSCNdOTTqT02aq+2+kWU2XDsSCeuE?= =?utf-8?q?T1BJ792qwhvSg7Zf5bsONrrcPwnw/cWMUoKpf/RXR3qA9ptsbDfT5NnbwaHZPtlbE?= =?utf-8?q?UaRWVW7Reb0sj4jwxfrNlbU3msVKvOTb7XLmo9aBYEyA1Uo84a4EHp7lXoJv4fMey?= =?utf-8?q?gwKbDMROgPZkJf/QXjCIjsxq93KgCnnRp55q1FFSHaHaIDWY/t1IzDA7+PRxCYY7d?= =?utf-8?q?+a7zj+QhKzOv5i08Z3ln0Hnfqw2a/MAjj55owMiJAGOdUetFVUm4QlOMHuGoJBVEh?= =?utf-8?q?2gxj3CxFSe6WQomn6gZQhye/dw+MYPc02LVMk3V0pD1lAyK2R66PX5019l5m6ZC/4?= =?utf-8?q?rQWX+brcRiEainKWnXQEa4MohzMXew8en6V6PlbgO+elsQPY4sR7NLOH4Vn43kiMA?= =?utf-8?q?EK5pd8Qv7YuKDRRYquu4Z6/tj2ewk9D4mdXd5l8B/8GgIaZWvtyfw7ZlQ2K58vFhA?= =?utf-8?q?GHUBXOJU+wznrNiQkbmR8CqJSXK6P7fuQgEkr/F6RoQk65fYcj3Q9SuZ5xxh+mvzy?= =?utf-8?q?nLpe9Q3rCc3kRtB/rX2l/H8m6VDjcklaseN3Ij1I2r8+0MUPFBxHJsW+aIcgtgdaG?= =?utf-8?q?tFOIZMOX2iVGngwhl5WRss/8RPiIHa4CAAuVAj2/ybWdxbunEdT6vGXpxK+5nxWrB?= =?utf-8?q?+wkVmCzRE+hgGXdmEpuKI/Qutd+s4oqSAg/rHz1WKtpjVKPboYd8HSRFczW6z9gRY?= =?utf-8?q?v/tvELKlJGVH?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2aa9abaf-9a02-4fd4-816c-08dbb291b66b X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8788.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2023 06:38:30.4609 (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: 9BkthNkDrEkVEdVeEEnP7G81iVFLiMuAnOV4tCHKIEN7ecH1sEbZvv8FJlT23UHo0A7clUv6D69O8uoXz50jcg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB9889 The first of the commits referenced below didn't go far enough, and the 2nd of them, while trying to close (some of) the gap, wrongly kept using the potentially type-safe variant. This is getting in the way of new ports preferably not having any type-unsafe private code (and in particular not having a need for any overrides in newly introduced files). Fixes: 41c48004d1d8 ("xen/mm: Use __virt_to_mfn in map_domain_page instead of virt_to_mfn") Fixes: f46b6197344f ("xen: Convert page_to_mfn and mfn_to_page to use typesafe MFN") Reported-by: Shawn Anastasio Signed-off-by: Jan Beulich Reviewed-by: Julien Grall Reviewed-by: Shawn Anastasio --- a/xen/include/xen/domain_page.h +++ b/xen/include/xen/domain_page.h @@ -56,11 +56,11 @@ static inline void *__map_domain_page_gl #define map_domain_page(mfn) __mfn_to_virt(mfn_x(mfn)) #define __map_domain_page(pg) page_to_virt(pg) #define unmap_domain_page(va) ((void)(va)) -#define domain_page_map_to_mfn(va) _mfn(virt_to_mfn((unsigned long)(va))) +#define domain_page_map_to_mfn(va) _mfn(__virt_to_mfn((unsigned long)(va))) static inline void *map_domain_page_global(mfn_t mfn) { - return mfn_to_virt(mfn_x(mfn)); + return __mfn_to_virt(mfn_x(mfn)); } static inline void *__map_domain_page_global(const struct page_info *pg)