From patchwork Fri Apr 19 05:23:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 139526 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 8863043EAA; Fri, 19 Apr 2024 07:24:19 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BA13E402D8; Fri, 19 Apr 2024 07:24:14 +0200 (CEST) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2119.outbound.protection.outlook.com [40.107.237.119]) by mails.dpdk.org (Postfix) with ESMTP id 5FD2D4027D; Fri, 19 Apr 2024 07:24:12 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KVFXQ2Ty7p1gvguttskJ6miam8KmIzidwhxzEwrG3OHvHDfuCSD5r2xEM512ITXPOLsGGEdZPvCZx7nOJTMAVB/mGea0Trs3qn3A8V4B2eKPIFJhQrZXIYIBtEena0JWFXNXcRdj2wgr0ZPjbA+BWe2uRxBBDlV/HCBmLXqtaoGez2lq9nyeAYSuc+OqdilXsRPJ0AcBTGLCXyrL55KI0DURN7IJS01s8Z21NKeN5vl2Kp3cHiLQPxZRc/kzF5q6LexNFcJuTC/BVuGl/5Cbss2bIPjMfMG8zkAVNWPFPFHP9knKcvH9Mo/Y0mOYjbiG0yRHu3osGYqYbrP4i8S7Hw== 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=xezgCZBF0qLHcaebuMnGFAdPaFEa6gYY0ZnSvkuua/k=; b=RwDvxGJ+Z41to+Y7jEk5w71/31S4oAKztTlVSvBnLImbfUVX1FcxClEgl0QmhfkQ01lN0/bWBj7HjoduI73gc6JMfp0i49c2x13DyXzqMkP/eYAdMoy2pu4eQ2oEN81UpWyg7Xz37NRYZovLHH6ASXumkuonbgPfxdGj7lfjWrG57ZqcvfIm8v3NPahFVuafseuIf9o59eKaPS9moiBC7mdZNOUXY3z+UryY+yZaddZ84OfWQXuQ3tJ0eDwnziTZ4JZ1xVIF0jyj3ikYxDBZDmOLxbyrFwQPWb0i0JyX54WY10fVcKPmz0jphRYb2le3W4IOQ0iM36bBdFxwRENn+w== 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=xezgCZBF0qLHcaebuMnGFAdPaFEa6gYY0ZnSvkuua/k=; b=V3FSabbTbMWfTeRwkc5MLwQjCfwUGBjwuDHxqH1uuNkvHXGdR1OarnfWzDZV3h7/cLMiH32fMHceaOCXETHsUVqx+EVUCdIEUoaE7V+KAl5Dm3jFfH95FL43OkRH2FjRzY4DXusneYXYvmlRLXYFb8zHLSzuPi8zQKIFP5ycfGY= 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 MW3PR13MB3961.namprd13.prod.outlook.com (2603:10b6:303:2c::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7472.42; Fri, 19 Apr 2024 05:24:11 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::ec12:7411:559a:850e]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::ec12:7411:559a:850e%5]) with mapi id 15.20.7472.042; Fri, 19 Apr 2024 05:24:11 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , stable@dpdk.org, Long Wu , Peng Zhang Subject: [PATCH v2 1/8] net/nfp: fix resource leak of secondary process Date: Fri, 19 Apr 2024 13:23:42 +0800 Message-Id: <20240419052349.1294696-2-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20240419052349.1294696-1-chaoyong.he@corigine.com> References: <20240419031226.1191069-1-chaoyong.he@corigine.com> <20240419052349.1294696-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SG2PR03CA0087.apcprd03.prod.outlook.com (2603:1096:4:7c::15) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|MW3PR13MB3961:EE_ X-MS-Office365-Filtering-Correlation-Id: c7bccfe4-d5f2-4125-a678-08dc6030f1ab X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8hIvGXzmii5eNG70SizNCFy0CgU1VkUTAJoEhQQ006sbVJyOV9Iq6X19QbzJmqwqjV1/q2RActnerXpURd7G55qW/VrLEdQtwfdmt5gsF+9DmXp9zEMr/3hjoud8Wm41P76UyfJvjfo1/2fiw8QZqwz/+zoBr0/pJaTV1RQdZGpDIPIScN6TdmLX/fT1DOLGtR2qfUVMdlFXS/7rjmbwcb0zrEz50c5qIw0uPjPmCCoI5z184MJAz8bDgSClV1InTT5xXZk3/PglfIa1YsRSExXxrg24gBU9d9Siy3Qy3mWkS3zCBinsG/Q2Jge/hFguPUqpOLc75OoyJjYWEgYXnWfBs3I0gFXBHKGlWoSxHeBBwC4Dwe403mDZFg8C1x+W4RpwK1d2RiFhRpZ6qK7sdlPvy6Tl8nEcBG2dWK48ym/cHrl8UOc/xtAIZ5hmcvSVb8X1g1/sqe0CrpBWgO91uxGFAfOjofgkTVn4TpY7j/3l1uWnnfRpPV6bKihBeyPAaV9vMBtjhqNI6/FNXS3sNiJhuRC+dOdTqAK3MTAcaFCw/JecidO0O9AoLUNBaqrDIL9XSd78lUZWVLzGFLkXV7R2NfmYt1wDc5yNA4Wcl+TOSwNJFIlADb9u4GVAFb3LfCa41IFmdKHcKrIe4cEwSdYOB7jVw8cFJpZFo3Vkf4fLq77JmTfHQrT7LedrVQ2RARWxMciLiiaopkE9YuaKIFBvjcHRkLEo9rlro/d1zfVP0LJMjCw9Slo3jMqNyrnbqmZFv7QxwsQ2ND+njUzVlFlQTP3p9KYCA1uOH9Gp5ZkZiizdW3S56zbqsh33Kkib+YPTI6QZvQ6NVuYuHuXRPIKzmJVxaM2MkED1uFKEEHLkGPQGmxqenkFFkNk/8xaCPqEV3b0Hq5p3lwStMiKv00VLcNfTtOusjEd0J2dTpfI0llxojTYS7di0hxxazvjBu0unpyvMHgpC6lcrgwCgdXn7gBODsq8z1QHoSogBIV7wKrPgBniKu23Mj851AdvN0izJTVFuw+F99nC8QGurmrBAkMcjLVLSADHx8jPfVe4bCzYzx49NitGLgXhqgOOEIvlPuo6aCM6ECsaruHPByNCE0UqnEk2rvNzoO8m0v5T2PUcrUY2JKkFfmvrcvRBEF1/Aw3udl6iwd8zpPd40sKRR63kaAS4V4hCltpwyIDKahnCiFJAEHt/yQxB2+zh4rYBSfZAHnew40ISH70iN8QfIArpuAYQum8rZNerU8smPweKEjcqIOGzg1GxQHgrg5Y3Km3hNwc4c9fC4Eqj28ZYwN1X7W6VsdU2PMn2J/qu96efrVlO1REQq9FGW2pLTTw19vKlRa4defzc01tMmPw== 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)(52116005)(1800799015)(366007)(376005)(38350700005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: GLKMscAVHzPy0HmfZFmVVsN3VaAtQGAND/QCMOf2SUWJc+peS1Sowy1Y+/EmLr5ZscQjdI5iQkKw2cPcjKU9Aa/hkjRXGE6Ar+giVnwr5XgUAtv2NHP9swq6hcVuZnqWUBYZZEMp8zK/nXogljvbB7QfEso9iMZLaCW80YhEjQE1XO/QbXcogcuHBR+KP7EbsahnMLZps1T8ZHk8bWpE33w0SwJ3vKPvAXEr7x5Xg1ZpacseLBfS/USHenMr4Nsp8PbfLyC/rizgF3BpyvL51W1ZkbxTkjXQj3jspWBmTKLgYzPBb9lGwIR+Gaq+W6fdmUNKpRw873GZVMWLy7b8QF9l23bwCeYov9sd0bjIKLKJA57iLZh8ROpMFPExsXqEmy/AZr1EOdxyWREQjFR4qSYD+iMKF2cMbdZAHdiXdc0Iu06hBJVyno2eLY9fk53tusL+O3S+6CW/uI5NoLRcvPh84CAr6MzGXAigTn4g3Ui+TvwL9fSmW+b/uT1bq8UfFT9D1I1YE19tHfnmIsOLgC1iUuzKqcyoggzN+3SgQuEnr0fk+8JpgxrBfB9AsVZ0VSUviGvOrYf4Lp6Se8Hv1U0BYNLEwHP4taVU2Sm1ken9Ak0/kwf2TTpQbuEuvxag9PCeIWVl+CQ0L3Mf+8dgSn52ODDwu/gS6/V0o6Oztaz6k+mcG0peBkRbfJctMvxp1bxHVGmOXoA2R2pXBStb7iSpAQE/q/bQ2b6TetSzgKalaAzs8o9TahJXmJxk7qCIcDU+Os8Fx7WcjdllZHUKVBddSTYuD+MTApYodgO8kng0t++ntsczlQE4kX6Kbwub/swVmbp9w5wCOyOJ0NnX66cGS8USv+O53BtXL/fU9NUu59Mr9xx8Dj4W+PMik9a2Is/pvUbCkyVsa/pyIi4E46qx3jWJBBPhGfkzWPqgQUpotBoq6ITjKxuu0HZfeK/mJCn82uzdZcVGJbFi1PUI+G0Nm9IZGDwO7aiivE+YnvVbNi4OIBIJvqZhxKpQsA/lJZZR9oF3Ek8T6DdB2KEPWB6jgKVMOiYKRQN8sFIRy5NLoOAzyYXqo3GZMo82pzgNMH1hhxyd9R3QYNLob5PP0BJBJsdmkeQSALHIX1q0KcZXAgsMhX0bPEfI+ZXmMm36vePW2hTYcmFNtqFkLMyrRfNOetk8ldqlfuz6xi51rrT+Ysi3pUVjyTIaOw/XNc2lmUqFS2sTWYI3kl900wDMebn8ul53zUZEWxUY2LD822pUd29ajv4Q11yKWhEKats6gK8Yw7xyE8SHlQbQOUVJY4Ven7thyiys6B/J8474a93hdKeBSgmkSOPgCYmKLX+N+o7FF49qIWC/TdGfudTHYi72jWoqdloLbGUxJe841u7wI/R9LV6/qS4QmpL65VhxTJ26cZ9VM5ud1B/XdAP3L2wSO6rtVCgcEIl/gCZjv5sKi4S/WQ9744oyx1RFfOdKCsldpaklIZa2YN6zTkpPpcblpstf8yqNPoSKniUxyV9JcqS2tvWBMXOzYH9eAYB46phgi3QWOdHU62CndsiVJ9ZyAgd6MNL2ECnf6aRNT6aiRq9fSUhR1BhT1Q/PuvlMBnxQQEarV2V0u1X3E+g1ig== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: c7bccfe4-d5f2-4125-a678-08dc6030f1ab X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Apr 2024 05:24:11.1945 (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: 4iat1KUv0wIynCZ0MLqHDrG7vF4LEwunWRz7vxQ2tDXagGKslfYixaz6p6NqMKRUqN0pkAUGS+eF6784Ww0KUTQfN1ajJKkHwOKmOp5BzkY= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW3PR13MB3961 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 one resource leak problem in the abnormal logic of secondary process. Fixes: 016141b18b3a ("net/nfp: refactor secondary process probe") Cc: stable@dpdk.org Signed-off-by: Chaoyong He Reviewed-by: Long Wu Reviewed-by: Peng Zhang --- drivers/net/nfp/nfp_ethdev.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c index b711e15b9f..98d8e87028 100644 --- a/drivers/net/nfp/nfp_ethdev.c +++ b/drivers/net/nfp/nfp_ethdev.c @@ -2123,7 +2123,7 @@ nfp_pf_secondary_init(struct rte_pci_device *pci_dev) if (sym_tbl == NULL) { PMD_INIT_LOG(ERR, "Something is wrong with the firmware symbol table"); ret = -EIO; - goto sync_free; + goto cpp_cleanup; } /* Read the app ID of the firmware loaded */ @@ -2171,6 +2171,8 @@ nfp_pf_secondary_init(struct rte_pci_device *pci_dev) sym_tbl_cleanup: free(sym_tbl); +cpp_cleanup: + nfp_cpp_free(cpp); sync_free: nfp_sync_free(sync); pf_cleanup: