From patchwork Fri Oct 4 12:22:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Orzel X-Patchwork-Id: 13822226 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 BC0ECCFA778 for ; Fri, 4 Oct 2024 12:23:03 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.810341.1223033 (Exim 4.92) (envelope-from ) id 1swhKU-0006CC-Rp; Fri, 04 Oct 2024 12:22:42 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 810341.1223033; Fri, 04 Oct 2024 12:22:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1swhKU-0006BH-L2; Fri, 04 Oct 2024 12:22:42 +0000 Received: by outflank-mailman (input) for mailman id 810341; Fri, 04 Oct 2024 12:22:41 +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 1swhKT-00068r-Eo for xen-devel@lists.xenproject.org; Fri, 04 Oct 2024 12:22:41 +0000 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on20614.outbound.protection.outlook.com [2a01:111:f403:2415::614]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 580d7bb2-824b-11ef-99a2-01e77a169b0f; Fri, 04 Oct 2024 14:22:39 +0200 (CEST) Received: from BYAPR02CA0059.namprd02.prod.outlook.com (2603:10b6:a03:54::36) by CH3PR12MB7593.namprd12.prod.outlook.com (2603:10b6:610:141::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8026.18; Fri, 4 Oct 2024 12:22:32 +0000 Received: from SJ5PEPF000001F0.namprd05.prod.outlook.com (2603:10b6:a03:54:cafe::c2) by BYAPR02CA0059.outlook.office365.com (2603:10b6:a03:54::36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8026.18 via Frontend Transport; Fri, 4 Oct 2024 12:22:32 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by SJ5PEPF000001F0.mail.protection.outlook.com (10.167.242.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8026.11 via Frontend Transport; Fri, 4 Oct 2024 12:22:31 +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; Fri, 4 Oct 2024 07:22:30 -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; Fri, 4 Oct 2024 07:22:30 -0500 Received: from XIR-MICHALO-L1.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; Fri, 4 Oct 2024 07:22:29 -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: 580d7bb2-824b-11ef-99a2-01e77a169b0f ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=aVZDilnPaD0TTCjTngS3ozjRnMypmu98wOGs8mAv2SfHFhdkMoLLx61ogDxnj/UACLOw6A/SkePhYjciUbWAXoTTI3x6rzaoskgbSfeOYA4ly9HieaWDEQMat5yv7DmuHACaWSxjZCd8dNUXf4t0vz76/WdCj1IYjZ6CrzoYF6aGOVnj6zxWpNGNWlfPJz+w8GQVlo8SIjJc0yXvcw+gVnX+fCAT2j1ROkgL61dQ9Uyy6GCPSvadRGUV5uDvr5f5gIOg8hGCcIDtHJN1IyH64UAhvGJAuUVCfWCotlPAt44YBH/zse/hKb/sJmtaoMLwp5YakUGcJ7XdhQggVk59EA== 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=qMyZSSKtyxLWnjqInD9m5eg0zHWpnF3h8hQyllg0PFs=; b=GzijKEmIRS2lmTWcqW69Q924y+/jz3gJ78IrQ3DMMzShMSBUyDsQhEx/BlyCBqDHrmJqYUGwx2dVVqQCgqwkYT6KBIgjygCTwKoNU7trQcMdWsPPOxDFPTQM3s3MHqpPO/iKlFpUMqP1XGHIJVZ1If7+rvWKk8X9jnkCBWTVAZJvJrc9PUGycNxkn5zw9aBkgUfoAI9uxIE8Q9cSj9qJqWxK1NBoieOY1dBz+tlDHbq5zVCEhn745PDhyat/INyT2rQ7awCX1Q2xkUrJpOTu7MiRNRRWtKf23JYkyPSz8Dsw2IfjqbJPDuXRTc72Mi58qwRFM00Kn2VOnWASGVePTA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.xenproject.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=qMyZSSKtyxLWnjqInD9m5eg0zHWpnF3h8hQyllg0PFs=; b=HRB7fJTWp2Egcia55u85OXOLNRnu9dW2oktL+//zQEb5acIJQyTT//faY8Z2TpZ0Dlynk4jXvs0Xt+yXEw8+gOShbCRNcSX4bif1EUQ/+NWwS/KF/6fK7PyJdnBaGO45Yu1OHrmCQjf+HTpy/jdH4SO8z6hFCkHfsYEC8zGvNgk= 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: Michal Orzel To: CC: Michal Orzel , Stefano Stabellini , Julien Grall , Bertrand Marquis Subject: [PATCH v2 1/6] dt-overlay: Fix NULL pointer dereference Date: Fri, 4 Oct 2024 14:22:15 +0200 Message-ID: <20241004122220.234817-2-michal.orzel@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20241004122220.234817-1-michal.orzel@amd.com> References: <20241004122220.234817-1-michal.orzel@amd.com> MIME-Version: 1.0 Received-SPF: None (SATLEXMB05.amd.com: michal.orzel@amd.com does not designate permitted sender hosts) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ5PEPF000001F0:EE_|CH3PR12MB7593:EE_ X-MS-Office365-Filtering-Correlation-Id: 4fd0f08c-f481-4fde-0d11-08dce46f382c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|82310400026|376014|1800799024; X-Microsoft-Antispam-Message-Info: qco94T9poxxSlC2uze1PSbCG5rFu3a4g6Ak6S8hMdzIVLpp4XLx4VDo/rjlA7qPJZWTvYMhKDXzlnDknMOml8xJsG658P7KvROymh7CtCzs6CdnvAid1f43ArkyXsVKyE+azuvu8urQgM1V3kVm9kuc2KXAfRJf3yrCFNlhzqMGYKVGPuODG3u0CG1iYX+zgKkWkzAwSVkMRs/yXOzgJYvUqAUkGGX04zk2E6+LzUDs8N/4wNQnzQcbpZQ4W29TYC9XH10EiM0EXGA7x1AGpQE0W3gIs2hnCxpXDQVTvA6shRA9Hn1E84vhUP5TANlsCce4C7vsPUM9B79gXujdIuyfL/dkRqfuJNgE1yqUtMWWwMvxCSVzwyQcGO/REqP32a9V1AUsLx/Acg8mgCb+ztC9YXaFjU+Cg5Z9KxgzFOkEoM+Q7V0rmhKb4cD4fH7Zed97PvY74E8lsHW693ufDUmDt9ZNm5V4BL+0nz1/NglLGfH3SR6UkCRKYiCXnanrQrx6wR/mHlbu6jqL/G+CTIvRtfxy7x4ovfWiEIp6bmJimrcEJR+5RDWxCDnMxHHhPVn7jRelV1jT69MlVlN9O8oEX+hKi4K9aWXAblzcqzm1EOfoVh8U0hVMPeR01jPEFqxko0c2eYeF3AmX1kL+qqLIBXuRk4RFqHCSfemnif6+oz0vomfRbReUfJTaMk/8Nlo8lAg9BjPbMEOow2S5g10ukuWdsc64z1ywMRXdK2k17mHPhjCPbNIu2xcXwGojOGQgKjGiVFKPB+xDb7KEeGic1HlCspgaohBuVQco/+iE5kyF7RJWUDiBZuSNXW1qAvnklDZJ7ns9o/CpJQNBaAQzfA/Wr1Q1/yLRVmEabDHZvAR1SB8/TzNvZw+tDCTZeR9zAvpARfT1jgmnjaAPlfHKh3O6WGLdiVuaJ74vSrgwiKuB/C/gNnFyTOsDMOiUd16FrhXzp3+KaP8+B0a2a9mxB8NK9QO/rmM9wnkVKbT1RGu7/sX8od5hXrlGKQepmiNHCaQD+1HcXG6WgyUoysNgsxi5l0Dk7B8yoEMSYUYWG40smv7rSlP2qSWBMF6Wf1M/LdiOgTvfRrXpSEEW5YJSJGI5mDZdVrN75fxvXXCku9zbIK0CLmuEsBUXzdZmEpqqguKEe1mN8c2Pu1NTKT8916AWDFKFAHe4p5Ga7MkB50SJjV2JIAKXaQ4xPeh9p4cpCeBHlL70yZBb5o9v9j/TljoaZ98sor8VPg2hZeUYSo8YWUlfMjD83vz1DDnToxiTL/EqO2N6tckowyIV7+bggzSAyjX9zW8jszqYxlK9RjG1neQRePUsitZR1/itEmjL9YOAtBtzGdvagCnSVwqFjfLQbHpHhg+q07vybpvbBCaUS2+HUTZ+Fu2G6n4cw 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)(36860700013)(82310400026)(376014)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Oct 2024 12:22:31.3275 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4fd0f08c-f481-4fde-0d11-08dce46f382c 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: SJ5PEPF000001F0.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB7593 Attempt to attach an overlay (xl dt-overlay attach) to a domain without first adding this overlay to Xen (xl dt-overlay add) results in an overlay track entry being NULL in handle_attach_overlay_nodes(). This leads to NULL pointer dereference and the following data abort crash: (XEN) Cannot find any matching tracker with input dtbo. Operation is supported only for prior added dtbo. (XEN) Data Abort Trap. Syndrome=0x5 (XEN) Walking Hypervisor VA 0x40 on CPU0 via TTBR 0x0000000046948000 (XEN) 0TH[0x000] = 0x46940f7f (XEN) 1ST[0x000] = 0x0 (XEN) CPU0: Unexpected Trap: Data Abort (XEN) ----[ Xen-4.20-unstable arm64 debug=y Not tainted ]---- ... (XEN) Xen call trace: (XEN) [<00000a0000208b30>] dt_overlay_domctl+0x304/0x370 (PC) (XEN) [<00000a0000208b30>] dt_overlay_domctl+0x304/0x370 (LR) (XEN) [<00000a0000274b7c>] arch_do_domctl+0x48/0x328 Fixes: 4c733873b5c2 ("xen/arm: Add XEN_DOMCTL_dt_overlay and device attachment to domains") Signed-off-by: Michal Orzel Reviewed-by: Stefano Stabellini --- Changes in v2: - Add Rb --- xen/common/dt-overlay.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xen/common/dt-overlay.c b/xen/common/dt-overlay.c index d53b4706cd2f..8606b14d1e8e 100644 --- a/xen/common/dt-overlay.c +++ b/xen/common/dt-overlay.c @@ -908,8 +908,11 @@ static long handle_attach_overlay_nodes(struct domain *d, out: spin_unlock(&overlay_lock); - rangeset_destroy(entry->irq_ranges); - rangeset_destroy(entry->iomem_ranges); + if ( entry ) + { + rangeset_destroy(entry->irq_ranges); + rangeset_destroy(entry->iomem_ranges); + } return rc; } From patchwork Fri Oct 4 12:22:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Orzel X-Patchwork-Id: 13822225 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 43285CFA775 for ; Fri, 4 Oct 2024 12:23:02 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.810340.1223027 (Exim 4.92) (envelope-from ) id 1swhKU-00069T-GM; Fri, 04 Oct 2024 12:22:42 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 810340.1223027; Fri, 04 Oct 2024 12:22:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1swhKU-00069L-DD; Fri, 04 Oct 2024 12:22:42 +0000 Received: by outflank-mailman (input) for mailman id 810340; Fri, 04 Oct 2024 12:22:40 +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 1swhKS-00068r-Ol for xen-devel@lists.xenproject.org; Fri, 04 Oct 2024 12:22:40 +0000 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on20625.outbound.protection.outlook.com [2a01:111:f403:2412::625]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 57873b07-824b-11ef-99a2-01e77a169b0f; Fri, 04 Oct 2024 14:22:38 +0200 (CEST) Received: from BYAPR02CA0069.namprd02.prod.outlook.com (2603:10b6:a03:54::46) by CH2PR12MB4261.namprd12.prod.outlook.com (2603:10b6:610:a9::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8026.19; Fri, 4 Oct 2024 12:22:33 +0000 Received: from SJ5PEPF000001F0.namprd05.prod.outlook.com (2603:10b6:a03:54:cafe::81) by BYAPR02CA0069.outlook.office365.com (2603:10b6:a03:54::46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8026.18 via Frontend Transport; Fri, 4 Oct 2024 12:22:33 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by SJ5PEPF000001F0.mail.protection.outlook.com (10.167.242.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8026.11 via Frontend Transport; Fri, 4 Oct 2024 12:22:33 +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; Fri, 4 Oct 2024 07:22:31 -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; Fri, 4 Oct 2024 07:22:31 -0500 Received: from XIR-MICHALO-L1.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; Fri, 4 Oct 2024 07:22:30 -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: 57873b07-824b-11ef-99a2-01e77a169b0f ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ESM/LCG1VZAqsN8asJu9yydd/nyGBVpU/1Yt2+Fkpv7v+x9Kvmts9RgxRDrwLyWTXznOAZB10RPCbgh9sZokVgSVJ5FgRZfJDC/ejp6CRPh20mvwNGgmeYdHLbL4xcs60nYB2CgNvqX+AD0Uq9PR7katoZu29th0awKdVroZD83zYpk7TRsP5T8Ht3siTJNS0R4NMLs39C3QWl6SGxdhem25C0lSTR0BJGBYcYXxyV+0kM9eLH1W1KERJQGIsctGLfIG7E6iZZ7yLXX5/DpxhglwYRZG6h5AzZfpxdbrog3yvDjTqg9rX8nQogjMiJhV1rDfOxolXDoBj+yDxOC4vQ== 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=5Yxzb8QUee8LL/UwpSrq/bczqcgMTL0/++EpgLvvFVQ=; b=t/RKvrz1KoLaks/J/RfhK0I9bkyJWyYUJexVDs/UHo+LFlYhBIl62my35tn7GjHrAGpegEvSZR7ZZhgL9xiiC+XDyq+yz7tcht0T5mrB+3fuMDj3sJ9ZlPixyy56QTrOoKDqah78EfGphnsKOsWOXAroMMiN94fuD+9RGk1AWj/gPGulFvFI7LXXXoDn1vGB+uzaoLIUWm/Wlid1JXYxzurajPVAzCz262J2lohalFIY+uUhZQ2wJueSBH2COMDmv2LZrxqbxRnQvxKct755bb7z6WW1y6n8ErdbHZfcqOG0f0B52SnD+4yVT9WdlKBXP7A/eAxL90eWMqEV1W2q4g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.xenproject.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=5Yxzb8QUee8LL/UwpSrq/bczqcgMTL0/++EpgLvvFVQ=; b=Jq642LNZhyCw/mz/0KadPhLuS49zrQpepT33gzmBtxhLtRN6sMfbCdKlKKyZ0asy7xvnXP0KdSNytH/98GthyRBNlh9lE2NrTr5Fq7ElxA7lZBYVOTiLxfxmSPKK0KFg46TnRm1AT4jcIpsK9S3qjHfiLdNtKHivf1YTyTQNB74= 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: Michal Orzel To: CC: Michal Orzel , Stefano Stabellini , Julien Grall , Bertrand Marquis Subject: [PATCH v2 2/6] device-tree: Remove __init from unflatten_dt_alloc() Date: Fri, 4 Oct 2024 14:22:16 +0200 Message-ID: <20241004122220.234817-3-michal.orzel@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20241004122220.234817-1-michal.orzel@amd.com> References: <20241004122220.234817-1-michal.orzel@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ5PEPF000001F0:EE_|CH2PR12MB4261:EE_ X-MS-Office365-Filtering-Correlation-Id: 5a9c3f55-3d46-44c7-9ce2-08dce46f395f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|376014|1800799024|82310400026; X-Microsoft-Antispam-Message-Info: ISqzX7YezNUIGeoauTHyZTrIPy5+wvGB6PnRoiwbddtSXoQUi2ECBnKqlLwLIAMXvYntld0yo7NAQEBoyH8rfhdYnsNZlqRtA6hTOXsp4Bj8lE8FwI9AQLyoQ3Mj5Bb+bR2Tt6aww1RbM6VqoQ5rAGLxErWiGa07cBxo1Di3omlp74Kh124zaIKo8cxYhuJHMDgvTxI3EpWwTuNzYun1u8IuZkVggsNRwLy6eeBSC2mBqpdanXQdBiZp3Dc7IBwF0O3LpBU4jjA0HbaDqRRVyzKdPPWaYC3TCKInjYXU+vAnZITMatFHbeoQFdEd57s37gkayXmLwHG4Na588efEEAorOG7zFOY0xhSMfEwhqBikRjDpGIweO23FLDgkd2B+Y15o28hX8Oxzx1iaZ2yyDzF/8KG2JomBr7vJb9ZkTS5nUJhvk7yYuauOE2hKWmb5XBjkwKHqmkWy4VbGVmp8jxtwHvDAUvnOp+wkpgcz3J1Q1hEVE+Hd3xoVxNksmDUfEu0haui/7c4/mhvF/cJgy9qEb2SAfoamR2zCnAwMj42wsv2OQSVk8BgPUEX2R+SQYX2IQY6LfupulgZGZOkYnwy+6a1TKl+UOD/yR7XtZVkjVYtItkpH9b25mzwNBeFuQTjoLtRI1QTD/YuUJXZaJfp9pk8KAlRHFAGK9w1G2845qQw7KZWDEeFV4EtLg9kHlWc7E+3FrDlkMb1+JrPS6+/11ff7bPKzLPYnNucSFQR964dHJYsfk5UaWBAjcm01zEBL3BkrZ9BoqwG/PgXXAdJ6X/3t7PQ0XllE488JGiytPtiGup/Q6vJhiqhF7SQewxCiT6bbycnwFUi2DqktVv6yiQZTN+uLuQ57tKhmILtlqYWW9K8Af8P4RJLOgkZmVTCvPlsxrIgRfiKLI5NAKz8A/8z+PuFbVn0Vd97U8uI/u0qjbe/DRAxZSiVTnAapdlhE7jbCF3UXv549eu82kFInwpXD7O7IGN0tzT2zrQ/9A7jEO2uNNv7YQS9vacLZYi24xXy3R37ieLUCAucRBlMeXbhicxo2QQSBbAR81Np/4Z/h80uf1sa+OfrxAbJYS1JkV0oEOBgAz2xV2wGOddeC5leL7EtFX9L1yiTiw8pstzMTlBnak15U8rGTwTLnMZJfwFaemtJJnPb5zXw0U8VoFEoHaY37EkvRp7c6vyq5ys6c0KppuSoYo0dSkJOf9JzvTyePPalSsXQUIuAwK7q6wymeJ7c34RrVz5f016DXGGgqDPvj1P0UAbmZ3K8sHyimUPeuMwPE4kR20XANbLMrnahzcc06GZJE0q+fEW+Axmei11r8b+uFWCr0Vh6YXLinkEcv9H91kFkET4z01QxoNmFrbITeL4IEF0LDxjY3q9nWGuGo+dYpNDIjsciC 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)(36860700013)(376014)(1800799024)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Oct 2024 12:22:33.3431 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5a9c3f55-3d46-44c7-9ce2-08dce46f395f 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: SJ5PEPF000001F0.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4261 With CONFIG_OVERLAY_DTB=y, unflatten_dt_alloc() is used as part of unflatten_dt_node() used during runtime. In case of a binary compiled such as unflatten_dt_alloc() does not get inlined (e.g. using -Og), attempt to add an overlay to Xen (xl dt-overlay add) results in a crash. (XEN) Instruction Abort Trap. Syndrome=0x7 (XEN) Walking Hypervisor VA 0xa00002c8cc0 on CPU2 via TTBR 0x0000000040340000 (XEN) 0TH[0x014] = 0x4033ff7f (XEN) 1ST[0x000] = 0x4033ef7f (XEN) 2ND[0x001] = 0x4000004033af7f (XEN) 3RD[0x0c8] = 0x0 (XEN) CPU2: Unexpected Trap: Instruction Abort (XEN) ----[ Xen-4.20-unstable arm64 debug=y Not tainted ]---- ... (XEN) Xen call trace: (XEN) [<00000a00002c8cc0>] 00000a00002c8cc0 (PC) (XEN) [<00000a0000202410>] device-tree.c#unflatten_dt_node+0xd0/0x504 (LR) (XEN) [<00000a0000204484>] unflatten_device_tree+0x54/0x1a0 (XEN) [<00000a000020800c>] dt-overlay.c#handle_add_overlay_nodes+0x290/0x3d4 (XEN) [<00000a0000208360>] dt_overlay_sysctl+0x8c/0x110 (XEN) [<00000a000027714c>] arch_do_sysctl+0x1c/0x2c Fixes: 9e9d2c079dc4 ("xen/arm/device: Remove __init from function type") Signed-off-by: Michal Orzel Reviewed-by: Stefano Stabellini --- Changes in v2: - Add Rb --- xen/common/device-tree/device-tree.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/common/device-tree/device-tree.c b/xen/common/device-tree/device-tree.c index 8d1017a49d80..d0528c582565 100644 --- a/xen/common/device-tree/device-tree.c +++ b/xen/common/device-tree/device-tree.c @@ -120,8 +120,8 @@ void dt_child_set_range(__be32 **cellp, int addrcells, int sizecells, dt_set_cell(cellp, sizecells, size); } -static void __init *unflatten_dt_alloc(unsigned long *mem, unsigned long size, - unsigned long align) +static void *unflatten_dt_alloc(unsigned long *mem, unsigned long size, + unsigned long align) { void *res; From patchwork Fri Oct 4 12:22:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Orzel X-Patchwork-Id: 13822223 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 70A6ECFA776 for ; Fri, 4 Oct 2024 12:23:03 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.810343.1223053 (Exim 4.92) (envelope-from ) id 1swhKW-0006gI-IL; Fri, 04 Oct 2024 12:22:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 810343.1223053; Fri, 04 Oct 2024 12:22:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1swhKW-0006fA-AQ; Fri, 04 Oct 2024 12:22:44 +0000 Received: by outflank-mailman (input) for mailman id 810343; Fri, 04 Oct 2024 12:22:43 +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 1swhKV-00068r-78 for xen-devel@lists.xenproject.org; Fri, 04 Oct 2024 12:22:43 +0000 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on20629.outbound.protection.outlook.com [2a01:111:f403:2414::629]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 59696586-824b-11ef-99a2-01e77a169b0f; Fri, 04 Oct 2024 14:22:41 +0200 (CEST) Received: from BL0PR1501CA0015.namprd15.prod.outlook.com (2603:10b6:207:17::28) by PH7PR12MB8121.namprd12.prod.outlook.com (2603:10b6:510:2b5::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8026.18; Fri, 4 Oct 2024 12:22:37 +0000 Received: from BN2PEPF000055DC.namprd21.prod.outlook.com (2603:10b6:207:17:cafe::52) by BL0PR1501CA0015.outlook.office365.com (2603:10b6:207:17::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8026.16 via Frontend Transport; Fri, 4 Oct 2024 12:22:36 +0000 Received: from SATLEXMB03.amd.com (165.204.84.17) by BN2PEPF000055DC.mail.protection.outlook.com (10.167.245.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8048.2 via Frontend Transport; Fri, 4 Oct 2024 12:22:36 +0000 Received: from SATLEXMB06.amd.com (10.181.40.147) 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; Fri, 4 Oct 2024 07:22:33 -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; Fri, 4 Oct 2024 07:22:33 -0500 Received: from XIR-MICHALO-L1.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; Fri, 4 Oct 2024 07:22:32 -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: 59696586-824b-11ef-99a2-01e77a169b0f ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ayrvRtm/FEIs5YtgeD8OvCq9IXNE3lwjuacSb1LGre09rW0RwOBpOSozJNmLC5gSXSyJESHDqpAg6gXaOEihabrsiK5oB8z4OldyhDDQGBbHnFYwl/YxP1/zyxpXtwKZANPaBi8z8j2llPcwqlNb0pfF254H0rD7wBl5UxbWiUrctt6ruiFOS22EbxAzl975xfj43OE7iZ3LYeoCQPFwtcsp2lEjZQQ1cGx4XR1bhtf2r9B5dwECmUERKnlxeB3vTbAtJFQniDGAVhyw9iNPuEdFNzdGA1rE4I7e/6BUwkpLhgQ7yk6cg8yP5ogf4Qx4tsBX+gh/9bqjvnDw1BDLXQ== 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=RdOa3RV+tWRNRzTlY1JHgYomlKbBfTaAePYvs1PDYVw=; b=GY6R7tJbjTg2U9cW3OIh6LHRiLJ3lPriGGo6UuCy/9wVMvEZ0zFdymCrYiEl4N84p7VQvYGGAgZpGJqwh0rf5eGei8YWpw5tD5ay5Qv31vjxrH33yhe5HkQNcS7j2LdgvMdnopxnkamQghWxbqzHHpvOIeQqG5al8scqb9djx9l7JoJX+5LyVzzj9f8iOOPGAGBANKahgH4J7SnFX9au6U4F3gp75kuwqFvgQXaRnxFXHb6eJjNxL1motM6sNMFl3DZklzaEY0r8WXndyM5I0NPd5K87IJhEuBH4lNMUTFRWdBBYKOL+HqIa5aAP0/m4rCP77/bVhEkz27tsjJf8aQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.xenproject.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=RdOa3RV+tWRNRzTlY1JHgYomlKbBfTaAePYvs1PDYVw=; b=R7lWF1l0Xd4gkZ5u437TfVOUMLl55qgy+MPWeRJfrK3FKFZW2/MV0hvWfqMB/Ir5MspoMzlVbl2KlUx47tlPWYXkmNeusNkPv6+5hpsVNNXNNJg5JOjM8YJdd6xBlB/6up5yYEACnvwlNzWWCMghlMEi/hpOvvEytITq3g2AQ14= 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: Michal Orzel To: CC: Michal Orzel , Stefano Stabellini , Julien Grall , Bertrand Marquis , Julien Grall Subject: [PATCH v2 3/6] dt-overlay: Remove ASSERT_UNREACHABLE from add_nodes() Date: Fri, 4 Oct 2024 14:22:17 +0200 Message-ID: <20241004122220.234817-4-michal.orzel@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20241004122220.234817-1-michal.orzel@amd.com> References: <20241004122220.234817-1-michal.orzel@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN2PEPF000055DC:EE_|PH7PR12MB8121:EE_ X-MS-Office365-Filtering-Correlation-Id: 05dd4bc0-71fd-450d-0b34-08dce46f3aec X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|82310400026|36860700013|376014; X-Microsoft-Antispam-Message-Info: u60ByXVVJx60MSC/4Cam0TgnSebUnKXj3y2HjJfL6epzz+hdx+T+1PIQvC9YhUpmNK5rnHKazc8I4GzEmItwQRQMaWjpGtIPLBEYTO6iicAelzmSDm7dbS+UyJEaDAtq6JiZdpLR1QWZFOvSuLterS87XANaAIVp/Pn38vcGeMS6JDWLMTJdJtfU0x0OW3v6DJyETYBczz9o4TBLqRDPM3BhZcQok+v23gPXf1PdctsHPzICKsL1PFtAaBHeAyZh8dcaRjv8eqb2UkAWf4UINySChPbRUDInUxVsgISMRmFI9fxZXLsOeFTmL90CuWquCRswGEhqclD3U81X6th//7wi4UNo9LFz1RTFjIbKV4OeTDCnuCK2IVhFqBSjPogdoYCkdwxhp9TuFYW4Ftjk2ZlYTOhTJPi3RySJdZFtXCB9sNTISL0TxlA0danfSVK5kaWuUCHrT9uK0aNRWzbSxZd3qmoU2j3W7pmV4h9Rjc7GZtOkWHeIQ3XQy5ytfyPfN1GRVm8+gA4/TxvX9AwiulMdJe/ZgN6Pm3sPMZWCh8LoIsG9blgQgkMelrBfnS245IvKv8mnhF/IIfOwHdP5EhQA9YizLpR00E2PtXU7j1OnsAgJ+p41f3O6b1LCjPRLblYO+NBBDwhkVxudFfHzDcXC2iQZKYFP6PlJQyzYU4NfNZLoaYKLY2/fIYntbAKcp3Xwh8eo7uVcwQfs8afrEHNDd+wHIkoUH8yne+epD0xoIWs48rTChlEjSFrhvBYU1Bud70IMxAVMzFfuCbC1e7V3ebxZZxQyRvtlX/CsVp/xs3pBxnsZPB0wYq0LuDLuFm7PS0w2VV0jjfxMxICntfmMhBci5uCDibhNom1dz5hfo1mrnucriEYvyp0KB6Ti5ddUtfdutDhE4rM0q4bg7IdEsGz+GUXUxIJc9N8Ujn4n/AXa6bnLXjTep9GsEP91kX/Bjj3XKJqQ49K6dBCNvAGA7dEGDKgFULSZoaJ3xsWvDoF/i/lesMZWwmelwZJmSQ1VtIKDsorkX9cZyQxRQEquO5Pex6qglENW5GKeMXtwSNEC0Dp0THv7OV9aGSkVP0SSY9L6QLEfDYSot4EyUNgS1Z8dAQU3vwMWoiFDASjYKpnxAePFbOxpM8Y5v7BLcrSGtiVB/15ujNV3eOjWJBMO2X5grLQ8F+9kxaB1vnpSGqIo2TDgzxFBgblGzLddaR1MjoKqt93fYLKxcewZpjFgzmqHo4zvssaK95tWcT2dFVfZQ9NnfiQubQU/hYKQYoWYu0m5UlknGpQwqt1wzPaEKnC2T8OCe/+Bvub9d8BGxK7xJYkOjxgjm6BuPFS/ly1aeG+4sJd02Uo1COij2lK0eb8goWaTwqIQOz1yx8wUCyFg7/RcubZdxd8SYaTI 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)(1800799024)(82310400026)(36860700013)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Oct 2024 12:22:36.0193 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 05dd4bc0-71fd-450d-0b34-08dce46f3aec 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: BN2PEPF000055DC.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB8121 The assumption stated in the comment that the code will never get there is incorrect. In overlay_get_nodes_info() we manually combine path from target-path property with the node path by adding '/' as a separator. This can differ from a path obtained by libfdt due to more advanced logic used there which can for instance get rid of excessive slashes. In case of incorrect target-path (e.g. target-path = "//axi"), the comparison in dt_find_node_by_path_from() can fail triggering the assert in debug builds. Fixes: 0c0facdab6f5 ("xen/arm: Implement device tree node addition functionalities") Signed-off-by: Michal Orzel Reviewed-by: Stefano Stabellini Acked-by: Julien Grall --- Changes in v2: - Add Rb,Ab --- xen/common/dt-overlay.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/xen/common/dt-overlay.c b/xen/common/dt-overlay.c index 8606b14d1e8e..d18bd12bd38d 100644 --- a/xen/common/dt-overlay.c +++ b/xen/common/dt-overlay.c @@ -596,11 +596,7 @@ static long add_nodes(struct overlay_track *tr, char **nodes_full_path) overlay_node = dt_find_node_by_path_from(tr->dt_host_new, nodes_full_path[j]); if ( overlay_node == NULL ) - { - /* Sanity check. But code will never come here. */ - ASSERT_UNREACHABLE(); return -EFAULT; - } /* * Find previous and next node to overlay_node in dt_host_new. We will From patchwork Fri Oct 4 12:22:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Orzel X-Patchwork-Id: 13822224 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 7ED80CFA777 for ; Fri, 4 Oct 2024 12:23:03 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.810342.1223047 (Exim 4.92) (envelope-from ) id 1swhKW-0006dZ-7B; Fri, 04 Oct 2024 12:22:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 810342.1223047; Fri, 04 Oct 2024 12:22:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1swhKW-0006dO-2o; Fri, 04 Oct 2024 12:22:44 +0000 Received: by outflank-mailman (input) for mailman id 810342; Fri, 04 Oct 2024 12:22:42 +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 1swhKU-0005ue-DK for xen-devel@lists.xenproject.org; Fri, 04 Oct 2024 12:22:42 +0000 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on20603.outbound.protection.outlook.com [2a01:111:f403:2417::603]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 597c7128-824b-11ef-a0bb-8be0dac302b0; Fri, 04 Oct 2024 14:22:41 +0200 (CEST) Received: from BL0PR1501CA0011.namprd15.prod.outlook.com (2603:10b6:207:17::24) by LV2PR12MB5847.namprd12.prod.outlook.com (2603:10b6:408:174::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8026.19; Fri, 4 Oct 2024 12:22:37 +0000 Received: from BN2PEPF000055DC.namprd21.prod.outlook.com (2603:10b6:207:17:cafe::77) by BL0PR1501CA0011.outlook.office365.com (2603:10b6:207:17::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8026.18 via Frontend Transport; Fri, 4 Oct 2024 12:22:37 +0000 Received: from SATLEXMB03.amd.com (165.204.84.17) by BN2PEPF000055DC.mail.protection.outlook.com (10.167.245.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8048.2 via Frontend Transport; Fri, 4 Oct 2024 12:22:37 +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; Fri, 4 Oct 2024 07:22:35 -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; Fri, 4 Oct 2024 07:22:34 -0500 Received: from XIR-MICHALO-L1.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; Fri, 4 Oct 2024 07:22:33 -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: 597c7128-824b-11ef-a0bb-8be0dac302b0 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=iG6IjzYO9AO3iSWdMkQcIP4fBNpwJMmjxBx2GU/iT7GyCzFUDIYfXjgUBCHGnVti4rEcHzilB/92aR4L6TKUpj/KH9BqTXylzKcezFs01fK3QZ4kyjFHnbLzlEKKMruLtbw6UHY6ShKVsY1rbDv/o3Q4cFKHLZQmBraI6msGfM2/UqDrgLVLpgf50AWdKwOAZbQslWCZW0kPxNLleR3iOQ8/DQSzaeKFZg2+hR7tU0SHc2ztmWbxLOLTeAHKgeb3zd27PgLe+1stEqGKdxkmF4LTmyUqHyU0clqMZni4RUbThcZ81UFbQV151DHqUxYcvlv5fr0orQJ9TmCR8VxaFg== 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=rJLyeaB5M/7YIwM/WFENv9oGD3G+4gjHz/pbXz8yRWs=; b=gxhVCnpZNNyBEmNsXydXPkhHMV19LJkkc0cC5N2KCiO+p5wSW6epJg0cdl0s+J2HtCNz7tOWG27qx3P9QLdMBSE8DM2xBS3/N0pz7E0yQQLo+obskig5UqhdJvSehieRKkNuguu04P9E8ovGSfxPJ5NjSLPMSdZKrtuTu5Cezevk2a7QGTKqC+o3O66UdbXzi41m7fv1K78cFHls+AljWWdM4l8z+zT17V8y2s6aVvYcunMHcUir0Zd1RoxoIVSmJA5S0JLwz+AgDn7di4uyGnMjB5aNlWOyWrXIUwNjZAwK8qwegzkSGy+L32T69AZe6Mzt6hDxpKzNjsj/IM2aNw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.xenproject.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=rJLyeaB5M/7YIwM/WFENv9oGD3G+4gjHz/pbXz8yRWs=; b=tbPmPGJXMG4WP7YElZ4G03hNWJwAh++5FxEUhEFcIlrtlZQeO0lMa2BSRJBxjpZ+GMZ0gCw+n8RLjfkS8UWrYBPh6V0zMGOzEIK0pPMrFTGIs8MfTDIjOIWUc0eVn6pbZP8iM+fZjKz19L8tV9O5jhXl/0nPl53YQmReBYINU54= 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: Michal Orzel To: CC: Michal Orzel , Stefano Stabellini , Julien Grall , Bertrand Marquis Subject: [PATCH v2 4/6] dt-overlay: Support target-path being root node Date: Fri, 4 Oct 2024 14:22:18 +0200 Message-ID: <20241004122220.234817-5-michal.orzel@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20241004122220.234817-1-michal.orzel@amd.com> References: <20241004122220.234817-1-michal.orzel@amd.com> MIME-Version: 1.0 Received-SPF: None (SATLEXMB05.amd.com: michal.orzel@amd.com does not designate permitted sender hosts) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN2PEPF000055DC:EE_|LV2PR12MB5847:EE_ X-MS-Office365-Filtering-Correlation-Id: 4e894b71-36ed-455d-4fd6-08dce46f3bd3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|36860700013|1800799024|82310400026; X-Microsoft-Antispam-Message-Info: 0EX1QhFSaSjFvuLtjA82g4DgiUP1k2e9Itab9WnCxo9S4wGAouMj9bLrDVaWTjVCN0RetPuxc4kCaSl3HzOxc4Rz4WfAETM74mHLeMgR8YgLvkUI/i86TBIgXBTdf2oU+upvzb8sUUhiSgSGFrqtl8KUgAR8j/q9aP1pdV6Cr98xd63vUVbZ++0QgfBabOuIbcRQ2p12KWPNfpkCHaI8qoVgikkonrJ4r2+VaZgKx3I3Nq2kbSybsj3BkF+zkn8XFH1c7yJnJ5+uWYa7NQe6+0Bi/PKYJO14aobdHRgrWIJ25y15x8We8S/0Ni1KBMtXf77B549fEym+p2m/IpD/SseOWKfx2KKgi75kV/54c+oC6x0hIHkBiotX7/E2mauE0E6iyD62X6Gt2+7LxQ2kBPW6Or//YdkNIgWKaNoE9dinOKj4oyV06WH6E1TAv1f2/XpGvkNZ6hBOBH81e+F1G65gEVff/Lw1GBKGzwI9CyFdWYsyytCvvRj/JjIbJmpnp68/e5Hv7ibfU5qQhovbpN+O7v82kaydyOyI9wrYk1X9ycHldmPEjnhBknYJVdHJvfmhCyMkeAd2nix2rE+7UF2amURZKVHwLi9H4lUj2Z3QWRBf/h27VI2aOAxfXFUun6oqyN2FJ6OwQCJT6bGIFEI499q65g/9Zw6y0mgXQi8kzb4S0rpXqlT2QrHUOOi2pNnC810rrNi4pUVDVbeFpdNJIGqiAcVnBnt4Z9q1NSIoXiA10KZcvnETYRWmm5W0cUrC/gI1F9NUW028hyL1iuEZpnO3OlDLkGKicc1lFxykHJVmXfiJDtq23OTw8xH4RREMxmhIO9MQWQ0ZqgCB+GFGYMdU7ZKid55a/3GpSRTFyUp8uVDvqhDtK8RerEnFxg3v6I5LTez1HUwYzQaVzEaxPsEi1bXCM4EKG+nVDJPgfTZRpRnjQNJDlNO5HpPyFTctP1zx/YyTV3OuJklnM6rP8ZkQAuVh6sRFXNSeWZ5g0R9nFLV4JtacywQy+mx394Om2yTV8/QCpLcSqVQXeGS3XFV4PyTsuazVU5rSJtUXQFLQtXYyt/niTtjssAaVuxXdirpu6Mpy0jikJJC2b82zXapX6jvooZYkPQJ0bU0kYwVThcfiYIbVMJTt7AHm3mdEJSGlEfDJ9ZpFNFgVpXv+o5L0E3Hmfw4sPLDkfcA3/IngDvfHaKT18Wye1Lq2dF9LWRBm4PVAIsywXPE5P8scK/t+3tgGtR0LYF9ZgqsWzeg/IEFKSQm9IDcaWVE1VRZxbQQ8UiY9R4DB1gF1EK6tW2NR267+BWNWtTXqEMnl1zO25yLz1a/Y9Od0ZR/B+BdNdWElmIIiCnLA9nNf153fqUxvI21riMqQl+nz4tX+7l9gqU0shXXySjsKFzv2 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)(36860700013)(1800799024)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Oct 2024 12:22:37.5193 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4e894b71-36ed-455d-4fd6-08dce46f3bd3 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: BN2PEPF000055DC.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV2PR12MB5847 Even though in most cases device nodes are not present directly under the root node, it's a perfectly valid configuration (e.g. Qemu virt machine dtb). At the moment, we don't handle this scenario which leads to unconditional addition of extra leading '/' in the node full path. This makes the attempt to add such device overlay to fail. Signed-off-by: Michal Orzel Reviewed-by: Stefano Stabellini --- Changes in v2: - Use ?: instead of implicit bool->int conversion --- xen/common/dt-overlay.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/xen/common/dt-overlay.c b/xen/common/dt-overlay.c index d18bd12bd38d..bfa153250922 100644 --- a/xen/common/dt-overlay.c +++ b/xen/common/dt-overlay.c @@ -325,6 +325,7 @@ static int overlay_get_nodes_info(const void *fdto, char **nodes_full_path) int node_name_len; unsigned int target_path_len = strlen(target_path); unsigned int node_full_name_len; + unsigned int extra_len; node_name = fdt_get_name(fdto, subnode, &node_name_len); @@ -332,10 +333,13 @@ static int overlay_get_nodes_info(const void *fdto, char **nodes_full_path) return node_name_len; /* - * Magic number 2 is for adding '/' and '\0'. This is done to keep - * the node_full_path in the correct full node name format. + * Extra length is for adding '/' and '\0' unless the target path is + * root in which case we don't add the '/' at the beginning. This is + * done to keep the node_full_path in the correct full node name + * format. */ - node_full_name_len = target_path_len + node_name_len + 2; + extra_len = (target_path_len > 1) ? 2 : 1; + node_full_name_len = target_path_len + node_name_len + extra_len; nodes_full_path[node_num] = xmalloc_bytes(node_full_name_len); @@ -344,9 +348,11 @@ static int overlay_get_nodes_info(const void *fdto, char **nodes_full_path) memcpy(nodes_full_path[node_num], target_path, target_path_len); - nodes_full_path[node_num][target_path_len] = '/'; + /* Target is not root - add separator */ + if ( target_path_len > 1 ) + nodes_full_path[node_num][target_path_len++] = '/'; - memcpy(nodes_full_path[node_num] + target_path_len + 1, + memcpy(nodes_full_path[node_num] + target_path_len, node_name, node_name_len); nodes_full_path[node_num][node_full_name_len - 1] = '\0'; From patchwork Fri Oct 4 12:22:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Orzel X-Patchwork-Id: 13822227 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 960D5CFA779 for ; Fri, 4 Oct 2024 12:23:03 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.810345.1223077 (Exim 4.92) (envelope-from ) id 1swhKa-0007RK-7u; Fri, 04 Oct 2024 12:22:48 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 810345.1223077; Fri, 04 Oct 2024 12:22:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1swhKa-0007R5-4O; Fri, 04 Oct 2024 12:22:48 +0000 Received: by outflank-mailman (input) for mailman id 810345; Fri, 04 Oct 2024 12:22:46 +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 1swhKX-0005ue-Va for xen-devel@lists.xenproject.org; Fri, 04 Oct 2024 12:22:45 +0000 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on20617.outbound.protection.outlook.com [2a01:111:f403:2416::617]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 5b6f64b9-824b-11ef-a0bb-8be0dac302b0; Fri, 04 Oct 2024 14:22:45 +0200 (CEST) Received: from BY5PR13CA0004.namprd13.prod.outlook.com (2603:10b6:a03:180::17) by MN0PR12MB5713.namprd12.prod.outlook.com (2603:10b6:208:370::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8026.18; Fri, 4 Oct 2024 12:22:38 +0000 Received: from SJ5PEPF000001F2.namprd05.prod.outlook.com (2603:10b6:a03:180:cafe::e5) by BY5PR13CA0004.outlook.office365.com (2603:10b6:a03:180::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8048.10 via Frontend Transport; Fri, 4 Oct 2024 12:22:38 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by SJ5PEPF000001F2.mail.protection.outlook.com (10.167.242.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8026.11 via Frontend Transport; Fri, 4 Oct 2024 12:22:37 +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; Fri, 4 Oct 2024 07:22:36 -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; Fri, 4 Oct 2024 07:22:36 -0500 Received: from XIR-MICHALO-L1.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; Fri, 4 Oct 2024 07:22:35 -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: 5b6f64b9-824b-11ef-a0bb-8be0dac302b0 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=oLEncfoH8xaSWzO7h/E+0tPRLcqlcBRxUIXkZZgUF2RgePyqZVvBPBbT4UfS221bZAT6IjiQTMIqaN9sEZiGp+f+SL8zv+8jA2zddWTNomBQcpzI3+EgUsoyvOWJqtM/8k592zy4qwRwdB7FfHDjtVjp2Qy3ENyn2gkivPHHZVeQogs0z2vc25sMG13GGXKOjzmlpfzNrdUgMOetzkeJ7n2ehZpjY1SqGEeSC/PVMA+wm7UZTjrj0KI65W4MMorEgNRqnJzoxJqm7vfYQaCgyyC2/E6U9DUlS18LT1DT4c309xtMm0ChSlmq9OReQWx25mUCSCQSzzHXDD4KDZ2jxA== 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=3coa7/Q00XcmaWZs7n/oiZYQzKwgScWsvnM72TeQSnY=; b=PgABqA59YjClm1v6vFW9bg/zDJd8e+htlibpbR3WLNq24vnC5ok5wOPuUU7crQ/Zx1ZP6Fk6SRHQ/CIGFI687giyfIcD2lJBIFlHo0CuQ8dNHTtrMKsZ1Eo9AGH0GtmtjIQyAnqELMGbaCFk2e2kclip0mans65qrXQQI7I+rYGMQwP8NuUttK1YNZNcUGn4dVUPudCnpT5brM2ywV2ZbkC3TOoxMxisv8gdefVEuWNFDvGheGQdP1hJGXzIU/6f40U9LPnQF8j8dTF/Y0W8VBz9k4BGgGdJx39KPESByrqrLZMZOLkxI1oKk2STT2lHbI46krZ+DjofOXugjAKHzA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.xenproject.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=3coa7/Q00XcmaWZs7n/oiZYQzKwgScWsvnM72TeQSnY=; b=SNdYynGWb6wXIFzz+CRjLqTjrLUJKbBUyRJqyv0LHsCc6wS4Zt9DZpCWQgZPbJyoEMrvisaXzt1JdV3mIYR6p//2CbC+BS1M0jUb41iLbGApV8b9I4VktGKWP8XfJTEx/4gA2oNZU9qCjv4YWgbUoRLSDxmpqHhvO/4qkpqFOxg= 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: Michal Orzel To: CC: Michal Orzel , Stefano Stabellini , Julien Grall , Bertrand Marquis Subject: [PATCH v2 5/6] dt-overlay: Ignore nodes that do not have __overlay__ as their subnode Date: Fri, 4 Oct 2024 14:22:19 +0200 Message-ID: <20241004122220.234817-6-michal.orzel@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20241004122220.234817-1-michal.orzel@amd.com> References: <20241004122220.234817-1-michal.orzel@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ5PEPF000001F2:EE_|MN0PR12MB5713:EE_ X-MS-Office365-Filtering-Correlation-Id: d50d2992-d97a-4037-6573-08dce46f3ba9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|1800799024|36860700013|376014; X-Microsoft-Antispam-Message-Info: RqcX9FUAhYGsmfVzXBm8fKtaPZngTcBEO3PnXqHwebzbC8TLC99FH1l4Eja3xuMBdgHL2/mAW/aaL6xY50WAuwaFJ8dU7fcBWC5mIeMIuRUWVAzL/PSB2/iT9FAxuM3quRXTpplL3XsP92SpaykZWaedo42o/Ris0cBoHlVSRzqlK4/zKwfV8i7ZaR3J7ZwvCRkFEzU5gwbeOp0dg7mHV86qVEiYF+A4xuMHBsx0iYhKd6LftA2NwkY0kNVRMkuqtLNV/KURKMbudxi9TXOCpv1G92uhYKQ6yPQLZqVF5g8oD9qAS6bzakJ3rRcb4Rwj51+wxd+V4T8Zt0aKzBqoxAF4iY2Djj7qj6KLQnQgf1yO1b/lDdu3PVeT0QVopxfSHclo4fPUPy15bcQTogLHjxIkKCIczZshWxOGy5RQatGQUJQJTC6bwJH+MaabAkpKZZ5alxHFU4+OvbrXHQD8mnC4w4H/+Hgo9JcmdGmw5V+kU013lE/y5g9QjN3wI4a5MJfQv7WvNpnLHPbo07JyRcUl9vsACE8/INo3VNIO3qNF8OakySEiZOcFMn/fVULQEqzh5fDRAjzi19BZ3GbsYwxrxjeYzex6h88j6cDQT3++ChGj2UPqqEvAlzeQWCSP6ytwfHE4NPVlwPN3vIg97aacCQH6E5AMNPEwIO/YzPFPKWQTcVbFmH6716iWaP2jVQO3Bz5hNQJmrvju7ut4c+HigLk2u6V06xvdmNR91mJ2HPb9rYm8s6gu5mnRECC9oNmZQ2ptF0zAyvbCSV3pk79kdNYxsaWBPr/9X7iU3iFTn22NhoZBydFZJ2a0lU7iXxdrjz5Zl8ir8ax5dte0bG+9DCiXYsAcGY4MwnB5e9v6Pj/bxKd25NAVXPHuiXRs+q27cUILLb+DmlI4mx9WEFdXyNxkXo+Nvr6YrWTdRVt81NXV4CvqGu5yyyuEp0TWDNpWxoZfLsseyqusWmkouwKgorQUuft5WA2Tbm65UbZxwBYI833cNbCDOdLGlrAH30q1Nk1vrki1ieqUckfVup4mnwYtL9frKRVtQD2tNiaH0JTI+hN/dBi+5ZG/4JD5wb1iiSs9LTEfCUNGhtSF8j2KuHcbqd8ilG6MAYW17+MKfJKy2nBkJm4QCaWkifzLovMQBHpGPtKC1x43qjiiBnO+TPX9OhnbkxNJLM/stSALTZ552Xv4BiSYC9i2ROV3ws6a1TApNjEn+nNsEbs90oGoNSU9wEiRqEyscK95pHm5d1KmGRUZ5fi5LkH8OJ4V8pEGRnGxYulHAxICsVbCmmrSIFq4VAeUonPGW4VrMoihe/pZCgg4bYuRV/1tqzjf6SPbe74lu4ytBHPj1GaLiqLX5sjy0vQfBX1pbXCanP41xoRXo1KcopSbK9unu+Q2 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)(36860700013)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Oct 2024 12:22:37.1821 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d50d2992-d97a-4037-6573-08dce46f3ba9 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: SJ5PEPF000001F2.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN0PR12MB5713 Assumption stated in the comments as if fdt_for_each_subnode() checks for parent < 0 is utterly wrong. If parent is < 0, node offset is set to 0 (i.e. the very first node in the tree) and the loop's body is executed. This incorrect assumption causes overlay_node_count() to also count nodes that do not have __overlay__ as their subnode. The same story goes for overlay_get_nodes_info(), where we end up requiring each node directly under root node to have "target-path" set. DTBOs can specify other nodes including special ones like __symbols__, __fixups__ that can be left to reduce the number of steps a user needs to do to when it comes to invalid phandles. Fix it by adding checks if overlay < 0 after respective calls to fdt_subnode_offset(). Signed-off-by: Michal Orzel Reviewed-by: Stefano Stabellini --- Changes in v2: - New patch --- xen/common/dt-overlay.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/xen/common/dt-overlay.c b/xen/common/dt-overlay.c index bfa153250922..4d75b5b36a99 100644 --- a/xen/common/dt-overlay.c +++ b/xen/common/dt-overlay.c @@ -274,11 +274,9 @@ static unsigned int overlay_node_count(const void *overlay_fdt) int overlay; overlay = fdt_subnode_offset(overlay_fdt, fragment, "__overlay__"); + if ( overlay < 0 ) + continue; - /* - * overlay value can be < 0. But fdt_for_each_subnode() loop checks for - * overlay >= 0. So, no need for a overlay>=0 check here. - */ fdt_for_each_subnode(subnode, overlay_fdt, overlay) { num_overlay_nodes++; @@ -305,6 +303,10 @@ static int overlay_get_nodes_info(const void *fdto, char **nodes_full_path) int subnode; const char *target_path; + overlay = fdt_subnode_offset(fdto, fragment, "__overlay__"); + if ( overlay < 0 ) + continue; + target = fdt_overlay_target_offset(device_tree_flattened, fdto, fragment, &target_path); if ( target < 0 ) @@ -313,12 +315,6 @@ static int overlay_get_nodes_info(const void *fdto, char **nodes_full_path) if ( target_path == NULL ) return -EINVAL; - overlay = fdt_subnode_offset(fdto, fragment, "__overlay__"); - - /* - * overlay value can be < 0. But fdt_for_each_subnode() loop checks for - * overlay >= 0. So, no need for a overlay>=0 check here. - */ fdt_for_each_subnode(subnode, fdto, overlay) { const char *node_name = NULL; From patchwork Fri Oct 4 12:22:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Orzel X-Patchwork-Id: 13822222 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 24D5ECFA773 for ; Fri, 4 Oct 2024 12:23:02 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.810344.1223067 (Exim 4.92) (envelope-from ) id 1swhKY-0007A8-PA; Fri, 04 Oct 2024 12:22:46 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 810344.1223067; Fri, 04 Oct 2024 12:22:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1swhKY-00079z-Kp; Fri, 04 Oct 2024 12:22:46 +0000 Received: by outflank-mailman (input) for mailman id 810344; Fri, 04 Oct 2024 12:22:44 +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 1swhKW-0005ue-L0 for xen-devel@lists.xenproject.org; Fri, 04 Oct 2024 12:22:44 +0000 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2062c.outbound.protection.outlook.com [2a01:111:f403:200a::62c]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 5aa61c77-824b-11ef-a0bb-8be0dac302b0; Fri, 04 Oct 2024 14:22:44 +0200 (CEST) Received: from BL0PR1501CA0021.namprd15.prod.outlook.com (2603:10b6:207:17::34) by PH7PR12MB5927.namprd12.prod.outlook.com (2603:10b6:510:1da::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8026.18; Fri, 4 Oct 2024 12:22:38 +0000 Received: from BN2PEPF000055DC.namprd21.prod.outlook.com (2603:10b6:207:17:cafe::82) by BL0PR1501CA0021.outlook.office365.com (2603:10b6:207:17::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7962.26 via Frontend Transport; Fri, 4 Oct 2024 12:22:38 +0000 Received: from SATLEXMB03.amd.com (165.204.84.17) by BN2PEPF000055DC.mail.protection.outlook.com (10.167.245.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8048.2 via Frontend Transport; Fri, 4 Oct 2024 12:22:38 +0000 Received: from SATLEXMB06.amd.com (10.181.40.147) 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; Fri, 4 Oct 2024 07:22:37 -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; Fri, 4 Oct 2024 07:22:37 -0500 Received: from XIR-MICHALO-L1.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; Fri, 4 Oct 2024 07:22:36 -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: 5aa61c77-824b-11ef-a0bb-8be0dac302b0 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=f0M400ZoatVJr1uWl2ATq6naRGx07ZQylbZ+Teoj6YmSvSHop18H62FmoYemdLbGGC1XZ+XB27WVG4aVhzL02cTLMHfo2OMjClGn3o8/JnUno3wwHF1MeDtwRqYmnBnCKrRPFKDBKFhmN7XwIy6SXBNiuPt1mi4a3+msqKl5ZCYSVb8BLiAlR9QaeBvT4yd0WIjZIaVc7kWO17RD/uBQ/s/I/otjWuWOWs0Lsx6wcvKh+OFuif3DrzNp97jh/dIa946GivQHW1TwTGezeISYem2hzgcP1rtMDPAONLxG2jPvjbXUmzaz5MBvAU9EbbVyJOrN3T8M2sfyBlgIHBnl9Q== 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=f9lwpHIT0J8zNVYydoOKN/VssSl3wTjbztKqqkAcOOE=; b=OjteekwCtER/kPrGk1xoBx98GpZ49KbTUj2DZRJQgK41jo+5R5tio8tJerFouT9kYIYSkH59zIHCUXrTEgjdGrpzXjH+rcFRO+kPLnol3D6o3LclBgutYC6mzLfFo8Q99E7wvqdhwlI5ZRE49eeOIv4IOBuCWCwSZkUVS9vw2PsmZt9nEsU8YDFrQdvAJYGMcUcx+FWwO+Unxvk3Pks4GJQPssI8t176gwrELxiqlrAq3yfY5EUdDtD5zrottXQTyLTnUe7SGBu5gjD0cKo37yCZswyOicAlTNQHEpPZV2xARoFCR8tT2eR3Y7KZHb056n3uRxyitZT3u7QVA6qrRA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.xenproject.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=f9lwpHIT0J8zNVYydoOKN/VssSl3wTjbztKqqkAcOOE=; b=kooUTO8lsYnNZwnAe2V5AiWsDwCm8nDaNzCziLGROWqtxCe7/JuUCBNXZ9lsNh0gmTZATrccakWnNSa8oLplRZHi9XtmciHmimVWG+XF2+VvGiKCllk8hOcoo4t1bkLuMYF7UN9n7QHd58RkD9sW3ImBh857mhpOyOw5EKzKdjw= 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: Michal Orzel To: CC: Michal Orzel , Stefano Stabellini , Julien Grall , Bertrand Marquis Subject: [PATCH v2 6/6] dt-overlay: Print overlay I/O memory ranges in hex Date: Fri, 4 Oct 2024 14:22:20 +0200 Message-ID: <20241004122220.234817-7-michal.orzel@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20241004122220.234817-1-michal.orzel@amd.com> References: <20241004122220.234817-1-michal.orzel@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN2PEPF000055DC:EE_|PH7PR12MB5927:EE_ X-MS-Office365-Filtering-Correlation-Id: 802d7148-312f-4dac-e7fc-08dce46f3c4c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|82310400026|376014|36860700013; X-Microsoft-Antispam-Message-Info: HI9gxbL5j1IxdOqTK43drAKhKzN4z2Zvj0yFE/kOQQjBGvVdA0t6PSVz49a66CQQe8e916ZF1DaFiyZHJYqeVK72EdOubXFMOnoo0tqDhzgd7r/apsHHZx/CJns9g1UZM0kFJJ5lGmFZLYkLhI47MiZc2pVyqyJjQ56cW1DVh+jSDzXkAcDD5E301IjZAJIpW+YtaCiMoBniuMKXW9e4grBliYfDDrKuozlASkfhYFeJJwnoF3eMLLZ48DLecJHCA1Nalqfun5w0W3vnFjtIrtjBQyUHXHwZ4HnTaYDAna2g9SpvIHTrkod9Z2KXbd+Z7drQiPMaWEkWU9k9BUNHq1xrXNkzvSy32VjEmoTs7e4p3gZnVUcyGb33MUrM/EuoNb6Pj5iC9FulwK1HOTo26JSniUOQbVZGL2/ze9nvm6+aKqEVPe+b6XgVy75xnsr9ISWUtmfw4q93JhGvLYlSSPQSMnyCrxXULHxs2lf/7EBW1CCTfZyqAAuTPWi8ggcE8sZ2z8vRcXDZJQvtWuGJTZERV08yRmTHJs+iE/H9OhN04PKr9vu1J7IlGgCsDgvHBGLPaMyncetRrrktkC8hNeHaVg9dEt7pabNmKbrs1vnQTMaigDm3WxBgkrpOob+6tQSlFQje3WlM/AYEYXsQpSL8bkPkBlXZDIyJ2F0us3ONT33fXumbeNdpS44wfH171+LHzQuwyRcs8uLS7d9LYLgk7LmxMiGyRAkFCqqebIwcX14ZUmhnyeVz9Bt0iBGO+S+aoobAUA53hIgeJmA7I507bhER2N+kpi9Knot/+/eYAD7od7B+eyCIlga4wtSXC8OEa0GsYymb9VJTDUgKBARArJmVkwDthEUXPBQvT10bhONuUStiYh3Sz49b3q3r6jGkVBanB4MrFb2Qc7EWmzQKQWN61bifIvOp0xP/yHyzWOlz8/d3gW60Vux+RXQSYCHZmqRzejCG6DjEq0mAKo4DJzKHgtEWX5NyZWDdw9S2e2qMMA8fOugYBCR7US1iGHdqmQzzLaCY/lwQjf40NBiN+IlPWPfxx8QXI6VDpnSfoz53uV/Zax/GWMLKEWtjzX7VCTbThggyIobwA/FH0EUBqMxOkoBgkAaylyWVc7koqklFFr1hcQLdESW+h8s0pGA31tzN43qUth4/oXLgGTwXlaftuMQTlCRSB7D/yj3NoJk872wIDsRmxWzblFQiA1Vws9ab681ujz8lGVxdILEPCXsah8UcweSNhl9e/ecK2R3cGtUYsVGNWThehM1rH+Fqm5NKTitt30BO5+3pr/HjchggoICkbeLUGwPLWlBqoGh/4LCcRD5Lcw7yiIzLX9y014rCJN9j9c2OHgD2wIXEpdnUWDO/acnaTXY1cAOzYaj+MCzG4+qwGh2FAMtK 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)(1800799024)(82310400026)(376014)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Oct 2024 12:22:38.3162 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 802d7148-312f-4dac-e7fc-08dce46f3c4c 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: BN2PEPF000055DC.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB5927 Printing I/O memory rangeset ranges in decimal is not very helpful when debugging, so switch to hex by adding RANGESETF_prettyprint_hex flag for iomem_ranges rangeset. Signed-off-by: Michal Orzel Acked-by: Stefano Stabellini --- Changes in v2: - New patch --- xen/common/dt-overlay.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/common/dt-overlay.c b/xen/common/dt-overlay.c index 4d75b5b36a99..5ce00514ef14 100644 --- a/xen/common/dt-overlay.c +++ b/xen/common/dt-overlay.c @@ -869,7 +869,8 @@ static long handle_attach_overlay_nodes(struct domain *d, goto out; } - entry->iomem_ranges = rangeset_new(d, "Overlay: I/O Memory", 0); + entry->iomem_ranges = rangeset_new(d, "Overlay: I/O Memory", + RANGESETF_prettyprint_hex); if (entry->iomem_ranges == NULL) { rc = -ENOMEM;