From patchwork Mon Dec 4 01:57:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 134774 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 702B143666; Mon, 4 Dec 2023 02:58:25 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 591D240DCB; Mon, 4 Dec 2023 02:57:51 +0100 (CET) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2117.outbound.protection.outlook.com [40.107.243.117]) by mails.dpdk.org (Postfix) with ESMTP id 24CCD4069D; Mon, 4 Dec 2023 02:57:50 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oHpvpaUA5JLYeLEWSmFQDadmcDbQaboIdIeWgqjLZB9QTSWaairTX370dvajse4dYEdMXKq+dueXzrkGJPJN8hpOCynQUGaAaGZLgL5mYiIboSBKqbRFg55gHO/6fQyLGal8rn5cH/fVv4Z5IH7VLfhnBbgLk+NFlL5QR38epj7qMpzRzW4jNEZpQefYFewTgylXUBHbDrXuKFjK/RlGcGfpGVExdeIg1T30s9NVgpVl+g58Dzs6FyFK02KBruOjI+GNpr9N/ZRvY2sA1v98eYxsIBhlxa4njKQueAMxMiDyo9NHajcGABjsopXVCVHILRAwwe4d3bmCkrqU7Hv6wg== 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=NPCnv2G4jNPO6eXpGxq5Ooj4c2SQDi0IfcWisGylPuU=; b=krSCLnh/fNqPRcrat0wQUKDzcfLZ9w5JAqERxk09qvj1jfYxWKttcBBgu8/FTZA66VQTe+Z2tzQgJo3UbldOebXUkuRNQ+rgaGB6w6JjYQ6KI5HXNOaFtgkUxJsp+esASnMkQhRW01hvtf65z2oCzjh9/WwMOOVqzYCcc49JrZ2o0y7WKqQgHRoEmg5wCsjMgLNziSjStEmZLC4bQMdhUGh7j1QCJ9O4DEPxpBY6Zh8wra6U1XeD/z+PVjIIggnzjh6BD0os3ZtUPK3ojQxa/FqFS8dglXkO4vDjRbtCvydbjXahn90k6oyGY7wjmKd+U3RaiKPzYF7tBTEo4HByQA== 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=NPCnv2G4jNPO6eXpGxq5Ooj4c2SQDi0IfcWisGylPuU=; b=mnfqo6KkdP4JKy0IhpkMICKIMvbmo3qQaZfDmONQOiHVJQL/qQXFCtB+hr/kstSy6mK51/Sj+C6L7Ze9EN0ETdZyRYz/RDVHSPBab6qBoui8mzeHWTofwMQWHmNrHUYGlALbPjiRir5H3gaaaki638JE98uJWKYhQi63dycyCgQ= 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:48 +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:48 +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 5/8] net/nfp: fix resource leak for flower firmware Date: Mon, 4 Dec 2023 09:57:15 +0800 Message-Id: <20231204015718.780578-6-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: 78169d53-0028-43ea-0158-08dbf46c6a7f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KMD6ZdI4H21Dc2OIdkcUnr9dR++PEt9hmQLzdh33KUbSOjNpk2x8Xjmy/fAr/GP3p5cXCN24OR4S8Mt8pyV/UOzn/XhCL/rigmFH9PqIOhNBnhDe03QS0sMwjBLA3ai8YCPl3lcjJX4sJ2cf23zatyMg78WTq6fvsZXOOSBAZGt2Ocp3bxDdXjvNrNNoibi0booKy/rKU/DU0XvOA5b0KntTR8qvmqjc1Zh1GviY1Os/HHhhoCI9podtUatCCHmUF+vPxxnuFrI775rAq23DFypbR1FaW0Il5e/uSmwuPj1bcRd7ey3JCXKoC+BUtDVpGaMyrtvs+TX45JATO6EA0XUT59No/HwKKUPn3cLsTBORGYqX9eqT5G4OOe4F89KnsiteWIIJjuCeswQT7lXX1ajL5O63tvJAEPHFVqMWw+YGLSDwrKhjmy9Q9dPz5K6fLmnc8ZUJZBUPyiT9B1rHR0H5lxISl4m64fTFSi3Bd955tdjeacBoGM6Bii/ZBtAVUuke/qQXtV6dmCpnJBUCmUGPqkkMoSUsQR7c05HvUifM9Y/D+bUN7ZF74hR8BcN5/dZiGFC8uQiEJ7vaY/MNpSlaZgVlzQSuwUqLm0VTKvDqCatENSgaWaqXCmS3ARGDTCl9CnW4H+7FiNgWHrATufhLcPoCz4FVe/Y57jV8lApTnRm+bCSCMCSRkGy3JOOBmGePmp7D/hwjxoEy/QLWtg== 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)(230173577357003)(230273577357003)(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: K4mxGDC+PrbGf1Zqb3T89SV6WN4r6E6kWouqQ6zdnh/nIdPu+dg9usGqsBXIU7gJuwjGZREVXzl/cWoICPZTz2XvMVh8Xy0u4t2utBBItWVZHUxY+uWPsf7fQkwCu4XVSTq0rxCNKUEPtTZlaM7Yr5v61hcV5aBjIODNtsS+aBK2xucCFCAKK4WqPzd0dnQxzZU0p9UnEY6zLX6/UFOsMlaX5Jgu/e4LkSa/95AiKsdbXqcc7Ms4ktE34GKH0tP/YMflx31z6muj3QjHScZvKOfKUCN+ITzXK/QBd9c/QbHcqYOzOJcaDasBBX8hs+XdYzn5Wg6sS2PsGAZeWnSLcpTMbreP1FdCLzKLoHcPut7fDN5dzR3aH85HmuEhWcCiqwKa6Ft1s6A8TsMcoyHk6xK/TD8J3wDWVzVG6Aux3v58RQlNVAW/DDZ5Emg5ahdfa/pO9D7xzpeWWNl1yfUm2SccdQv6ej900bQXkCRDyNASZF0He2QfLCzf8rMPLwafLAHtT9sRQTiGnx9EqeDSl4jU+Dg46/bWJTlQElezK2XEEYjH1+REP/XSupcKF+KbSxv+jG3A0oaQNcM1bSPsfP/BUqwDjbSJZR9Nf0R6EnDHZ80MK1BCk152fK08C+mKzqpiai4giRgVR9py9Bj5MhCa8hVOBMhWF3HOEX5Dvj4ceSGYsllSbxWOtruEJxugls/wLqJC+m30+e1cmSqPgUaLQ0xbMFvjswiDTqudkOOFz6CbViIYrh3KIGu4otwNaEdfmNyhlOkzg9AEBOjE67lntN/kRC5/kjMjM3Buw4MP4FNa8KMaUpFg6C9TE63lWQC1FqpaWcCmdePPJBZEso4E2rvOXtXa6XUpl0Yl2Ve0p0oyilDNRbLLSxsEVDxxH72Pf9ZuTY5ipNF+toxp24rcL+fiyJD754h2TLXNUHB6MxOw35maBK5gJDvR31O4LBbU/YucZTQBIHADcLkWSniQytpBBmQcteDC8dCveiiyGLe0JAXIlmBUB2R/tJeuZxS8f4741vVc+kb98Ii7NhW3uq31Q1sY6Xhl4tFLoEw64ipCHOJ7qAHer1d+q66/LRDxo7PgTPaxkfQ7ry1FZGkVF6w+2N0j0WkaSJwr52KD/avAtLxf36BE5pnx3wg8S4UTe2kcjrzwXh4LrPN6em9SokLrjNNtN8Im04LB9qzwe/VlJXL0uP14C9cVRek2Byp3PCkyrRyN0XA2Av6qF/Ji4eji0Ihosu0wmeb+MnPL+HFC5Uk3b/7UWTg4EB+ZbYpCICh+HeAySQAZaqrtZcJ+EPZA8slDxCa70RnJYIgJBzWTvB0D5JbofqW0ufoJ000bTNw3ram5dlZszm2p7glME82PVZGX7ZjLrnOFK3ezYKMYggAVfUcOwaO8p0TwLX0QhqELUgRDM8TpnzGyUPZgPpQtLTJTgCy9vQQxUXLpgt5a8iLrXcNk8WTCQDkuF2cbZh4EmUOXRc2uFPpXYNAK+uxTiYBfte8nSJaf38vH4AhKTzETGQHKllJJhLbx7SkE7BSfsgzVJlDf87N0gi4PR8U6bu1/AaoR3IIOU681Fw8euocOJciwTy01JieTFWm0juPuXX9mqPdJ3sNAhA== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 78169d53-0028-43ea-0158-08dbf46c6a7f 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:48.6222 (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: o69ZF4WINYXNx0LH8QjztGB06es2ca058RGKNoLDxXy7IOvqwkKgaTLMjVM9SiYuJ7wY/lX05usMgXpixXY7WYQdP3dRLUesaguJV1PjXco= 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 flower firmware application. Fixes: e1124c4f8a45 ("net/nfp: add flower representor framework") Cc: stable@dpdk.org Signed-off-by: Chaoyong He Reviewed-by: Long Wu Reviewed-by: Peng Zhang --- .../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 0f0e63aae0..7212d9e024 100644 --- a/drivers/net/nfp/flower/nfp_flower_representor.c +++ b/drivers/net/nfp/flower/nfp_flower_representor.c @@ -291,6 +291,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, @@ -410,6 +447,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; } @@ -501,6 +539,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: @@ -511,6 +551,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) { @@ -585,7 +654,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. @@ -614,9 +683,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 @@ -635,7 +709,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"); } @@ -677,8 +751,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 bcb4c3cdb5..8053617562 100644 --- a/drivers/net/nfp/flower/nfp_flower_representor.h +++ b/drivers/net/nfp/flower/nfp_flower_representor.h @@ -20,6 +20,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);