From nobody Thu May 2 23:02:23 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass(p=quarantine dis=none) header.from=amd.com ARC-Seal: i=2; a=rsa-sha256; t=1679579855; cv=pass; d=zohomail.com; s=zohoarc; b=eiiwT8mS77g2mS7dogYlxf8mjNoyYUWHZ9f/RdtDd+nydb2PR5xqrxQ3lGUIor4HxCKlUt1/qm/7mEllPrgnGU8+hZXvjVGtzWr1H4eoA28TgMuwtBi26DZPODWGMj5SpCdmqReiSuxUU39OQAnLVjvDPgelsay6X9X6bjMoEHg= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1679579855; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=7VBmivoISHzCX6WblJCHDCa7l2kjScABzT2Aj/qIsOE=; b=jy9sxvuUNUmJZTFKqjp6+GptzyLNEeOEIKjgyJv+eNoG6xOxBnvUaT/9GM4TwvhGyPY3Ht15HOKt0qUqZHbyNjpXD0aFYf744/6sdzV20BqbeX5GL68798QwQOvhKdM92zH/n/P9rsP4OXMf2iFNWiL5s40irxnjVHKh97TcLXI= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1679579855604884.4129375962249; Thu, 23 Mar 2023 06:57:35 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.513887.795582 (Exim 4.92) (envelope-from ) id 1pfLRD-0000GO-By; Thu, 23 Mar 2023 13:57:07 +0000 Received: by outflank-mailman (output) from mailman id 513887.795582; Thu, 23 Mar 2023 13:57:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pfLRD-0000GD-6b; Thu, 23 Mar 2023 13:57:07 +0000 Received: by outflank-mailman (input) for mailman id 513887; Thu, 23 Mar 2023 13:57:06 +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 1pfLRC-0000G6-9h for xen-devel@lists.xenproject.org; Thu, 23 Mar 2023 13:57:06 +0000 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on20608.outbound.protection.outlook.com [2a01:111:f400:fe5a::608]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 964f1f0b-c982-11ed-85db-49a42c6b2330; Thu, 23 Mar 2023 14:57:04 +0100 (CET) Received: from BN8PR15CA0046.namprd15.prod.outlook.com (2603:10b6:408:80::23) by CH0PR12MB5044.namprd12.prod.outlook.com (2603:10b6:610:e3::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.38; Thu, 23 Mar 2023 13:57:00 +0000 Received: from BL02EPF0000EE3D.namprd05.prod.outlook.com (2603:10b6:408:80:cafe::6f) by BN8PR15CA0046.outlook.office365.com (2603:10b6:408:80::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.38 via Frontend Transport; Thu, 23 Mar 2023 13:56:59 +0000 Received: from SATLEXMB03.amd.com (165.204.84.17) by BL02EPF0000EE3D.mail.protection.outlook.com (10.167.241.134) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6178.30 via Frontend Transport; Thu, 23 Mar 2023 13:56:59 +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.2375.34; Thu, 23 Mar 2023 08:56:59 -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.2375.34; Thu, 23 Mar 2023 08:56:44 -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.2375.34 via Frontend Transport; Thu, 23 Mar 2023 08:56:43 -0500 X-Outflank-Mailman: Message body and most headers restored to incoming version 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: 964f1f0b-c982-11ed-85db-49a42c6b2330 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=G8jcm2gwTREW6O8Y4u8x2sP6CLbUMYRWFr2q5z6RH1MGawSdRBkeceCZ+uCzvslcW5f2VIbkAG3L2sb/JRfdP5NXFDg09/jpDcNER4+BYQJNUE4OzsaMBOon9+VvO2CcW04CdLW0eWtuC3xmPLXlcncsnKNe5pHOExOLRqYFsEBkvTSMc653SCaCuvLhfL4MSArjTIfgm86mXshBWtNG7xVd2zpcY/5E9WEM1jPhJOYcFppZQmQbd5V2s9ht0EWEUXy6UBeUiEaMHsfw5dV1VXzojr+z9ml7rFyXVZLG3w+vJfF+pxBinwzXC6YCUq198+cr41m3Wx3wovM7rz1mXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=7VBmivoISHzCX6WblJCHDCa7l2kjScABzT2Aj/qIsOE=; b=FdhqERuDpGnaVpS6y+uf72O+FblI3RXjWfinkATP0c+csONdK6I0Y+UQW0i+33j41Mqt0UXrE9JVnZHBmzTmqnfpAA51YavuJuxj8s6txC1C5uox8drb1owglyBuLdqDoVszkrG9fUr3OskO58Q87nbzRfGJvk3nV97WsjnDr1WHmyKCYQXsvVf0r1gN4tGMzvjKm8gauzIsq2NEZPz46/dfpejiWv8k8A/MWy/DMK+2kzLR9pikyKyIpowdsQ7Uc6V2z2gKrPb+RJ4ejA3rFHGLORpyf81Fnr4a9a4jZlVlx5tIFR+JayUabwxwvMZVBuOOfjBTAT3IiMNeDocrKw== 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 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=7VBmivoISHzCX6WblJCHDCa7l2kjScABzT2Aj/qIsOE=; b=U+cc/CCZobZj/gOpZnx0jwerw+tUQyAwP7ORMvPp3hEydlnfomPPSrf3CiEC2rvbVZVWq/IQTisRIlWnqRxDe4LHpmWIPRFxRZ2g728pDJM9VnT+T6ItOapoc+5KGCSxRD9u/KBWrg9n1iXYBFASdVbszKu+pZrQbOMfSqLc2+Y= 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 (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; 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 , Volodymyr Babchuk , Luca Fancellu , Julien Grall Subject: [PATCH v2 1/2] xen/arm: domain_build: Check return code of domain_vpl011_init Date: Thu, 23 Mar 2023 14:56:35 +0100 Message-ID: <20230323135636.25318-2-michal.orzel@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230323135636.25318-1-michal.orzel@amd.com> References: <20230323135636.25318-1-michal.orzel@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL02EPF0000EE3D:EE_|CH0PR12MB5044:EE_ X-MS-Office365-Filtering-Correlation-Id: 9d2c88b3-245f-4bdd-a913-08db2ba678e3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 368L1CWlS/rdamMmZxOy4UV2R6Vukcc89ZnLTROKySNkgYd5cud91+MJiQ9tZwfFhMcDZL3lg180uCFhUGXsemJIyroTcd5tAc48uUVDtfElKvWq8k2bYQIpvdcTwW/Q4q3HYwUoHe1GsOt5t8HeEI0xTvqbcNyxwVKypJaqZ4X30peXOh21d1E4A/fIl/aWOIWJCkaDVqE01kYwS6Qdl4SGBTOtiZjrzvNf/HDFO6nxMstGc7Ma1WtpVxJraxmYtN/pRHTwuOK9X91XqnCwii0yqgTR7U3sRwupzJlttXoiDdv6ix9FTtD83WpVoSUK9cnHOY+WyvK4xi/9b+viWiptV0/Xhoypfntje8pHT59PRGhQN+lg1GnI1W/XH2/3Vq5rCCHGcAxMr+8CW4KygWHRSmYJ4vFCSBYNTAOq5wV/3zlr+Oj6gUFKVzeNvWzN6Z5fMYs+ZIUmdEq8ryp+zBIlh9OTEvD62A4dOIPogfApQmAAFmgQfM+Tre7oi+SpN5N8yeoKe6SKePsCI9tmPP7v42n4SbjiDv4+SVLFe1IJL81PDG336gVTSMqlYzkVjguirL9T/frNr0GVSEqKOyuX3vwVA/uWNBzVy1hkInNVLpvv2J7+RbFHLfMPNeomHtPbYafcLlYst25fIDvuTog5keJYC6dkyHJ1X/lwxvOORk5U1DKE1lE3g9XprkFXOUGqVjKqyYXyFm5fEXBsOqR9b30JdI1tfHHTJUGpluw= 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:(13230025)(4636009)(376002)(346002)(396003)(39860400002)(136003)(451199018)(46966006)(40470700004)(36840700001)(356005)(40480700001)(2906002)(40460700003)(83380400001)(478600001)(2616005)(336012)(186003)(82310400005)(86362001)(36756003)(316002)(36860700001)(54906003)(70586007)(8676002)(4326008)(6916009)(70206006)(8936002)(4744005)(426003)(47076005)(6666004)(1076003)(26005)(81166007)(5660300002)(44832011)(41300700001)(82740400003)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Mar 2023 13:56:59.5340 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9d2c88b3-245f-4bdd-a913-08db2ba678e3 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: BL02EPF0000EE3D.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR12MB5044 X-ZohoMail-DKIM: pass (identity @amd.com) X-ZM-MESSAGEID: 1679579856564100003 Content-Type: text/plain; charset="utf-8" We are assigning return code of domain_vpl011_init() to a variable without checking it for an error. Fix it. Fixes: 3580c8b2dfc3 ("xen/arm: if direct-map domain use native UART address= and IRQ number for vPL011") Signed-off-by: Michal Orzel Reviewed-by: Luca Fancellu Acked-by: Julien Grall --- Changes in v2: - none --- xen/arch/arm/domain_build.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 9707eb7b1bb1..3195c5b6d6ac 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -3826,7 +3826,11 @@ static int __init construct_domU(struct domain *d, * shall be done first. */ if ( kinfo.vpl011 ) + { rc =3D domain_vpl011_init(d, NULL); + if ( rc < 0 ) + return rc; + } =20 rc =3D prepare_dtb_domU(d, &kinfo); if ( rc < 0 ) --=20 2.25.1 From nobody Thu May 2 23:02:23 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass(p=quarantine dis=none) header.from=amd.com ARC-Seal: i=2; a=rsa-sha256; t=1679579853; cv=pass; d=zohomail.com; s=zohoarc; b=mfIPrzQQspXmwwsM99ZBToA0ggQcGbT+PQkoyN8bR4asK5EzXoZ8wr7+HvMg94i2sYrFHubjIRm2jisNPYPdAR9kxqRmZRbJ/80A/tJgQlfJ4jmxC6+JKQyV0styOf+CsG+e8wSOa9+lIl3uF3pO/J9V8aMSsU8VFOzjobeJflc= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1679579853; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ToounznfMNd5yVA96KMkq0Sokt6TSD7jFIpRIWRezZI=; b=CJ4U+FWvV44fpSUH7fDWUQcuSsIva08qz1I5FY8ksMU5lPP5q53eFLWUgdMdT7Y6D4Q3IcB+08+qiFv8ZR926GUjRbugc0ynQIOnTx9StlxC7oDlFbAxVoBjQW18sA3RYDHSYI4fumuILFWFhDn4hozVRmnT12htaUztK28sDV4= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1679579853495929.5774095315074; Thu, 23 Mar 2023 06:57:33 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.513888.795590 (Exim 4.92) (envelope-from ) id 1pfLRE-0000Vg-HD; Thu, 23 Mar 2023 13:57:08 +0000 Received: by outflank-mailman (output) from mailman id 513888.795590; Thu, 23 Mar 2023 13:57:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pfLRE-0000VZ-EV; Thu, 23 Mar 2023 13:57:08 +0000 Received: by outflank-mailman (input) for mailman id 513888; Thu, 23 Mar 2023 13:57:07 +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 1pfLRD-0000GC-5U for xen-devel@lists.xenproject.org; Thu, 23 Mar 2023 13:57:07 +0000 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on20619.outbound.protection.outlook.com [2a01:111:f400:7e89::619]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 938dcb77-c982-11ed-b464-930f4c7d94ae; Thu, 23 Mar 2023 14:56:59 +0100 (CET) Received: from BN8PR15CA0072.namprd15.prod.outlook.com (2603:10b6:408:80::49) by PH0PR12MB8049.namprd12.prod.outlook.com (2603:10b6:510:28f::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.37; Thu, 23 Mar 2023 13:57:00 +0000 Received: from BL02EPF0000EE3D.namprd05.prod.outlook.com (2603:10b6:408:80:cafe::db) by BN8PR15CA0072.outlook.office365.com (2603:10b6:408:80::49) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.38 via Frontend Transport; Thu, 23 Mar 2023 13:57:00 +0000 Received: from SATLEXMB03.amd.com (165.204.84.17) by BL02EPF0000EE3D.mail.protection.outlook.com (10.167.241.134) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6178.30 via Frontend Transport; Thu, 23 Mar 2023 13:57:00 +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.2375.34; Thu, 23 Mar 2023 08:56:59 -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.2375.34; Thu, 23 Mar 2023 08:56:46 -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.2375.34 via Frontend Transport; Thu, 23 Mar 2023 08:56:45 -0500 X-Outflank-Mailman: Message body and most headers restored to incoming version 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: 938dcb77-c982-11ed-b464-930f4c7d94ae ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hXpOGdMrazuz1ETuqXe+hhMDpaK4iKvmBp1fglZgwV6ErdVxEr7NA2LXHbH2yY/xLAQUjqNTv4IWNMetHO7ktY1b6MHZjEMuUtIzONetqidmmuc0zf5w0q0V6xGh3GW2YJ7qvOUlaDfcqWzwBeVWiqvuC9OA4DCq/BtQj5+YrBqxNc/SKb+DIGadgrDvdOOgL1sROofBkpsI/JprA1CFU0nkiVkCaN40iZsiXvosH4ykMsqTDhW4X+vldC5/U2Yq1wW8iX0osTOZ8yF6BWk1Dor2iU+zeshEYmPC3NyYHihNd+lfixET7Wz4Iuv3i0To/zgG+LFV3Rh6PDxvjQbzGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ToounznfMNd5yVA96KMkq0Sokt6TSD7jFIpRIWRezZI=; b=OT9509P6Q4cTgZ9XqiKm8R8mt7vFyeBB/fq4sdqXaHvMJBqr2eK9OM8FQBBygqPy51x/E71Z+9fQbx5lL98YPv89uGpm77aFKt7Jo3U+SbsdjdbSK4n+JA17W4d2I9U+DpHYnJhBNAnuKRnjjY3IvMKzEkURoju0bAYj+rfhl+9p1tVRSjR2GwsCfAVr71oFQ1kOcsJTdh5kwcYYRZDio95Y/R/XiFHnQRbhA+ozb8OAuMhK53opVnYcPY18pvNOW2/TTzLbxO5ogi0xSOCTq/ShjKoH/nFX8QQkYMssirou8tpEdzW/9FRwTBLSsyoBqFIickz3rPI66wGlXd95Ww== 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 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=ToounznfMNd5yVA96KMkq0Sokt6TSD7jFIpRIWRezZI=; b=CBpRrSIb16+HdJLRKBSCkvr0tHPm0LK73fhtrb+ujLWQtXOkbGuuebACmXbCULT646GIt23Gp2Z2rWvdSYIpmco03N3fFLlKCP2toUWGOYVnzwrNCwxezSuKuk/oYqlikSzmxbLkJD7oyEjBSZrsAoJa1kBH2kJI4ZvyvwIOi14= 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 (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; 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 , Volodymyr Babchuk Subject: [PATCH v2 2/2] xen/arm: vpl011: Fix domain_vpl011_init error path Date: Thu, 23 Mar 2023 14:56:36 +0100 Message-ID: <20230323135636.25318-3-michal.orzel@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230323135636.25318-1-michal.orzel@amd.com> References: <20230323135636.25318-1-michal.orzel@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL02EPF0000EE3D:EE_|PH0PR12MB8049:EE_ X-MS-Office365-Filtering-Correlation-Id: 8452632d-e581-49d8-55d7-08db2ba67951 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ZYbE9kVFxm6s9horrTYr+uMuGVJSt4ZOoHtpkN5gckCqe8VkH48wdqOOj99qByJUcz55RLnkRta1WaqUL6A7gQj6ci8hSCQHJqgTqj3CdJSbTa9Q7T3zuFHDM26NNCnNdyEKmfG9Co67Wbw9Hsq7JkgsJDipsmRfdsDkG1c44Pl9e39EvSfxw7VJeomyogLGxmmU/+ajUMs8McQ7Z8KFp9v2bBd1us3Hh5/jL79IHEla57DN3ap5qyKTU15Rb2/VE570PMrLPB1fc2fCD9ZyDyKBEmEC8TqtJmrm5EK+OSf6sZtrsQ9VVL6RAOAcc7IE1mtvpGx20MWETyrmMHe2PtQDXLNG4vWW1qcyZDoBnOuptbpwedppGI/NnuWGYJmlVHOvZYnrWuAi8DOrShhwcp63t2ZBXMDheQWbN6cOuyBwSvtm8A0dzrqHJJoU1ZaWFww6655mCCXKHTeY/eJtMPqBIMvGt6vH2xOBmAWv75bDQ9GgR4pPgFY0fA31wARgDJYnLX69CjLMKQu3YNvMKYXNtRR5xIZs7TM2vpnTi/q7cdym0zCdEK8UIytmJO92joAYbfWlCM7RahR6yphqSVM2WGCzY4Pi1tZiMxbP6nqfG8pKWWq+INiHGhvmVpYx1ZwXQva6vK2T6jZobnvfTOCMPBn+7qFIgu9eFy+4oCEETYGpprdv1gnM9ullXcEuAtyRPDSE7ptwdiy/1/uMf9N7OZ7RrMjATAvPMBtPaic= 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:(13230025)(4636009)(396003)(136003)(346002)(376002)(39860400002)(451199018)(46966006)(40470700004)(36840700001)(41300700001)(5660300002)(6916009)(4326008)(8676002)(2906002)(40460700003)(44832011)(36860700001)(82740400003)(356005)(81166007)(86362001)(36756003)(26005)(6666004)(1076003)(478600001)(70586007)(70206006)(316002)(8936002)(40480700001)(82310400005)(83380400001)(47076005)(54906003)(426003)(336012)(2616005)(186003)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Mar 2023 13:57:00.2527 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8452632d-e581-49d8-55d7-08db2ba67951 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: BL02EPF0000EE3D.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR12MB8049 X-ZohoMail-DKIM: pass (identity @amd.com) X-ZM-MESSAGEID: 1679579854691100001 Content-Type: text/plain; charset="utf-8" When vgic_reserve_virq() fails and backend is in domain, we should also free the allocated event channel. When backend is in Xen and call to xzalloc() returns NULL, there is no need to call xfree(). This should be done instead on an error path from vgic_reserve_virq(). Moreover, we should be calling XFREE() to prevent an extra free in domain_vpl011_deinit(). In order not to repeat the same steps twice, call domain_vpl011_deinit() on an error path whenever there is more work to do than returning rc. Since this function can now be called from different places and more than once, add proper guards, use XFREE() instead of xfree() and move vgic_free_virq() to it. Take the opportunity to return -ENOMEM instead of -EINVAL when memory allocation fails. Fixes: 1ee1e4b0d1ff ("xen/arm: Allow vpl011 to be used by DomU") Signed-off-by: Michal Orzel Reviewed-by: Julien Grall Reviewed-by: Luca Fancellu --- Changes in v2: - make use of domain_vpl011_deinit() to prevent code duplication - use XFREE() instead of xfree() --- xen/arch/arm/vpl011.c | 47 +++++++++++++++++++++++++++---------------- 1 file changed, 30 insertions(+), 17 deletions(-) diff --git a/xen/arch/arm/vpl011.c b/xen/arch/arm/vpl011.c index 541ec962f189..2fa80bc15ac4 100644 --- a/xen/arch/arm/vpl011.c +++ b/xen/arch/arm/vpl011.c @@ -696,8 +696,8 @@ int domain_vpl011_init(struct domain *d, struct vpl011_= init_info *info) vpl011->backend.xen =3D xzalloc(struct vpl011_xen_backend); if ( vpl011->backend.xen =3D=3D NULL ) { - rc =3D -EINVAL; - goto out1; + rc =3D -ENOMEM; + goto out; } } =20 @@ -705,7 +705,7 @@ int domain_vpl011_init(struct domain *d, struct vpl011_= init_info *info) if ( !rc ) { rc =3D -EINVAL; - goto out2; + goto out1; } =20 vpl011->uartfr =3D TXFE | RXFE; @@ -717,15 +717,8 @@ int domain_vpl011_init(struct domain *d, struct vpl011= _init_info *info) =20 return 0; =20 -out2: - vgic_free_virq(d, vpl011->virq); - out1: - if ( vpl011->backend_in_domain ) - destroy_ring_for_helper(&vpl011->backend.dom.ring_buf, - vpl011->backend.dom.ring_page); - else - xfree(vpl011->backend.xen); + domain_vpl011_deinit(d); =20 out: return rc; @@ -735,17 +728,37 @@ void domain_vpl011_deinit(struct domain *d) { struct vpl011 *vpl011 =3D &d->arch.vpl011; =20 + if ( vpl011->virq ) + { + vgic_free_virq(d, vpl011->virq); + + /* + * Set to invalid irq (we use SPI) to prevent extra free and to av= oid + * freeing irq that could have already been reserved by someone el= se. + */ + vpl011->virq =3D 0; + } + if ( vpl011->backend_in_domain ) { - if ( !vpl011->backend.dom.ring_buf ) - return; + if ( vpl011->backend.dom.ring_buf ) + destroy_ring_for_helper(&vpl011->backend.dom.ring_buf, + vpl011->backend.dom.ring_page); + + if ( vpl011->evtchn ) + { + free_xen_event_channel(d, vpl011->evtchn); =20 - free_xen_event_channel(d, vpl011->evtchn); - destroy_ring_for_helper(&vpl011->backend.dom.ring_buf, - vpl011->backend.dom.ring_page); + /* + * Set to invalid event channel port to prevent extra free and= to + * avoid freeing port that could have already been allocated f= or + * other purposes. + */ + vpl011->evtchn =3D 0; + } } else - xfree(vpl011->backend.xen); + XFREE(vpl011->backend.xen); } =20 /* --=20 2.25.1