From patchwork Mon Dec 4 01:57:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 134773 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 7EE4743666; Mon, 4 Dec 2023 02:58:18 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 05DB540A8A; Mon, 4 Dec 2023 02:57:49 +0100 (CET) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2094.outbound.protection.outlook.com [40.107.243.94]) by mails.dpdk.org (Postfix) with ESMTP id CCAEA406B4; Mon, 4 Dec 2023 02:57:47 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=X2nqrLMs6kbsnN6+nz4Q9PVUTMSuQdwmjTPej2dzGdOm0HLck3FT6yMJy2PHdle8Tppnr3T8h11RYR2kd4zh2sTtyEkNCPrTYQMw38Hu4nVJoGuG5fgIP8edk+wMJd1W5J9jzFGCSrwM4nv0HEPrKP3d92WlrVS95A3FTn/4GU21ZR5NaAkM+0Bys1CEVxP62owkNqKHRmDB0cd7GdScPSuqiPGCn/bstUT2wyMbveRCIWt/00ILZEQ+bAG2VIeX+Mq7PxzMAa0bft5Ub4a6YQoq2skjRRUKB2bZiqw8Cuvd6tYifO5UZgrLamwVJobsp5TrKZ/P2yT65OM7QVMXIg== 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=AjDcgIbGeTThFgObYgS0KljYIwgx3ifZ67ZRycLjRvU=; b=TJfrkIRgdmg/HJ91GZeKnAOPNYa+Dr41Sg3M/dCV99TjSIIpN2a52Jsdu/o6lLu9CAnXcJaamm9droACvmG8wgAxU0/fGczG0iG8Ao2ufsfRmfUugp3ALlnJGj8CjoOFgjIbnEUzuDrZfdkB9282mYJ2oV86tuo/8sG5sojUo4sMN05KXc8RZCsUgrGyGZsxDwHbsHJ34B4SKjF/L98b8XLcFz9tnmhNMeJt1IRHdBBvWUDvrGfnfEtWe7pCKNvIi2fEaDU+GRY8t7bQjnP36sIWMKaQmKdSHxELDD2h1iKtrUWtnj/ZvFKfXjK6NBR5hJ1ARTLHtGk6WcUt9WcPjg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com; dkim=pass header.d=corigine.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=AjDcgIbGeTThFgObYgS0KljYIwgx3ifZ67ZRycLjRvU=; b=BdL4Bmld50Ol1+HtSxskRmxGq4xob4cgt5stV8imiBRPyYXCOpdz2Y32InCk9TwF8LVSmedVfcWPXPeIFDSC429yUcb32oT3NoHRWfck+zLFlroUIcnwP7rG1VABCpESmVTgt8MSP/+1mFdRppBaY08ZLJ13D+l7NtVhYGQIU1U= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) by PH0PR13MB5876.namprd13.prod.outlook.com (2603:10b6:510:168::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7046.33; Mon, 4 Dec 2023 01:57:46 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::45b3:d83c:cff2:4a1b]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::45b3:d83c:cff2:4a1b%6]) with mapi id 15.20.7046.033; Mon, 4 Dec 2023 01:57:46 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , peng.zhang@corigine.com, stable@dpdk.org, Long Wu Subject: [PATCH v2 4/8] net/nfp: fix resource leak for PF initialization Date: Mon, 4 Dec 2023 09:57:14 +0800 Message-Id: <20231204015718.780578-5-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20231204015718.780578-1-chaoyong.he@corigine.com> References: <20231130085238.60290-1-chaoyong.he@corigine.com> <20231204015718.780578-1-chaoyong.he@corigine.com> X-ClientProxiedBy: PH0PR07CA0021.namprd07.prod.outlook.com (2603:10b6:510:5::26) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|PH0PR13MB5876:EE_ X-MS-Office365-Filtering-Correlation-Id: 041ae083-bf5e-4d58-731e-08dbf46c692c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: RCk6wnaWqckjuATYzjcrnUNOt6h0Ofqi9r4P2+Rsj3Mcq3uPJ5FtPe23mpvRAooqL1PMq53HPKYY9/3oPQnCEoYZuozVaVHg92yEKHgdZNbUn2+azxYQ1+CXBIJMNV7zsIwWr0ZLpW/U3LSWGain8vWBZ5U83Yl0RIZsLbr2oF/uDYGS5j2gZNv0vrZaykHab1dljeZPOcO8Ej8Dkdd3ViDiXeVR+mtE47ftilBchf6oo3npllHzvUO7lpjXncGeLkE5M1CDP7a/NVx5GM/cTHkauHn/Q077rX0aqCgRmViIyHCINZChX3Y3NUtTIkmgf/5qIYLceBoTdmnX/ZWjOzVuL45CtCuDF+w+DZea0rIZU9vMCncBHnzy6SRa1jtM6Y7KdH1uU6vEa3xB+KB8ZbNOTRRM0FSAyx2rovGpDSy+PNWNLVOOe8CJXXrFwAPwUy4AoHQof8+DB/rto7twbHpljNsjjv5SoAkesujstS5/SnHGW+MjFIJxKUgPIm1LQeeNYrIGnqI7d4WM0Enfpal/J9MZGVIU9Nw8kmkKm84H4a/q/C0xieqWd7VhlDfhowOZ8kDJlJFvgJgr7MMDUWwxf03b2dW6WtUfqBO03IPkuT881TtQPcrbGsaRkM8XukW/IHgKivm5VNSLAwAQSP3QJCMZ66oGmAVN0RULqwM= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(366004)(376002)(136003)(346002)(39830400003)(396003)(230922051799003)(186009)(64100799003)(451199024)(1800799012)(83380400001)(38100700002)(41300700001)(26005)(66556008)(66476007)(6916009)(66946007)(44832011)(5660300002)(8936002)(8676002)(4326008)(450100002)(316002)(54906003)(6512007)(6506007)(107886003)(1076003)(2616005)(6486002)(6666004)(52116002)(478600001)(2906002)(86362001)(36756003)(38350700005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: DLNyx/q2CnwIyD3YzLZkQRh+T2FL+SSNXFyilP8FJcS7BpJEDJSlHE+JjBgFFnCVy47hTA4zpzodgB4iLoCu1O68ZonJWjBtXJ/X86s047msj9NYR+8S4ANxDQvzaD69Ps1xsFQrDDItAbXLagysRv1+48Eldeow8DfNjewPjc2vuMszKEPhJaKEZv/pZ6R7tfGkIgZHpPDAJQyMDOApln5zaSuwLWY4u/srUfWxRShW8hK1TutHuBIiq3zC1SnT5R1hMoV0gS/Hhe7VAwJW9ZzEDW7yfXvRDdt91VAwtX9r+iUaH5cO4CPeUZSjfbTtU8ySMEnYMs9akhPN1Yi6d6i2TrXcFe9XUJ+2BUbJm30RQ9Q6ROs5LolXW0OSi35pNXrv5+bX0SKbkzixa3RJ+iwS2/PvLMxu7gfelKGn7OTYtH5TRabJ+dWFGTgKssGyolRsZHJHIxc20qlUMWHM0QkpRRH5Nj6dM9KZ9xNP6F0UGhlUiEXnSFMyJVM5JcAfAnaj0bt1V+1o9+YXEuA6YBi1wAxzHOua1V0wZLQ3jVCJLIuqLqg+gBtPtEFPvfDzSB+cEGUaIsC/e2oiUJC4FWjoB0w/zoMg/YkfBi87RhW+ohJJbs8paWvbFuet1JlbXj3fM9l1AtEPZUPi8H0tRtp0Xq6o2oHH7S+/fiNrMhnoDX8BUpzWS6tpHk8Pi4NExY398zpXd1Sk4KDGqpR00VIMxcx/2uoTYaNNO/ciEsfg1t/ORlpNZ+PzWw1wdjD7tr7PZ6jt+9gQ5GvzFAknVijddLDy1DBkNCw0FUNvEREHyPw3g2Fux+J2b1NK0rVAKtHCmw+x3TC2srr0LjNSAesyXBbUVKTilBNsWUEHYODmxEuSMflLauXZGmkHsbkyZ1QvPiveyv8WDE7macKf4hGz1vxcZo8ng5lxu9JOpfQTehleJA571iEU0N/tVaZxH6rF8uxStICfm+hVPOGZdxRanQgk8mmiWwZi6LogJXAnIE7HOUbbLTMVnLEuv+6yHMazXMk0KdeaV+zGmQO5vkAK/382EHBlsjw4DDR/usoXgLicraR0I2Zg2SDOuKr6WPfct6HVkDIh70V9VJZJAxk7b17h/xsP4pTTTrQxxwV+mCAqGYoddOQUEV0u1LKVJaN0LI4owXvfJw4ifQTwzu1npoTUx6M/Fv/hQqJjZ71vtHTRaFxJDuBXjs8w7vhXnCrLK7KAJLh6UtmrkwF1YXY+FJA2g+OsGUixkUbzK1b4Itjd3o0VkPdNHMsWAaS2zkkkxQFP0QD1hxan3KLiKNRGFfrDCJ6jp2HkoVGBzMtOEvrl4aEdWGSXGI1Y+4Emav+3B9+bO+SNG1GdTzMB9sMh9JY+iLhNetayqEk7t50NBzStl++g1M4VFIjrSbQYpu0LJnlMorzWBBrlw72yZuH5AnIpeaGB0gVPy90sWEu/OJVJ6OJ8paX25na+M+1MlaifF3HGyjmkvSNxkVwfOJAv15r/ThR+Fy1k8zr6lm4ux7AggIztxMzuCu/don7AqMZMt7dyeExPrBEp0mqML/wCXbX8BkS5+Bz8PMi2zJ4peJGvnuoda4jCTD/w4d+T/TQSEPu4XAlH/YAyLRrDGQ== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 041ae083-bf5e-4d58-731e-08dbf46c692c X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Dec 2023 01:57:46.4328 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: fe128f2c-073b-4c20-818e-7246a585940c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: L82vfX00BofU6zjtOfWmdLH+gsjifdwkGrRykdFWa5umOsCxwP52jkbTNU9t5Z6RCZIo6x0HQI6eMo0gm9riV/rm20fwCRgqcRLq2C+NIf0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR13MB5876 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Fix the resource leak problem in the abnormal logic of PF initialize function. Fixes: 646ea79ce481 ("net/nfp: move PF functions into its own file") Fixes: 8ba461d1eecc ("net/nfp: introduce keepalive mechanism for multiple PF") Cc: peng.zhang@corigine.com Cc: stable@dpdk.org Signed-off-by: Chaoyong He Reviewed-by: Long Wu Reviewed-by: Peng Zhang --- drivers/net/nfp/nfp_ethdev.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c index c132e97d1a..6fdde105ba 100644 --- a/drivers/net/nfp/nfp_ethdev.c +++ b/drivers/net/nfp/nfp_ethdev.c @@ -1333,12 +1333,13 @@ nfp_pf_init(struct rte_pci_device *pci_dev) return 0; hwqueues_cleanup: - nfp_cpp_area_free(pf_dev->qc_area); + nfp_cpp_area_release_free(pf_dev->qc_area); sym_tbl_cleanup: free(sym_tbl); fw_cleanup: nfp_fw_unload(cpp); nfp_net_keepalive_stop(&pf_dev->multi_pf); + nfp_net_keepalive_uninit(&pf_dev->multi_pf); eth_table_cleanup: free(nfp_eth_table); hwinfo_cleanup: