From patchwork Mon Dec 4 01:57:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 134777 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 8FB8343666; Mon, 4 Dec 2023 02:58:46 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 96D7040E36; Mon, 4 Dec 2023 02:57:58 +0100 (CET) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2103.outbound.protection.outlook.com [40.107.243.103]) by mails.dpdk.org (Postfix) with ESMTP id EC56C40EA5; Mon, 4 Dec 2023 02:57:56 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fQr2Jomk0PYGxhu0z0nVM/GX5hUtg5s6mcKzNzXck6SNT//GzuqQG6N0SgOO1oxkRyBH+0GIWAlVZL9OC07lohRNunO2IFO/cVcZfTpA3XznP6PWQDrOOo4MPA0TF9Cefo3zEnFWsnsTt9MV21+a+NRfdnj8PneORzNRkas/ImQkXuAkQUOgFgAqgHu8lVUYzfIpZYWgAjqgX9Y4K19Ek0Mzw8++9PqWM5BJoADpS9XsgB+DFuvWC7PJJd8KNvJGD979DSUm4fdCWisoNJyiMb4L/S6CwY7nTg99Jcwk14oFmMpq9vTUgo3LifP6LTAMhTHnR066tnaiTUXk9trTUw== 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=k49IQE1+US6ripxigXOIE3sWvlLP0hIcfea74eSLHX2lWQrR3FUBoj2k9ezY7r5bx3aw/90gda+Um8EUc/r+ax4QAxlgI8d8OGei0LuEvWhWPK8gYlTomOLmZoXm+Zd14i7WykSg4dZKBeRBrk75yiWoaXiVXvFdcbwfiW6H7x3k1Ctq1YLRuRCWTDAr7ppOVoXhcQ0g+XOHaqSAu4yUGuiLLXRz1/KUQe/Zs320XkHmrIqnAZcmW/iPZDdDCJatz/NZkOfBzo1cDDyYyfKBTuenlKXPNnp52CR+qfJZMYgxb3FNiouH1cs80URkhoC/WBco4idypTz3MhSbYL4Jmg== 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=HqFLcASHJ9aeSunfuJoD91QcDCHyqTkvvU32dxJKZ0Y63pBzlBBf3N/zUFmtUNaE0qJrsKFknGYkrOs/M63RHzZaJu4n7YmHV52oj5oq9cUYwv3jS3M4zjMdVserD579uvEP6yXZCloPYOwCjOspFMlLctXGh5S/V7y5BrnGAWU= 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:55 +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:55 +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 v2 8/8] net/nfp: fix resource leak for VF Date: Mon, 4 Dec 2023 09:57:18 +0800 Message-Id: <20231204015718.780578-9-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: cba19c64-a574-4864-e604-08dbf46c6e90 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6zcXuUcWpY4gp8eZflQlb1Wl5UfQEyUwYMVCmiZuXIbcuHZT9UzYVKGWMqfcKjdwELysLc/IQx4zhxnOrgYk/5FqmFj2+NTdxS5J7y376a4Z0bUn9u8TGKjNEVkRSbRWnkhJnA9SZqCKRFSEr0zVT3H/ALinPzutZ95xeYCS50gpBgpD3ODS5DrKe6yo2FeE2u910MObSv7QAJ+DKjMtkRFpMS6cBZ1pVLm0Q48BAKwpHmJmH5lyoXdx0SzunGdKCQwqJuOSYAW9nJsjvVNoh7ol+Tt/UWfnAfpuVaGkbsEaOPhUD18fAoBAncdhYONrH+7tCp1q5mLAbIH/ObtaOtRvEKxr/CEd9wevFYbqQ5wfJufCMW6ePRe4OIqHN8j/f8PhKHfNbftRfCu0XhjK+mgyLjx0IxMRJyl7OexW958sh2chRyxHRAKGOHhyVDtrOIDL3VKG5lKTYRdCITULBq6zxMETpMbLF4dew9tBR6lsOx6i6DWEH9yJL9H2k/o0Nb5WnH37xTZlW6yA6Z2NqMdb4FDGtod9YA/ztDmx4igVtK0Nosg9HGITcwE8q0tXoZpdyn6hEJuWQXnm3c0dxEAdZuVBsyFjXLqDYEDbqlKV5eArdzgSb81+NUwI4vaWj0FLWdNNe9rnTjq/PNiBsP4BuXZ+bHqfWBsxZ8pi8QE= 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: npAllOmhzp2+swxEOPKXMqHiVsc46zbLdb2gb/zSnHR1g/JfMDPgfmXZY2YtxtGz6PWQVavd9nOsXXtLgN/TtpqL5AJy4Yl6+BhjQBEcwYGVjo0r7WFVsl4Bzz8mVJmW5wELGFeG/CuBd6suDpRtN40QQhtWkr6TDYojFA09mbDvUBhTQ0uXwEUGcPzvXZT39tcvlI3gVH1rWSKT0+ad23ISS620yX6nEZy4M0/WED3Hv62pe/TvVm51fzie+8qddpiVYD7nfru7SXoadZR6xylwLJgfN0/ILmiOTYr1YScjcqDqy6ib6QL1lDiXOfHY3XqTpGLH4Xx+4xIor//0RPJ661eJu82pC/g/6Utomi9LtKUXVv4RW/GX1k3nkNW1IwzdWoBCgDO5pOCKarkrxLj/m426ODIXXMnyEHN7tOiheUBe+iGffZttrOoNjvFXfqODso13teX7hA4WNSrlctuaNpsiVfrwHzR1NsTwg14egTu3euiCZIEku5lEJoxzK1DtRvEGiKCbcRxixceOVoPsHaoWwncEgyQ820FSibnKaPZ7vQQy3/iJkclJB0scDTX02vs+FiabUQ5kgSp53erh20PCtUuC1LGBoIsJgnVfQVSIIdPlK+tCLwEMRM4paLR5jdC2NlaNWgPdZO71F0w+x38aZAXOtgk4LYO6SxhZDaPfTY6i2lrnQAzw44aqHsBdRvIOD4viBtjUa9iad3NRgosbMhKmHR+/L+WsRo6/9gfiTcD0SYz4NC7oWdHcmfLkYvH5J2Onz2lQ6whnGzjRBXMAHISr2/AXl8/JfN2ll9GvRGpxEV01T9kVbTyUqAIRE28XQCw6xaJF65ZlfjwaKpNgSS/S403i7OAOpjB6aUE+hUEg1zuA5iOT8ZUZcmX5HoCDoRoe8jsgPFhrWakJZ0g5IfgtEiWklg/5Nwyvo/ZVuCkrkF8KUDLbe9dJYPOOq3T4z0p3+876ZWQ9dqQM8Hy+4EGOtmRZl8knitbxf3lbNAxhHKiuR+JbYrU9lqxKkqrtKTFPBep9Zz/zqSV2To9tkyB5RWajnEtT4Y9fsYuMmxu9/bUa4uDvmiWXsh5xQugPzYQJ1ubu+jhmwsIfHssSSGMnt53cK4U0kkVlM3tXM/c/akqUYDPkrWkbaaHwI64tjgi3b+e8zNdOwYNIXbQMcJeblBN9+9HzK1mOuE8m0ucx53fAt1I21dyjAB+LlgMmwgrkNAdRyLsV9NztMltlmT/S69sSAI10KMSP2vBL1+ggHbp92OW4CsWGcWhBsG/mjDw4LUrQSm+6QU+bAIxHvwBD9XJmO1AscRGo8+4LqJG6mhzY3VxTTGjSoP86oswHfH/nvr4p6Bp9EOZOVKP3y2jGx+o5xW5Td6ktoauMScTTBAbAUm9A478ARvxVTml0Yl4CAHOZtd01FKLQ9cke+Jkb/ug8ZBRfZA715ONx0ju+J4XLm51Dr2y7ZSJvQemze9F5YLZapz0dEE+XInYtCDqEDLdZBqLaDnouMjhZ8vYeqetrYaQDNNtk5hemSUFZ7fxFwanmvlie53mqI0VkHWKlwl3TQXdmNE8InQpRnQ6eH07XoebgKcvlkLvrKOOyhh8bfT4LVkLHPg== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: cba19c64-a574-4864-e604-08dbf46c6e90 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:55.4902 (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: Uoe4SagvGwD6RYV7crVu0yVObAAda7rFAdGf7rn2s9RZQnxATg3Nbxn+BNT8PWzTyC1wZ2XKCBuenrRhntyteRZtYmXmBdPziBc0ZALxAYU= 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 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; }