From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id B67F643B74 for ; Thu, 7 Mar 2024 06:57:10 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B0E1240A6D; Thu, 7 Mar 2024 06:57:10 +0100 (CET) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2104.outbound.protection.outlook.com [40.107.244.104]) by mails.dpdk.org (Postfix) with ESMTP id 2BF2C402F2 for ; Thu, 7 Mar 2024 06:57:09 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YO4UeX66VF6kxaLechKp0VEGEn0h4KhByOoZF7m10Lm9gmcCL7A+kkwHGlLi0PmPaymWJRSwhezYQifI3j0KTrXQic3XUDCUCMkqV9lbEli8sdmW5hfLK45EajjkGIrUICTf6uuk/ysAVb2LmXYvEiFUChqzAYIVJq8JC2CRWJi0NhQ18uue7Wfw/0qmN+eay07zs6xNP1kRQ6wmHk9cTpy+kiwW/OgY5jI1osm/jGout2IXhD5we6tQV510Qm2vKWNIpX0A/FqqmsFX99Q3Us7cj28ZQtPoJKpSUL6puYfqk4duExkrzglGyGsCVsqy4Wx4H56ZBaCm6KIi74FY1Q== 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=OEVPlMXTfcSvCyJ3JPGUcL4OzrM3bMtPgJhL0F7G0xE=; b=E11f4LzJGCXAHsCXiN1zAKRCcp+mty7jonWnY5lxexwmyXZvAgeWVdRiPKtX1eIgDmZkM4JBWFhGNmANs3+U6RnXIlVYAhiTSaS0Agz8bnUPTNOLbr+IFMUBDX7wxWu85owojspaM2riNioZCUxrNw262M8aBblzOVpFIXvyJNlKVm6Yok8C+LqIi8tZ8w852yV/M0NYwYHkHkG8Ec0lQGa25eCMwlpl5k64yLgv1kDAq1ulznxikPu4YhArlULasF96KIhfQYMPtJ1hSFlP+Zcs/F2VQbO8lXeTQOiTxyejrJOMZ2T1hiqDkZa+IpRfbWu6i2O9LFinrxNgRXM6bA== 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=OEVPlMXTfcSvCyJ3JPGUcL4OzrM3bMtPgJhL0F7G0xE=; b=vq6SqIN5HEXVELGI5Au/0iPlsKwDGsH70yv74Nmk/FL+JKYF82Msm2Xc4teoVI+wVG4lbiN8C7kNZqM0efFqZMl3fpi3lDgZrCdj/8mt+zvv4wACLa1CFyWgy4kURol71sVpHzsKVmTDAWKsWvS035m4sTsPRuYEtz14oHok+0k= 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 BN0PR13MB4648.namprd13.prod.outlook.com (2603:10b6:408:116::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.26; Thu, 7 Mar 2024 05:57:05 +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.7339.035; Thu, 7 Mar 2024 05:57:05 +0000 From: Chaoyong He To: stable@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He Subject: [PATCH 22.11 2/7] net/nfp: fix resource leak for flower firmware Date: Thu, 7 Mar 2024 13:56:34 +0800 Message-Id: <20240307055639.1626192-3-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20240307055639.1626192-1-chaoyong.he@corigine.com> References: <20240307055639.1626192-1-chaoyong.he@corigine.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: SJ0PR05CA0097.namprd05.prod.outlook.com (2603:10b6:a03:334::12) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|BN0PR13MB4648:EE_ X-MS-Office365-Filtering-Correlation-Id: 4cfcd95c-aaff-43c6-1133-08dc3e6b6a83 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Cde4GahRo56KPQh9BN682ZVv52A5eOm2HDZjwdINjDOnhQbAGcKfKkHePBnnCQbYbkD77/cYnqtWIPAIPpDOUzVBqpcgSqFt4YvvLxGrNqKASx3FCmc/a67L8Mf2kdXuOqApy/IXpOwQGY8OtPXP03cZEFZj8XewbYpRQDdQFkJ3ZF2HUcj/NstYOxe2j0O4fzuhAVPnYS8JdlX8UGM4WZ28ixtRzL1zrkV17pFdW9bnAtTUYMw3+1vaq0G81UyBYtfLqbuqBKMF6HyrZAjyuvaMv5Dujh9hfl8pYsh616t/fITU+DEiwbRTRq71t47U3T8YHdO2zqXJq7isNUw1srdNyWXbmJnbsv9VRtmvORR7gG0q3XawbABlcM94N3hbeOzE6RP7jM6E9U645pU8yMY9LXwTGCkuKFCOIIS4dGiafLSKc3g7Cn83oRxeBY+YcJxcaMBJ3V0jEKDjIwkds/aFLfq1JX0ZBjyDi8Hp9y2G/qH4yTBZfrA43c5UdOZKi0AmSyA6gbZT5M6Ay3H4Si8g0y64BC9caXhXDsmGBZ2I8UbG9uDY1QqMiZVcKUr5NXKH9eqhEQLXaCGaiVYJfxz8yA7+5q3/+EpH0nA9MiWF/jV3YZuIV3NYYutGBjuHfIDc6zEllHHKSTvp+j8mL0TTX9yb3rujln+4KsReWbZMDFYwkJo88SkoPTP7Bc58toZ5uumvLGFVco/5EL+KQjZrtF7iH/gdn64B1xrHYOc= 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)(376005)(38350700005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?i+f49ZUGYDlIkTggBX9juK1KhlrtR6cDD06cRcFyq92Tea1nYN8dWE6sI70P?= =?us-ascii?Q?9DI8pgMw+Lp/FTIImO9NVbfd+m5dlL32q2s1x2pVAqyi3IjIXkk4Ka7+DobL?= =?us-ascii?Q?UPM53gOXMt2yKvYV+iwL30+418+MnDZnuQ81KjeJeItEa4Yy2MjsxJXgMkTN?= =?us-ascii?Q?m7Q2IXGmw3XxmCXlHXSn5H2iy/WrCmi1d11WPihx5K42DX0z0mS2G0S71voo?= =?us-ascii?Q?aWsDH44ke2luY1muR75BxuLyYuC9KMcjW0bErpAi5pNGtO+3C19BiTUKzJl4?= =?us-ascii?Q?SLD9DDp3eM9yfOnEhTz1GbEeoRbotccRAkwuuHCHE5RpXM6LHVfYPPzRdKYC?= =?us-ascii?Q?ZlqihMWRw71ML2KHMALtC46h+DKPcpEwwcKUARHomvvC0Xv6oSKBE5DhWhXG?= =?us-ascii?Q?P+NOVdc0IOGJDXhlSqG7s6sjjmohIuFMCzOy2edAo57PJlN2W0KUSOoljQTv?= =?us-ascii?Q?cV1XUGqJhY05IHplEDGlF0N3G65hP/sZgV5MFQpTvMzROI6l/9nLPt0uTrWU?= =?us-ascii?Q?1my+Dq6eSX4LLyqdjXTbcSuMqA6ppJkLHjXk2MRCQ2ZbJCd2xVVH43Qjb6OO?= =?us-ascii?Q?bxf8d+f5ncQQHm8cg6IVJ9L0Zk3cROanqsayBzjc3JXxHG2uLdHI+5L0u7A0?= =?us-ascii?Q?7rgn3t2IfKAort7w4JPAphswgZKp4Gl4UF7tjzhkztW8jUC6isLLezL/QbSZ?= =?us-ascii?Q?Bp6v4dHIcTHI3iOUEXxbqoloszTPUJ6tALGgKeeuV+XoEyzKlsaeIkHd9TuT?= =?us-ascii?Q?9lJSqaAXm9BDdVu6nxFBvHWGHlt73jjdM3FgEsOrJpmeQ3Dz9aVJgcSEPz8g?= =?us-ascii?Q?WL17C8eDGPy2SXJQVW3rSAQChLn7SN/IF6Ho0fRKpYpxl9Pfl+llhMZ8O71L?= =?us-ascii?Q?gqvjtzszReU9MgjuJfboY+BDO//fiJPlU0Mqm6cQdRqAxo1b+R2b84e8sMCv?= =?us-ascii?Q?W2teQs0VBDbLBsZRynoxBKj70VqD5mwsh68vo0nIq5UAv8Z7uaZLiFoBXopH?= =?us-ascii?Q?3Zs6FHUshUvqnfpQqJzS2kR6cczYXq3AhOVjtjtTfQfKThRCs7KXy4WZctYs?= =?us-ascii?Q?NdUHyMlWdjVInXng8+XH2QALhH2KHwfvUoszWjXaCU375FZL2V5cl0TIhPnM?= =?us-ascii?Q?1TvcHjtomb3uCriHI1uJ6IzB5jlGtz+7+kxbGGmjubfXO1E6/kL13+9Ujjez?= =?us-ascii?Q?K1P2ZY5wxultk8fnaxJGpu5acEHhacW9OYMps1m46QqQigo3VeEbQfu7QtZ5?= =?us-ascii?Q?QEm/GH2YB9CKLvLHksaRIxLhXdUDjYSkHB9yZc6NNFBW4q2TvQ4sCBoNjf7G?= =?us-ascii?Q?zvf+hvwb2wkJtNQ37G3AlkohwSaGMZxtfNtFbk92+03Q/Fz2cSx0Eyzqm9CB?= =?us-ascii?Q?3X5jh4VVm4MzNN26uXCzcYizjZR0qZPVRf9lt5nEp2M9g/yzgLM5Jo5BQY/n?= =?us-ascii?Q?xj5l8l76AOvVPEVahbamr2yR0+b4KLb8gRCH/D6GDduxGjfrJTPDtkXNPbx8?= =?us-ascii?Q?UcH1gnQNAxADsMLQHIT5R4bWniqp3PJtWk4FvxCm2P40nx1XdGSm8YWCVWxb?= =?us-ascii?Q?6fce8iZSBOlHvNDhqH+zRgaANdUkDhjZiK6soNIm4rnobtvA3hOvod22gjyP?= =?us-ascii?Q?zg=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4cfcd95c-aaff-43c6-1133-08dc3e6b6a83 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Mar 2024 05:57:05.2070 (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: k8DktrDZL3XXUCK16aqOHcj2XEvqP6hsyoBFHVlKLjw1pyuPaLapq+lsdtJ7l7zgUqOfG8DgMcXPsjgxp1VnJRMd4iQeFjjnGON50CbXN+w= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN0PR13MB4648 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org [ upstream commit 7c596721ae5f41d1dbab8b936a4983928d6b5603 ] Fix the resource leak problem in the logic of flower firmware application. Fixes: e1124c4f8a45 ("net/nfp: add flower representor framework") Signed-off-by: Chaoyong He --- .../net/nfp/flower/nfp_flower_representor.c | 89 ++++++++++++++++++- .../net/nfp/flower/nfp_flower_representor.h | 1 + 2 files changed, 86 insertions(+), 4 deletions(-) diff --git a/drivers/net/nfp/flower/nfp_flower_representor.c b/drivers/net/nfp/flower/nfp_flower_representor.c index 32c4574..854d117 100644 --- a/drivers/net/nfp/flower/nfp_flower_representor.c +++ b/drivers/net/nfp/flower/nfp_flower_representor.c @@ -524,6 +524,43 @@ nfp_flower_repr_tx_burst(void *tx_queue, return sent; } +static int +nfp_flower_repr_uninit(struct rte_eth_dev *eth_dev) +{ + struct nfp_flower_representor *repr; + + repr = eth_dev->data->dev_private; + rte_ring_free(repr->ring); + + return 0; +} + +static int +nfp_flower_pf_repr_uninit(__rte_unused struct rte_eth_dev *eth_dev) +{ + return 0; +} + +static void +nfp_flower_repr_free(struct nfp_flower_representor *repr, + enum nfp_repr_type repr_type) +{ + switch (repr_type) { + case NFP_REPR_TYPE_PHYS_PORT: + rte_eth_dev_destroy(repr->eth_dev, nfp_flower_repr_uninit); + break; + case NFP_REPR_TYPE_PF: + rte_eth_dev_destroy(repr->eth_dev, nfp_flower_pf_repr_uninit); + break; + case NFP_REPR_TYPE_VF: + rte_eth_dev_destroy(repr->eth_dev, nfp_flower_repr_uninit); + break; + default: + PMD_DRV_LOG(ERR, "Unsupported repr port type."); + break; + } +} + static const struct eth_dev_ops nfp_flower_pf_repr_dev_ops = { .dev_infos_get = nfp_flower_repr_dev_infos_get, @@ -640,6 +677,7 @@ nfp_flower_pf_repr_init(struct rte_eth_dev *eth_dev, repr->app_fw_flower->pf_repr = repr; repr->app_fw_flower->pf_hw->eth_dev = eth_dev; + repr->eth_dev = eth_dev; return 0; } @@ -731,6 +769,8 @@ nfp_flower_repr_init(struct rte_eth_dev *eth_dev, app_fw_flower->vf_reprs[index] = repr; } + repr->eth_dev = eth_dev; + return 0; mac_cleanup: @@ -741,6 +781,35 @@ nfp_flower_repr_init(struct rte_eth_dev *eth_dev, return ret; } +static void +nfp_flower_repr_free_all(struct nfp_app_fw_flower *app_fw_flower) +{ + uint32_t i; + struct nfp_flower_representor *repr; + + for (i = 0; i < MAX_FLOWER_VFS; i++) { + repr = app_fw_flower->vf_reprs[i]; + if (repr != NULL) { + nfp_flower_repr_free(repr, NFP_REPR_TYPE_VF); + app_fw_flower->vf_reprs[i] = NULL; + } + } + + for (i = 0; i < NFP_MAX_PHYPORTS; i++) { + repr = app_fw_flower->phy_reprs[i]; + if (repr != NULL) { + nfp_flower_repr_free(repr, NFP_REPR_TYPE_PHYS_PORT); + app_fw_flower->phy_reprs[i] = NULL; + } + } + + repr = app_fw_flower->pf_repr; + if (repr != NULL) { + nfp_flower_repr_free(repr, NFP_REPR_TYPE_PF); + app_fw_flower->pf_repr = NULL; + } +} + static int nfp_flower_repr_alloc(struct nfp_app_fw_flower *app_fw_flower) { @@ -816,7 +885,7 @@ nfp_flower_repr_alloc(struct nfp_app_fw_flower *app_fw_flower) } if (i < app_fw_flower->num_phyport_reprs) - return ret; + goto repr_free; /* * Now allocate eth_dev's for VF representors. @@ -845,9 +914,14 @@ nfp_flower_repr_alloc(struct nfp_app_fw_flower *app_fw_flower) } if (i < app_fw_flower->num_vf_reprs) - return ret; + goto repr_free; return 0; + +repr_free: + nfp_flower_repr_free_all(app_fw_flower); + + return ret; } int @@ -866,7 +940,7 @@ nfp_flower_repr_create(struct nfp_app_fw_flower *app_fw_flower) /* Allocate a switch domain for the flower app */ if (app_fw_flower->switch_domain_id == RTE_ETH_DEV_SWITCH_DOMAIN_ID_INVALID && - rte_eth_switch_domain_alloc(&app_fw_flower->switch_domain_id)) { + rte_eth_switch_domain_alloc(&app_fw_flower->switch_domain_id) != 0) { PMD_INIT_LOG(WARNING, "failed to allocate switch domain for device"); } @@ -908,8 +982,15 @@ nfp_flower_repr_create(struct nfp_app_fw_flower *app_fw_flower) ret = nfp_flower_repr_alloc(app_fw_flower); if (ret != 0) { PMD_INIT_LOG(ERR, "representors allocation failed"); - return -EINVAL; + ret = -EINVAL; + goto domain_free; } return 0; + +domain_free: + if (rte_eth_switch_domain_free(app_fw_flower->switch_domain_id) != 0) + PMD_INIT_LOG(WARNING, "Failed to free switch domain for device"); + + return ret; } diff --git a/drivers/net/nfp/flower/nfp_flower_representor.h b/drivers/net/nfp/flower/nfp_flower_representor.h index 685cbe4..c043214 100644 --- a/drivers/net/nfp/flower/nfp_flower_representor.h +++ b/drivers/net/nfp/flower/nfp_flower_representor.h @@ -34,6 +34,7 @@ struct nfp_flower_representor { struct rte_ring *ring; struct rte_eth_link link; struct rte_eth_stats repr_stats; + struct rte_eth_dev *eth_dev; }; int nfp_flower_repr_create(struct nfp_app_fw_flower *app_fw_flower); -- 2.39.1