From patchwork Thu Nov 30 08:52:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 134726 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 5E6604340A; Thu, 30 Nov 2023 09:53:18 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EFFAD42EB7; Thu, 30 Nov 2023 09:53:06 +0100 (CET) Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04on2132.outbound.protection.outlook.com [40.107.100.132]) by mails.dpdk.org (Postfix) with ESMTP id 1CD6342E98; Thu, 30 Nov 2023 09:53:03 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nImFdH49RNqa+/agNJ+0OVMDiv1xU5RiQgouHeb/YigafhEnZPJbwae7IaTYkt+tENp/G24I/q58n0jriGKYrpaafdlyjLIvnyWMhV6FuHEuLu51omVkctLb8M/yQL2Xswq9z0NfeJEzw8sdtPKT+7u9AW/iJONZ0NXoO3qQwqz8IUndmPDp1+g6vMyJi0vDWagMRqATBWGceX9a5CgMA8GO1AY7kaVAtE2bHHwIuGN5VK0DO14xxwBQ5pRYzSMb3YKbheBtHOcOteQ+WeZrOKbgWt4J0Ue+Xk8PpIFluz5V3hiYoM/VoJIz2O89NiU/REEnbWC33nF6+gbP7R5tBw== 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=dWkpm36JjMErskXh+b8jETPMuvJz7IIwwUvp9wzmSyk=; b=lYnWOrVrT1V3PiuS5HFxihOo+LIUfpdY3UQJNAJt2va0DgBNP+4HV4xst5I+y7+DOn0aMXFhqy/GOpVIZSN+FswOm+AJZq/HvfUi2mGGFq9MJvRF9CJY3YMTL6/dzNP3Agvb5R3anb+pKy5TcKwDQDRndqdooACQIAt1UXJc2DstEHDn3HmYv5VuumTa7ZonvT6g6Ndng9Mb4JqnccLQrThc4obsDPjaaaQYG570HOvMxvp5s2Yd+urPF2m85e5q+aOhmzeXBSlfqo0fzPDowXDAqHck2x+4Oo9f0eqFWZ36tojDpUCEbOntSB69h5pp+11Dl3xMSty61RbZ3Ux4FA== 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=dWkpm36JjMErskXh+b8jETPMuvJz7IIwwUvp9wzmSyk=; b=DfrZyKVW4IP0h/ujCPmaZnF506Flz2Ha2QDK/vf4ONwi1oExhsdDAyznVWropbedxPADRf3meqjUPxVfyL9groRYdlY5FMXcnkicatGaMTK3cZxSEyXV7BtimcQxH9e+B59dHnhFHAuikJpL08sKsjFjDA56mU/SEm+r3eTd7ws= 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 SJ0PR13MB5381.namprd13.prod.outlook.com (2603:10b6:a03:3d2::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7025.25; Thu, 30 Nov 2023 08:53:02 +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.023; Thu, 30 Nov 2023 08:53:02 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , stable@dpdk.org, Long Wu , Peng Zhang Subject: [PATCH 2/7] net/nfp: fix resource leak for CoreNIC firmware Date: Thu, 30 Nov 2023 16:52:33 +0800 Message-Id: <20231130085238.60290-3-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20231130085238.60290-1-chaoyong.he@corigine.com> References: <20231130085238.60290-1-chaoyong.he@corigine.com> X-ClientProxiedBy: BYAPR08CA0056.namprd08.prod.outlook.com (2603:10b6:a03:117::33) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|SJ0PR13MB5381:EE_ X-MS-Office365-Filtering-Correlation-Id: 4328f670-9a13-470b-8314-08dbf181c25f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pUFehij/r9d9/fPrOm8wzD75D5gMO0fg2h+fKQHjWApS0wKaSCFWPnHY+cd6M3pTKPJnmdjIKBomEPpU+MFQ5sDcFfYl9ZHXXG1lBJYqGVNppDl4SmTByugOk98QNaaOSr06oqdVs+CFpJQbcaN99WBEYnj8Wcs4aGy+GX/s7nwdAfEyInh0dgALUdBgMsa3ZUWbx5Zo8TgXibYLgL2wRiRxoXU2StAspmwa8ZeKPU+aXG97yiLKd7cWb8h/zA1PjJHG6P3tABQ3Z0w9/uKY4P5h/G/73XTv5mEUkRqB2YSAMOvn83hB8oNYzvuC5OGzDxREBMreb3tJRgga82zLzNqpU+2gsBJDrBlJjVJU+v4NT+eDJhTdPBliVagD3CegzV9Z/hSSEoBfZcac+vPK8DCsjWTLtSIoPJ0mzzQDm4JUIqNJ4DD2zy0OjVlRA0NZ0n+RqbHFAaoTlPCHA2JB6E++/6elVTUOz3e52vYo5bC9cKLWhuJi5fVe6u+L58IDM28bzi6jDFoZWbkc7hKldXZh9rojo9Z+1b0QMAInMZYJmV5LBZUZ1eGYhcZPwjQMD8k4Zw09h03QcWoSwkC3DB2qt8/zaS2Hi9Ogaw0VxgXKdu+IbKBocCbU8BITUtdd8+gwb0ipW3gzRkYTvKvFsr5sajvwv/OdCOxGahzMshtycovjdFwPwBS0/QivHbY8y6iMsdXqUryvFdU5F0zNUg== 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)(39840400004)(376002)(366004)(136003)(396003)(346002)(230922051799003)(64100799003)(186009)(451199024)(1800799012)(5660300002)(38100700002)(2906002)(36756003)(38350700005)(41300700001)(202311291699003)(86362001)(66476007)(107886003)(316002)(478600001)(54906003)(66556008)(6666004)(83380400001)(6916009)(52116002)(6486002)(6512007)(66946007)(1076003)(26005)(44832011)(2616005)(450100002)(8936002)(8676002)(4326008)(6506007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: wfb5CUvARxuel4p7zrCTEXVsI0UABuofE6ZGmYdGTopBCOrj43I6hduHVKLUf0FKjxvVk9cvJGGK9ohliipbpLiZITpv5Ptd5e+V7Tu99gfC6tMgnKf8kYlElsVFIU+S+WJhb+6gNMbWcllr9TkZowebZQXVBl81aeIZrS1dFyYrSW1R053WYwss9prlbmexaVe7HabUS1RyMizeHteIp1Sb4xQc6trwHfC424FsPOgnLA+kNzZBMjS3htBe0O9q5u1eJPNqs7j+wXdBXohn68fhL+Bp/o1cxgsrzHXlvzn1WmmPc7vNgNRDENmjAEU3MxmElWwR5liHGauVDYWjlCzM4nXt+kb2rvwMQ0aBHO4/wYNDpSfAyHZ54K/UrqsfAf64jJzHd2ccT4kvDXVU2dsmL5F8SSFyeXdXQEvC3dS4EpOi9Ag4lkAlW5lRurkUcc+RWlB4N0v2v2AYfzSA9GR0PMTi6Fn6JfUzmmaPB4tFssEoUK3NfKVvU23jh5SmpxNxQ8E4DKQdXji3kFe4QRSup4x464ygIo61E2+2uAopmh9mEEvrgRynJm9lmCQnl7uzsREW93vC/eRIOho35PcmuwPsI9gdP07nFl0PfHqHKqq5Jri22MDxZgfVGnKTLS436oK8H6L1zYnm5prZ7SEbT1L978Bg9QpfztDryvTwYD5WIvH4r4PEh9MxjYvnwkfNRQ/tiz1huPtyL40QRWB5Duk6RQLhaYpaYuNA4ERhshtik7X8vVwDJC8L6eaPJXY3CszAEGTMqgqB//RnYzMS5i1dz2XSar3/cPFdzIFG4HWIjljb00MH1st5warthkG88A3vfsLALGMd0DMlHTwRvhKmWmGsScHUglaLsaAipFkm8XuB3mI9xhQQbPb5iIThYKgYq76sVZgaBDudyfNcaxV+GAksbuclAg3Ua4FMY3kCRV09KUlhGtNx1AwaCK09Zn79+UkIQBU7V51rv49iTZnjZA9d+yiPvpSqIfsbiVGYqr6B9x4WxM+wj+e4zdkws8Z4qo+EExYnGQG3IlkZZMnNAzU6wPmYh/hvHHFHjK8sh4XFBO5yGG9ZMf+IklnAySPyUz0/CDYTtDrynv3hs3nZJ0Ljbskn7w5ZTjPrszWhDEocLp8P+8XXccYzzmvp2hthSIipwx+41MJy/ISPBCJIt7W388sV/fe09YM0pc6Fv8xFR2e7608uwFT9HNgm6XjTlfHQ7G95OtcltgbPgsQ2k42CCYkqsHnUImbJWqghUytIa3etWeDb2wHlanKYUSTUg+QI+HvWstE9WzXIEKOffScLGctCEqX6mNecuxoUVyvjLET9r+jREM6HVTPWBiiaUy9torQKWLG4Fxd/T+j5d20PBKXvnLwDET2K366wSqlUTu/aE90oHAMNkJwCEiWtZ93dq9hgh/YhuLs7kIPZ+AZDe+MvXZ7cYBfhwNHseUt6ZuGNEW2lefT5LWpNUgIVvMp87LGGmDUHtvlQ7ZYhIEo4gdzCmrCWKloNH2sxPH+Tn0+OUtXs5AMDf2sf676PTR5mkGdSyGcMxfW1lE8rLRMu8SQNv3T1hITltk5/vcttkTGrl9DOa4KXnshfeshQLBCu/E4B6dr46Q== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4328f670-9a13-470b-8314-08dbf181c25f X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Nov 2023 08:53:01.9619 (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: KojqWhhPVroKheC2tW1ryD4R16GUGZCLM04+kl2NQWRqBrXIFViHfMJQjhUckXSxoQLqTHtSwnhJxnDb8AI5DeFynsqkmMrD51CpeMxK2CI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR13MB5381 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 logic of CoreNIC firmware application. Fixes: 646ea79ce481 ("net/nfp: move PF functions into its own file") Cc: stable@dpdk.org Signed-off-by: Chaoyong He Reviewed-by: Long Wu Reviewed-by: Peng Zhang --- drivers/net/nfp/nfp_ethdev.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c index 25feb8e394..38ee1c399a 100644 --- a/drivers/net/nfp/nfp_ethdev.c +++ b/drivers/net/nfp/nfp_ethdev.c @@ -310,6 +310,18 @@ nfp_net_keepalive_stop(struct nfp_multi_pf *multi_pf) rte_eal_alarm_cancel(nfp_net_beat_timer, (void *)multi_pf); } +static void +nfp_net_uninit(struct rte_eth_dev *eth_dev) +{ + struct nfp_net_hw *net_hw; + + net_hw = eth_dev->data->dev_private; + rte_free(net_hw->eth_xstats_base); + nfp_ipsec_uninit(eth_dev); + if (net_hw->mac_stats_area != NULL) + nfp_cpp_area_release_free(net_hw->mac_stats_area); +} + /* Reset and stop device. The device can not be restarted. */ static int nfp_net_close(struct rte_eth_dev *dev) @@ -1130,12 +1142,11 @@ nfp_init_app_fw_nic(struct nfp_pf_dev *pf_dev, app_fw_nic->ports[id]->eth_dev != NULL) { struct rte_eth_dev *tmp_dev; tmp_dev = app_fw_nic->ports[id]->eth_dev; - nfp_ipsec_uninit(tmp_dev); + nfp_net_uninit(tmp_dev); rte_eth_dev_release_port(tmp_dev); - app_fw_nic->ports[id] = NULL; } } - nfp_cpp_area_free(pf_dev->ctrl_area); + nfp_cpp_area_release_free(pf_dev->ctrl_area); app_cleanup: rte_free(app_fw_nic);