From patchwork Thu Dec 14 10:24:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 135191 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 D5DD4436EE; Thu, 14 Dec 2023 11:25:03 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8163343036; Thu, 14 Dec 2023 11:24:55 +0100 (CET) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2126.outbound.protection.outlook.com [40.107.237.126]) by mails.dpdk.org (Postfix) with ESMTP id 3910F42FF3; Thu, 14 Dec 2023 11:24:53 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nGT8IhSlyi06l16HTsqEWWJcLcaePj1q5c/uZgdtY4GsV686oPF0bTV00i5hqPvlSpOBoYFRmJcYhmdjx+wPA5lYqFDlD3YKB64GVQsebneBW2+RpexdDLL+FyGN/6QLDrTL1doUg6R109xjqKlw9C83u/CHs5Mbf3lDQvvGUGtsL4CDJsOaHHQgzb4oy7GA+1lHJBLd+OT/N9jApZZUQlCwrbedDTJ2KSnf1o93qfs4VjCTEcLEwt16fstTsTfcNJNzuXfAZslLBywwf2+eI7f35nldJaetLqJTx0p2bzFd25D93TohrHdDmt+kBHJ9tbv8R4gwngxBvOhnOmU3MA== 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=9v9nJC4U9iope8zCbMRuFO1Ks1FBK7rlk8nUM8P4zY8=; b=DUWi+5F5ymfacqFRjpZOA5xXbuBxLncIxCl3WHfjLWJVYDzZ3j14j1Kydnc0v9D+Ml6khgvo1F6gOQiO/FSFOVXknkNk6Kl385noCb3aPuqmh4IyRpO6Y+t1Zba52PcPyzMGyqt9uNS0UoCjvjPeNNOEok6obBqHwiA67N78GncoSDp6Z7YeIHZQ/EkCN8QZ7iPh1EPvHbNqjlAPzIck4XyajMPL7AGIfgkNu0NACnyqiS3dsEIF6T06+k74oFicwEKosPl6laYQNX+APqSIq8zX3GuTIj7NRQ61+nAi1gOFj5A96lGDtZe+Ebh/TqGMpWpQ+GmPbefBgRdp7XNL2A== 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=9v9nJC4U9iope8zCbMRuFO1Ks1FBK7rlk8nUM8P4zY8=; b=KtXqUFpTyWdvY7Cnxhr2dTFxuvob6q6/IP2UwrsYE0n6KI1RKyQfj01lFB9ilQBYXah+vnwuWKdt4SEGww4ghmRjIfR1EyhYhjzKZnUUdcK2AwlRuZIiRv3oj3E32x7iOlZxRTnu4jPbN6vQpXJqQDsfVkxowTdux64m4nei4QY= 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 MW4PR13MB5460.namprd13.prod.outlook.com (2603:10b6:303:183::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7091.28; Thu, 14 Dec 2023 10:24:51 +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.7091.028; Thu, 14 Dec 2023 10:24:51 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Long Wu , chaoyong.he@corigine.com, stable@dpdk.org, Peng Zhang Subject: [PATCH 2/3] net/nfp: fix free resource problem Date: Thu, 14 Dec 2023 18:24:30 +0800 Message-Id: <20231214102431.2091608-3-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20231214102431.2091608-1-chaoyong.he@corigine.com> References: <20231214102431.2091608-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SJ0PR03CA0273.namprd03.prod.outlook.com (2603:10b6:a03:39e::8) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|MW4PR13MB5460:EE_ X-MS-Office365-Filtering-Correlation-Id: e13aac0d-5e08-4283-b873-08dbfc8ee818 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wt4RCrdsQfvTb8V/zPDHs86r16yz+Es5UfDah917ybbvZQaK2nPgJghRnRuqJXfWRmS7+yMmhhHmI+45M/YLVvj4cTn6VrKwomzNa6+mRizZPy/1PgpCemhA3Ti3Ilm98VwzSN2+kS9snaPp7IcU6MFEW9VLHiwbKH/RHDCfwVLFOW33UllLfkBzXOZ1mEAEu6hGmwokq9z3qRgovnGLsHvo/J1EORWA6LCjMqzruMjJZDKjKccQio1ujUHoBYsZ1y9rUNF16r59r3987nDq71lJzaptuBzBrgFkHfoxlxTjossPOYAkZ+T6JVfLudDQQlELoBufR8au7SxRLJoOQMDalSMGbaTjps1ldNaQ5ODpxqwvnO2Jkp0K7svoGeSbItpr86nLmJajkcT91YPzSU/LCTM1QJoKmcQbWacjX+xnFgCcThEDsPyPcHkdQEp/MhTzOZ5c3RNxOT7YW4VNJgnf4Y8GIu7CAlXfq8yXHlrnGRm7RDZ5YqT5j7D5xPd9I2hB2x+ZoxCBWiGWZcMijalJCUGHrAqeSqtLhREnDfmgvVgOi9fnklttscmdEH4lvIKaASrECFKasor1H42SQwLCTU2uc2YClvCtcWy1H131G6JnNy7LYHJv3YxXWQPKIkJPTBTSLFHY5/ev0QOH9jWkMFe+Wvra+JfhS1IKP8U= 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)(39830400003)(376002)(366004)(396003)(346002)(136003)(230922051799003)(64100799003)(1800799012)(186009)(451199024)(2616005)(1076003)(107886003)(6486002)(478600001)(86362001)(41300700001)(6506007)(6666004)(26005)(52116002)(6512007)(66556008)(66476007)(66946007)(83380400001)(54906003)(6916009)(316002)(38100700002)(450100002)(4326008)(8676002)(8936002)(5660300002)(2906002)(44832011)(38350700005)(36756003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 2ErAGYkSPtm4DvEG8Eha+SIH4P5z1ggb/A3EOW96+0Aut4U44nhxZ4RiBoJURIekfadT51oCfvwqoyjmTy4eWKiq7t+0m9hpI8QhfvYZM2ANA2oMktOIWTGETEgpeO26QCEARCqshjUuSKW2d8pVMLYYwLo2UhMXmpwGHVslk2w22BiQxN9Z3jm4GumitvfBFh6LoxsF49h8rfY6jXU8Y0e8D2Fi1u9VG4Oku3zugI8r9g6/LryXhTuUyhFlBnWwqWHHsU5d1yhCpRVDvoN31nlNV1wrVt7IIF/JaERUjp6jbfNAytkXEvJsdvD6KcIgAjHhvePffritC0DtUvlQohIVzfRE29N6Xa2zKD1wKzQFrs8UlB6gzRhPPDtkab2CTx3S6VJGyabxFoXXBZym0B64Np/aasRqPWb6XnJw4TLMFdEWjPhRt4njdWLYJ9//41gc6cW6syaTKcSJ4M8pRISfsyEBtvLOXhMWKvXCRuo0UOEYQE+iysPY+3lL4oEaquQq31MFQWex7iauH2+8TYojkBPBLAiIJCFJZv5PSQEMOPv1XpC5TFZan46p+iHAfNilq3vfoEt2sbZSX7GwPD3/xGU6LLibOuo2sQdPULNzHVjraeyZBSwN57MSSbe2+VzAjpEeHfJsyH52JGUV9QJ7L2STnyc04ZvVhjNrxJnskLHDDMFEwmzh92dplUz87RIDLqhD/j2cTzYEEtriOBDEtoUEUVQWJyvPeNpVMlGHnzVGV0/+RJzoy3wjq8DwiDBqVrD1MG9pRcmrUXQTtLkwHcPsBx7hkiePV+xzzwSOzRjgcxR6xhz96l1JcRXONadUiSenYiNCSKECl+X9z+SjMmNL9EniVZWBOMLF5m1pGQkASIcj+MHMyx2vcpPQKM3DBrV1hJrVzDHoAQFcEsD2LtxUKI14DAUvmf7zWjP4ahQUZgHHed/oRh72Cnr4iF/Wu/5ILwYys679fUcUimFGtZK2a9Q0v9pE06ZGhpBTlv9If3vxXBumzbBbRNiTkN7XwSnLEU0fZ5WIvmz2MdiT5Vaf5H+zi1JnlKug33NJO4MW+Vl5VcDAu74hekIJsOsn3+hZ2chkBGnDr6akaQtuamB+/EUggA3t6IRDoceBsQ4VzDbxFf+W3UIfX0tqM5kHlnG3MZISl66OM59KXUS3yQxtCYQG4LjQpS7BYMOyD+N0kJ0jYGEzXu8r2eLt+3k6E4lfQmcKiREHe6r/qST5LgUU/Nlj/6+DQPzgWZRNRcs4buP8MCgFkPAI7lLMVaU0czU5zzTDQagMh1RqfAGffYaE5r7/ikcbvl3B0ASN3d/0KA2QXGKg2VZkraPZyXz/xXUfgJFEulGhgiaEsKnD/0uStFJ1Qu6AsfunfH4/RtFDD+kIxqzt3gMNjz9h/AByXaiAWCtZQ3553QotDyezd9ujBT+AtSpR2/wLTSV+LwbIcJzbMGdsUAcQyaaBnImGmlHLVS4snBClTFoPhMwqRDI+AjtOaN7VEOAaaqV0H159Rp+/Zy66oFWBqehjof/Ra2FuPQ8riCBEPixq7FD7QtmbLArrY7AvJgIaj8+BwcUFej6XiyqNNoSQAwKl0Z4qgjD1Mzjuz3oZmXKZgQ== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: e13aac0d-5e08-4283-b873-08dbfc8ee818 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Dec 2023 10:24:51.5101 (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: AElUnp3ZCFBpo83LlDtPMY8jD/c+CbhAqTKrJPgkK6asWmxecM4LrhpKUOenTmDrRyrEwH9CN9EcHU9l1H3eThx50eIP3NuW/hM4nOr7psU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR13MB5460 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 From: Long Wu Set the representor array to NULL to avoid that close interface does not free some resource. Fixes: a135bc1644d6 ("net/nfp: fix resource leak for flower firmware") Cc: chaoyong.he@corigine.com Cc: stable@dpdk.org Signed-off-by: Long Wu Reviewed-by: Chaoyong He Reviewed-by: Peng Zhang --- drivers/net/nfp/flower/nfp_flower_representor.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/drivers/net/nfp/flower/nfp_flower_representor.c b/drivers/net/nfp/flower/nfp_flower_representor.c index 27ea3891bd..5f7c1fa737 100644 --- a/drivers/net/nfp/flower/nfp_flower_representor.c +++ b/drivers/net/nfp/flower/nfp_flower_representor.c @@ -294,17 +294,30 @@ nfp_flower_repr_tx_burst(void *tx_queue, static int nfp_flower_repr_uninit(struct rte_eth_dev *eth_dev) { + uint16_t index; struct nfp_flower_representor *repr; repr = eth_dev->data->dev_private; rte_ring_free(repr->ring); + if (repr->repr_type == NFP_REPR_TYPE_PHYS_PORT) { + index = NFP_FLOWER_CMSG_PORT_PHYS_PORT_NUM(repr->port_id); + repr->app_fw_flower->phy_reprs[index] = NULL; + } else { + index = repr->vf_id; + repr->app_fw_flower->vf_reprs[index] = NULL; + } + return 0; } static int -nfp_flower_pf_repr_uninit(__rte_unused struct rte_eth_dev *eth_dev) +nfp_flower_pf_repr_uninit(struct rte_eth_dev *eth_dev) { + struct nfp_flower_representor *repr = eth_dev->data->dev_private; + + repr->app_fw_flower->pf_repr = NULL; + return 0; }