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 53A27A034F for ; Wed, 10 Nov 2021 07:36:35 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 49E9B40142; Wed, 10 Nov 2021 07:36:35 +0100 (CET) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2048.outbound.protection.outlook.com [40.107.92.48]) by mails.dpdk.org (Postfix) with ESMTP id 090664068B for ; Wed, 10 Nov 2021 07:36:34 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bxixST+dwa/pv0JB1L9tMWDj+LXZgsUHHuMKJZ9l8QW+R6HwdmnkMpLrBtSL1QL5gWXM5P8HR6FH3pZF8mX7yVXx8tm10u+2ac6S05FhszNJIDnsYlmpRLk4tskWsEYt7xKoComrRYSo8UM1L9XVe68hFRfeBqlq5XfvW6nxRsguJwfNOvxqSC/mjQBucRXzLkfgbyte/gUQxoy30IoDWiw7KNUzAu0RGjrg/idyql7/RcsjjLYTYJEdFRmJdf6afjZh0Jyyo+VD8JcCXioDHvHnOv6GPyTE5zHuwrKt6dWQo96bYboechmF24ri99G9wzdWuXL1fTRetfeABYf2ZQ== 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=7yRRmRXgz8MOd7l6h/2rMsdaRMa2t0AdTYCCew/35Io=; b=cjNflNouRuUiWMkCcCIW6NDTtGjtvrh4qSnrh1DnSjboKPxUDMX1Ahly6I1/dUZmmuZxA2M7XIylPtrUmZXjYxNBeT/AVsUCNo78gXdJVAQONjeYagaWjB0J7oZh3HYVZmlgdSqpOrgFQ3AdDGaVRSKEwaqt1tVj6CCsuUP8al9/87ysxWjL+Fs9zLVbOkG44IK9AiyTvZxMEWzDDQ2iB1id0lqwTqeVEqbOPX0mts/6PZZ4XKcASJ/8KtslfTDey8NnUUeOJ0OoakPVXV9IlG8JpWZzNSiuaIywizzLKTLMrYtwSJgd4uZbf/xMHViqzH9QoMmqfM7bVkhLWZJsiA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none 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=7yRRmRXgz8MOd7l6h/2rMsdaRMa2t0AdTYCCew/35Io=; b=iHfCbD5iBnoqXcQ4YDrzyVIsdI2nrjB2LV4L5m0dc9Dcyf/AztQYCMo2kv8Fl84vIklt2ct73v/QHlM4K20U0ebWesJFaO9kbCVdyIOVeF11+p5uPhWuE+TBKW25MwiciQTB0a8+1mLMUbXHSMit0hsHeemJrIBorejxG9Yyp2FKuKV/QVognULbcj4iyWlO21NcsDPALRr1Ya1tcR4jUptQPYs7/gjY8JFsAlbgJ3PmX/jbXmo5V2ZWdp1z4lW6TYFjUnZ6kQcLHiAPHiYaqagPqngk8hp4+rozgm5+kXF0Sak7SeQ9OKTgmZ5EIUOmUthISAb/9UrAcRcNnsctSw== Received: from DM6PR13CA0055.namprd13.prod.outlook.com (2603:10b6:5:134::32) by DM6PR12MB4649.namprd12.prod.outlook.com (2603:10b6:5:1d1::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.13; Wed, 10 Nov 2021 06:36:32 +0000 Received: from DM6NAM11FT003.eop-nam11.prod.protection.outlook.com (2603:10b6:5:134:cafe::e3) by DM6PR13CA0055.outlook.office365.com (2603:10b6:5:134::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.8 via Frontend Transport; Wed, 10 Nov 2021 06:36:32 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by DM6NAM11FT003.mail.protection.outlook.com (10.13.173.162) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4669.10 via Frontend Transport; Wed, 10 Nov 2021 06:36:31 +0000 Received: from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Wed, 10 Nov 2021 06:36:29 +0000 From: Xueming Li To: Qiming Chen CC: Luca Boccassi , Haiyue Wang , dpdk stable Date: Wed, 10 Nov 2021 14:28:43 +0800 Message-ID: <20211110063216.2744012-40-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211110063216.2744012-1-xuemingl@nvidia.com> References: <20211110063216.2744012-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c0aef303-a440-499b-f45d-08d9a4146f1a X-MS-TrafficTypeDiagnostic: DM6PR12MB4649: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GpsuqLZK75+PHJ53nkHc6wRHV9uV+w0rRmcc983vGv94TWfsCPRUtWrXkrRJWCEcOUXNRcAXOv9bCoJpTTanfBaZf5FILurtErOBtuR7xCwLPd6Vqve4n0SWv+rMwwDIUnLoKKq6woZ1rAAaTeK2XNfvqeIDjHHS6WGW1tHkWnHQCHFO0N9ZzDKqBCBXRPtspjZIYs7enDASobH88uVEb3hSBAeNMtF/aJJLmFu6gVS+9q5h3BdrED2Z2AxHvmW3oc5afc/+ul/o650w9LSA1QoJQMt3QCufrWUn4xyPuhNyIHwbMfPI/3tqi5yPo2D9VjGtCtqSZLZP9PZqbbJW1uQg8vW0/MroVR808pZwdwnsn9QS0UWiLa4Q4qxCP4HOC2UmumO6kRLlwuslps7k69cLNTRu2ZZvK9k8uO5AyHaudnxZYRcgNHEK4LKbEA/oGG9f33w+W9TZo5IJCNmJp/M3EGDbXyZUT46ecsxweYsbeqSyPGsg88Z0MC7k1p0/qzm8BDRDgZPOcmr3yetAlt3LAWpMoRWE2416+c6YMlp1e3BRaUxt2HLgOBlW8ZoqId+rID7kaPgifrK/pgomRKp0NTL52mh3EPErseObVLtcOKS2WqGN/wHDoIr+lRaTVkgWqNVGNlLc8MBirwT1jB6vazSEtP3l/KYPeZPq8qgJTR3NsvnN4W7hhyJkiA+EiCeysIrlblhIg3C9ugQS62BEKlAo+uYbJPSB0bjJFlrpQobj0fcfQ0Hj5MJLa5QqsaIOYxgAitv+r7tFvguO/D9HsRxbKhA1UzYoSlFy+mZuNwsHtfC8f08ivQIXSOpcGNXAp21hGwbT4b2rCJXbvQ== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(36840700001)(46966006)(336012)(8676002)(6916009)(53546011)(426003)(83380400001)(508600001)(4326008)(7696005)(5660300002)(70206006)(16526019)(2906002)(54906003)(8936002)(70586007)(36756003)(356005)(4001150100001)(1076003)(55016002)(186003)(2616005)(86362001)(7636003)(36906005)(6666004)(316002)(966005)(6286002)(26005)(47076005)(36860700001)(82310400003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Nov 2021 06:36:31.8845 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c0aef303-a440-499b-f45d-08d9a4146f1a X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT003.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4649 Subject: [dpdk-stable] patch 'net/ixgbe: fix queue resource leak' has been queued to stable release 20.11.4 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/12/21. 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://github.com/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/5787cc1187ee2bc760a6c240005b234a8d49c344 Thanks. Xueming Li --- >From 5787cc1187ee2bc760a6c240005b234a8d49c344 Mon Sep 17 00:00:00 2001 From: Qiming Chen Date: Tue, 31 Aug 2021 21:40:17 +0800 Subject: [PATCH] net/ixgbe: fix queue resource leak Cc: Xueming Li [ upstream commit 3a732dce93af3355854dbd0fbfbe26d8c8ec8982 ] In the ixgbevf_dev_start function, after initializing the rxtx queue, if an exception occurs in the subsequent function, the rxtx queue needs to be released. The patch solves the problem of queue resource leakage. Fixes: 0eb609239efd ("ixgbe: enable Rx queue interrupts for PF and VF") Signed-off-by: Qiming Chen Acked-by: Haiyue Wang --- drivers/net/ixgbe/ixgbe_ethdev.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c index 1af04357cc..f15cc7d4ef 100644 --- a/drivers/net/ixgbe/ixgbe_ethdev.c +++ b/drivers/net/ixgbe/ixgbe_ethdev.c @@ -5360,8 +5360,10 @@ ixgbevf_dev_start(struct rte_eth_dev *dev) * now only one vector is used for Rx queue */ intr_vector = 1; - if (rte_intr_efd_enable(intr_handle, intr_vector)) + if (rte_intr_efd_enable(intr_handle, intr_vector)) { + ixgbe_dev_clear_queues(dev); return -1; + } } if (rte_intr_dp_is_en(intr_handle) && !intr_handle->intr_vec) { @@ -5371,6 +5373,7 @@ ixgbevf_dev_start(struct rte_eth_dev *dev) if (intr_handle->intr_vec == NULL) { PMD_INIT_LOG(ERR, "Failed to allocate %d rx_queues" " intr_vec", dev->data->nb_rx_queues); + ixgbe_dev_clear_queues(dev); return -ENOMEM; } } -- 2.33.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-10 14:17:03.857441182 +0800 +++ 0039-net-ixgbe-fix-queue-resource-leak.patch 2021-11-10 14:17:01.790746745 +0800 @@ -1 +1 @@ -From 3a732dce93af3355854dbd0fbfbe26d8c8ec8982 Mon Sep 17 00:00:00 2001 +From 5787cc1187ee2bc760a6c240005b234a8d49c344 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 3a732dce93af3355854dbd0fbfbe26d8c8ec8982 ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -20 +22 @@ -index 7b198d95c2..3371a7df78 100644 +index 1af04357cc..f15cc7d4ef 100644 @@ -23 +25 @@ -@@ -5362,8 +5362,10 @@ ixgbevf_dev_start(struct rte_eth_dev *dev) +@@ -5360,8 +5360,10 @@ ixgbevf_dev_start(struct rte_eth_dev *dev) @@ -35 +37 @@ -@@ -5373,6 +5375,7 @@ ixgbevf_dev_start(struct rte_eth_dev *dev) +@@ -5371,6 +5373,7 @@ ixgbevf_dev_start(struct rte_eth_dev *dev)