From patchwork Thu Aug 8 12:09:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ayan Kumar Halder X-Patchwork-Id: 13757325 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 3553AC52D7D for ; Thu, 8 Aug 2024 12:10:10 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.773968.1184510 (Exim 4.92) (envelope-from ) id 1sc1xw-0002AR-FP; Thu, 08 Aug 2024 12:10:00 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 773968.1184510; Thu, 08 Aug 2024 12:10: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 1sc1xw-00029e-9R; Thu, 08 Aug 2024 12:10:00 +0000 Received: by outflank-mailman (input) for mailman id 773968; Thu, 08 Aug 2024 12:09:59 +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 1sc1xv-0001oM-K1 for xen-devel@lists.xenproject.org; Thu, 08 Aug 2024 12:09:59 +0000 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on20617.outbound.protection.outlook.com [2a01:111:f403:2412::617]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 1f2c40e6-557f-11ef-bc04-fd08da9f4363; Thu, 08 Aug 2024 14:09:58 +0200 (CEST) Received: from BL1PR13CA0274.namprd13.prod.outlook.com (2603:10b6:208:2bc::9) by DS0PR12MB9346.namprd12.prod.outlook.com (2603:10b6:8:1be::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.14; Thu, 8 Aug 2024 12:09:51 +0000 Received: from BL6PEPF0001AB51.namprd04.prod.outlook.com (2603:10b6:208:2bc:cafe::2c) by BL1PR13CA0274.outlook.office365.com (2603:10b6:208:2bc::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.14 via Frontend Transport; Thu, 8 Aug 2024 12:09:51 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by BL6PEPF0001AB51.mail.protection.outlook.com (10.167.242.75) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7849.8 via Frontend Transport; Thu, 8 Aug 2024 12:09:51 +0000 Received: from SATLEXMB06.amd.com (10.181.40.147) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Thu, 8 Aug 2024 07:09:50 -0500 Received: from SATLEXMB04.amd.com (10.181.40.145) by SATLEXMB06.amd.com (10.181.40.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Thu, 8 Aug 2024 07:09:43 -0500 Received: from xcbayankuma40.xilinx.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server id 15.1.2507.39 via Frontend Transport; Thu, 8 Aug 2024 07:09:42 -0500 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: 1f2c40e6-557f-11ef-bc04-fd08da9f4363 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=eMlQP4+y2FrFx9H4bhyS2a6nkR262E4IcYDsLvcYEwjgRym92KV4cyS+nhW0+PPNRLA4nSeWU1ohHEOOPvQPmg7K6yBcm9aAvblosMZd64VDqkVLmA2s1tfvVYbM1QHKhMfnJYdccIrJBBhymPm2R40qJyXhG6DMmnEhICnswULWxyElQFbjq5e9uN9MhUEPiFeghhyQojJRZ15sw88Z3cvw4c1tDHSytCwg84u8TTrGJfvF/1d9a6yGKSud7XXBRBkU058UUPhY/s/xBlfs6fSCoDODHSzz9vlptvMVKK9KXqVyG1850TRaBrXp6DfkWV/U04b6ZgWXU3VcMnz0TA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=ifeqpzTG7mgd8CW0d8omyR5cvab2skN6+VC4y+ldVDE=; b=Yp6FTioob0DIU9V56uPrkKk9bpej9Yhvf2vHElIYWVUsiNo11bcQZlTazBIX85Pi3jEoLp30AFLEW9sgVori9TvYgw7QgIjnDq+1XtupeSswLIFrjNHKAS0xDOG3oeZzetxL6aKf75eqml8j4csO2vrE9OQFaRbyHieQ1KyuOQvq2enTqaJVs4v+u8MKSEwX37z8AzJnS/P4JjtDKx0IQdCaJ6rZV9gSbzEpmQsrxbEtcJgmIxRAwSklh3/hMzzbPlGoZtX8+/Do4M6lbEQGH12L2jf6E7PvG2zJjdenmoi4pZ9a2kw4iiwpQ993CMUdexV1zO0ocio7iCMn80nclg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ifeqpzTG7mgd8CW0d8omyR5cvab2skN6+VC4y+ldVDE=; b=ZHpW0KBDGLfxOl1gkKYcfHyc0vPUphc7ulVK8iCq1iPjCtQ+OuiVmsp6pnDHjYRG+NPmyw5a99LxtCUCCvF4p1G8kB0w0ReWRf8PwE/qLEf83eJuflW5l3A6yP8YNCUqgXpRkRGiF76hIWQyC8m2rWijnJ5+cVKkmCellzccgcI= X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C From: Ayan Kumar Halder To: , , , , , CC: Subject: [PATCH v2 1/4] xen: arm: Add a new helper update_boot_mapping() Date: Thu, 8 Aug 2024 13:09:33 +0100 Message-ID: <20240808120936.3299937-2-ayan.kumar.halder@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240808120936.3299937-1-ayan.kumar.halder@amd.com> References: <20240808120936.3299937-1-ayan.kumar.halder@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL6PEPF0001AB51:EE_|DS0PR12MB9346:EE_ X-MS-Office365-Filtering-Correlation-Id: ba38611a-041f-4eda-b6a3-08dcb7a30190 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|36860700013|376014|82310400026; X-Microsoft-Antispam-Message-Info: iMFINjeaRhphnzIhdQ8+XbUmpPzE8dHzYcTwRERtE1wuA/qlYjtX4e+poJSMCCVwnmA7JXiVb5mIiiVOYJnMqGs59k9EXi+Sq/3hrNqmfX08TkTh2o01iWRQM2YqrURrPpe4EUWB0bFN5Xhkpbo911LQCogrXzx4c8/WVvdiwMWp33/wAkOgIiq+bNXFKHcmpJ/vHSc8Wgggm9FB7nOyL/0JEownpHRrDg5SsL2C0rNWEFCRtcLaBaenCj5LW4Xy27WmS4tqewoklgynw6fvgar6j5RNdazwSzdoSIcyGVIvkLsletkW8rwYInyoZ9HOniO9+ZZLuQ4Mg8z85DjFIMxhq3yq0+0IMPFCIPn1E0GEYyArgOBO5guYQCSfUs6SlW5ZTFs815zQr2ey+48cp5Oa4WRH+NRiKgprpTIazFF8k/p98S20eFKW8vAzUG4j4CCWPEw0MuHk7GpWQcjmfM1Xw95kDLZsHF0n4j14zIJD82g7VE65FAn03ORy2vhERYraTCDa8kmlTpK1PR1TohZ/yFbloTUMpPnx99NpLyGY7SoruE/aH/A3DMg1IBgqt98nJoyAM4qJCxRk7IU3n6S8/ir2nnEMOx6koYrYhgFH0GNY6iHhh0E60WceaYX6uol4QmaHqWOdh2SS256NPfLapAlQhsZQfvIjvjrpPv5tW2jOfxVbhTp1+Ih2AlKnahlp+pJRerrK5yeJfDf1FPFJ3O3EDPTbOphhbE6XKZPAECnXHxglZYkRDkBYgycyUYSyUXQIO2cC9/K0KL7xYU088TZRseIsQyry9VNrq7o4HnQtOk2MRLQ8NGO+w04H47Wam8APo49UQF24E9zUkPaSi2nQLbz4s2BRXZf8LzWSXMP68hQa7ivQq8DfMid4VbhY/1QpPaKN9+z2mTXVa7LK1iO+FUd/J+LtK55h3DXZwO9KAn8kZGQK8cnBjyYsQWeqxi72GpyV9fZ7jYieo4Tot38/1sHCLmeXxBeX3gI9nfwDm5loPVO0fDHXu0n1+CfrTaTIVMPBa8c8e0k1Bd2taHxvL6H10CvHsUfb6jiPHWVbnyRlngFs8oYsV4oO6YIlaQE7muyZ/OibDV9QIGPXa+wjBffnwLqMOWQdNUVrtgEHzBIQ/06KS1u/acFzr1eh5Tqwj7nsRMOLqgrHthtcjM3r1/ufkpcN3nMOFGn/CsSDV7tVjtyrNtYaNXhSp36s2Ydt8tOHQY0CEXxatPEVkjDP9DCxsd8szcwd4kM7vyq3r8rcBlPdljcBIXJgYRhsHpKxnQY/yQIHPMitkQaw9AP1aKqQ3/tMIbTF4sakFYtmZoniEPOZQPkG8gvmmey1MtC2tv6c7gaQfmmi3B+OY8Imwn1tno41WgrpGV5xJ/qTgfvKOSrRmRZft4MkBCj/7oyYfluDh+je5OWZdPIbQ2EW9JN6CozlBzp3IG+Cr/gd8zIRUgcjNS3Q/J6B X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(1800799024)(36860700013)(376014)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2024 12:09:51.2956 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ba38611a-041f-4eda-b6a3-08dcb7a30190 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BL6PEPF0001AB51.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB9346 update_boot_mapping() invokes update_identity_mapping() for the MMU specific code. Later when the MPU code is added, update_boot_mapping() would invoke the equivalent. The common code now invokes update_boot_mapping() instead of update_identity_mapping(). So, that there is clear abstraction between the common and MMU/MPU specific logic. This is in continuation to commit f661a20aa880: "Extract MMU-specific MM code". Signed-off-by: Ayan Kumar Halder --- Changes from :- v1 - 1. Introduced update_boot_mapping() which invokes update_identity_mapping() in MMU specific code. xen/arch/arm/arm64/mmu/mm.c | 5 +++++ xen/arch/arm/arm64/smpboot.c | 6 +++--- xen/arch/arm/include/asm/mm.h | 2 ++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/arm64/mmu/mm.c b/xen/arch/arm/arm64/mmu/mm.c index 293acb67e0..72e089a339 100644 --- a/xen/arch/arm/arm64/mmu/mm.c +++ b/xen/arch/arm/arm64/mmu/mm.c @@ -125,6 +125,11 @@ void update_identity_mapping(bool enable) BUG_ON(rc); } +void update_boot_mapping(bool enable) +{ + update_identity_mapping(enable); +} + extern void switch_ttbr_id(uint64_t ttbr); typedef void (switch_ttbr_fn)(uint64_t ttbr); diff --git a/xen/arch/arm/arm64/smpboot.c b/xen/arch/arm/arm64/smpboot.c index a225fae64d..789f352ab6 100644 --- a/xen/arch/arm/arm64/smpboot.c +++ b/xen/arch/arm/arm64/smpboot.c @@ -112,18 +112,18 @@ int arch_cpu_up(int cpu) if ( !smp_enable_ops[cpu].prepare_cpu ) return -ENODEV; - update_identity_mapping(true); + update_boot_mapping(true); rc = smp_enable_ops[cpu].prepare_cpu(cpu); if ( rc ) - update_identity_mapping(false); + update_boot_mapping(false); return rc; } void arch_cpu_up_finish(void) { - update_identity_mapping(false); + update_boot_mapping(false); } /* diff --git a/xen/arch/arm/include/asm/mm.h b/xen/arch/arm/include/asm/mm.h index f6ba611f01..e769d2d3b3 100644 --- a/xen/arch/arm/include/asm/mm.h +++ b/xen/arch/arm/include/asm/mm.h @@ -426,6 +426,8 @@ static inline void page_set_xenheap_gfn(struct page_info *p, gfn_t gfn) } while ( (y = cmpxchg(&p->u.inuse.type_info, x, nx)) != x ); } +void update_boot_mapping(bool enable); + #endif /* __ARCH_ARM_MM__ */ /* * Local variables: From patchwork Thu Aug 8 12:09:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ayan Kumar Halder X-Patchwork-Id: 13757326 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 38D97C3DA4A for ; Thu, 8 Aug 2024 12:10:09 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.773965.1184479 (Exim 4.92) (envelope-from ) id 1sc1xt-0001Qo-Fx; Thu, 08 Aug 2024 12:09:57 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 773965.1184479; Thu, 08 Aug 2024 12:09:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sc1xt-0001Qh-Cx; Thu, 08 Aug 2024 12:09:57 +0000 Received: by outflank-mailman (input) for mailman id 773965; Thu, 08 Aug 2024 12:09:56 +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 1sc1xs-0001Bl-30 for xen-devel@lists.xenproject.org; Thu, 08 Aug 2024 12:09:56 +0000 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on20620.outbound.protection.outlook.com [2a01:111:f403:2414::620]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 1eb32eab-557f-11ef-8776-851b0ebba9a2; Thu, 08 Aug 2024 14:09:54 +0200 (CEST) Received: from MW4PR04CA0130.namprd04.prod.outlook.com (2603:10b6:303:84::15) by MN2PR12MB4469.namprd12.prod.outlook.com (2603:10b6:208:268::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.15; Thu, 8 Aug 2024 12:09:48 +0000 Received: from CO1PEPF000042AA.namprd03.prod.outlook.com (2603:10b6:303:84:cafe::1b) by MW4PR04CA0130.outlook.office365.com (2603:10b6:303:84::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.15 via Frontend Transport; Thu, 8 Aug 2024 12:09:48 +0000 Received: from SATLEXMB03.amd.com (165.204.84.17) by CO1PEPF000042AA.mail.protection.outlook.com (10.167.243.39) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7828.19 via Frontend Transport; Thu, 8 Aug 2024 12:09:47 +0000 Received: from SATLEXMB04.amd.com (10.181.40.145) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Thu, 8 Aug 2024 07:09:45 -0500 Received: from xcbayankuma40.xilinx.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server id 15.1.2507.39 via Frontend Transport; Thu, 8 Aug 2024 07:09:44 -0500 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: 1eb32eab-557f-11ef-8776-851b0ebba9a2 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=r45nxc5ioOZfh+axUX0eSv5kIqMvcqbSZMOJtkKbx5eH/lehbCQQaMeXTMuhSGZyOIDrXT6fE4DvcYAuPJHpmgt3bPWC99XAocT9cjUJrTuSaDQl6hetXXDKDTJ32rhRBg34nWvLrDcUjBwQXcFWZMJq6WOGG0io9M+cYJt8B+tjV4IIXM1N4xJXRecdQmUr4pF0CWfDBb+fUcxY0fnPoK9zn5dLZTCYPquA+wERigOWm3A59n2AncoaQ352FenJL31nlfs9M5gakS/Z+2SUMDJUfw64XsEet7bt9gmVzhj5uSBts0/Ew5egpbPd94nH2gd/5kEGOgnFSd/IaCv/bg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=BwnutoGseyOzPvX5xpU7euJ358TBpCesIKsrFcbDnqU=; b=ugiShT6dDzYiTlOynD3opqKpHmCuXow995k/4PbLHW+QbhWYGHQxMwcRKSvq80ylVEQnnzkfAxcOCYnKlkSMD9QaY4DxjT7FSKp02OeS6d0ZDt+XSTKLGXJfqVYBU8bWLaqTmobVeJvepdYY+xwcK/Hfzl5JdG47sMekWIzQ+nO7jehGPH2fwk/3puRbqzN4a3mXOeEM6WoDZsW8KZOwxWPCS651nGLp+2hib1b7OIrDwaBXmOix4LJ+RbgWSWJtlYCoZPpq7neNaH6LUY56WXKlwawGLBqMboGBvNod0H7nWqEc1sGfty548UmfJaLP8aHp1Hi+NkJQkGVRitDxDQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=BwnutoGseyOzPvX5xpU7euJ358TBpCesIKsrFcbDnqU=; b=syPB84+sX6kqZLMHisPRl9eo+E3JxK2hol2sw2rqvjn5XAA2Ng6Fcde+5lWl4YQxNtG055Zu+UrJK2An1ik33CH4rv34th9smBfB1pmdW1RS1UkN0vH3dgAAkKbx9D8Td4dSUV82BWT9mqTfHMrw68gPo/qNTDqNcdvnihpzw38= X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB03.amd.com; pr=C From: Ayan Kumar Halder To: , , , , , CC: , Penny Zheng , "Wei Chen" Subject: [PATCH v2 2/4] xen: arm: make VMAP only support in MMU system Date: Thu, 8 Aug 2024 13:09:34 +0100 Message-ID: <20240808120936.3299937-3-ayan.kumar.halder@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240808120936.3299937-1-ayan.kumar.halder@amd.com> References: <20240808120936.3299937-1-ayan.kumar.halder@amd.com> MIME-Version: 1.0 Received-SPF: None (SATLEXMB03.amd.com: ayan.kumar.halder@amd.com does not designate permitted sender hosts) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000042AA:EE_|MN2PR12MB4469:EE_ X-MS-Office365-Filtering-Correlation-Id: bbe88be2-003a-4d26-2cc1-08dcb7a2ffb7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|1800799024|82310400026|36860700013; X-Microsoft-Antispam-Message-Info: Lc7ottl+1M2zg0f2LDpRfZmm711mqvS07oMMJjEjb9ygofS9Fpsm9knnJW83huobFhSyaTujCPWzs4J5Gm/gg2zL6d+eqEZqHX2EH+rvwtcT1m3YngM301fwa637cHm4egl+MR9g5eOjvRneXWSWMATLM9vJnBNrZeYEER27iyUvhhIXbFiMhFq8JDP688CCDfow4GlSjJoYjCWbWShbv5m+4Lr1Iojyb5W3vSOHWdBtaaTOA445dYyUzQtgWCGoDbmlDBlmOohCLaKUfBOvTj2uLQe1Ikzk5eDgqjbYCyKJAjT63sSifoANOyBb0fxn/2xZnMxP2y+fTjsYPUNlwxPyVW0YHL5WOZNHSKzSCkVefcZFjuof6HKjio60ftcxL0fnbv/9Vs7XbIlAvS+JMQcOOXYHGxIek13senRadHUj9SnSRipk39ujUIwVp4lQc4HDgzvHozNrbOSUx+7acQa50CnTXo5bZtuvMKfZ7YtxjS9tgjKdjHS+SB0jmUDQ8OGPxvA4TiJBuK/78mtKAuSm4qrzLZcdXaWbbRvUDH56MMeW0XEI3W8x2v9ORy3wnZfFGrYbU1KB7WJ9WfLIMxbJ0MA0TOOMNkr9CysdGjSnjekPd9lDqWS81Rk37DfvQRTgogV+p4HWP/DmkmBEXH9WnmSbPEsR8LzBboS5IL07L6uIhcuvrMKKIFhs5zpTA5PyOzmmNKMGzLQcdggUjROLD5BcT+mEIBxV0+HldhYzXfo9fl+KOFalDYx1+VfpcHCovk6hwwsj7qDrxRAYZajtwzONHavs2gEXFOCbU/bS1te+b4/RedYm1Nfrf7IApOJPg/9nSzARhGjBNYxJ+Tq3nWWk/F8SknpFWzK9mLamuRH6pAL22b87Xtt9kNiOzSdsmmWiUDhokIUGcpZPiVqtzfyAWZcNd3oZiXv9RXuWfVnrD046qZSHat33Ry25rzazvgDTeOHS3tas7l3VOfiRIHZAUcODNoh47Gpn4SwZIMbC9D2jJ/gdwXeje1P8VgmB9tKvaCAS2duXCWw5qlFZlDNY/Pg0zwfBlgTffR8xLdLFTfGe/ICupJcVpZMVI7NNSyyFaH1SwiRZ8oOdMWKogkuMQN+ONghW9J5SCMWBWGjI8eYdgbQ2SYB2gw/m2yYDxlVbkDPmj6rgCRpdLNgoQ151x9AYzQIoshoyUWnhrHKpBXNRRGF0Jb08e4wCkI/dVCRpoVHw0LVhv4lXdzRRA3brYO4I0ZnO3vnRDqq584fgZAJJnHOw67O+xrzMulZt6yx09qDON0Aw6umV8kfSB8mO619QQhh0v78FbrH3vGqYaIKrooAQncsfnF6wtW++2SfQnMftdrzoupx1s7Xxppuci++p/+d5EFZXqDYBJ/IBrMAjUHlCF+61rUoa X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB03.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(376014)(1800799024)(82310400026)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2024 12:09:47.3953 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: bbe88be2-003a-4d26-2cc1-08dcb7a2ffb7 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB03.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CO1PEPF000042AA.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4469 From: Penny Zheng VMAP is widely used in ALTERNATIVE feature to remap a range of memory with new memory attributes. Since this is highly dependent on virtual address translation, we choose to fold VMAP in MMU system. In this patch, we introduce a new Kconfig CONFIG_HAS_VMAP, and make it only support in MMU system on ARM architecture. And ALTERNATIVE now depend on VMAP. HARDEN_BRANCH_PREDICTOR is now gated on HAS_VMAP as speculative attacks are not possible on non MMU based systems (ie Cortex-R52, R82). See https://developer.arm.com/Arm%20Security%20Center/Speculative%20Processor%20Vulnerability. Split "https://patchwork.kernel.org/project/xen-devel/patch/20230626033443.2943270-16-Penny.Zheng@arm.com/" into Arm specific Signed-off-by: Penny Zheng Signed-off-by: Wei Chen Signed-off-by: Ayan Kumar Halder --- Changes from :- v1 - 1. HARDEN_BRANCH_PREDICTOR is now gated on HAS_VMAP. 2. cpuerrata.c is not gated on HAS_VMAP. xen/arch/arm/Kconfig | 7 ++++++- xen/arch/arm/setup.c | 2 ++ xen/include/xen/vmap.h | 2 ++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig index 21d03d9f44..7d1dde89d7 100644 --- a/xen/arch/arm/Kconfig +++ b/xen/arch/arm/Kconfig @@ -12,7 +12,7 @@ config ARM_64 config ARM def_bool y select FUNCTION_ALIGNMENT_4B - select HAS_ALTERNATIVE + select HAS_ALTERNATIVE if HAS_VMAP select HAS_DEVICE_TREE select HAS_PASSTHROUGH select HAS_UBSAN @@ -58,9 +58,13 @@ config PADDR_BITS default 40 if ARM_PA_BITS_40 default 48 if ARM_64 +config HAS_VMAP + def_bool y + config MMU def_bool y select HAS_PMAP + select HAS_VMAP source "arch/Kconfig" @@ -171,6 +175,7 @@ config ARM_SSBD config HARDEN_BRANCH_PREDICTOR bool "Harden the branch predictor against aliasing attacks" if EXPERT + depends on HAS_VMAP default y help Speculation attacks against some high-performance processors rely on diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index cb2c0a16b8..7f686d2cca 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -447,7 +447,9 @@ void asmlinkage __init start_xen(unsigned long boot_phys_offset, * It needs to be called after do_initcalls to be able to use * stop_machine (tasklets initialized via an initcall). */ +#ifdef CONFIG_HAS_ALTERNATIVE apply_alternatives_all(); +#endif enable_errata_workarounds(); enable_cpu_features(); diff --git a/xen/include/xen/vmap.h b/xen/include/xen/vmap.h index fdae37e950..4c7dfe58ba 100644 --- a/xen/include/xen/vmap.h +++ b/xen/include/xen/vmap.h @@ -141,7 +141,9 @@ void *arch_vmap_virt_end(void); /* Initialises the VMAP_DEFAULT virtual range */ static inline void vm_init(void) { +#ifdef CONFIG_MMU vm_init_type(VMAP_DEFAULT, (void *)VMAP_VIRT_START, arch_vmap_virt_end()); +#endif } #endif /* __XEN_VMAP_H__ */ From patchwork Thu Aug 8 12:09:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ayan Kumar Halder X-Patchwork-Id: 13757323 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 45877C52D7C for ; Thu, 8 Aug 2024 12:10:09 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.773966.1184489 (Exim 4.92) (envelope-from ) id 1sc1xu-0001gx-SA; Thu, 08 Aug 2024 12:09:58 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 773966.1184489; Thu, 08 Aug 2024 12:09:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sc1xu-0001gq-OU; Thu, 08 Aug 2024 12:09:58 +0000 Received: by outflank-mailman (input) for mailman id 773966; Thu, 08 Aug 2024 12:09:57 +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 1sc1xt-0001Bl-3D for xen-devel@lists.xenproject.org; Thu, 08 Aug 2024 12:09:57 +0000 Received: from NAM02-DM3-obe.outbound.protection.outlook.com (mail-dm3nam02on20601.outbound.protection.outlook.com [2a01:111:f403:2405::601]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 1f0f21f8-557f-11ef-8776-851b0ebba9a2; Thu, 08 Aug 2024 14:09:55 +0200 (CEST) Received: from BL1PR13CA0282.namprd13.prod.outlook.com (2603:10b6:208:2bc::17) by PH7PR12MB7985.namprd12.prod.outlook.com (2603:10b6:510:27b::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7807.27; Thu, 8 Aug 2024 12:09:48 +0000 Received: from BL6PEPF0001AB51.namprd04.prod.outlook.com (2603:10b6:208:2bc:cafe::1) by BL1PR13CA0282.outlook.office365.com (2603:10b6:208:2bc::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.13 via Frontend Transport; Thu, 8 Aug 2024 12:09:48 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by BL6PEPF0001AB51.mail.protection.outlook.com (10.167.242.75) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7849.8 via Frontend Transport; Thu, 8 Aug 2024 12:09:47 +0000 Received: from SATLEXMB05.amd.com (10.181.40.146) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Thu, 8 Aug 2024 07:09:47 -0500 Received: from SATLEXMB04.amd.com (10.181.40.145) by SATLEXMB05.amd.com (10.181.40.146) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Thu, 8 Aug 2024 07:09:47 -0500 Received: from xcbayankuma40.xilinx.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server id 15.1.2507.39 via Frontend Transport; Thu, 8 Aug 2024 07:09:46 -0500 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: 1f0f21f8-557f-11ef-8776-851b0ebba9a2 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=pZZRdCi4muUTZhwkG2es7OnvTAAHLJND9rynbE7D4ZYBYWQqRZ1hVUpekEkIi3tRQXaYuGEqv9SY2U7ycffzMuf/2VOiSkqn7HOlNLoKkRjuV9dnTwr4SxoDKNDUavr1fAinwp048Y4bdBuarEIm64q2seCzMVTGuqsn6KtGSiShakDNoUthUPFBNrUe1fDCw8Z75J+p1c0LN9SNIAf8ckFdv2tJGclHfk5s9wPDv/qWfht9VRfdmM2Xe+bXIw+vl54cGEjzO207Dq6JWVgREG3pdajMEMh8ZXDc18aXietdzChOsJm0WJ0i581NdTBNbNXWyWLbtov+yjx4/QBkWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=oonAN7b47urGvxo0xGpm8NNdDhrVQquVh/ZJyCDFHG4=; b=xTzpZtqAzool9+1kC7xASqEM0PuY2R3FK/UaV3RmzZV8mk4h9l8mJe/coygDYD3qQ/uVDjJf2SnuMqS3j1KcJ2UeRdaKJmj8Dq2dWT7ek4pPj02ak+gRPsLEoe8OWbvoLxBkadmBZt+N1vnMgbE5++btRKkmUMsr9tNRTycQmqw7guzIbgae2j0coqzQXaWhxJOg6qRFvdV2I8Jfm2VzsdOpBu2i3xjpaLFhQalQ16AiREE5g3BUW60vMaPjRQZpxQPsdTvDUUUfzbgGwFjaqSdkDkd0rx0NxPIMK6jg+8sjF7xP2kl/oe8bGbNcgpT1EWCNs0NuKNS6ByAVcqneeQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=oonAN7b47urGvxo0xGpm8NNdDhrVQquVh/ZJyCDFHG4=; b=SKm0f1uYVz5X373p+QXIw48wt7xY3DwXIlce8npf0goODYqJCavwa78yKo4/Z1GlZSH+mcTuFXVYTOJr4drwrnPP5yNze1bLLeMBmG1gJVXBj7iT5qF2JN8SJUNSSqOe+1AH1eI1gXMlsmfFim0CmXVu2a3x7AbJnI9vqhhpkKA= X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C From: Ayan Kumar Halder To: , , , , , CC: Subject: [PATCH v2 3/4] xen: arm: Moved domain_page.c to MMU specific Date: Thu, 8 Aug 2024 13:09:35 +0100 Message-ID: <20240808120936.3299937-4-ayan.kumar.halder@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240808120936.3299937-1-ayan.kumar.halder@amd.com> References: <20240808120936.3299937-1-ayan.kumar.halder@amd.com> MIME-Version: 1.0 Received-SPF: None (SATLEXMB05.amd.com: ayan.kumar.halder@amd.com does not designate permitted sender hosts) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL6PEPF0001AB51:EE_|PH7PR12MB7985:EE_ X-MS-Office365-Filtering-Correlation-Id: c6608c8f-ae3a-4c6e-06ee-08dcb7a2ff9c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|1800799024|376014|36860700013; X-Microsoft-Antispam-Message-Info: KXMr/2+dM8ES9zbqQ9Sg8BH2ZuZmJ2XG0cCwQ3zx4Lc2Rhu5PvZz6ivLYRMKx6Z6uu1q2FRBuNTta6bSg45u7vxGrs9l9gzm0c0U3/WeGUnBGH58jr/vEQ0i01QX5DaX6Vq/oLhVd9+TVUoHf0tCPRK6rQzRct27o8Uaboh/HddOjazKItPjHKEmkOPqLcvoGPOfT8LgbmQ7zacSWlk7hS5lbVXGzh6PtHHAyulFUWnpiBYYKOkHFGMsLrRtwbjrUqo0hssq8yiWRQWVDVXzzrdhXG5wpVHQ3r9MxQBJ1MhzS14wDE2ZeZBk+5EK7zXQjpktWmIxlcniBytgshqoiOU5aIm7MEfLZIQVD31KYkQGAg3hbvqn2v8/21TEvGDBmhuCivHcqBI4S5a/c+XUnVWhiR9YyPj1xPJ98b7fiMgYNDIT4DCuMzohHWyojqDs53Vfjz6xieRdZgje2mmzzRJLuPuH/GYF5xE1mdDJpsOlvli9DOd2nGIsN049vrlRb4Gx8bdCdHfEQJ8kcfnP6CQX8853nu5Zzs8bU8wwk4vH2gMyeqgkQH2dS5qZ3NGjvoFGRG5xo0kCcGg/L21MxYhSWMWmsnBTVeH9honw8aN1urORIUm+UsBs7lbp6aP5zKJsQ0pBKsBtdWXTENJ5ywpKE5luHRSBFTJ3pDa4uV/NhMtOE0QhywN8b2UyBRn0bHtYZIhJOdZNyt8jCB9X04TNZrTB2ub3T1XC0/WD2tWnqhbpkDl3VRO9EhUowzeFnaK3qiRHJB3IyPn/HXjGOm7TgR6CB2qtQXKHxd+SbsyjKB2EJTShZReRyZNdu8TaxCGWe6AMXu//y35WYBPc4l7v0qn1zYvQG/6Y9lMgcy36h2I98sNd697gf+yZDg6zXHtrhWLrZKwX9XTbqRDxU4WRhAJDVgom/0IWPLkTK06JKPLu5SgCXS0tClwG+xq5jDqg04YEw8p+JacvhHaXvEJdwP9b2tvL66ZkUEDY3ExEzwD4XfKgSHATn/1Rlop+0dOwArUTnfo56xOnoVLnTiWqcMuhQzvne7f7+sB/wwSh3jonBOKhloiymTHy/kU+/AzpJG5X5k7yC4Jk2rfVmIX4xoS0Da/bPc1h/zgGG9i+IaVNqsqSddu6bxeYznpzpDCPG13mH6lbWYpeBxCSI0A3jey23J882HvODJXRoqj4mJkrIJ1vy1Gf7W0XE4iKSrfGwpwJQO7HilLDLUA33MVSHU2VGnIwq/61CCDqkAEybwt1ycaTUmWEnCZub1N0OYh6x1IafwDV0PCMu2OoCKys+5g7amqs50SbeS9sSrTMA8p1K9LjTWbA6mykFMXLI6UsdmvLNAKdI0yoL2OwCSIymv892p+NjOejSR5blKf8JnOAOhCfl0ecmYZzSXqXoe7Jhg9nJoukRVzgk7/+IjNjHso6bRZAxOqckEf/iHbecRkqrlWJxZSqBQgdHkja X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(82310400026)(1800799024)(376014)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2024 12:09:47.9986 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c6608c8f-ae3a-4c6e-06ee-08dcb7a2ff9c X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BL6PEPF0001AB51.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB7985 domain_page.c has been moved to mmu/domain_page.c. The reason being this file implements MMU specific logic for mapping, unmapping, etc domain page. Signed-off-by: Ayan Kumar Halder --- xen/arch/arm/mmu/Makefile | 1 + xen/arch/arm/{ => mmu}/domain_page.c | 0 2 files changed, 1 insertion(+) rename xen/arch/arm/{ => mmu}/domain_page.c (100%) diff --git a/xen/arch/arm/mmu/Makefile b/xen/arch/arm/mmu/Makefile index 67475fcd80..2cb44b857d 100644 --- a/xen/arch/arm/mmu/Makefile +++ b/xen/arch/arm/mmu/Makefile @@ -2,3 +2,4 @@ obj-y += p2m.o obj-y += pt.o obj-y += setup.o obj-y += smpboot.o +obj-$(CONFIG_ARCH_MAP_DOMAIN_PAGE) += domain_page.o diff --git a/xen/arch/arm/domain_page.c b/xen/arch/arm/mmu/domain_page.c similarity index 100% rename from xen/arch/arm/domain_page.c rename to xen/arch/arm/mmu/domain_page.c From patchwork Thu Aug 8 12:09:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ayan Kumar Halder X-Patchwork-Id: 13757324 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 B3808C52D73 for ; Thu, 8 Aug 2024 12:10:09 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.773967.1184495 (Exim 4.92) (envelope-from ) id 1sc1xv-0001kW-9a; Thu, 08 Aug 2024 12:09:59 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 773967.1184495; Thu, 08 Aug 2024 12:09:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sc1xv-0001kJ-1l; Thu, 08 Aug 2024 12:09:59 +0000 Received: by outflank-mailman (input) for mailman id 773967; Thu, 08 Aug 2024 12:09:58 +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 1sc1xu-0001Bl-3Z for xen-devel@lists.xenproject.org; Thu, 08 Aug 2024 12:09:58 +0000 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on20601.outbound.protection.outlook.com [2a01:111:f403:2417::601]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 1f312d35-557f-11ef-8776-851b0ebba9a2; Thu, 08 Aug 2024 14:09:55 +0200 (CEST) Received: from BYAPR11CA0089.namprd11.prod.outlook.com (2603:10b6:a03:f4::30) by BY5PR12MB4305.namprd12.prod.outlook.com (2603:10b6:a03:213::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.15; Thu, 8 Aug 2024 12:09:52 +0000 Received: from CO1PEPF000042A7.namprd03.prod.outlook.com (2603:10b6:a03:f4:cafe::6f) by BYAPR11CA0089.outlook.office365.com (2603:10b6:a03:f4::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7828.29 via Frontend Transport; Thu, 8 Aug 2024 12:09:52 +0000 Received: from SATLEXMB03.amd.com (165.204.84.17) by CO1PEPF000042A7.mail.protection.outlook.com (10.167.243.36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7828.19 via Frontend Transport; Thu, 8 Aug 2024 12:09:51 +0000 Received: from SATLEXMB05.amd.com (10.181.40.146) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Thu, 8 Aug 2024 07:09:50 -0500 Received: from SATLEXMB04.amd.com (10.181.40.145) by SATLEXMB05.amd.com (10.181.40.146) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Thu, 8 Aug 2024 07:09:49 -0500 Received: from xcbayankuma40.xilinx.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server id 15.1.2507.39 via Frontend Transport; Thu, 8 Aug 2024 07:09:48 -0500 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: 1f312d35-557f-11ef-8776-851b0ebba9a2 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=i1KL6NZ9fVSt8GhNvSghW6Rv7MEJ6U6115eBdgd0QFs4r6K32r0LhliG2/lF2zVE/qlbgII0tvVj7CvtT9/273nTyuPpS85HD6uRrDdQ0ESmP5dMOw0scNfcsjhs8KBmRCvEsvr5pvpuHdagVpdQpszHrKF2pqfGsUzkP+PMZMo9q+zOoRSDZyvL6jq4xVNfkBK8kfA6jwW3M3TpfygrKMkzABkk9lzn/0u7KpeDzAxVDW9VL3dZHRAWS1p3b1xzXfIr7o420LIC53jXUPYduisUtqEZlUnG7aF9O5WKAIVLeCxmCwNzPGytOLUoppy4U7yvD8dGPwoDgOCe1xfbJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=FHt71xPDWyVL/mL/ASV+Ga6PDc7Kh8iO9GgDEGgNhss=; b=aVeqsB+4XhSYIyy824UwXeeJ4hcagNPu48zsgzmH3gRabU5Sk+sbRL55ItB0AxQt7VKL4wWXflJBhy5tl+GUGE0Z6YS2D73Epn8J0eYTV4kZyzPHJODzJpQU2twVsVWdTT8RH8we8DuSsBPWspPKCdtGEQIni0mEoRhEoIPo3Jby4Mh8MpzghmrnBR2395vvloRtncU96yEFaqbKBXGbqMY9/uJWyHNQd9T5rHUPSwg7bi0Sb55WbniVDAyw5h1Engc/NzclyoNBKQWG+h8P2N3VFis/RmFcYc1gqP5ki3NnRCo5SO9CHEvLD/9PVpkSPQUQ1pEgGe3G4B8VRZxbYA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=FHt71xPDWyVL/mL/ASV+Ga6PDc7Kh8iO9GgDEGgNhss=; b=Vi+bGCENyadjN6beCPRe22RHprYzATs+7fD5mZlktJPB/Dl+2gPt+VAw6B/W8Q+oCDgMuPuh29G/IqHk/W8ulSRGEBxbvE2Padw3/B9AWoyZ0Y4JduB7sHLZxhy1oHPc8DUaCsCIMN2fpvKO+qWZ2jF6XDOmWDfbbNfoC1eWFN0= X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB03.amd.com; pr=C From: Ayan Kumar Halder To: , , , , , CC: Subject: [PATCH v2 4/4] xen: arm: Enclose access to EL2 MMU specific registers under CONFIG_MMU Date: Thu, 8 Aug 2024 13:09:36 +0100 Message-ID: <20240808120936.3299937-5-ayan.kumar.halder@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240808120936.3299937-1-ayan.kumar.halder@amd.com> References: <20240808120936.3299937-1-ayan.kumar.halder@amd.com> MIME-Version: 1.0 Received-SPF: None (SATLEXMB05.amd.com: ayan.kumar.halder@amd.com does not designate permitted sender hosts) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000042A7:EE_|BY5PR12MB4305:EE_ X-MS-Office365-Filtering-Correlation-Id: 68d8ef76-460a-41db-5f86-08dcb7a301f4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|1800799024|376014|82310400026; X-Microsoft-Antispam-Message-Info: MI8MmMqeoVjtpEdvNxnlJ/tgHRZwZyB6P5hoFdvR2EAEBVSCZ22vCX7ovw3wAVBOP0/47TSXx/97XXpFwJqjsOh/bv0sEqLSJ5N5n/zwUc0n4Uv3vM2LuylskrctT2FCdt1zKry+s3tFKx8BjYjCEhxWFLwyA15OM56BojAuKYr97vOdwK7hxVsECwtC+VafwCmeHbx/Z5r5ycHIz9wGz5Ngn4GCKnBuso6p+NhHUtrlQZFz2eMPGX+nm0zXUjGhDWezP1cRz/fyNjrptl2amRuvNVeZ1ba2lhfDbqk0/jTfhSLYzab0uakgZmIDiWSx/j0Gmcn6vkxX7aX20U5haJHCXevDAgbWUCRBqu7u3IZOQt64u90jCxxYoUH7rvAdmNBkLGPifmWzwXWxf5EMk8RZG5ZBFE82xnIbjVx/NdxOZ0p9uf3/CF3YocFxkjrDZ+yb5KJOvrH2cKq8c3Pbu14sHaNvNgOi3YWgoC1+VHyxez6I2tOzX4rBKSbL/lD1LVSH6dBboWa6ETCOCQI6Ktev7LA+PbOR2W07/8barXyHpKkEgdOOE0KYaFJOSLBOfhylIaL7QuzkiyqMqZw1xF3/Uaz1DrfpE83RcRPZ+JjD6wWIVUGwo7G3GAQdcBKJuIXUzqH9Gz/J0EGHawi7djm+CjToPUuESWN6Qj2K52K/AVR/4dHoOWqSxrFAzKXMo8y8dQDxxQp6gTwS7Ey6XyUCiOGqfQ6g1RXWR5yExwPKhE6lT2X+zqRk2YjET9x4JYZelZh08p4SPGJex6QhWxVJmPp2Sl1Sgm8eZs3F3lhzOragVikmLiV7BrVi6AaiuRJQFeLFyQ01Cx+KQ21SjzdoUexTqURMAKsKESEbMNhBndPYqMkCR2zzY5vAh08hmTN76RAk8locP2PcIB6WCK3raEgeRQovDLyHxaNiG1bfEvjVsde8uzhE4qDXFI2Mb9VpgfJT4PpilbrTrPZ4GB9GDHG21Z9WE9XAr4JVFU0BNJD9On4C8t8suoq8ucAlvb1t5z2RMkbICX7hDMnh29ZqL2ZaX/bdUz5uknxOyasmsuwjax25xoOhAZAXOGPWE+8NAwutW9IbabrmQ7p1NZYAdohxYtJPDt3CRHY0AwntQJDpjE/iilLJxvoIIJhvlSbBsYUiupkwC98qun4Vfty6mCZ5nJP1zMdnTbd3l0Jdg/v90BaQAPnGFSj4RA2o6QIB1alszCO/SZpV5KQ1TXaJA3bWQqRLGajBwfGCDsDXoQnu+hFed35HbMKT81DkTFn5pi2bMPMyWY6xMcodBWi4AevbxoSOkFu5/18RYwWhZERGuDVP0fo64/mvCrv128iEsvtkLoNS/HTL5tK6/rogSdLZGDRO45cC4o+b/5jkF4VWnbBZ9LFEWdZfJia1dYY40xrRBMmq8TiuX5y1JOcQ+bVXKPnPy5V19O0/vpVhpLQSTnay6C5yEEMP8BrK X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB03.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(36860700013)(1800799024)(376014)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2024 12:09:51.8237 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 68d8ef76-460a-41db-5f86-08dcb7a301f4 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB03.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CO1PEPF000042A7.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB4305 All the EL2 MMU specific registers are enclosed within CONFIG_MMU. Signed-off-by: Ayan Kumar Halder --- Changes from v1 :- 1. 'vttbr_el2' field is enclosed with ifdef. 2. No movement of code. xen/arch/arm/traps.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index aac6c599f8..f51e1424cb 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -720,8 +720,10 @@ struct reg_ctxt { uint32_t ifsr32_el2; #endif +#ifdef CONFIG_MMU /* Hypervisor-side state */ uint64_t vttbr_el2; +#endif }; static const char *mode_string(register_t cpsr) @@ -919,12 +921,16 @@ static void _show_registers(const struct cpu_user_regs *regs, #endif } printk(" VTCR_EL2: %"PRIregister"\n", READ_SYSREG(VTCR_EL2)); +#ifdef CONFIG_MMU printk(" VTTBR_EL2: %016"PRIx64"\n", ctxt->vttbr_el2); +#endif printk("\n"); printk(" SCTLR_EL2: %"PRIregister"\n", READ_SYSREG(SCTLR_EL2)); printk(" HCR_EL2: %"PRIregister"\n", READ_SYSREG(HCR_EL2)); +#ifdef CONFIG_MMU printk(" TTBR0_EL2: %016"PRIx64"\n", READ_SYSREG64(TTBR0_EL2)); +#endif printk("\n"); printk(" ESR_EL2: %"PRIregister"\n", regs->hsr); printk(" HPFAR_EL2: %"PRIregister"\n", READ_SYSREG(HPFAR_EL2));