From patchwork Mon Jul 5 16:05:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 12359353 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.3 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1CE32C07E99 for ; Mon, 5 Jul 2021 16:05:51 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id C6A9261968 for ; Mon, 5 Jul 2021 16:05:50 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C6A9261968 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=suse.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.150429.278137 (Exim 4.92) (envelope-from ) id 1m0R6N-0001mK-EP; Mon, 05 Jul 2021 16:05:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 150429.278137; Mon, 05 Jul 2021 16:05:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1m0R6N-0001mD-AQ; Mon, 05 Jul 2021 16:05:43 +0000 Received: by outflank-mailman (input) for mailman id 150429; Mon, 05 Jul 2021 16:05:42 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1m0R6M-0001lp-Nh for xen-devel@lists.xenproject.org; Mon, 05 Jul 2021 16:05:42 +0000 Received: from de-smtp-delivery-102.mimecast.com (unknown [194.104.111.102]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id d889d61a-ddaa-11eb-844d-12813bfff9fa; Mon, 05 Jul 2021 16:05:41 +0000 (UTC) Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-he1eur02lp2057.outbound.protection.outlook.com [104.47.5.57]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-4-yQsuM0daNaiDx4oti__Xcw-1; Mon, 05 Jul 2021 18:05:40 +0200 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) by VI1PR04MB6861.eurprd04.prod.outlook.com (2603:10a6:803:13c::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.23; Mon, 5 Jul 2021 16:05:38 +0000 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::99d3:99cd:8adf:3eea]) by VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::99d3:99cd:8adf:3eea%5]) with mapi id 15.20.4287.033; Mon, 5 Jul 2021 16:05:38 +0000 Received: from [10.156.60.236] (37.24.206.209) by PR2PR09CA0021.eurprd09.prod.outlook.com (2603:10a6:101:16::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.22 via Frontend Transport; Mon, 5 Jul 2021 16:05:38 +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: d889d61a-ddaa-11eb-844d-12813bfff9fa DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1625501141; 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=Z4RpaDeng9lWcvFK84pEeyS4Y5FUQv/CbdN7CkzTyrQ=; b=UwLRjneZU9oyXtDDwHpcs07V4LSnMf1PAC9Tuk0pVNzXezv8a6HgWyMwnHVYZ6ZOneKyO5 M9NbW02SSyxzbmXqJ6pL0+Bklc1ZCCmv/p995zI0XQz7Wyz/vi6RbCqABuCToDynKrLLqJ JFQPWHAwK07+N7wvGMvGamxRb3YF4SQ= X-MC-Unique: yQsuM0daNaiDx4oti__Xcw-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RaY/l8CgDOuH0MeNIF51p8UC1Tx9HVuDubP00DOtFBgbMgYjpZxd4kwV6BDfn322YXzEsexjNqdMm5XBYn/meQWoOdMs6FGsxMTm13+myZTFCviDX5FP5Avadcs5ho/+o9+Bb+yXBxsSiYynSY5P3ev7NAEkb878mDNA5ZiIHt4gLgmNzscqapfpMXjkanQjKnmjYeuw04pobKp/ai5TegCUfB/5Ovm3YT4NRK7oNMK1PzzN54JWuNaG9upIBSXtBJmbJLadAF4oBfZgNOoCdSXs+3E1FZ/UqeZ92PZsx8mME2xYgwPFu868zD4MkgPJGEcj22n7cvgFusTC0R4l9A== 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-SenderADCheck; bh=Z4RpaDeng9lWcvFK84pEeyS4Y5FUQv/CbdN7CkzTyrQ=; b=iKscJRJE5NMYs8pB1ESmibOFyxOJPuSSmfIOGrEgsT/zejvqjPITVm4FNWQOwgMjQaSuEvwzvk5aiDijctUKaM9x/aU2JnouzjLxM9lQRIVMGew3Kh4PQ8kNrtSkdXjNGTJw8IlXYtDKBvgjpyvn2UC7zu5E9ZxFl5hQimppWMtyeSriDIsU2s05DgZdtAwH9GAOEbm/33vVQ4M4P0m3eI81btLgzW/CyddjmFW0KjW5QIcov6oXqqc81MTVLf/LqqjnIj0ETVYtHGbm/ZlqUQRx6mjnp5JIU+3uKx/iYi5Y/j9RlYbXyuqfSfH4RWFCBJyeFzW3j4vNx2IqpLl3Fg== 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: citrix.com; dkim=none (message not signed) header.d=none;citrix.com; dmarc=none action=none header.from=suse.com; Subject: [PATCH 01/16] x86/P2M: rename p2m_remove_page() 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: Message-ID: Date: Mon, 5 Jul 2021 18:05:36 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 In-Reply-To: Content-Language: en-US X-Originating-IP: [37.24.206.209] X-ClientProxiedBy: PR2PR09CA0021.eurprd09.prod.outlook.com (2603:10a6:101:16::33) To VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fb5d391c-3b65-4826-aa72-08d93fcebb29 X-MS-TrafficTypeDiagnostic: VI1PR04MB6861: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2512; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wEbP80NctPr/Lc+EQsq/uLfvi2N2W7lO0llBUJcQjsOdQ4lnQpnIzbq05aRRhdmHxwRoWG6KoAr+0sSSAAfsTAcjd2TVEbGmTl5xHCscrZD5RI4or8n1CKfhz0OWVzEmB3AJN5L3fIcI7U4O/3vdgNDVbA1OV/lYXrjDsb1MMXThgDC17bZFPBnNISC6Ts/tHpHfdL3uZoVeKPoL6r+AySPKa9Jlxd9IDcqDheqaCBA+zTwCUC/+2MnxqF2L/FXB3OiqqAamJCi3vWIhagzZ7D8xZ/9gYzE4pqSKbeNBSVc0BDP64UZ/SBTCv1SLPSbRRB0W5O3+E8nvOOd15XXqjAu35gW+S6oZeueqUFVV3DaXe1SFZMjDcJdL0jlhF1b/vTf1rW5enoGKfLX5dzfe6mukPWT4BB/FRPUFjnAALD6EfQz9uSUkzRGE319WKMJfauusew/xd0REeV0OSp+LipVBMwjSWAJtOtOAeir8tXAxsFz05DXXAscmSDcx0S5py0AE/tbIno7CsiU0YeZP90PQatTNjlAQbXhH4IByCYKtdy57nXxBkiLvGCRButjP/HzaCwaCl2gUwwrQAOHzfH9K8tuXMVHW/Ire/VidLUU2VEu8ewLPRAsHPOG4w8XW2DYDe0UILUXutFpJqX1u0GkBJys/4tH4gDINpBg0dX28EYTKijdhFB8R6iJkhPQVx3NOVesy8VkUdhFaqmq9f7bsN1YvaBT+zDNY9hU8c00= 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)(376002)(39860400002)(136003)(346002)(396003)(66556008)(66476007)(86362001)(66946007)(5660300002)(16526019)(31696002)(31686004)(38100700002)(26005)(36756003)(186003)(2616005)(83380400001)(54906003)(478600001)(6486002)(316002)(16576012)(956004)(4326008)(6916009)(2906002)(8936002)(8676002)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?/EGdL1BFR9fdMz5/C1DEI7szlTlL?= =?utf-8?q?djTZMhxDJXI2DHQc63VHK9eYTRiLFdGzbCyczm3h4+tu/N/qza1QLw4DN2Zrk9W/f?= =?utf-8?q?NcchX0fRujhVQCuNbhf91t6geY2eLK3u75iDLUHAI1db/J3KWGl89llCvehnkVeaM?= =?utf-8?q?jXDHU0x5EuhvNS6EfB5uLAWcFrxBeYZNgtmJJt+W/MYN1ol8EkjZVxpLA7Tq+ivZt?= =?utf-8?q?7DTHhzQO1lT+yhsTxqXQ1A0Oi4UdFBrBnXCKJ7PDhEqcEnkGvj5IzEN40DMaVSN51?= =?utf-8?q?bATnCBXmD/qVlRdI38nWcD5ra0oDgv7mdUJ3+Ul+endtlhvu9re8GOr5DE0CZy+37?= =?utf-8?q?3JbDbiHr3x3dWyvsnkQCFwx6E71nIRapOu3c0nM/sYdsZxz4PMMXy5c53CTnd6G6R?= =?utf-8?q?qox0gO9HVzsXxVKVmTs8A8zJW0FVnVzep6m/kt8EKZ73xIJgXXXW6GVpvZccoiY6W?= =?utf-8?q?YEgTwqRHbd1JB7B2415r4xmhsR4ZPN1QT8QNAW83IZ+JLdufOQCQjPhUEmisX200Y?= =?utf-8?q?1Wp5Wju6D7Lc+/7G0YFIqyLbpDwjAt7ijwCNdzbXlRnj6BFPi2RMiqbrsWFb6sWnc?= =?utf-8?q?ve8wFrH0b7SNURQCirRmaL4G+lH42GgtGeGj8DnNB0Iaz3jCuOwLnqqiA6Fd9uzo1?= =?utf-8?q?D1/vxtDi5u9+y0t6e7xj0QA3gzPFAyMPP1c0I6mU3VbvMODc7b6xhmbyvbJqpAmLn?= =?utf-8?q?Aa9kwzZGhT56GI67f4Y2x+j/aH/wmCQ4sl9zFowZ7s8LxRWh+Qr69qgKd/LFf4+rV?= =?utf-8?q?y6MOVPzYislr+CzMChAdjNIlU7Y75qPUJ/zEES00Lxy1GXzCbSnaZflAJnFF6FVun?= =?utf-8?q?d5GQb04ln+bkRB2bnPhQQB4C85jdppRUZ89kz/YshCqiPX9i0mV1c/bNpppxEAkqF?= =?utf-8?q?lDcsqCFdDy0AX/0YETRAhdfEN8a91nUE8w8EDwSF6A/E93Yf1XJcuLMcxP7Yodj08?= =?utf-8?q?frmDi5vhskR2GOAWZ+LG0ohfSpwja5aueGjZ60ZwXjZViCsOU5rDGe4gF8AXc4Msl?= =?utf-8?q?HOy7K9rX7nnu07zBqCe0DU6Z2DZtXcuMyTBbKWmSvDuooV1poTDb27MH5uCUIbuAc?= =?utf-8?q?2zAY/SdrEbe4wteHTvrO1RYGou7EXhLIN2uPpNqEi42ppGff9sCAs9i/GIOKqJ7EA?= =?utf-8?q?eIRPQi6XCFGIHGFdjpKPPyCpJQX6vygor/1qNfTivz+09Zn8nwU+aBOY7oJMCfN3w?= =?utf-8?q?0XpFl7DSNNiWD9QcMdC+Um+/jp3yKEVeCIOVMvqz+oGj7pVI6ufU6KDQn+Bb+uoFa?= =?utf-8?q?ppoEx0gI1NcDKetV?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: fb5d391c-3b65-4826-aa72-08d93fcebb29 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5600.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jul 2021 16:05:38.6787 (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: zOFLAA2APgav0dUOZlIWgUnGAelljeprCzswQbtb5GggJyAeJ7HpgkCyoGqSkyEXSQSXFaU7in2jUnEicS9oZA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB6861 This is in preparation to re-using the original name. Signed-off-by: Jan Beulich --- 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; @@ -840,7 +840,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; @@ -1009,7 +1009,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; } } @@ -2382,7 +2382,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; }