From patchwork Thu Jun 9 15:39:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 12875761 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 1A5AFC43334 for ; Thu, 9 Jun 2022 15:39:49 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.345592.571259 (Exim 4.92) (envelope-from ) id 1nzKFx-00064P-Kk; Thu, 09 Jun 2022 15:39:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 345592.571259; Thu, 09 Jun 2022 15:39: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 1nzKFx-00064I-Hw; Thu, 09 Jun 2022 15:39:33 +0000 Received: by outflank-mailman (input) for mailman id 345592; Thu, 09 Jun 2022 15:39:32 +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 1nzKFw-00064C-0r for xen-devel@lists.xenproject.org; Thu, 09 Jun 2022 15:39:32 +0000 Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-am5eur02on061f.outbound.protection.outlook.com [2a01:111:f400:fe07::61f]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 5a801793-e80a-11ec-8b38-e96605d6a9a5; Thu, 09 Jun 2022 17:39:31 +0200 (CEST) Received: from VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) by DB7PR04MB3964.eurprd04.prod.outlook.com (2603:10a6:5:17::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5332.13; Thu, 9 Jun 2022 15:39:30 +0000 Received: from VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::dfa:a64a:432f:e26b]) by VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::dfa:a64a:432f:e26b%7]) with mapi id 15.20.5332.013; Thu, 9 Jun 2022 15:39: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: 5a801793-e80a-11ec-8b38-e96605d6a9a5 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RUH5oqs7pFPbC8PJof2LCId/UAdxg3EyF6x1zjPGrrITy7M8ZovqG3u4P8MjraPiP6yGcKN5hhH7A2GyAeuOG8eUBt9OgjOmbTkQ92GA/cyja9c3qNQLkYDvCUBgAQJ76JV5tVEZR8GXEKy793fkTaj9JjfxxXcuN4JgXSJk1hKtBhaidQt6GRya4p883ZgjvEocZXU43O1p3KuLeXyBvuO878bi/8jg3MZyOdzKMx+wO9cmGAoxL+veqRGukV02RsUtxYTpCr1bp5o5Kiuy8ja9fDCsGTSoNO5KO94ylxzf3lPOmXIEfHwoFU+OHuOC+TxJvkOAQuSivS69hx+3LA== 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=KqPCUXPxC/LvcetQHGK7A6OTL9d/F0npFli+zI/opfM=; b=mzMjKjj5N/ID2CyeahjFFwm0UAJxecqg24mvEL8wyF2dVVrrvmxfwzCfRZJKz2+fih0d1dKosvdGZl8i7mamqP/SUOZNL3egN+2PN8XPPfzlHlIQq5CXQXTRmq7K2QKn9p1LLidB+PqZMJIUzVS1ub8sBqX3XCgYBq7/ZLssMDF9PxIr8Sk3el3f7FYptWthj5Ha8c2vj5cMT+X980XsyJveIvaIeMUw+g2Y8g+XJnVExBHOZFg9wQvim21ub9+iMXJoxqWrCiJNJbKLljLdcvHafXAqVKVJbjbwYbQAYDbqg+MJLkMcVOZc8N5tM5oUcEEsBF+RxLHff0pqRtx4Vw== 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=KqPCUXPxC/LvcetQHGK7A6OTL9d/F0npFli+zI/opfM=; b=U77Z/QvIvxy7Yvv+y3o1QfQX2wKPVKI/iYtRxSM6CecU53o5ulwCRePp1Md+HdY7/fdgToK1vPZvDZK7BsKD98V6e+0ouDNZ9S6pQEYgn+5eSWfruPmR1jHZ7YEl/VRi8XbJMoxlFBjgs8ZjnD1oNI5jj2g/CMFiCW1A+szPz5DFE59ck/HVG1FOXhFQeMTHr2gsT3x8e0VWl669o4U2HNBSZHBgJVbU1H1UN0arLGqclfPNfZfuSO9Auvi50duYQjRGjdev5x4G2WTELf+yAVRabPlVYhykiN7OgSzjn2Pe/TA/P0uiaGWopNpl43pNDauD0kkGlDbOnv/IKZn5jw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: <56d16bba-05db-cef1-0746-1591a6744afc@suse.com> Date: Thu, 9 Jun 2022 17:39:21 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.10.0 Content-Language: en-US To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , Wei Liu , =?utf-8?q?Roger_Pau_Monn=C3=A9?= From: Jan Beulich Subject: [PATCH] x86/mm: further simplify cleanup_page_mappings() X-ClientProxiedBy: AS9P251CA0012.EURP251.PROD.OUTLOOK.COM (2603:10a6:20b:50f::14) To VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3ef5e3fc-31d7-4ebc-f616-08da4a2e3e2f X-MS-TrafficTypeDiagnostic: DB7PR04MB3964: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: dgqA7CW8l45UoHUeJgdiTe5OlAHxzUyVbpkT2OIWihT+Nb18iuV1H1cxV6nJJaGq3rZSb40k0Z7mYRX+PAKxIktpCNeBV9mRpsaXtxQk0J+K3XN3JTrVn6otYHKhnQXAtU2Y7ZOqWPghOMsf+AwMqoOG+LxPT2W0kh4DMX8ZEBDz0/IoKLcK8/mJjnKFbBM3klGxW0suuekjArbcLLruEO05U72QeVEkBMl9PRA8xCy059AxdI4ULC3QPUJ3k3PDWQgeN+B+r7Zn+CXiT9fqmJqttlPSiNtp6lUSNmj7UwuIdZNSbyiQIVyOo3DTOXj1IZn4wJqDtqBBLc/qvwusORoKqUGbqh7B85OkEdyvO7E4zOUubNKyEohgPdxwZ8giffhdS93RoGrgqCUdlDQbhBIJDTbmYvQz91D47sYPVTtaJ1MyRZJ1xu5H4PlqHaR8ySkWndsMZM8dreWgTFlZh3dfKsgKf0NXUIvA1eKQdTtP6vKzTJewoSLH6GfrnljS+S8jG14HM3+Yz+gh9/rSEaOoZogrW6XhinX4Kh6pfXuYdfpZ4mRZCNinPLWe0fqX3KHPeAyKW2uREv162DkxtbuEiDGnY5Ez4R1sBsCNtrbX4bIEyiDBwO4ZzKY5OTglj0AM25gXdzxn05J1l0OiSOiX70wpPMLjc93Mf0JETjBlcLfIChevKSChXA5divHB+4ICyfWzrhv1WjGiUgv0MYzj6kyFDJr+m8h+n0P170ALeuviibZrm1siBQIkh9V1 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VE1PR04MB6560.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(2906002)(6506007)(6486002)(2616005)(6666004)(6916009)(54906003)(186003)(316002)(8936002)(38100700002)(31696002)(36756003)(83380400001)(4744005)(86362001)(508600001)(5660300002)(4326008)(8676002)(6512007)(66476007)(66556008)(26005)(66946007)(31686004)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?+iNIwH8UqxNdYHY77oIk5wBun3og?= =?utf-8?q?AKCnVOUtY8m/bPBca/y/W0IAXqL30WfxPTo7GRYFGaGOcN/KBbSvY0jhMhbNiuDgD?= =?utf-8?q?cOJD/ESaCfRrbczJ2F4NfrF53w8vuPe0VcOHZj1f7m5NjzX8gjryP9qJJRy/kcnoT?= =?utf-8?q?9i4IvxElJPfjQXcMEuXovyK54VkFpU+BM9fVPnlWIkO2VNU308cjNyvbcrRKqHG4m?= =?utf-8?q?qHdi/jreN2/2ROuxXsGWcZQegxFwlaYw6yaT1d7yFM9P07g26ksfNQjSL9TalhC+r?= =?utf-8?q?5PwrF3XR0lAdPUnYv6x8WL/B3bNjfN/fu8lYfyDkxV31k2/F6HKZqmnzM8xXrCdjm?= =?utf-8?q?1rOzmTiOVa2QvoIdk8Kp7hUItO9Epwktfj++D8WB+zip7Hn33tScyCQWJAw7Ne87t?= =?utf-8?q?52alQYmJ7SE7I0PAyFF+69fKJj+ntjOgXzq2DJ+6l9qyV1ETYmzzBJqOxICiHmSz6?= =?utf-8?q?Y/bobLt9HunkucyY+ilHO/ZFOXeQoiDqITxr3/n/VivUiyhn3efpOyKh7GAQEnRHC?= =?utf-8?q?vyWGoA6LX+0NMiRhWvntGjPUDGvEmjHBmJoD7YnlGhBM+Em49Ys3K/roTt+BJSfDg?= =?utf-8?q?tc6P52skRwPUoVArZodsMV69AoA0T2Nktuy9ebr0cx86evRV5TqHrfm6O0w/ifS9X?= =?utf-8?q?wfbl33f0LnNRf97dp6y1YocZoI6CixBCo8WJV/PdRYGySbQ0tW4DRkWMWUFtNuiNC?= =?utf-8?q?XkwJMstitdC8eiZ+OZ3tbdXEg52Iu9t8KV+4Jn2QHlsqFYhFzIZ9w2ZjGVGLZmF17?= =?utf-8?q?pMfjoH6085vlR2DZqp2DA3XIkCfKDKwoxrvFHNwK0PPV46IWGsHi8tKV6fJzOG21Z?= =?utf-8?q?4x0XejhlqjbiZ3xnlgPKsrB5WmxbkFFxGdywBFfO2YYLx3geVW8413S9jqXLFSNUv?= =?utf-8?q?ZC02adIOWWv7X00LTrZYkZBSqpP/rYbYNLMBI04ZDvuGr8OYoG1LpHk+eB6iRgy+N?= =?utf-8?q?s4H5Dt/Hy1HpNj2hp99mirfCDGyg7VvJOZqugzqLuHupQabIqEJFkawhjgS3rsqTK?= =?utf-8?q?ydJ2RWOErV4hMhWbO+TPY1XBYteOcWrMrFclQPrwFJF2y7KeNk43KCBPfD7A4OVdn?= =?utf-8?q?+c9h3/jeSqMmCmngfh/sTxVMWDs9EjqbdowRayfnlRhSKQvwL/KxpYRWDIYwqf4rG?= =?utf-8?q?9kcqLKEexoPsn1YOSNIi+5ApAg6RKB8E6YLAKyWY40xEswnBHoSPBj38JnbdNfImd?= =?utf-8?q?ozctlFvrRrOUYeRLcaWoyPNqfaHDmxdDreqpTBBe39+BKdX3g+QAcwOLBTyCcxAZ+?= =?utf-8?q?+wRtd6hsmGXfMVZ9HgJXJ1yF47wZ6P0/Dtac8q3CVHDY7y+rsbyv6yBGoFiM7q2ZR?= =?utf-8?q?E169YYkWN5bGimTkUFPFwCV81QAetCnRuYRrKXSo3+spHclowyrWhMenLNwEzHLFE?= =?utf-8?q?uEvI6WwlYI8BlgIgLHGrzd3kfORtu4UTcWsYwVBrDXNcDHcZNOGqHSYHRUo3yqFkC?= =?utf-8?q?ilh4QGHUn2Z/sJe7ZBvs9amqUGJTArkGDQ4Zg/qUdPqwGQ8xzAMsJ3csMNUc9rTmn?= =?utf-8?q?XiNS3PZiVDdIUUI2002sj6Wz01Et2CUmS795iqD97BawCDbGVV6c69+XYdV9oLC2q?= =?utf-8?q?4UfGQqsGjxzZbhHFWV+brLI5v5Qd8xaOEVpNwvXX+Ph2Y/6ElR+Q9+GtLkxFAZNdm?= =?utf-8?q?r9KlF7hexNdInG96i/2y86n2LYDmtNBA=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3ef5e3fc-31d7-4ebc-f616-08da4a2e3e2f X-MS-Exchange-CrossTenant-AuthSource: VE1PR04MB6560.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jun 2022 15:39:29.9878 (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: svo3/M00rfo6WCkSkWcfSaWcwp6pgHn92ZIYGWWalOrktFIbOkDH0d3MfPX3CqelVushbLsIQfuik/F7LMkAXg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR04MB3964 With the removal of update_xen_mappings() there's no need anymore for a 2nd error code variable to transiently hold the IOMMU unmap return value. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- I have to admit that I was tempted to get rid of PAGE_ORDER_4K at this occasion, as it feels awkward to me to have such in clearly x86-only code. --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -2470,12 +2470,7 @@ static int cleanup_page_mappings(struct struct domain *d = page_get_owner(page); if ( d && unlikely(need_iommu_pt_sync(d)) && is_pv_domain(d) ) - { - int rc2 = iommu_legacy_unmap(d, _dfn(mfn), 1u << PAGE_ORDER_4K); - - if ( !rc ) - rc = rc2; - } + rc = iommu_legacy_unmap(d, _dfn(mfn), 1u << PAGE_ORDER_4K); if ( likely(!is_special_page(page)) ) {