From patchwork Thu Nov 30 08:52:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 134731 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 E6EFF4340A; Thu, 30 Nov 2023 09:53:58 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 125F442EE4; Thu, 30 Nov 2023 09:53:17 +0100 (CET) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2137.outbound.protection.outlook.com [40.107.223.137]) by mails.dpdk.org (Postfix) with ESMTP id 05EC842ED5; Thu, 30 Nov 2023 09:53:15 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=A3vshTVYarp3Svrh275/fI96PO41WtrUUHivJiklknoNYujHcvIrCqqKUuugt2ERWVEODoXdv3UdOBT1c05RPIhiJ2bInEyJkV4zlAyNK/S80J2f4FlJmeORI/gDegRRkxyBe0lPSkwGsMnncGX7lhq5fFrD2wg2Q0IZX7AwQ9qrGoRLKFd2GYuOSAVf36OqJuu41fuge2qi36U2BaC9i6YW5WhQlcUKbPvJ+fS7V0QXcASosVhH2BRkvrOv6s535fIQ5iaLXthlg8qzedMnVVpPrx1lR4qf6Jb+/8HvMRncakzzCWe6vw6qbcXCg0XqgPHqeO7eZ5xeq1cnXCKfcw== 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=7JVn/Hs43u5KYBBCIIihM727EuCw8Q8oIMk3RNWlHVk=; b=WLB9TvNy5XMnkDTrrmhXGYO9kmMfhLrknNI58JDJ2K2jRbQFmBWSXmJoXxQDtDto+/oZ3S5PeLrhybf240KbQ+efbOQbRts5ttKDV9LzBnK/hCi6BOmoMg0S2nIpFmIZORfeRrJqtoisqIpuHDtzVjDWjQD2NPEoRZ3jkvwwnjdhx1icdczK5GIQRVerpa6piyEXk9d1wWyQQJ3824EKIITUoaZnYE7UrMAr3VSASJ7Q8xOYEb+MjmumEvdYeZDtZw12g8peCd6xWDYKFXBGDs3PZw1WR4YI68+tPin6rLLalWlxiPiN7Uqbrg19ZIMRfX8l3us7iSmML+r7kVQv8Q== 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=7JVn/Hs43u5KYBBCIIihM727EuCw8Q8oIMk3RNWlHVk=; b=fyKY2WMaumZqIM8/RWIDBDjlESG7dVoQYf7Otp4Vj6SxViO+jJzg9fyhetSJz55RNK1YWv2PGc/MP7AYQyfaltmH3rsl38qOcP20PhxBmIDpkIuNyOyYvdUhGVOxnn81n8ea/bXi7zGNA5K+VPr/MwFWZz9/OtiVvJUUYuZZA9o= 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:12 +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:12 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , james.hershaw@corigine.com, stable@dpdk.org, Long Wu , Peng Zhang Subject: [PATCH 7/7] net/nfp: fix resource leak for VF Date: Thu, 30 Nov 2023 16:52:38 +0800 Message-Id: <20231130085238.60290-8-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: fff96c36-5ce8-466d-e690-08dbf181c8d7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pzxev7p1t/YB7iPBJGXynsVmU8puIDK8LEDRdCB8K7FTek9VGAEYfFB6G50xR+8QI9pkHzzDqLBVVjayveClrjvwgz/QtVWlEgPmWE20p1rTy5jf1hfPcliJN2/8AHF7ICS3J2n/rV0X9MkdygnBP7GNFdWPO+5URLKx/jRI9BreNWmBer+WkGrmgdjt6GSVEteaDOTp53QaobC7Qce4755OhUX7azcgAVv2xzO6HjomH0iyjUAHDJzJSDfrwK/3p7LQ2MwHeHUXMzklUjo/v8PPgDYeleIlxNZHOeFKIf1F+Jwg7ZmEOADObwZ/Pv6PGGPaziOXxHLNf15x9Ap3l67E6hsloQvtEUsTEaZ+T63/ifiJBd8xsMPTbmf9EDmP9VBzkvzrKxubZFVAYaXLmPwmJ0P3zDFVJIlBvujjWpInt1+RJQd/ErBglL0dNhqZJcyQuHqhz24vNakCoEnq0SDZCExuRLXOkOJERNLM56eGipCqZ0rbjbG66LazBU6M7hdDOp+YpIG8s3GQL8r73uKRjWtACMxqlCd5yRkYQ6RswjKGimK1nhoj7IcE7ZcdccgIz1lVtir99/JCOB537T6Ry7dw16QXCPwQdtQcqrNJHBGpG5l/88w9FZo2aQWV9XBv4Fb2XFtTxDr6veYUXc7S+Bs3fky7d7ubEmVYjnW5NdOvL0pWlEduAjPAutzj347rfqw72CKUqUuseq6OUQ== 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: zxwWd6LvoWBkdiCkCWtJm8yUZzF9CzYRIlSAMazb/NDUPokZW6b1lh1TPZZn47honJfetk1qbIf4FH33qJlVIdTvE9qOZUbGnqM4BD8dPo/wfOeFMPTO85eWp2QezZhF7sl+LXi6r8Jpk3SZuPDdi8xKyiZxijcIg5JZuo9g3rGl1KJnpJhjWp07v13hHXRrA+ThgymWgK9HG6cpvhZGVzeFpE465LKMlvYXeKWedi6jc97BOwpRQitt3O90eUsSO2D/Pl9dsHfLO9jT28V/WfP8rCsMGP07xJcdUjcZbh5KuojMqYN/e7baR1QRu9vG6DNh9Lpp41Dvu9RqtnTaRd7C0Z0R/wYWzTBXH1A8xFeT91EUx5WHz5Az7YP/NEzfF92WsQE+38Wo5f6Uqy8zFAofCcnhx68P2UArDOUV/ZpIvcN4y4e1rHyrnwFGRAFjhEkRknRqtgXyOZliTrsKdujewiAP/EFzYP7oHcrOfFmm4RkVvfxlJX9/t7VwIRac7dkoR3wLNHsweXtUrTWxxpTBkO3ii2SouV657/bfIMLdAqusVvEu7p3vRiGMP5bMgm6pHkeTb93MyF+cZ+YXF0KuWbNvjd4mql8JMZzz3q8I30z9vZ/Leg1VVE6AQv738mmf0iuKR9n5GFeJ+1SBa1LPePG6272uSsmRRGn72VeCNePbfQp86jwc+V5PYC2Bo9s+RC9fh40qiMQKRrY2XXmwLmb5eElq5nRzfcUS3KkWQ+YcHcPZmUzGU1mTIQmGbO+RsCSt+7jtBTWLsPxrV6zy0qqoLFHWydiPyDWb67slwPVXsmaQK656FIrX90QSZ7IhM03BR2YUIVZma5MbrjvavZWItenqHSafa84XawIoBQrIy46UbrAZVTlmePyC5kTGu9KOVkFkWXYK3U07QfnU/WT+zUj8vXSY/nVEuEf3N2/to65TMJZYRDpBZmLGW3RR0ctuQnfAhQxo9RgjgSNwLpBw9mGE7SY9Nk8HtHeF3ZZCkfQHepXOFYxOeDbbOjhhgnlNuxkvih2TEKmNYi/HtxfPM3zzTgXf3NtiGoulQYCjSTYzyr5ROxqlwzUJuMcAN7GN6+YdPcay9ttH/4YNoFeIBZPX/CN8tSvkGUtcnCF0L7p+2X7tBRBoBkggQeceRP+31xwJMnCxsrAkqhm8jTwhIydLSZGw6+3rDcnlnSdIGk7aPeTbuAIKZQRzoaROF45VuIvYOblElVeLdN6PsYlArzfu5bGILR9OnZOw8QNEPHs7AYU4nmLCGSLwxFylBGftqoT6oVtDtel/xd8ncDV/qCJuMNv/NgOqDZ567nsSErmEXiqG0zuwW1DKpNAX91psomxTpW/xNZUIy6CsAMN89RYKgYJYyNXN0bFQxvvNgLzC11fe63NTwKaQVaHrF9bubINpjmVvnkJ7MU0X/4CFUlXhnWJDP0AnajSWCrLkjzNkI6xx1FKs29EKrJYzaBiUQXQpqjJTU5AmkkK8O51SpccwsmCCkFtd0FmvPk56ANbzv7Yxf9p+szz+fZ73G2nFzOB4mQFxtHf4HM5dmSvpBqGeNyCBCjXWIGCWJu5k6k4NFC4Pwa2yr/pCa3YBVTNtA2KEdA716bA/gg== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: fff96c36-5ce8-466d-e690-08dbf181c8d7 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:12.8172 (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: Xr+mnBTL2J+A11rq1AS2uU+urGzzFvv/gxajJ6gjqARM1L8sp2C3sozU7vYqXcTJJZLB1OugB0MT3DnwPFruQ0HDu5Nuc2A7rEDZ0ebjp7w= 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 VF. Fixes: f26e82397f6d ("net/nfp: implement xstats") Cc: james.hershaw@corigine.com Cc: stable@dpdk.org Signed-off-by: Chaoyong He Reviewed-by: Long Wu Reviewed-by: Peng Zhang --- drivers/net/nfp/nfp_ethdev_vf.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/net/nfp/nfp_ethdev_vf.c b/drivers/net/nfp/nfp_ethdev_vf.c index 7927f53403..88da593190 100644 --- a/drivers/net/nfp/nfp_ethdev_vf.c +++ b/drivers/net/nfp/nfp_ethdev_vf.c @@ -160,13 +160,17 @@ nfp_netvf_set_link_down(struct rte_eth_dev *dev __rte_unused) static int nfp_netvf_close(struct rte_eth_dev *dev) { + struct nfp_net_hw *net_hw; struct rte_pci_device *pci_dev; if (rte_eal_process_type() != RTE_PROC_PRIMARY) return 0; + net_hw = dev->data->dev_private; pci_dev = RTE_ETH_DEV_TO_PCI(dev); + rte_free(net_hw->eth_xstats_base); + /* * We assume that the DPDK application is stopping all the * threads/queues before calling the device close function. @@ -323,7 +327,7 @@ nfp_netvf_init(struct rte_eth_dev *eth_dev) if (eth_dev->data->mac_addrs == NULL) { PMD_INIT_LOG(ERR, "Failed to space for MAC address"); err = -ENOMEM; - goto dev_err_ctrl_map; + goto free_xstats; } nfp_read_mac(hw); @@ -360,8 +364,8 @@ nfp_netvf_init(struct rte_eth_dev *eth_dev) return 0; -dev_err_ctrl_map: - nfp_cpp_area_free(net_hw->ctrl_area); +free_xstats: + rte_free(net_hw->eth_xstats_base); return err; }