From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 3E4C045610 for ; Fri, 12 Jul 2024 12:52:15 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3781342F0C; Fri, 12 Jul 2024 12:52:15 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2059.outbound.protection.outlook.com [40.107.92.59]) by mails.dpdk.org (Postfix) with ESMTP id 9F60140261 for ; Fri, 12 Jul 2024 12:52:13 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=BIFKPql+d0N7mKA8AB/ZOQ0IAnRshEJ5d4K85TVMV842GCyJHbAeM48J8/sJc1xa0AjzsRMqExpoHQh23BtkHNvLDs18dWhhX0QfDhrVaJm/LDgVdDEtgwk0Mo7fWMrcM8UGKGIHoG5kAXf+atC+FpmJUFFZHma9EcXce0etd8PedZZAxbxtgZdTEdcIEn7O8pQ7yH4BOlhjylel1rBrNcy1iHiVqRMK/DoAft00Arb7C+l1BB2hb0KtlR6Wm8cyr9CwDD2bg/WB7xvRJQkR4u6yJZvsRaoatdc+G79oZ8JUISTKRWwGPzXVowNro2afG1AQHH1qtwUFtsxei4Y6Tg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=Fhq9Z/b/ib+M5sTnmEzgtVAi1e0NRa1mJYcUrbfLtQg=; b=KuxdLXeAcRu48bT+FkYiJpddssF/aX/M/3pn/8OvnqqRIUdhN39Nyj3pOFXPS1yXbOpzcn4LE1c+GqxsF13dU9JcQeIfzJQ2zes8T7nof9up9HTDsAOy7DsUTv28XjM5vytCqy5tZS8lUDit/Q8q8iC3voMEuQUo9lbq27A9UFV7Azt0tyaXilcjCixJKiMQHCv/S3NMnFx1/UKDHShYVJ+Co0rETSUdNl1sJoGJCBzkJcjqeVTD+Lgv/EabY4VIgXMqrgc8ShOg0GtD79r6DbdZhtP+JYAPlsZ+GmIWr6OzkYohDbYHyWgf2RQdVm3UfQD/ara8oRmNZ8I3l8GntA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=temperror (sender ip is 216.228.117.161) smtp.rcpttodomain=nokia.com smtp.mailfrom=nvidia.com; dmarc=temperror action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Fhq9Z/b/ib+M5sTnmEzgtVAi1e0NRa1mJYcUrbfLtQg=; b=B+yo73xPaYIDrREgJCAZxK30e0CPLhwoCqV4c5NPxH51uWaHzLfo1hFkDGChR2r8ZMb/E4qG8yfquYB61s++vGwRVNWf59nvGRks7/kQgEDJsUKWl5bvGnNw9E25QArNHncsDd1hih1y8YSnbDm+oPGvWWLZfJkvGbny9XfAxyz59DvspECCBTezZWMIog23azAAgFBRMTNjczsB4Tu2q2dO26MYxby1fXbS8Er1a30+Hotv4dpb0Ka51V3HTPHBs8zB90B7pTCLmonpI6F90bmi1DaV8elxVhacG5ObeLVnwBfqp725aE/OBwNaSpqlGutb99rh+5w4Cnntrh7taw== Received: from BL1PR13CA0098.namprd13.prod.outlook.com (2603:10b6:208:2b9::13) by DM4PR12MB8524.namprd12.prod.outlook.com (2603:10b6:8:18d::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7741.35; Fri, 12 Jul 2024 10:52:11 +0000 Received: from BN2PEPF000055DC.namprd21.prod.outlook.com (2603:10b6:208:2b9:cafe::27) by BL1PR13CA0098.outlook.office365.com (2603:10b6:208:2b9::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.23 via Frontend Transport; Fri, 12 Jul 2024 10:52:11 +0000 X-MS-Exchange-Authentication-Results: spf=temperror (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=temperror action=none header.from=nvidia.com; Received-SPF: TempError (protection.outlook.com: error in processing during lookup of nvidia.com: DNS Timeout) Received: from mail.nvidia.com (216.228.117.161) by BN2PEPF000055DC.mail.protection.outlook.com (10.167.245.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7784.5 via Frontend Transport; Fri, 12 Jul 2024 10:52:09 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Fri, 12 Jul 2024 03:51:55 -0700 Received: from nvidia.com (10.126.231.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Fri, 12 Jul 2024 03:51:53 -0700 From: Xueming Li To: Julien Meunier CC: Bruce Richardson , dpdk stable Subject: patch 'net/fm10k: fix cleanup during init failure' has been queued to stable release 23.11.2 Date: Fri, 12 Jul 2024 18:44:47 +0800 Message-ID: <20240712104528.308638-62-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240712104528.308638-1-xuemingl@nvidia.com> References: <20240712104528.308638-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN2PEPF000055DC:EE_|DM4PR12MB8524:EE_ X-MS-Office365-Filtering-Correlation-Id: 5c44966b-2a3b-457d-fbac-08dca260ae00 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|82310400026|1800799024|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?YYxdUbQ2Ihdu2OPk+0YaYXsolaxHbohUyCx7YCp+EEMQVmqco8V4jP8oOJgP?= =?us-ascii?Q?A5Yww+QHABdkjU4HBwXdwK6gwpigq5HFaVWs4uI7TrJtr1AI8d04JGjXzZme?= =?us-ascii?Q?xRQXiUxkGhq2qzjgn1M4827ibiXyg7XpfV4gIB7+5n8aMBtHLQcTEdP48sPR?= =?us-ascii?Q?h+n7t3PoX9HmUc5ZJZ9Y6B/iWqv+AjcxhSlDcwuOa2Q36Bb/5EjteJL4iBIF?= =?us-ascii?Q?l1JagAm4Hiezi/eCq2Mlys32/Xm/wjOSdl6uK0wSomfJbEHDErcn0q3zrLur?= =?us-ascii?Q?6P9BGacIgYsSNbRL8m0+k1cNHYiDILgpmSIoQjH1KAFyE3pfyITqcPeVU+RG?= =?us-ascii?Q?dWtKdLyxRP69D/OrLGvj5E+TKgOgXDEIHDN8mg1C1hY9DSL+3McF1kq5uvRd?= =?us-ascii?Q?tnryZ5vDlPllT+wHElE7xLuNzDMXwaMtGJ09WjQWZT5ZZGII64r73YzTJpHA?= =?us-ascii?Q?hUTAe5tuBndU93PSh7YnWQiAhyPd6MkXjJCvFYZc1T+IiIHVB6Y+DosJA9pe?= =?us-ascii?Q?r+gGRjgEmYvbhX/NgH+OUWdWQQCcjZGPGSjzx14gb6ZmQwK6CpRX7gLPJQUy?= =?us-ascii?Q?FOK5WO1yMBu/1ASizJkAHR4ngT2TYzD9Pur9NV4gnAA1qKqv6VGu45QZdyvy?= =?us-ascii?Q?TN647cgRPMUl5V16eb/AcNYQw11y0c+YPfpsyKkCzRHYfxAAF/or+6R28rCJ?= =?us-ascii?Q?4eHvg6Sb3wBCmcFkCuguWIlVg0YIN+YdUR7dU0DTJGYLrq2Z+Pggkkxy2b18?= =?us-ascii?Q?obN50DCymsQQt9gxzV+v1EsMsszMk8gHjBB4FZfiKRxddPT1B1VsFHlrLNeA?= =?us-ascii?Q?jUfmgo3mPV+bQWda8D8khZjR+Jhgg4zSr4vttfSmiAYjteIU341o7wAYV8uG?= =?us-ascii?Q?TdwTek82rQzlIoA0NFyk/2iFb80qyFEX38sWgO0Phhxm2FeRZUYOwwGA68aN?= =?us-ascii?Q?ZEy8XwZz8yRKHkzLRdO50Y45LY6HAZh8vgDyCDUMnPcc3eMgntGUIsZj9N2I?= =?us-ascii?Q?HDdu5OdJ4+885V2MLUHxnUn42edvpYGdjwR9mBkobzII2TTI7MlGhsnGjf1W?= =?us-ascii?Q?8/tzTFC2Wz/ctYx7BqC6T0j/+UghDfVKR74POLMy1OViffPunhfehb6CQEID?= =?us-ascii?Q?EWIOze5A8z0ppKPK5EdQRpQkZXjqi1kxfBrduHPNZF29LYVgxSOpOoL8dt1F?= =?us-ascii?Q?J8c5yJ8T0nXpOmKrySuAUQcuzj02Qg3TfM1mMTEDyodvWQl0FR6l6g8MWP7O?= =?us-ascii?Q?TZK8VFt2nMTgmzUXDBKQECXTmIYE4dIuwEnxqW+GmU6lxJ/fCiNrPHx1i9rV?= =?us-ascii?Q?FIKMjONQlhJbrLD9WE+a7S8tbmDmqKaaMEe9N3mgEoDLxAaAHdV6frjGAmYg?= =?us-ascii?Q?LAdXm16fSw8nQG+qd16NM+CDJoswlWCtaJAKYK9cuOfw3rpthPJxiuV/isTr?= =?us-ascii?Q?6pranzLwgDnU6AIgqfTOY30r9ouNxjH0?= X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230040)(376014)(82310400026)(1800799024)(36860700013); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jul 2024 10:52:09.7440 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5c44966b-2a3b-457d-fbac-08dca260ae00 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN2PEPF000055DC.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB8524 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 23.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/14/24. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://git.dpdk.org/dpdk-stable/log/?h=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=eaaa1b29af82f97553af84a14190b0b2885ece21 Thanks. Xueming Li --- >From eaaa1b29af82f97553af84a14190b0b2885ece21 Mon Sep 17 00:00:00 2001 From: Julien Meunier Date: Wed, 3 Apr 2024 13:55:41 +0200 Subject: [PATCH] net/fm10k: fix cleanup during init failure Cc: Xueming Li [ upstream commit cd7f5da2e7d647863a3d6552b6787f413bbd05f2 ] Cleanup was not done on this PMD if a error is seen during the init: - possible memory leak due to a missing free - interrupt handler was not disabled: if an IRQ is received after the init, a SIGSEGV can be seen (private data stored in rte_eth_devices[port_id] is pointing to NULL) Fixes: a6061d9e7075 ("fm10k: register PF driver") Fixes: 4c287332c39a ("fm10k: add PF and VF interrupt handling") Signed-off-by: Julien Meunier Reviewed-by: Bruce Richardson --- drivers/net/fm10k/fm10k_ethdev.c | 39 +++++++++++++++++++++++++++----- 1 file changed, 33 insertions(+), 6 deletions(-) diff --git a/drivers/net/fm10k/fm10k_ethdev.c b/drivers/net/fm10k/fm10k_ethdev.c index 4d3c4c10cf..cc2012786d 100644 --- a/drivers/net/fm10k/fm10k_ethdev.c +++ b/drivers/net/fm10k/fm10k_ethdev.c @@ -3057,7 +3057,7 @@ eth_fm10k_dev_init(struct rte_eth_dev *dev) struct fm10k_hw *hw = FM10K_DEV_PRIVATE_TO_HW(dev->data->dev_private); struct rte_pci_device *pdev = RTE_ETH_DEV_TO_PCI(dev); struct rte_intr_handle *intr_handle = pdev->intr_handle; - int diag, i; + int diag, i, ret; struct fm10k_macvlan_filter_info *macvlan; PMD_INIT_FUNC_TRACE(); @@ -3146,21 +3146,24 @@ eth_fm10k_dev_init(struct rte_eth_dev *dev) diag = fm10k_stats_reset(dev); if (diag != 0) { PMD_INIT_LOG(ERR, "Stats reset failed: %d", diag); - return diag; + ret = diag; + goto err_stat; } /* Reset the hw */ diag = fm10k_reset_hw(hw); if (diag != FM10K_SUCCESS) { PMD_INIT_LOG(ERR, "Hardware reset failed: %d", diag); - return -EIO; + ret = -EIO; + goto err_reset_hw; } /* Setup mailbox service */ diag = fm10k_setup_mbx_service(hw); if (diag != FM10K_SUCCESS) { PMD_INIT_LOG(ERR, "Failed to setup mailbox: %d", diag); - return -EIO; + ret = -EIO; + goto err_mbx; } /*PF/VF has different interrupt handling mechanism */ @@ -3199,7 +3202,8 @@ eth_fm10k_dev_init(struct rte_eth_dev *dev) if (switch_ready == false) { PMD_INIT_LOG(ERR, "switch is not ready"); - return -1; + ret = -1; + goto err_switch_ready; } } @@ -3234,7 +3238,8 @@ eth_fm10k_dev_init(struct rte_eth_dev *dev) if (!hw->mac.default_vid) { PMD_INIT_LOG(ERR, "default VID is not ready"); - return -1; + ret = -1; + goto err_vid; } } @@ -3243,6 +3248,28 @@ eth_fm10k_dev_init(struct rte_eth_dev *dev) MAIN_VSI_POOL_NUMBER); return 0; + +err_vid: +err_switch_ready: + rte_intr_disable(intr_handle); + + if (hw->mac.type == fm10k_mac_pf) { + fm10k_dev_disable_intr_pf(dev); + rte_intr_callback_unregister(intr_handle, + fm10k_dev_interrupt_handler_pf, (void *)dev); + } else { + fm10k_dev_disable_intr_vf(dev); + rte_intr_callback_unregister(intr_handle, + fm10k_dev_interrupt_handler_vf, (void *)dev); + } + +err_mbx: +err_reset_hw: +err_stat: + rte_free(dev->data->mac_addrs); + dev->data->mac_addrs = NULL; + + return ret; } static int -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-07-12 18:40:16.949536886 +0800 +++ 0061-net-fm10k-fix-cleanup-during-init-failure.patch 2024-07-12 18:40:14.136594223 +0800 @@ -1 +1 @@ -From cd7f5da2e7d647863a3d6552b6787f413bbd05f2 Mon Sep 17 00:00:00 2001 +From eaaa1b29af82f97553af84a14190b0b2885ece21 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit cd7f5da2e7d647863a3d6552b6787f413bbd05f2 ] @@ -14 +16,0 @@ -Cc: stable@dpdk.org @@ -23 +25 @@ -index fa0d16277e..7b490bea17 100644 +index 4d3c4c10cf..cc2012786d 100644 @@ -26 +28 @@ -@@ -3058,7 +3058,7 @@ eth_fm10k_dev_init(struct rte_eth_dev *dev) +@@ -3057,7 +3057,7 @@ eth_fm10k_dev_init(struct rte_eth_dev *dev) @@ -35 +37 @@ -@@ -3147,21 +3147,24 @@ eth_fm10k_dev_init(struct rte_eth_dev *dev) +@@ -3146,21 +3146,24 @@ eth_fm10k_dev_init(struct rte_eth_dev *dev) @@ -63 +65 @@ -@@ -3200,7 +3203,8 @@ eth_fm10k_dev_init(struct rte_eth_dev *dev) +@@ -3199,7 +3202,8 @@ eth_fm10k_dev_init(struct rte_eth_dev *dev) @@ -73 +75 @@ -@@ -3235,7 +3239,8 @@ eth_fm10k_dev_init(struct rte_eth_dev *dev) +@@ -3234,7 +3238,8 @@ eth_fm10k_dev_init(struct rte_eth_dev *dev) @@ -83 +85 @@ -@@ -3244,6 +3249,28 @@ eth_fm10k_dev_init(struct rte_eth_dev *dev) +@@ -3243,6 +3248,28 @@ eth_fm10k_dev_init(struct rte_eth_dev *dev)