From patchwork Wed Feb 23 15:57:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 12757135 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 91301C433FE for ; Wed, 23 Feb 2022 15:58:13 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.277457.473960 (Exim 4.92) (envelope-from ) id 1nMu1g-00008G-TS; Wed, 23 Feb 2022 15:58:00 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 277457.473960; Wed, 23 Feb 2022 15:58:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1nMu1g-000089-QM; Wed, 23 Feb 2022 15:58:00 +0000 Received: by outflank-mailman (input) for mailman id 277457; Wed, 23 Feb 2022 15:58:00 +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 1nMu1g-000083-0k for xen-devel@lists.xenproject.org; Wed, 23 Feb 2022 15:58:00 +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 5f3ad3c3-94c1-11ec-8539-5f4723681683; Wed, 23 Feb 2022 16:57:59 +0100 (CET) Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-ve1eur03lp2055.outbound.protection.outlook.com [104.47.9.55]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-19-SQzgJmp3NryWrBBt5thgAw-1; Wed, 23 Feb 2022 16:57:57 +0100 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) by DB3PR0402MB3770.eurprd04.prod.outlook.com (2603:10a6:8:12::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4995.28; Wed, 23 Feb 2022 15:57:56 +0000 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::d479:b728:345c:bd65]) by VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::d479:b728:345c:bd65%6]) with mapi id 15.20.5017.022; Wed, 23 Feb 2022 15:57:56 +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: 5f3ad3c3-94c1-11ec-8539-5f4723681683 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1645631878; 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=+aFyYLBG+wsL1hFDXE2XB3gg/hIZf4QnUWxpT0OEYsQ=; b=lHBmmS6P6PH3J3TOR17keKx2dAwglPwF4UEa0cCTOHpXOHDAdzggDSE8zvSc1H9Pg2XapF EQBZIv2n3a6XyxF4qLikjuvILXtM1s+FQesgkOK/341HjJh/kOJLzT9zjBWaiONs/06FxR NUVIoDmyMx/fU9ZjaYxL8rh3HNnD4mA= X-MC-Unique: SQzgJmp3NryWrBBt5thgAw-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jPm1eBKfko+0msEY4Srou/jjGn3g1iQ2VfaGtWZDCwZ8OoGd03wpWzyoRwdCAjk3xi1ij8+OMJonAfsg58NrpqMiPheKXIn6XQFmg6vUhuDpPp/yzrIOuXhJdalQqAZvbNbt302Z5S7qYyMelCvuF5JHNNyBHnvctQQ/XGkIeWVgfitxWwZlTeKFrmJBj7ngWIKpLsg6QiRn8i5HzIvNRkqzBJiNUOEnuJGXKArR1jgWiI7wZeNSr6QIfFg0ftEBs5RddEvGF5T4ExH7QotGcgdxys6PXLLJMS9w72zs6n6wPblbdJYtS/NJs43xhamHaYydDaaB2WxB5MA+FgGGxQ== 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=+aFyYLBG+wsL1hFDXE2XB3gg/hIZf4QnUWxpT0OEYsQ=; b=mS97rn069Ede95/TcGHwN8fy7CC446CWe4n7tl+YDPUS9oHiPpqbqLdtsmMGRhvN02RGNJI9s8ZZyyujHuzmTpUfcBTSwk9HWOpeRZ+NmW5oIkXYCu54K/B7Y7vsM+UXFzapCe5+PKP+CRhpmy7iQ01fdJ/BMhlTIvMkLmKfrq/40VoKQUDhdVk+KnjKc9OKfZ4m7vwzsIGvvJ/9AmP+/CAO5S5+J6/5525U6sMi9abYnQ+ERd8e8f9qY/8QUr4nJxTtbQotzqxdu78Jl8a8cvU5NdpYdBybEWyAREJAQqU1T38J0mbMvPdB2C2LSrQR/OtoZf+XPJXEJqdPjoWfFA== 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: <2353ed37-e62a-4e34-7442-0638bb92dc2c@suse.com> Date: Wed, 23 Feb 2022 16:57:53 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.6.1 Subject: [PATCH v2 01/14] x86/P2M: rename p2m_remove_page() Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , Wei Liu , =?utf-8?q?Roger_Pau_Monn=C3=A9?= , George Dunlap References: In-Reply-To: X-ClientProxiedBy: AS9PR04CA0103.eurprd04.prod.outlook.com (2603:10a6:20b:50e::14) 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: 5f9a0e0e-c011-4b7e-c8c2-08d9f6e541c5 X-MS-TrafficTypeDiagnostic: DB3PR0402MB3770:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7G/HNfygm3MNpj2kD5dxbOsbERLa9Y/VF2MB8MqzFwu6msYEnUReAXXg6dAUy24BrVwcc9uE/IhATLpWJcSYc/ixgIouTZmV5/9F09sN3Ps8PMxjniBD49jGi4ZpCg0jecc0MvbR3MzhreH3BZNTkL37kQ8fvhVYWtxC/fE+VAkQp4h2b5KJau0bDt8vqGAP//D6ALTQlAVojjP63oUub581AD1UUPnsOyPqfEfJEjpxG/1An0JyoG/MAwxYJCgiIWExnR9Hj/l6zxBsYQoQiR8eZSvmhtfjudVsbljeVwve3BSLZoshBsE47tL/yx1NCrCdNPH0E1HUUjLStwtSFadI14TVEtg82jK/oI+3opcuskeevCcCV+FMg++sIn2xI0fv9K7auQugxKWonZacPEc4o3AsJ8i4AFRVTAykhNJS7Zwq3C4kh/AoVMSeRsC4h1Iehh7gujIE4mrMZmpxiqq/HRbW1+1gzXY1gXYb1rdJJHHliNAD7vuXqkXJFskKBFOlQJxBiDeERJmEkUEr2F125JMM5DKumS2rtzHRIy19jR3XaVfPv8NjyWtnxzefzwO09KcWNB3gWv2/S55yGjdeBxQX40i3cjaOAfx6YfnpaBEaJrw2F38WA4s1R6aY4OS3oFiEJDPYyDVcG73APKKru8NEYwIXkWS4Tq2hteqfJdIh1LGvXx3SkT27uPfFEexzXzWKn55BJqjD9uVjp5tut80SNuv5H/K66xP99rbX12zttcTO3dzCOQwykogq 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)(66476007)(66556008)(66946007)(4326008)(8676002)(8936002)(36756003)(6506007)(31686004)(6512007)(316002)(6486002)(5660300002)(6916009)(54906003)(31696002)(6666004)(508600001)(86362001)(2906002)(2616005)(83380400001)(26005)(38100700002)(186003)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?fWpeLEhbSx4IBGifV2/2dZCYlG4F?= =?utf-8?q?QKiOLVu0IIHEmcgcg5dss8HPfbUBGyVQwBRjCnMkxEyVVx9VbfJTn//AgCzi4C4pX?= =?utf-8?q?ZhwzVfDmnLDzbfMgqITEQbi557EJRtT+Y6fkuxq4O3NG6Nc+Aa/VZbnk0PAuVJTB4?= =?utf-8?q?0aldx/BACg3xfFUSD8PLLr+RnLiGdQPKyxwkGSVja0YCDOvj04IPdmDwufZSMx/w8?= =?utf-8?q?ZZp3OofEsnrhdrz6b5kvU/BKjX/aJkKK0Cs58bXBwgEE5ly3HXTztXN5dwu+61yUI?= =?utf-8?q?21qXAjJrJhdUuZOUPV6sKwhgye/hC86hfNc2M3NTEjBIUWcps/fkfgfmy7xyv7vVd?= =?utf-8?q?PerwBelsUIzti8YyERphyDW0k4XVJHq+FMDh5+27KioRQTOXMer9vdSVs8LkLQKU2?= =?utf-8?q?9EwcFhroVbxHm23gsRxX2mqvqbmQ5tqqvvpYQxXwRTOlF3GMNj7i3+QCsUTM5gh5T?= =?utf-8?q?VbL+NyLkokBam2TxhTLZoSMcCYEJp7sMrmc2GDE/viCRNKJx37at7BQh2GikP2hmH?= =?utf-8?q?DqCNoiLqkFCRskcNuBhnkKpXhkDav3aqF3KNnfQrZfDOej2p6yyO6uLBIZoZqfy7a?= =?utf-8?q?1A5WRAJX0fmjpTSqYkISthBkXMTFeaDJLZqQcE+3o677KIpZr3Y2WNWG8RhUHJtlm?= =?utf-8?q?yG4gO6RopCUAGfwX4/V0oUsuH//ERuMJ7D2FOjScuqqszueR3UjptY6L1sBWOGU0s?= =?utf-8?q?Bk1/PncKmVfkAmDRBIjd7jQthYFoEy7L1gy5rjeS40YJVFXB1UeYEjfI9f69Yrfin?= =?utf-8?q?QkWSK0qW4oUy7jEJmgP5LhXVsTUhxJvCywlKTXSBsQ6KEIqPQ638keISBN18ybaPB?= =?utf-8?q?4LFhYxgiQ9wjXd+pPGnoIGERGtSfEqTtwPUhLFSyJuUv0LHh1Ce6G+HsF6EmPesiT?= =?utf-8?q?414mJxp+KHVesoP4gWusm29vjCci5wce4eE8Q0Ue4Lt44eDFL+by/KJeF8eZrxmHW?= =?utf-8?q?hnTWpt41dPmvO+Xt7Ark8SejSbGNLNhDjog39xJBrISzVc6omy8wk6K8UziLk/lbA?= =?utf-8?q?+8plMHJHMZxkoO++eQ7VjAoLl8SGA+Qfv0NFYZ6z76YvT341IHWemPkZa+JdZqQgf?= =?utf-8?q?gL70HAzmPd+GhkgjW9davoqFGTYldY9SwxByBLMsPLI20A6gR8iXy8fflxgvWar4O?= =?utf-8?q?J+TJziHsARNK6/UykdLTwAXWY51aIQkoshVlBE8lg26h9G0QUIPZeg7FEwLJ90AmH?= =?utf-8?q?lLIgVOVPrOZ8KmiyzgCdjaeyrzUQOsXbZCiHLolnqL7TSV8/fmegdr3O00x0and26?= =?utf-8?q?bnNQGjFj0Mt34FKNMevU3eRzp5cV7prKj8QPsf9GuDZLEcuGVjdV8Re0kpG7nBP7a?= =?utf-8?q?uwg8HDPocgdbas1P3YVh8+4NHhdD0YpPC1sboZ8bLvWewlnP65cM8jUufmbL9NvJY?= =?utf-8?q?y68PQ4fPOwqpP57nSy99ZJtjcr3IzB+hpE9UADZ81pTzcHcKjRuJjsC53k72wk60B?= =?utf-8?q?psYSqlYAk2xqHvoYEV/ZUOh6aHqA3DWniGwSd/xg3c+qaF+tTHHwE/DOOJ9hslCTU?= =?utf-8?q?nm3/A2K7vdjHA+r/UfjRXkVGJTuT1prCY8N08vJMOnRYKlKpN/ug//o=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5f9a0e0e-c011-4b7e-c8c2-08d9f6e541c5 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5600.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Feb 2022 15:57:56.2310 (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: 66J6X4yg94OJC5Sx0LWHMCdwjgOUe/FMe+ZfB2cL5yAt7c3LPuni4lZvViKy2ZOvRSl/rU3lBjMzwl4jUQg24w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB3PR0402MB3770 This is in preparation to re-using the original name. Signed-off-by: Jan Beulich Reviewed-by: George Dunlap --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -788,8 +788,8 @@ void p2m_final_teardown(struct domain *d #ifdef CONFIG_HVM static int __must_check -p2m_remove_page(struct p2m_domain *p2m, gfn_t gfn, mfn_t mfn, - unsigned int page_order) +p2m_remove_entry(struct p2m_domain *p2m, gfn_t gfn, mfn_t mfn, + unsigned int page_order) { unsigned long i; p2m_type_t t; @@ -861,7 +861,7 @@ guest_physmap_remove_page(struct domain return 0; gfn_lock(p2m, gfn, page_order); - rc = p2m_remove_page(p2m, gfn, mfn, page_order); + rc = p2m_remove_entry(p2m, gfn, mfn, page_order); gfn_unlock(p2m, gfn, page_order); return rc; @@ -1034,7 +1034,7 @@ guest_physmap_add_entry(struct domain *d P2M_DEBUG("old gfn=%#lx -> mfn %#lx\n", gfn_x(ogfn) , mfn_x(omfn)); if ( mfn_eq(omfn, mfn_add(mfn, i)) && - (rc = p2m_remove_page(p2m, ogfn, omfn, 0)) ) + (rc = p2m_remove_entry(p2m, ogfn, omfn, 0)) ) goto out; } } @@ -2444,7 +2444,7 @@ int p2m_change_altp2m_gfn(struct domain { mfn = ap2m->get_entry(ap2m, old_gfn, &t, &a, 0, NULL, NULL); rc = mfn_valid(mfn) - ? p2m_remove_page(ap2m, old_gfn, mfn, PAGE_ORDER_4K) + ? p2m_remove_entry(ap2m, old_gfn, mfn, PAGE_ORDER_4K) : 0; goto out; }