From patchwork Thu Nov 30 08:52:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 134728 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 45D1E4340A; Thu, 30 Nov 2023 09:53:36 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 80E8742ECA; Thu, 30 Nov 2023 09:53:10 +0100 (CET) Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04on2110.outbound.protection.outlook.com [40.107.100.110]) by mails.dpdk.org (Postfix) with ESMTP id A68DA42E5C; Thu, 30 Nov 2023 09:53:07 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ecqWE7CEXB7Y9mfp3wxFiEQTO4xjLijvwVmYoXqbTVa5b5UU5Ig5WyjrvmAmd5yO9O6co82NE9MCAGVVuFi/RpQ8PveM9MPnQB7pRbDgk/1xtKe0HbY8BmC/Nq6zs1mxDWkd1FTFMfeMW1tyfEJJw3uiJxNxJfmlGYhPEeHmbNqNNe1FtRIVZwsGjuuHXFyviH/T4cq028YzdsL/ls6Da/E+anP6yKh4LRIA8szdn2Vx0RMW+Q0SNn/qKd4QH5HySlWoKYILhrM1bXqeCIf4ibW160UGptIBaJy4rDWrc/q6ge78t6A0wr8c7d6E8VglEBpdPxD/fsOFG3dVLeKXrw== 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=VKK1rB3+cVKpnINvxY7UbZ2UiO+bOuDgJnjjlfxrCJrmjpkfZd7LSHqc+t/HvD9ZnHirVsJlD2MHoTz2y7mGRA98ziN2jNkCYI3LpUozsM+ttzGa+WdWt52UTWXIUzAIvDL53RZy69diwLJp0tD2dDJ6ymCZMQiA4IsQZUZuy6NZaLJTp9uCaeTU+J9OTWie9OdFKdDsuRCoKVqfXM75ZLXrhftSqDOjkHMpV4ognSAo3yFiQn0/L91Eb76hK2jLHgJotC4Qc2HscOktffrg2LUFujpSICEAbAqUHxXTDOzlFzAOMyoaPAmtGwO5PrN9yb+t7+ayoRGn5uLwtUn9Gw== 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=vVTwZTqn63kLq9Gka8A94oUCgSvj84fIcBrGQTX+4hg2OsHIGO9J1yjDQENtuNYVQlpBPa8a8Xjw6H/oJ1XxHSeZvwAmeVKCEuHOiHwlMnHe3RQCiyzZ5uDkx+TRKknU/99YP+pqRK7HCR9Vt/B9csUrJAaocXGTfNMFrlip2gc= 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:06 +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:06 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , stable@dpdk.org, Long Wu , Peng Zhang Subject: [PATCH 4/7] net/nfp: fix resource leak for flower firmware Date: Thu, 30 Nov 2023 16:52:35 +0800 Message-Id: <20231130085238.60290-5-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: dd70d968-82f8-424e-5cee-08dbf181c501 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: siQpH983vrwkOIT+kW7CQKQ7k1zVnKRRDCQgh9Usy/adOKg5nCPnfdE3wAPPfo3jFfmCS7z6wOCkvMHr/ex4TnJIdhj7X3qofVB5w/udagBnr7ha4jVZO3519ZVKssR6J0iISuc0YyiYFOBtZWPZK8iZg/HPcvnb5tHK1oVu3tr7ygpOe6NyA8WQHB1r2BIzIPcnNjwutnSVkRewAymppnPDOobgTfl3SGJerYzq2NQ087AwMFX1dm2B0/dGGJpeyJl5Mp02Wc02wrgffoslPODvf9d7ZR2b8r59meZsY+FJpBSQoFxENSRJy9NrL9/UP2fnSMP8YmtSGkyiGwOzEp/B0kCLUN4UQv1B7Q5d3Gboj6VfBm3xwgAiLY3lN1o1PmURru23hfcRzSdfVTGTQWwSjdYguv26bKjgliOmflVHh0LwJoTi0oX89njzaUaLulLlLCczoe3Fcv29JA7plAzAiyKmKhZcgrxNHLmUgCNRXZTcQEw0hjUUu69IozCoXGB/sfUyrZNd/02xRXahVaBeTs+bv1Hs1mavcqvbyPupNAMFlrz4xdPo90cga8FlCE91qP43F+IJrGX6EBOsLoH0rQymscLIJ3hc7oRVHfbTqO3zO72qahmwTI99ZgDOIMyRQIRw3RmqgZkpdmnllRGH4yIN9p93UdmXFR7YV699dqHP3BEmUNR7EZnKahZ84aC6NLWnOm4vWa+oG5adItBNFxAIPDQkDChuiGtD8kZ0ZuweaFDEahjDPm51ssuS 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)(230173577357003)(230922051799003)(230273577357003)(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: zBKxtPr90i9OzUMWBurpu53YXVu/tyAnvpuj28WE/byU/zJ+Uxtv4TwgZW9PCtGbZrOfP6B4njRF08+EVpeHo57dghTtYWCj93iD7DtdkaowzTzRiiuEnXZ9+Lwp/yRDtQygeTAN98w42YvPkLoFl6j04tCFNAFqlBlrPJplvNqDLygCPi3hC0L9bocIAn433mPfzbdc51QAvwofK5BBNQnR0eVkUiYW9yJm73YFQd+oTH+PEq13wnEBH9GpqXrgL6s/P1ZTLPBQSolBQeYPWARt3NMqbfxoWj/t9Xkdqhvt5ksFlE3MgbXwY6GnkbtswHRW/86qTxs71hlqJpJyoHpud3sQVvtKH9BRetSE/EkgOR2VYh611JlZKAk7z/mOitKSiuYNXNp1qthE1T4rA0sUrHols6cdY85Sv7icX1woUe8NJFBGvHCosT2/R6Yv+wqVrCZiUU38mQdJz+8mY90iN9tw3IzxP83S13rlaw7AZPniEESuTkHl4EnzSO32rA6sRfCJ5K4Dk/wP9j2OqI4CZ4pS4vruiknySKrwV5CqlftPed4EvdZIWrFsyzLnnDNH681sMYrk0HQ0Mg0W7sazUDBrSlIoym7sCgkoZBZBHOC8ffaHmbsAi7VBNBb1zMDoEqL0MGreJZEpEJ5/osYnFXaCRtcHJ1rLelks3B0C8Sz1Qj7HXF8ji6fK4bzfTqd9DQ5FRqDRm2i5Ag3sCDH1gjD8e/6Y0NxDUYwIKa0zGCDTA2VRV5Mb3C6hu+quEnGX+kuK2uJtAVB8kTRjFVx6uPROCdHeO5PPqeKZ8cGKYjHD5N8e/dfypv+0yyyskJvSv4Ux/iUDCNRfe8AiJS46W7TqOJUpp/1JIMzI+DOe1VrPH0/WgBbFiz1JEG7XdHBplX0+ftnsnY2lMzJnEi9dapIYM3t9AY+Gn/Dp25BRTuO9MrYPpkjAWp2tQG6u40pXGra1S61c9PAr6I1t02s2bRiZgfn95psRVK1LwQLVWa9U+nbmdYR+/GJ/uHrx391fyvZqWUuc/Nbt8vtYE9q3/kHms6Bz8AeHF5vKrlTN4z6uKx6LZGD8v/LcudMEd/s9tJ7cihDGO3YiIMOgKLgfrbQNyu0uontHlqYXr1Tlja2pe59jqfSGkfaFqhS/Ue1NBF/FPQGIi9LvTFb30KWutqs12/ALt6GXoc+WRDqBKRu+FNW1DvM4TK8bxzwoPkVJ6ghyWXcIGO6B6e8wYjTYbK18ffidER+CbzedWg3/JGIXh7nSI2Vw06r7KsVwO2pWMFxn1zV8E3wOxOmJg+DLedtxptQqtZjIwkOi8+cd1weHIslTwTT0t/qAhjeBCjD0uR5BYJyMh+iaWIMZ+uNmLpDtUC0N7uEH3uz95ANgKCAo4NQQUv3U9GN1C4eiyOQ0NHdB3E+kHnOD4oy3vodfjAtnkdKPpOHNnSqJyNzbZLvceIQbkS2KVHv506rk97zLdB+yhMoIbaYaWWEEzHGOZ3JLnckLmGUKXN4f7Qqvo7FablujtpMSr0Hv5EVFcjevZrOLdurYUI+Bq7smZlJke050PrhbmyzQqUaY9VtDHK4Oa+Y9yYOlG56yVFIF2ap09EP2kLXxTqSYuHiFhA== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: dd70d968-82f8-424e-5cee-08dbf181c501 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:06.3858 (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: jZzjp3UV1jsaaF1b1jewRsHVciwtOQmuDPZ11pNvxIdw1HSklcaKk0W4JAMB2K/PhDntWvy3/BXmUQcoKxOt9NESEVMTDgmxN9VoPZXKGYk= 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 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);