From patchwork Thu Nov 30 08:52:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 134725 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 786D04340A; Thu, 30 Nov 2023 09:53:10 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6A3DE42EA2; Thu, 30 Nov 2023 09:53:05 +0100 (CET) Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04on2096.outbound.protection.outlook.com [40.107.100.96]) by mails.dpdk.org (Postfix) with ESMTP id 8B42442E5D; Thu, 30 Nov 2023 09:53:01 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Pn2zMWVDc2TD1fgNZYYBxvzzRcBT79+GtaUSAPkwuUA4Z2LNFe9j5lYiDvc3ZfjD8Oc7wsaSGegeoeGw5WdgWiLaqe3bnAvJ4IMZ+AQ/2/uI4Y0NFcnjdNSbGKK7/z/soi1DiTaUPeOv+L40pPR2I5WvfZeZlvtMz61HNBVQJfgd9QuBa8D/z//E4h0OXt6Ch2p7llxOkFHRGcZho9c2LCVAnGj4NUInXF3ZBzhuIYHVdhIYDX54n3z9oqkbHkzol/pXtNiZLdX2uyMEP9ulgU1ulo/QiLknfcjVdX7WIo+Sp5Agy520ANB72DlHqtbC1raj5nNnhRZc/VuQsf8EJw== 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=WIpKu/fBWRCQsGISkakLeoLt1mI8X3Yt5Q4IMxlMQLU=; b=g4SXNAibaM5AQw7Qf00kpy/rOlRyccPfKFiu/csJ/kLFICnyIZXjB94Uxsgi/MVWAkH5E1MzOIMIpz6qW3LKVwWW2yA5nGF0Q+hQV2zN+bM3wYmWNA8b3SvzjJd+pSVwNOqd2fi/P4Tl0ji/TTL9/oXUp7DJ4yxGjjtm2kzui/asXJRSzDr0vO/iaabgvaIsANhttZd9uxXXQgLVNhAcOKYvJ5rOentxVMRqM64rGNJz9/igzf0Q7c4AgiGQkQ6Rd+LiGXgJ9U2PidQXnvnEAOemGBZ/3eJiX4UGFsLPAfuiiEwTeD1UjGBRzp/NbiM3/seiYLGJ9SS/7YKFChwb8g== 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=WIpKu/fBWRCQsGISkakLeoLt1mI8X3Yt5Q4IMxlMQLU=; b=PzCHlcc1HlTlYoms47s3YLUlydVSCrtVoyXj7KqoP6si2w7+cvo846lAQlXkuzd9pyy52gTsxYNUlBlTXe9ZTqPRxynai6JkHcR0t/3cBd19nCVDk/QBBVQ9OUPrDWL4971rUccb7YVpLtSFYZ+0Z0d4hRiW3CLuXfkTbBEDTgM= 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:00 +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:00 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , james.hershaw@corigine.com, chang.miao@corigine.com, stable@dpdk.org, Long Wu , Peng Zhang Subject: [PATCH 1/7] net/nfp: fix resource leak for device initialization Date: Thu, 30 Nov 2023 16:52:32 +0800 Message-Id: <20231130085238.60290-2-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: 20387ce0-76eb-47fb-5b40-08dbf181c12b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wuTnUt2Du5chWY4o3G5haupq/Gmv99y6ehJUkeZnbVimfeQK4ETfaAhQtv3m2uWZJOFDlhzu8AIpvJkBQCgreMFh/LyyKUBOtoCJeJdSgVDMKJT/4u8wXI4p/5labp80ZFrCtthuotcMOgf3BkKTOV1IPtUJ6H4xarTaifRaJpi0K6wPctBV/2bx1RUL6f5rTKwIme7rIy+ukPCkpQPMll3KNELILJNenEXSxXGe/04F1txyB/ntGChg7LwP85Z/80SjafOzHt/5eG+KRYXrb0mmypcejTMgpXftLGhperFwAsdppKgHgmVyom4XCrfIMMJpDcQNRImStF8Z9Ai+BWG/gu3t/me9wUSVija7EONZGapkXy7PDH9w3RR+ly7dMWZKstvsAc2/IiXEcBlMFNXJchQKY2tFUIvEAb1lo2m0AOMHwljsBkB7D6+PJ2W9Eo0/qdpPYTP4USl7pJvXg4Kmb+m2G9pVYKSc7lslLSBWudf3gAJmPQGvvFqHaUsZNui+iu//zABGJ+Qi6c7pQTtKSSml/vg7kAqQr4B62yL9N/lJIAvaAuVquUdzf0RovfqqSJT4/PXM6iRczjZwSDoCMfd+d01dIF+YLIfngtvZlM0RxMDeqAH/NTO7balmSR3+WYeaOK5o63wob2BO/LlVDTWMh/O7OLgix/UzBG6OVz6Pd9bfWHRt50PgsE0k4kItf/KEM9shhDDWr5APEw== 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: m4TohH1DQfcJB2Op6RMpS/PMmTT9c09yGBfQS/0kYt5iXq5Al0hDcUiMd6WlubXrZOrX/nVnt8OnJ3FPgoX9ri59ofJ1NJ1HyFKOmTSkVzNAUZhDUND6fUtN/VTM7KkcTQtKRaCNiOKB2nbB0UgAIJv6ysNQEYNP19+LmojF6o7RdPCdTF3LIeulROySYqgejsgA9xfaIbwK5Xgw19dVKmuCuoz8RD+gAbrQamoXclYCIVVzikj2rTEM9a+sO9rYix2SEIp+iOBTD+KIo/nYj5JdP61kBRGZEpJhxnUJwcOVM9H+/7PYb8gvVnAxkhn9gk0s2hKlZb7XsP/pDTDPcVZAhdM9IKzZln1jsc9c44RWoj52CPb1/RtTFF0CMnHtacGC1D3AOEUcEMdYmBseWWq/X1CYRgQicS7Y9Sxy0KIYp8P/ukufdmuJadgTnJ8683b0fbWVdbIV4xw+0ucQ8NWvMsJKKtcyEhuj31ecD6DTV1dCS6U7pZriy2iZw+mkytFFofHObZFfemf0DYBvJxy5lfQPTthvABK95gczk3/+OxcEhyRBKczTyfsL+LkPyvnE6ID/jVsZCyndGIqdVi5/wwuJIHQ1uI3p1sZ0EIyRDUJrAy6YGCISglcweCJXNtBWF1RfMr1fUAYcGw2aJDCD6nX6Tlw659LDyg+mS6duEG+a3afnahVHj8+T9tQ96snkb8EWl3p/9aysSm5+SHpmYiW2JVgbumU1nfcN/O9TTsa9VswPowcZYpocIvVAKuKTeNMaypyRxzk7SRxBLgcHTXZBhI+7h21OPzDK1Llj0vKbJdnI0c7YqPEg23/Cg4atp0YYEjqPS/2ko0/cefDIJZsz2cljMiGevrLdRe+KGfT2OdwBIMp+KM5J8nBKeDCOC0ThhusxbwHxf9HGOn5kRtwLPyFMzfG6hmPKOB0urho6h78kiSPjKHHTbBB0pU4uDkFoybaP6tVVCmRsm+qcrxmzmePKfFzaJ+w2uEc1BJ+gmGrC8NSEisQh/+5z2c75MIqsu6BJf892uNVrIOAlPBBhwAew5vZVuidvAZAcjf0Jg3aIosS8yE7ENU2bvaR7KBJtqorgaN5lcAb1HV1gFzm1iVF8J0kYajgLHd50HJ2qlC3JEyot+05XScdKV4JQw/RoqPTDb8dLcuq1houNcxpmsaFfr7yLSFqf6M/lmeMQiinim4OAXjPu1RxEB9BKJWPskhHrkWJtMiiwe1B1strbuyOhROyN6zlR4mMFAgwtEh8dRNQX8+PWEVC68AjVsMyLWpu7zW7n0uNVfvNsNb1DFlbKCV32X2Ut0pX+sb0ZIRfeBC20vc3gKDVUINb3m9HY1W5+B8a/VIq51YCHBcB4cqN5qebTgXxfwMRrPZPgKQdBIZ3CUHFOXl1TQKhhFonVw8CEG61DUrZmC0Xw5/QXadsGeo/m6W6sHQfuJYCTDpNqRd8sPtW9NB52Bsqdjcw7S+kLWmbuJ29Docufdox6NqLVAbZI7oETgtlI4XMqZwuc+yZeI5YeUP/57nnlGsH0dUchBR79Sp5t5m910zeO5cY+bxf2DCwfOu9NPXmWplz917TMPd1WXdhn8BkhF6dodgtCwrebLh4I5Q== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 20387ce0-76eb-47fb-5b40-08dbf181c12b 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:52:59.9465 (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: kZ92qKPGf+OXRJ9ZgDu6o0F0/RLWbQpmVtBX1KHjKHEpx/+K0O+6yK3gp9xzElOJovW/VbUZMIUEfJdPtdTyWaNVJZ5stz6qhc4Nf7ENszM= 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 abnormal logic of device initialize function. Fixes: f26e82397f6d ("net/nfp: implement xstats") Fixes: 547137405be7 ("net/nfp: initialize IPsec related content") Cc: james.hershaw@corigine.com Cc: chang.miao@corigine.com Cc: stable@dpdk.org Signed-off-by: Chaoyong He Reviewed-by: Long Wu Reviewed-by: Peng Zhang --- drivers/net/nfp/nfp_ethdev.c | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c index f02caf8056..25feb8e394 100644 --- a/drivers/net/nfp/nfp_ethdev.c +++ b/drivers/net/nfp/nfp_ethdev.c @@ -590,9 +590,6 @@ nfp_net_init(struct rte_eth_dev *eth_dev) net_hw->mac_stats = net_hw->mac_stats_bar; } else { - if (pf_dev->ctrl_bar == NULL) - return -ENODEV; - /* Use port offset in pf ctrl_bar for this ports control bar */ hw->ctrl_bar = pf_dev->ctrl_bar + (port * NFP_NET_CFG_BAR_SZ); net_hw->mac_stats = app_fw_nic->ports[0]->mac_stats_bar + @@ -604,18 +601,19 @@ nfp_net_init(struct rte_eth_dev *eth_dev) err = nfp_net_common_init(pci_dev, net_hw); if (err != 0) - return err; + goto free_area; err = nfp_net_tlv_caps_parse(eth_dev); if (err != 0) { PMD_INIT_LOG(ERR, "Failed to parser TLV caps"); return err; + goto free_area; } err = nfp_ipsec_init(eth_dev); if (err != 0) { PMD_INIT_LOG(ERR, "Failed to init IPsec module"); - return err; + goto free_area; } nfp_net_ethdev_ops_mount(net_hw, eth_dev); @@ -625,7 +623,8 @@ nfp_net_init(struct rte_eth_dev *eth_dev) if (net_hw->eth_xstats_base == NULL) { PMD_INIT_LOG(ERR, "no memory for xstats base values on device %s!", pci_dev->device.name); - return -ENOMEM; + err = -ENOMEM; + goto ipsec_exit; } /* Work out where in the BAR the queues start. */ @@ -655,7 +654,8 @@ nfp_net_init(struct rte_eth_dev *eth_dev) eth_dev->data->mac_addrs = rte_zmalloc("mac_addr", RTE_ETHER_ADDR_LEN, 0); if (eth_dev->data->mac_addrs == NULL) { PMD_INIT_LOG(ERR, "Failed to space for MAC address"); - return -ENOMEM; + err = -ENOMEM; + goto xstats_free; } nfp_net_pf_read_mac(app_fw_nic, port); @@ -693,6 +693,16 @@ nfp_net_init(struct rte_eth_dev *eth_dev) nfp_net_stats_reset(eth_dev); return 0; + +xstats_free: + rte_free(net_hw->eth_xstats_base); +ipsec_exit: + nfp_ipsec_uninit(eth_dev); +free_area: + if (net_hw->mac_stats_area != NULL) + nfp_cpp_area_release_free(net_hw->mac_stats_area); + + return err; } #define DEFAULT_FW_PATH "/lib/firmware/netronome" From patchwork Thu Nov 30 08:52:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 134726 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 5E6604340A; Thu, 30 Nov 2023 09:53:18 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EFFAD42EB7; Thu, 30 Nov 2023 09:53:06 +0100 (CET) Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04on2132.outbound.protection.outlook.com [40.107.100.132]) by mails.dpdk.org (Postfix) with ESMTP id 1CD6342E98; Thu, 30 Nov 2023 09:53:03 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nImFdH49RNqa+/agNJ+0OVMDiv1xU5RiQgouHeb/YigafhEnZPJbwae7IaTYkt+tENp/G24I/q58n0jriGKYrpaafdlyjLIvnyWMhV6FuHEuLu51omVkctLb8M/yQL2Xswq9z0NfeJEzw8sdtPKT+7u9AW/iJONZ0NXoO3qQwqz8IUndmPDp1+g6vMyJi0vDWagMRqATBWGceX9a5CgMA8GO1AY7kaVAtE2bHHwIuGN5VK0DO14xxwBQ5pRYzSMb3YKbheBtHOcOteQ+WeZrOKbgWt4J0Ue+Xk8PpIFluz5V3hiYoM/VoJIz2O89NiU/REEnbWC33nF6+gbP7R5tBw== 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=dWkpm36JjMErskXh+b8jETPMuvJz7IIwwUvp9wzmSyk=; b=lYnWOrVrT1V3PiuS5HFxihOo+LIUfpdY3UQJNAJt2va0DgBNP+4HV4xst5I+y7+DOn0aMXFhqy/GOpVIZSN+FswOm+AJZq/HvfUi2mGGFq9MJvRF9CJY3YMTL6/dzNP3Agvb5R3anb+pKy5TcKwDQDRndqdooACQIAt1UXJc2DstEHDn3HmYv5VuumTa7ZonvT6g6Ndng9Mb4JqnccLQrThc4obsDPjaaaQYG570HOvMxvp5s2Yd+urPF2m85e5q+aOhmzeXBSlfqo0fzPDowXDAqHck2x+4Oo9f0eqFWZ36tojDpUCEbOntSB69h5pp+11Dl3xMSty61RbZ3Ux4FA== 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=dWkpm36JjMErskXh+b8jETPMuvJz7IIwwUvp9wzmSyk=; b=DfrZyKVW4IP0h/ujCPmaZnF506Flz2Ha2QDK/vf4ONwi1oExhsdDAyznVWropbedxPADRf3meqjUPxVfyL9groRYdlY5FMXcnkicatGaMTK3cZxSEyXV7BtimcQxH9e+B59dHnhFHAuikJpL08sKsjFjDA56mU/SEm+r3eTd7ws= 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:02 +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:02 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , stable@dpdk.org, Long Wu , Peng Zhang Subject: [PATCH 2/7] net/nfp: fix resource leak for CoreNIC firmware Date: Thu, 30 Nov 2023 16:52:33 +0800 Message-Id: <20231130085238.60290-3-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: 4328f670-9a13-470b-8314-08dbf181c25f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pUFehij/r9d9/fPrOm8wzD75D5gMO0fg2h+fKQHjWApS0wKaSCFWPnHY+cd6M3pTKPJnmdjIKBomEPpU+MFQ5sDcFfYl9ZHXXG1lBJYqGVNppDl4SmTByugOk98QNaaOSr06oqdVs+CFpJQbcaN99WBEYnj8Wcs4aGy+GX/s7nwdAfEyInh0dgALUdBgMsa3ZUWbx5Zo8TgXibYLgL2wRiRxoXU2StAspmwa8ZeKPU+aXG97yiLKd7cWb8h/zA1PjJHG6P3tABQ3Z0w9/uKY4P5h/G/73XTv5mEUkRqB2YSAMOvn83hB8oNYzvuC5OGzDxREBMreb3tJRgga82zLzNqpU+2gsBJDrBlJjVJU+v4NT+eDJhTdPBliVagD3CegzV9Z/hSSEoBfZcac+vPK8DCsjWTLtSIoPJ0mzzQDm4JUIqNJ4DD2zy0OjVlRA0NZ0n+RqbHFAaoTlPCHA2JB6E++/6elVTUOz3e52vYo5bC9cKLWhuJi5fVe6u+L58IDM28bzi6jDFoZWbkc7hKldXZh9rojo9Z+1b0QMAInMZYJmV5LBZUZ1eGYhcZPwjQMD8k4Zw09h03QcWoSwkC3DB2qt8/zaS2Hi9Ogaw0VxgXKdu+IbKBocCbU8BITUtdd8+gwb0ipW3gzRkYTvKvFsr5sajvwv/OdCOxGahzMshtycovjdFwPwBS0/QivHbY8y6iMsdXqUryvFdU5F0zNUg== 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: wfb5CUvARxuel4p7zrCTEXVsI0UABuofE6ZGmYdGTopBCOrj43I6hduHVKLUf0FKjxvVk9cvJGGK9ohliipbpLiZITpv5Ptd5e+V7Tu99gfC6tMgnKf8kYlElsVFIU+S+WJhb+6gNMbWcllr9TkZowebZQXVBl81aeIZrS1dFyYrSW1R053WYwss9prlbmexaVe7HabUS1RyMizeHteIp1Sb4xQc6trwHfC424FsPOgnLA+kNzZBMjS3htBe0O9q5u1eJPNqs7j+wXdBXohn68fhL+Bp/o1cxgsrzHXlvzn1WmmPc7vNgNRDENmjAEU3MxmElWwR5liHGauVDYWjlCzM4nXt+kb2rvwMQ0aBHO4/wYNDpSfAyHZ54K/UrqsfAf64jJzHd2ccT4kvDXVU2dsmL5F8SSFyeXdXQEvC3dS4EpOi9Ag4lkAlW5lRurkUcc+RWlB4N0v2v2AYfzSA9GR0PMTi6Fn6JfUzmmaPB4tFssEoUK3NfKVvU23jh5SmpxNxQ8E4DKQdXji3kFe4QRSup4x464ygIo61E2+2uAopmh9mEEvrgRynJm9lmCQnl7uzsREW93vC/eRIOho35PcmuwPsI9gdP07nFl0PfHqHKqq5Jri22MDxZgfVGnKTLS436oK8H6L1zYnm5prZ7SEbT1L978Bg9QpfztDryvTwYD5WIvH4r4PEh9MxjYvnwkfNRQ/tiz1huPtyL40QRWB5Duk6RQLhaYpaYuNA4ERhshtik7X8vVwDJC8L6eaPJXY3CszAEGTMqgqB//RnYzMS5i1dz2XSar3/cPFdzIFG4HWIjljb00MH1st5warthkG88A3vfsLALGMd0DMlHTwRvhKmWmGsScHUglaLsaAipFkm8XuB3mI9xhQQbPb5iIThYKgYq76sVZgaBDudyfNcaxV+GAksbuclAg3Ua4FMY3kCRV09KUlhGtNx1AwaCK09Zn79+UkIQBU7V51rv49iTZnjZA9d+yiPvpSqIfsbiVGYqr6B9x4WxM+wj+e4zdkws8Z4qo+EExYnGQG3IlkZZMnNAzU6wPmYh/hvHHFHjK8sh4XFBO5yGG9ZMf+IklnAySPyUz0/CDYTtDrynv3hs3nZJ0Ljbskn7w5ZTjPrszWhDEocLp8P+8XXccYzzmvp2hthSIipwx+41MJy/ISPBCJIt7W388sV/fe09YM0pc6Fv8xFR2e7608uwFT9HNgm6XjTlfHQ7G95OtcltgbPgsQ2k42CCYkqsHnUImbJWqghUytIa3etWeDb2wHlanKYUSTUg+QI+HvWstE9WzXIEKOffScLGctCEqX6mNecuxoUVyvjLET9r+jREM6HVTPWBiiaUy9torQKWLG4Fxd/T+j5d20PBKXvnLwDET2K366wSqlUTu/aE90oHAMNkJwCEiWtZ93dq9hgh/YhuLs7kIPZ+AZDe+MvXZ7cYBfhwNHseUt6ZuGNEW2lefT5LWpNUgIVvMp87LGGmDUHtvlQ7ZYhIEo4gdzCmrCWKloNH2sxPH+Tn0+OUtXs5AMDf2sf676PTR5mkGdSyGcMxfW1lE8rLRMu8SQNv3T1hITltk5/vcttkTGrl9DOa4KXnshfeshQLBCu/E4B6dr46Q== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4328f670-9a13-470b-8314-08dbf181c25f 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:01.9619 (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: KojqWhhPVroKheC2tW1ryD4R16GUGZCLM04+kl2NQWRqBrXIFViHfMJQjhUckXSxoQLqTHtSwnhJxnDb8AI5DeFynsqkmMrD51CpeMxK2CI= 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 CoreNIC firmware application. Fixes: 646ea79ce481 ("net/nfp: move PF functions into its own file") Cc: stable@dpdk.org Signed-off-by: Chaoyong He Reviewed-by: Long Wu Reviewed-by: Peng Zhang --- drivers/net/nfp/nfp_ethdev.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c index 25feb8e394..38ee1c399a 100644 --- a/drivers/net/nfp/nfp_ethdev.c +++ b/drivers/net/nfp/nfp_ethdev.c @@ -310,6 +310,18 @@ nfp_net_keepalive_stop(struct nfp_multi_pf *multi_pf) rte_eal_alarm_cancel(nfp_net_beat_timer, (void *)multi_pf); } +static void +nfp_net_uninit(struct rte_eth_dev *eth_dev) +{ + struct nfp_net_hw *net_hw; + + net_hw = eth_dev->data->dev_private; + rte_free(net_hw->eth_xstats_base); + nfp_ipsec_uninit(eth_dev); + if (net_hw->mac_stats_area != NULL) + nfp_cpp_area_release_free(net_hw->mac_stats_area); +} + /* Reset and stop device. The device can not be restarted. */ static int nfp_net_close(struct rte_eth_dev *dev) @@ -1130,12 +1142,11 @@ nfp_init_app_fw_nic(struct nfp_pf_dev *pf_dev, app_fw_nic->ports[id]->eth_dev != NULL) { struct rte_eth_dev *tmp_dev; tmp_dev = app_fw_nic->ports[id]->eth_dev; - nfp_ipsec_uninit(tmp_dev); + nfp_net_uninit(tmp_dev); rte_eth_dev_release_port(tmp_dev); - app_fw_nic->ports[id] = NULL; } } - nfp_cpp_area_free(pf_dev->ctrl_area); + nfp_cpp_area_release_free(pf_dev->ctrl_area); app_cleanup: rte_free(app_fw_nic); From patchwork Thu Nov 30 08:52:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 134727 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 C80A84340A; Thu, 30 Nov 2023 09:53:25 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id ED2FD42EB9; Thu, 30 Nov 2023 09:53:07 +0100 (CET) Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04on2112.outbound.protection.outlook.com [40.107.100.112]) by mails.dpdk.org (Postfix) with ESMTP id 2FC7842EA7; Thu, 30 Nov 2023 09:53:06 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hAfGzqxxZauV/I4kmA1u4PZpR2OwWCjVTESN7s2UjWwYB41XboipKfSAiFx9ATGyuyYdjJoFvRjIqPCQ0E2lfdrTu6QkAh137gM91Ogp5thMyAAYq2p6VlDjB18lOfBnohdJ8lmLevMlw13RDJJkJsfbYGqPnHYWBuX9VkUTBpiK38AAiFyQuvjEfCtv+Zh7bt5dQnZ/d8ttQUj+1tXnYVmkJYza7EFuBZXlLhk4TB3Jr9umTtBTT/xggi7twfyyK3XE9sF8YZ38oIyG2KhfxgQ6UZEwbPqQp4kagg63A5PZsxy0r7nN5vezSuRe7CF+ovw2TZOaf083zELoVPZkmA== 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=K9mIl5VbakJVu4mUJrDZEB/9VRgDgxghhUPC7GyECJg=; b=RdsWQFr1PqsVcVtdIUryF6mQ9AD6qWgfL2sXUynqQz5TAyTNx9BI0zxK5EzT2IV46e/QvgS3oU65DK/+82R0tXGE4XWftXOxZyamOYl0a7oNuUdbg41D/+JQcLoKIh6D2AfEq0XQ4/Fil7qYBZjciueMulEsm/H6lAuAi/TQSMJxSsxs6cnOqJTynGdmI7UzXz7tne3CFVmyfLvVRi+TCVrJUpPSpqmjL1n8MQqCtwbJ7qjPVy49uGtPbEpHKFImy7MqiKgfagUYaZVX754u598ZQwinoOIWTMc454ip9JTcjoo576sWXUtw/8uNbo/J6/MVZGTihdvoPpgkDZbj5A== 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=K9mIl5VbakJVu4mUJrDZEB/9VRgDgxghhUPC7GyECJg=; b=sDjz3tkmgpAW/S4q8hGmzBeJSWPWxzLgpap1GovFCGoQH94QX4mXLshIQ2MIwgmzLf5VNI2iI6N5123f7N57kRl+3vE3vbY9VT1G1VSJpBZJvwWfelxEdgt3vhC+OBXv14MgYUrbqyxPRtyFGzFKgc7fDK9fL4T3AhC2bg8Nk9s= 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:04 +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:04 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , peng.zhang@corigine.com, stable@dpdk.org, Long Wu Subject: [PATCH 3/7] net/nfp: fix resource leak for PF initialization Date: Thu, 30 Nov 2023 16:52:34 +0800 Message-Id: <20231130085238.60290-4-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: 164da792-9dec-44c4-4ef2-08dbf181c395 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: a4G73UWJ7b66AAcH3QbwsuBP40kxFgc4n7wpQ6udusUUsthaDQ/Po9y3juYIKeaRJtwUHJEkatHpDFicDX1AX3gu91F5logQkddHMbT9rVSnWGm5LhsBWFl92l/dIhLJ5wiqK99GDmbzSYwb0WkkzvHPUTOeGW0+zTotsicgO+1dpBNVHYlfCfsNz4R01Z8+UdtUNUwimjxBsJMEG9xotYB5FtJUU+vkc1EO43TDs/tGuFJnEr7BBTN5WHRUzQfSOlOxMtPaXgtIlPLbLFQ7QShtXDO8T5oUqW3VryqG8FNfZKITNE1K1qd4kYq9tqbpZUmWbcJvbn2fs9a0YOH5hvFAxTzutvJXmxnezonlrZYJp/Px4hFnnqSdKOspX5zRrS/mRbvrESnzIJgl7RevoPEYGgwr8eTPgWI6ylfQF18KvZMg9s5URZutKcbUL7Ww6Xx+EPYXNb7RGDpqJssooQMqt7fsemd/mpdpC1gvP8UE4cPiMUWxHDef8dhpLkkkrGHL/OazxdiogZJiESJaQPs1RK5aUVVvUD7BonOc9k5woZBYUKWeKB0BOcyXirhODSGc2h9z9hhyY2GWJR6St/llaoUmFHjQYxN286/xgZsBXYz8Fy9VvfQ78UUiCDPaMan1SxOYUTi8oUgg8WpPdKUZLDgGx4hUV4lVkT1Lzijbvau9oGeIxtwZSlStxTFH6i25JrFHOcSlz8U+DgmEFw== 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: VZ8h6H6n0jt6WE79vJ7bynn5TlaEW1gqco3rpCEEK+dw9ATilnZM4PCTHV6N08AROeXq3ND15AJ96iorp+lJQtsUZhC7b/eUrf0AFDRasLX1ljdzDNAO5BTLyY0PlDLPzHmnaQAI+y/2DssbSHp+S/fpsAWWIzt0Ug6Jm2cEJVDjv3/zxikAAg1vVQhY3vXxQUDp1R0Juc8inaQbbjHFvdVNTE9Y80T7TMGlm+xlM/lLJQjF2HfE6ba62X6wtCKftwdadMFtnGeJjNSVjlFAEUxdY8jKY03F8CR5qSdp4p5W7lDaQ3PfW2yhvdWYbqJWW1XEixVJnAI3nQ4w0jGFnymbHxRU83/5wtT1vfL+XEr99y19WQS5cnLjSEhmhfN/lOQFT3DPRkKkRaPpNbwYO/5FUNmO2Cm2VKqlh57DQpIl2pfSqEZgFz/zsp4bzkogAek3uiYUZYhGe5KEcewoWKHRYmGYRKfAXfv5jugi6jxDdfwYJaS0PWXtX/HmTFFa3ayQInbT5+JUr3+9LX/FJyeEpQbGGQbGqRyUVZZtx0cv+SoWrkBO4DS02hN/KhAjhGc6fFI4qhAitJaJ/IYe/ysIH2hu8sJKYwiU3KFENci2SMSSa1s53MpAYdGhMOi36uGwm4chO4A7JERnZG1eLZCr2CR4t65BO0LLprGswxF8NukxoWCKkcp39MF30hGjznx7orLRH1WDs7pn37Ha1pPkAxoAyFLuK4VaTwWVILugDit0Eur742jH6EOF9S31MNaxsjDy1m8NigGpOWJEoOJx9sZo2t9VY+uXCjIZ6NKY8p2TclthQhSoCESAs5pdzUQYCz86qzRmoiB86qorDu6V5U2NUzY/UPLVIYBVr9FbkGq41r1qjDC4qkx9KlWAxzRr86VBGqWB772rnkCI9ReBjKNf5atwLnAlSZACPQUcQtsjGRW24br/Jbiz/QolMMHxHgMjU0mwvbGHUmfP7moUM5ePHTTxU0gJjO+pJYwB9XjwdFkntBSQfvohA3fiuVc1cMWjyZpZH6xGUskYQM4aioG2TXKbk86D+6eLNRn+0rOtDKzNrT7UNgTy0iN4zfDvVvFuvWQbrfPVsBwN9ScnrRU97fPRYGdyug+fTnD1HbQiTVHrHwY9S+RzGjTIB++hL2DMVGpGU+C96/VqMXQRYqXWIZrzz+OXDYd/f9qhQZXSe3BXmtIocCRs4ysZG7TxF+vVeMdjoYCVOfv4CuwgzznVIPE1VFFWZCiRkMeNlw3nOC/7C7/E/vjr9HQ1TPi2JYssjbRKhaC5Jnt9PjR75XHBS42EYQG3Y7geJvUz3K39f6/i9WSTrsYXhukBATSXDAYTIJWELiDIIFixzRtN4DUbL5nheDINBKw6IpI99GGSGDkrweIn3ID9kyYOeR/iYnQ7Vzkeg2BEp2Oop4D5usUsIMy8I+KtKzPvSQ/UURxB5/aqbBakHkGwcOfSVeLu1yVbphj14dg4fbf21FPedIkxY0aP5VQf/Dt12TV1C7V0Or/N6o+u3cARign6JZUS+tx9PKxgSlfS4yQWAvQswA2C4JG0ZCa2oqqQz8T9HwZ20MXBgN7KzgbtZDriWu9VYUaPX618OR0UwdqYsw== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 164da792-9dec-44c4-4ef2-08dbf181c395 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:04.0278 (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: 9fpAuKEXHY0rI/EFtLrNZPqQjWEFPgPyuP9mh8FWygZBHYYu2SDVyuBT8jUbw394F8RFI4Cue4gAh6PncbqlvPokVeuH9OqwTB+xgWMcWFg= 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 abnormal logic of PF initialize function. Fixes: 646ea79ce481 ("net/nfp: move PF functions into its own file") Fixes: 8ba461d1eecc ("net/nfp: introduce keepalive mechanism for multiple PF") Cc: peng.zhang@corigine.com Cc: stable@dpdk.org Signed-off-by: Chaoyong He Reviewed-by: Long Wu Reviewed-by: Peng Zhang --- drivers/net/nfp/nfp_ethdev.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c index 38ee1c399a..bb0ddf3d54 100644 --- a/drivers/net/nfp/nfp_ethdev.c +++ b/drivers/net/nfp/nfp_ethdev.c @@ -1326,12 +1326,13 @@ nfp_pf_init(struct rte_pci_device *pci_dev) return 0; hwqueues_cleanup: - nfp_cpp_area_free(pf_dev->qc_area); + nfp_cpp_area_release_free(pf_dev->qc_area); sym_tbl_cleanup: free(sym_tbl); fw_cleanup: nfp_fw_unload(cpp); nfp_net_keepalive_stop(&pf_dev->multi_pf); + nfp_net_keepalive_uninit(&pf_dev->multi_pf); eth_table_cleanup: free(nfp_eth_table); hwinfo_cleanup: 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); From patchwork Thu Nov 30 08:52:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 134729 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 173454340A; Thu, 30 Nov 2023 09:53:44 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F1BC942EC9; Thu, 30 Nov 2023 09:53:12 +0100 (CET) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2099.outbound.protection.outlook.com [40.107.223.99]) by mails.dpdk.org (Postfix) with ESMTP id 619B742EC9; Thu, 30 Nov 2023 09:53:10 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DWJIBo4HshvQbTbAFw8o+c/0YR9RkCIoNCZk4qM3hb5caM9Dt0zDqagb/BLPxMFWX+ki8krlAXBNqWeP5vQKOVW0W0HCckhYp8kbbXbuULgVgsRSak9DGiREd6yyYSXHnSjQoiWoYgwQ7PYQJOQgea/amio78vS1yau8ZOqwdySQUYvS3/TihwBbaWUsMbSDShAvQEMGYuBOaFsK/EfHq1CSRtqhuMAYzLj8EXtjM6w5YoZQoL97FxblywzkEzJiaCTTxpXx0LRmjMouNaQGvdmmkUojtIN9yNNUHas6e3yE788qbMbHCtdlV0c6mWv78cggPxFXrhils52Y6DAH9g== 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=UEYYwTk+z6anJFza+U8Iix1gyJnKBCwM6XjaJzUh5uU=; b=iLxKf/T5sH6kQMcsfjT5FICmEQ1g1QE4i3jkXsjkaDH5AGmu1zHM5DkV7iyAyRgyetwsZ7hLlEJpuFODkTwDdBMMi13l83GjLX38dVUawcLznsdoyyPixcgwqleVw0uYfhQ2C4JFcjj/5Tng1raAfS9NBeYV3izICddvoyEC5gQftm0432JD8Of+K1HxzWJDNSseOddjFcHgXMUFIaz/NVCn3Wgw/bg9nRDKU488jWadvU5LU1GgiOPSJ7t0zXpM3qM+ejmOS1TXiM8FNLyEy//EM2/PApJjoHbiptlWx4dqEmQMctei2vbm8dxS6jTSK+KVWfpi+weiXp8QyQTyaQ== 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=UEYYwTk+z6anJFza+U8Iix1gyJnKBCwM6XjaJzUh5uU=; b=ElgOJETQATanl2fgJHmuO2J7O0/tMC7EEKEx7EniQd31ukE72UN0lwSx6ZQfx58UIejmYUE4+t7kOd43j/7uGDgpxwBJjS+gLK9rBdO97I1n2aHJgW5XBG+REPTJStove+XQsfM0yUpjXckY81exymoHqIb8j+gFXj25uqGOYwo= 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:08 +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:08 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , stable@dpdk.org, Long Wu , Peng Zhang Subject: [PATCH 5/7] net/nfp: fix resource leak for exit of CoreNIC firmware Date: Thu, 30 Nov 2023 16:52:36 +0800 Message-Id: <20231130085238.60290-6-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: 8ba350eb-ac1f-4a71-0163-08dbf181c63e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: UtJoo4aSaydbbEcbNGce9Swkhod1E7oym0UFq5K0LiD2P38JLMWBMIJ+3ur0vL6kH/lZR8IgbPwdJbNkQ6lRtg6AdMdXKpwYFtqX/iuzcRj0BW/f1fbNRBGBKiEG1L8rn3kwBEdyAwaExIK5Gr6foOULHYNRSErYrii0mDUwh09EeZgMiQCcv3BwCcEsYjFATywYR5Rv/7NwvotZAXqf9d9/BzutwQUQwTlfIw551piVc8CB26g46c7/ctMn2+d9ovUIKIsydl+9DDTD/Hq7rxw59XyGsyMaCYrWqBswEyU2SIT/T3l/6kO4LGbzmCtPaBFsY9/WvVzFmuGVAta0OWY39ZZknLtwk2FylwEpm/K1Pl3gSSdCg5qBz7ijNem03gmXHxrnwv7KkKVeB4bVfoHIOaBdb1/2eCycLfDzGQ20ddCvhAvgp7USfeeWtg9XZfSzT8DyaO3XaanB4Ty/tYDMFP6XyNHF8PPA3J7jIVlMt/bF9w5rqiF4UW+ya6rtM3QUR/40nm3hRI9q/fACx/zvidS4Ftnoog7ES/JUQDAs8AxAHNeHJVw/X7nzv+5X8+dHm7QLe/ItLJ5QRvahG2PZRGCeeWZKqmYBjFM1vZlR6sxJVbg/OGAsUCvnu4mys5/TJ+sADsWUzs+pH0kBrlKVWNBUttf/XwcvJe83ytMgntzGL3WGkR2ctRGiH28RZ9Tgla+oXV3I/A3/Mlz2uw== 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: jSlf07DWWg+432L6qbEtPoH+4gcqir1zA9ATWwZHLyg1rS5i+XEKN3ZOqLtVZKHqJbrdHfAdixtB5qRf5MvBcrtos1sylnUb7wyFJJShDCSklN1DPRs2PsatDY6SbCp42N9AlKQNJQjxIdYKKJ7V83KeFzX1R5OnoK20rAChM9Ryj1Ihk2O1ChYAC0x8TauXKDjbPwTcCnoJbKI2CWzv0tPJd+ALvthpmVCaCFTKYtB5MUOJb+rRagO61uoMDVYLlGRn5yJnMRPtbTNIMbCkv5x8haV/ymj6AhNbQ/cAMMWF53MtP78t3TRtVpTx1P7Jastj7NSOjXqyK0fa+2rcoCbyKbKjkx+e44hlSGE7hnEhZoWK7OH0LfyPeqcDzVnIdJdAX4u5ZAULamyzvIA+42IZzk2PhlqmLmoZ8NUPZ0wbFMjqsfvkCbjaRYKhv2aQ1jVGDaOZ11s2ruHXFUm1bom0qpnRueuccTswpkyTMVOINsJYHZ3mJFgGZ74Wp8zGELjeqBbXRwqW2T+Q7WJSJZ2LCfaav+qF1c5JEK/YRovvpPCn2ST+zWmbx4YngGPEhIq8zjfl8quqaXHIJnrqlOFyWU3AtUWR94V0fyGpAkkWCsArKrqH5tH1PUgTY0h+CnaPFsdWR3H/DkCg5kzsVKy90KmRyvYbS1Git36pDFmjwZQ0PGkDPfMuaAIABPiJL/8gWxG6HPj/DjCy+mzcPFy2G5Ge2RupWj1zfsRb1ObQbWQLoARBkU490yttwTHiCCW+bsigiQvl4CYa3+kNONC2RKPIQpYNfa7Ss1f5UmSoyu9Bp8+Gibher2cnWRYXD0A0CzC1u8hV7WMTpk/FYcdv/UJC15p+eo+n4rfGYYH2iMOXaDFb6gs5RIpmAa6aB/s3fLJ+pnj+erwZY9tS840+iIHBS0sWWxleTBZcbe3zwkG3HGsbJsvc0p9RyW5vkBLITO6YAJPE8OZeVbmSSUNGBhUqRHigYgMMAy2bzoMClWHWr2NiyOk4vFcH4xwm8THHQjc5QcA84r+tddrW6HWnU2pCUp6CsVqNXKpfngPILez/5u6ECQaHUo/ZjajTPOI2gqOfbPMFKXoOVvtiy/XyYfBTwo6bKLbSh/HT+1rRLMjaSoCuWP72gCEs4NT4h17+ifEvf2y42rbB9998zG9GLznCeUkVTEAk1uj2RTA6DHbutLnPnFqLyaPgthDNg//2zm9838q1q89zvCYmRT1PdEPl+KpWouKsdB7sUmjThXrqKMWyr+w3PEFptaBKgYeUNoq22ESbKnLeK5M2UXENf72VXDTzHI3fLQoXZ9pQ0yDHxV1h/RSH4WOxlCtp0g+LHA0/ngTn6MmzCciulrioF5mv2EBPkDtVkXJe1BROsyIJCVFhwi5W0fWkjlAFM4KWSqb2OHoGYGFqPmaB3Yirpiw8XOaTmUk/XBiDfwoY3PJr4d/hsJlQz3cwQFPzq99BDbGwtCyM86gdH39mii2jjHIHOri5afhXVSwV0Rp/3htPas7N9W+UflF9a/0V3iU0ZacS+kg2acWwW5xaE7UbcZoXpOVPcZtXDwMCxM7OhLRz1F7+Zzl4nXOUGoPhGl+P5V0GJ0c4nXr0u9cDag== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8ba350eb-ac1f-4a71-0163-08dbf181c63e 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:08.4969 (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: D+eeWRse+hPczDeE5J7XP+WyStdD6vkhQfwnOSeJcwmqMW7I+dSahc/ZXpq1Rm8+8LNynaAYH9lCVYIFKmfbK3jlozcfQwmSCEpRd0m7ouc= 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 exit logic of CoreNIC firmware. Fixes: 646ea79ce481 ("net/nfp: move PF functions into its own file") Cc: stable@dpdk.org Signed-off-by: Chaoyong He Reviewed-by: Long Wu Reviewed-by: Peng Zhang --- drivers/net/nfp/nfp_ethdev.c | 94 ++++++++++++++++++++++++-------- drivers/net/nfp/nfp_net_common.h | 1 + 2 files changed, 73 insertions(+), 22 deletions(-) diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c index bb0ddf3d54..5c5e658671 100644 --- a/drivers/net/nfp/nfp_ethdev.c +++ b/drivers/net/nfp/nfp_ethdev.c @@ -322,6 +322,54 @@ nfp_net_uninit(struct rte_eth_dev *eth_dev) nfp_cpp_area_release_free(net_hw->mac_stats_area); } +static void +nfp_cleanup_port_app_fw_nic(struct nfp_pf_dev *pf_dev, + uint8_t id) +{ + struct rte_eth_dev *eth_dev; + struct nfp_app_fw_nic *app_fw_nic; + + app_fw_nic = pf_dev->app_fw_priv; + if (app_fw_nic->ports[id] != NULL) { + eth_dev = app_fw_nic->ports[id]->eth_dev; + if (eth_dev != NULL) + nfp_net_uninit(eth_dev); + + app_fw_nic->ports[id] = NULL; + } +} + +static void +nfp_uninit_app_fw_nic(struct nfp_pf_dev *pf_dev) +{ + nfp_cpp_area_release_free(pf_dev->ctrl_area); + rte_free(pf_dev->app_fw_priv); +} + +void +nfp_pf_uninit(struct nfp_pf_dev *pf_dev) +{ + nfp_cpp_area_release_free(pf_dev->qc_area); + free(pf_dev->sym_tbl); + if (pf_dev->multi_pf.enabled) { + nfp_net_keepalive_stop(&pf_dev->multi_pf); + nfp_net_keepalive_uninit(&pf_dev->multi_pf); + } + free(pf_dev->nfp_eth_table); + free(pf_dev->hwinfo); + nfp_cpp_free(pf_dev->cpp); + rte_free(pf_dev); +} + +static int +nfp_pf_secondary_uninit(struct nfp_pf_dev *pf_dev) +{ + free(pf_dev->sym_tbl); + rte_free(pf_dev); + + return 0; +} + /* Reset and stop device. The device can not be restarted. */ static int nfp_net_close(struct rte_eth_dev *dev) @@ -333,14 +381,25 @@ nfp_net_close(struct rte_eth_dev *dev) struct rte_pci_device *pci_dev; struct nfp_app_fw_nic *app_fw_nic; - if (rte_eal_process_type() != RTE_PROC_PRIMARY) - return 0; - hw = dev->data->dev_private; pf_dev = hw->pf_dev; pci_dev = RTE_ETH_DEV_TO_PCI(dev); app_fw_nic = NFP_PRIV_TO_APP_FW_NIC(pf_dev->app_fw_priv); + /* + * In secondary process, a released eth device can be found by its name + * in shared memory. + * If the state of the eth device is RTE_ETH_DEV_UNUSED, it means the + * eth device has been released. + */ + if (rte_eal_process_type() == RTE_PROC_SECONDARY) { + if (dev->state == RTE_ETH_DEV_UNUSED) + return 0; + + nfp_pf_secondary_uninit(pf_dev); + return 0; + } + /* * We assume that the DPDK application is stopping all the * threads/queues before calling the device close function. @@ -351,16 +410,17 @@ nfp_net_close(struct rte_eth_dev *dev) nfp_net_close_tx_queue(dev); nfp_net_close_rx_queue(dev); - /* Clear ipsec */ - nfp_ipsec_uninit(dev); - /* Cancel possible impending LSC work here before releasing the port */ rte_eal_alarm_cancel(nfp_net_dev_interrupt_delayed_handler, (void *)dev); /* Only free PF resources after all physical ports have been closed */ /* Mark this port as unused and free device priv resources */ nn_cfg_writeb(&hw->super, NFP_NET_CFG_LSC, 0xff); - app_fw_nic->ports[hw->idx] = NULL; + + if (pf_dev->app_fw_id != NFP_APP_FW_CORE_NIC) + return -EINVAL; + + nfp_cleanup_port_app_fw_nic(pf_dev, hw->idx); for (i = 0; i < app_fw_nic->total_phyports; i++) { id = nfp_function_id_get(pf_dev, i); @@ -370,26 +430,16 @@ nfp_net_close(struct rte_eth_dev *dev) return 0; } - /* Now it is safe to free all PF resources */ - PMD_INIT_LOG(INFO, "Freeing PF resources"); - if (pf_dev->multi_pf.enabled) { - nfp_net_keepalive_stop(&pf_dev->multi_pf); - nfp_net_keepalive_uninit(&pf_dev->multi_pf); - } - nfp_cpp_area_free(pf_dev->ctrl_area); - nfp_cpp_area_free(pf_dev->qc_area); - free(pf_dev->hwinfo); - free(pf_dev->sym_tbl); - nfp_cpp_free(pf_dev->cpp); - rte_free(app_fw_nic); - rte_free(pf_dev); - + /* Enable in nfp_net_start() */ rte_intr_disable(pci_dev->intr_handle); - /* Unregister callback func from eal lib */ + /* Register in nfp_net_init() */ rte_intr_callback_unregister(pci_dev->intr_handle, nfp_net_dev_interrupt_handler, (void *)dev); + nfp_uninit_app_fw_nic(pf_dev); + nfp_pf_uninit(pf_dev); + return 0; } diff --git a/drivers/net/nfp/nfp_net_common.h b/drivers/net/nfp/nfp_net_common.h index 30fea7ae02..ded491cbdc 100644 --- a/drivers/net/nfp/nfp_net_common.h +++ b/drivers/net/nfp/nfp_net_common.h @@ -272,6 +272,7 @@ int nfp_net_flow_ctrl_get(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf); int nfp_net_flow_ctrl_set(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf); +void nfp_pf_uninit(struct nfp_pf_dev *pf_dev); #define NFP_PRIV_TO_APP_FW_NIC(app_fw_priv)\ ((struct nfp_app_fw_nic *)app_fw_priv) From patchwork Thu Nov 30 08:52:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 134730 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 CE5B94340A; Thu, 30 Nov 2023 09:53:50 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 56A4742ED9; Thu, 30 Nov 2023 09:53:14 +0100 (CET) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2105.outbound.protection.outlook.com [40.107.223.105]) by mails.dpdk.org (Postfix) with ESMTP id 718DD42EB2; Thu, 30 Nov 2023 09:53:12 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Vx/wva+5cxFlHKIQCEth75mMQd4UryzHHc6G3TY8PaiL8H2kRAddcmRmjUC8Ay2RJ6U6u3XzftHPagZBaqbdA1yxHdfiBYfu+MzM/md/+hcvveLUyo8VnW5EAazEozhTZH4k1Xo0UhjPD2N7emkC+VN01tYW4gTOPaYSguaXpCSS6O/XBRPDgxa67atWweXtcjGgMOMzJiMO48vLVj5/jL7YYs2N3DbbZE9GMQNWHA520HsQPZrw5+/IPbm+mG7J6473hJA7hfcJXTQ7YLLCl1aoHva/bOxoWr0qlQ+3aetG/s6FbLfxDrbLJoC5QtjYAZcZ+18N6njUXiTMosEQ/Q== 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=2/AFRG7qctTKgzQ+2Zz7QLV/vIbU9ZAt/d1hBeC+k0w=; b=PJ2Ay12HMRuohGozzANeXmWi+RDZ3eIpiRIMmFqLDchPibPmHGA9ajQWR1cAP4jZqO5Ksc0aFzwrgrkn7FmCK66qO5OkKNFCrsB0JABskU0XDsmT4Yu0WAVEzaae2aRmwhlRKg1lfi8wcyQgoyDW2tA1LXxYvUCTByMn8YvotIvjMgFqrJdUrjw3zeglH7VZ8rewfIFv9DeM3CW8cB4RVxqDFsgVHUwvaGdGqO73Zk15d0x4LdEW9MY899IsCUu4et46MTwuOr7SW+2dDM7uAYMM8Q9S4jVaHGr0x1MNDnyREtxz0wjg/pntYVdl2sG3G/ZtxwrylsIKEFhwW4ZnKw== 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=2/AFRG7qctTKgzQ+2Zz7QLV/vIbU9ZAt/d1hBeC+k0w=; b=CphEc03N2Vq6LF8sEWY7fsYN98LzWiMrEUFmkqlZWhDA6gDBgC3nyUMf/kbe+xjzCamX3AoIazKEavNjN/XyqoUQ97uEWEAFcCS4FUO/DSp+Mu4xja29yK0J7dVSz69YfLytHfkWhLwIX1axMa2Shv5Ad7/5fmakg5GBpoq1w14= 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:10 +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:10 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , stable@dpdk.org, Long Wu , Peng Zhang Subject: [PATCH 6/7] net/nfp: fix resource leak for exit of flower firmware Date: Thu, 30 Nov 2023 16:52:37 +0800 Message-Id: <20231130085238.60290-7-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: 50852ad7-de1a-43a1-c7ae-08dbf181c77f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ulrZqw4TDqYPZ04UHK/M82BQ+UQkmJkFTCTvI5v64f3V90Aan62qIIghklK8eMKYz/mZgzyYU6HgX71x0e7tMaYDFehRG2N0yXfaSGu5MGPI96vtVD23Roj/CACwY51nsb63TRKbnh1dAJEVx1oHsrZFMaTcuLorpgXFmuZ1bHx5fahDRLO4WF2CEAXQL+F6KoysoQwrJ6VA0d/w3qREUAAJvfN1DmuacvCTnKB/BY6FT5pKAV1xjTsxJema3VhABF8wsMqfaiKRD9JUHKftS1DyC2RBp9JC6E1lI8B+uOLC4stdinTFQrmldpTQZErO2Nx966ufI3/0D5iBefsPw35+PdzxVQpLqCg60CRWhUvBzujBsYM4QlQQWWW6Hmi+/4j7qacb11fKZAsJhxD1f9l49vYRGf2GuE/zQevGKj6cH0xIc4qLwMiOyxUyPYdzp8yJCWDW0RocpRcfvuk7F4fbxS/gChwwgSFthdCMMNMbixH1XY3U2yIpIBq658iehWDFydsKrfOI07DOx0yGFisPGADj2l6IWAJ9y923U74knyqFAU/DjiZJM11+p+Mmn84h+Pslx9WuRlCwaXdXMjqcg3KXtTlY+1azRPhz1X1EXxnTOzgAxivoK32JZa3dwZ5YxsP8tQE3mIAh6Dvc6ZVzFH29HB0Rvb71PMdyFVD+OpnOKFUVpimbtM6TOkNXKYoYsmhhmJMhdfySStMF4w== 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: h4Jp9oq0Lg/vXAQKN4siw0730wtoAInZePE/z7iXfPyBTD/j8KSWv2629Z1xBQUEEJF/FamMg/s3b0mZZqga8vvQh1pPz6VogyLoHSnkJ8m2RqzWZBB2USsRC9JPZpJeN1SU3Zr+y7CqaMigQXdsBHc17YSGAelTVRLGFIRKDaA06JwP5nWUD0VC8FUPD2VcgCLnVBf+6AE+snxW6LPi+7IEuGDKUpdhbDKuDeIFTm8Ty6/3e7zfbFeUGVSu+6h1NDWjj5TEcvS0AyAC40wYOLM2PGf0B2GIMIV6/lyCBTduLKD2GTRoN1eifkUibZoP+xkIZqSvMvVxnLAeEL5bweiTwzD0bdcwTXS28nAkIbJxs7kUL1QIdQRqMuklpmAJtCV0IDiGIVh5OkD5WH8Rh5mmZe6FBD4q540AdliFbuTMIBa4SHqXzc3wlIkdrL5VDTj2bYIq2Qd+YODvUiWX+xODPkZw20YaiVglAOqA7dMOLN4duBCPeiCYQ5oLcc0zeJ6lS4RaToEOgy7caycboifhMp73dAIzp5AZPmN0QgtKWuXBI5GMZTDcOdINo7aYk9eJ3gEptJfcIuznzc9fuhLSTPK9LiBXLK3P/6arLGX9tx3tyiwi4n8xAO8OnndfqjbQ7ty0spV05rbfhAsckCkQJ5xXevaWlmSyaTaodnUIY2oXrSgxb3qqVs3pSok6mrKGeQbHUH2rVfATGwV7qE7vpzTPLdd/ct7/MaiTjAv7iCFspzgIN+IbxdGUsKHospLY3rMMIS1NlgS+M9ShYpVX3JMV0k5eyqizO1iAke0hrTSW1oDeNGodG0xfZsjvedr4sc5pLP5ZggLEpDNS1HBalx9PKBBpPjBSDJnDG8Y9gkbGmvk901unTh28WEgFHNpUBBSEZcz2zovHYbzpz/YCt5T+ft8U3AUlG3Hx8TGb0fYacMQWHILLFkf/4zKprz1T3eIxYt61g2Na5YWQzrN1ehCcMkvfUbRmkOid9Ck1bHje2G/2cUC7gQnZukviCid0zpOv/le2BGQp3GD/qBAqV04jBxPDJsy2uFCoQjRRMiNYS50Jqz+HhXywPBFkcOFEOciEu7Ghy+cvGpOZ0Mc3Y9PieGOjiavExip97knORNc1h55N9F0QqFDTkpuKjFPReidAd45eMwvxIjgRkfNP6FZaekXVFz+Bhf82rRDsZeWTDcK+93KhYB9KylfAwMJje9ovys9maCanbSOL+21qrdRAFSLCRtCRp5+mfNK2q+ZwfQpJkZSSc0MQc9f5FPIfh8arYml0MOg6q8rdgWr7hwY0TQuDD3PQQ/IxZcnghJ6J/p8DEBTDVLQ7gcqet7DBHWQcRWZoHKXN/SMqFXV0Zty59ZF8RtipFrjJJGCgX0gFTAx4IoqSCt6GAG97nlP4POeahIdO8jeTg6y5FI+JbK+A+4U/VwR9kLf+52WWtHVOjUPrm2rh1czP9QDor7TJDRCMP6owa1yHyTHI7I7vCV82anbnpTWEr0Q5UVs6Ti6u4cWexjwUTt8hCqxDFIAHeuc/uIX0jR2R2TMqGlQgpjD0zogHzZAE73DliMRV5504YS+092oSEaWjVoVWYHa0HYnE9wWRTBDv0TgWPQ== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 50852ad7-de1a-43a1-c7ae-08dbf181c77f 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:10.6041 (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: yG4bL4I4jy2EEnei0e7vHhqkX4ZHcwf74eHXzQcx8AhARwnOjgNvTa6e/0fxBgYBHEdkvxKQm5o2hC3aTlExJj128sgXYagU+z7SV9IOheQ= 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 exit logic of flower firmware. 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 --- drivers/net/nfp/flower/nfp_flower.c | 73 ++++--------------- drivers/net/nfp/flower/nfp_flower.h | 1 + .../net/nfp/flower/nfp_flower_representor.c | 64 ++++++++++++++++ 3 files changed, 80 insertions(+), 58 deletions(-) diff --git a/drivers/net/nfp/flower/nfp_flower.c b/drivers/net/nfp/flower/nfp_flower.c index 6b523d98b0..3698a3d4aa 100644 --- a/drivers/net/nfp/flower/nfp_flower.c +++ b/drivers/net/nfp/flower/nfp_flower.c @@ -82,63 +82,6 @@ nfp_flower_pf_start(struct rte_eth_dev *dev) return 0; } -/* Reset and stop device. The device can not be restarted. */ -static int -nfp_flower_pf_close(struct rte_eth_dev *dev) -{ - uint16_t i; - struct nfp_net_hw *hw; - struct nfp_pf_dev *pf_dev; - struct nfp_net_txq *this_tx_q; - struct nfp_net_rxq *this_rx_q; - struct nfp_flower_representor *repr; - struct nfp_app_fw_flower *app_fw_flower; - - if (rte_eal_process_type() != RTE_PROC_PRIMARY) - return 0; - - repr = dev->data->dev_private; - hw = repr->app_fw_flower->pf_hw; - pf_dev = hw->pf_dev; - app_fw_flower = NFP_PRIV_TO_APP_FW_FLOWER(pf_dev->app_fw_priv); - - nfp_mtr_priv_uninit(pf_dev); - - /* - * We assume that the DPDK application is stopping all the - * threads/queues before calling the device close function. - */ - nfp_net_disable_queues(dev); - - /* Clear queues */ - for (i = 0; i < dev->data->nb_tx_queues; i++) { - this_tx_q = dev->data->tx_queues[i]; - nfp_net_reset_tx_queue(this_tx_q); - } - - for (i = 0; i < dev->data->nb_rx_queues; i++) { - this_rx_q = dev->data->rx_queues[i]; - nfp_net_reset_rx_queue(this_rx_q); - } - - /* Cancel possible impending LSC work here before releasing the port */ - rte_eal_alarm_cancel(nfp_net_dev_interrupt_delayed_handler, (void *)dev); - - nn_cfg_writeb(&hw->super, NFP_NET_CFG_LSC, 0xff); - - /* Now it is safe to free all PF resources */ - PMD_DRV_LOG(INFO, "Freeing PF resources"); - nfp_cpp_area_free(pf_dev->ctrl_area); - nfp_cpp_area_free(pf_dev->qc_area); - free(pf_dev->hwinfo); - free(pf_dev->sym_tbl); - nfp_cpp_free(pf_dev->cpp); - rte_free(app_fw_flower); - rte_free(pf_dev); - - return 0; -} - static const struct eth_dev_ops nfp_flower_pf_vnic_ops = { .dev_infos_get = nfp_net_infos_get, .link_update = nfp_net_link_update, @@ -146,7 +89,6 @@ static const struct eth_dev_ops nfp_flower_pf_vnic_ops = { .dev_start = nfp_flower_pf_start, .dev_stop = nfp_net_stop, - .dev_close = nfp_flower_pf_close, }; static inline struct nfp_flower_representor * @@ -858,6 +800,21 @@ nfp_init_app_fw_flower(struct nfp_pf_dev *pf_dev, return ret; } +void +nfp_uninit_app_fw_flower(struct nfp_pf_dev *pf_dev) +{ + struct nfp_app_fw_flower *app_fw_flower; + + app_fw_flower = pf_dev->app_fw_priv; + nfp_flower_cleanup_ctrl_vnic(app_fw_flower->ctrl_hw); + nfp_cpp_area_free(app_fw_flower->ctrl_hw->ctrl_area); + nfp_cpp_area_free(pf_dev->ctrl_area); + rte_free(app_fw_flower->pf_hw); + nfp_mtr_priv_uninit(pf_dev); + nfp_flow_priv_uninit(pf_dev); + rte_free(app_fw_flower); +} + int nfp_secondary_init_app_fw_flower(struct nfp_pf_dev *pf_dev) { diff --git a/drivers/net/nfp/flower/nfp_flower.h b/drivers/net/nfp/flower/nfp_flower.h index 6f27c06acc..8393de66c5 100644 --- a/drivers/net/nfp/flower/nfp_flower.h +++ b/drivers/net/nfp/flower/nfp_flower.h @@ -106,6 +106,7 @@ nfp_flower_support_decap_v2(const struct nfp_app_fw_flower *app_fw_flower) int nfp_init_app_fw_flower(struct nfp_pf_dev *pf_dev, const struct nfp_dev_info *dev_info); +void nfp_uninit_app_fw_flower(struct nfp_pf_dev *pf_dev); int nfp_secondary_init_app_fw_flower(struct nfp_pf_dev *pf_dev); bool nfp_flower_pf_dispatch_pkts(struct nfp_net_hw *hw, struct rte_mbuf *mbuf, diff --git a/drivers/net/nfp/flower/nfp_flower_representor.c b/drivers/net/nfp/flower/nfp_flower_representor.c index 7212d9e024..02089d390e 100644 --- a/drivers/net/nfp/flower/nfp_flower_representor.c +++ b/drivers/net/nfp/flower/nfp_flower_representor.c @@ -328,12 +328,75 @@ nfp_flower_repr_free(struct nfp_flower_representor *repr, } } +/* Reset and stop device. The device can not be restarted. */ +static int +nfp_flower_repr_dev_close(struct rte_eth_dev *dev) +{ + uint16_t i; + struct nfp_net_hw *hw; + struct nfp_pf_dev *pf_dev; + struct nfp_net_txq *this_tx_q; + struct nfp_net_rxq *this_rx_q; + struct nfp_flower_representor *repr; + struct nfp_app_fw_flower *app_fw_flower; + + if (rte_eal_process_type() != RTE_PROC_PRIMARY) + return 0; + + repr = dev->data->dev_private; + app_fw_flower = repr->app_fw_flower; + hw = app_fw_flower->pf_hw; + pf_dev = hw->pf_dev; + + /* + * We assume that the DPDK application is stopping all the + * threads/queues before calling the device close function. + */ + nfp_net_disable_queues(dev); + + /* Clear queues */ + for (i = 0; i < dev->data->nb_tx_queues; i++) { + this_tx_q = dev->data->tx_queues[i]; + nfp_net_reset_tx_queue(this_tx_q); + } + + for (i = 0; i < dev->data->nb_rx_queues; i++) { + this_rx_q = dev->data->rx_queues[i]; + nfp_net_reset_rx_queue(this_rx_q); + } + + if (pf_dev->app_fw_id != NFP_APP_FW_FLOWER_NIC) + return -EINVAL; + + nfp_flower_repr_free(repr, repr->repr_type); + + for (i = 0; i < MAX_FLOWER_VFS; i++) { + if (app_fw_flower->vf_reprs[i] != NULL) + return 0; + } + + for (i = 0; i < NFP_MAX_PHYPORTS; i++) { + if (app_fw_flower->phy_reprs[i] != NULL) + return 0; + } + + if (app_fw_flower->pf_repr != NULL) + return 0; + + /* Now it is safe to free all PF resources */ + nfp_uninit_app_fw_flower(pf_dev); + nfp_pf_uninit(pf_dev); + + return 0; +} + static const struct eth_dev_ops nfp_flower_pf_repr_dev_ops = { .dev_infos_get = nfp_flower_repr_dev_infos_get, .dev_start = nfp_flower_pf_start, .dev_configure = nfp_net_configure, .dev_stop = nfp_net_stop, + .dev_close = nfp_flower_repr_dev_close, .rx_queue_setup = nfp_net_rx_queue_setup, .tx_queue_setup = nfp_net_tx_queue_setup, @@ -356,6 +419,7 @@ static const struct eth_dev_ops nfp_flower_repr_dev_ops = { .dev_start = nfp_flower_repr_dev_start, .dev_configure = nfp_net_configure, .dev_stop = nfp_flower_repr_dev_stop, + .dev_close = nfp_flower_repr_dev_close, .rx_queue_setup = nfp_flower_repr_rx_queue_setup, .tx_queue_setup = nfp_flower_repr_tx_queue_setup, 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; }