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 21BF8457A1 for ; Mon, 12 Aug 2024 14:58:54 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 18BFF402C3; Mon, 12 Aug 2024 14:58:54 +0200 (CEST) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2059.outbound.protection.outlook.com [40.107.237.59]) by mails.dpdk.org (Postfix) with ESMTP id 9FD334029C for ; Mon, 12 Aug 2024 14:58:52 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=TVUsqoEPaUGyDqM9vUt3emXam5m7eEGIMsJHYNwyF75Q3C9t+p1o/uDvNjbJzMKsxbecQDV8h3phcxhIBIs5Snj+vwNbO4AUghqD9JzOuCFH9SxJgJpvkT9DvbOGcdV6qoXfYvQsN+mmo+AOdUC5Y8/ORvoCtRZK0dIXOo08irbQ7Ut9DR78DFWZYKZKK21ybNoC+WddHf026j6xMsEO4nQlHw8ds7lAkNDldCEnJ0fJ+fjHbsAnpnuLqmCYk8QU3KFjLBWrS89F01HdufElajqfWPDOyoe6t+Fitk8PtbL9p5MpTBG6afiC3ob6cL0ZYQ/NH/792Z0dlT9M8/2klA== 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=oK49UNHVhRLL7UkWPc0esQSDtCcyrvII+rsNYop831Q=; b=nEMIGRbkFv+42E5jcvtzKf+AbLDtwHz0AimqPJuteazceuhpl4c11Bv9qJJAP5AeIJM0PK41rP6YKolv5UZSbjxSrWN0ljlKO7NPQUZUN9JDEN8TQuGEr3lKLWXPhugFFHnl5leuw8tGrEqNE2kUgVply+ZnAIrNDFrro/CSqn/MPRj+A+s6h6E8Q8mM6rgN3h4YO0yetg0yN73gRaBNvVJJyQQoO6Gmncqu7agIxk8bCTD7Yg+v3KGOXKjM1HKTjLv8TjiMDUg1t9Ya/wy47Z2IUqcL33W2vO+CTbc+s36Kq/bmU4gqFlg2BFaHJJT036NBbYMDBWNkiEjxKBJYeQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=trustnetic.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) 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=oK49UNHVhRLL7UkWPc0esQSDtCcyrvII+rsNYop831Q=; b=IewNUemr8Yh3X3CvQie0iIf95W/3DMC1F1PPkW5dJDI9pS6RJqi8ahSGUNyWGscACIEuDSJKsjpqpAAdnvJdb/6h5X9tlStHnffwn++4RjoAJUtuLBpjuJlPvsM5IcDJnkXInKKSgnyq20BaCty852UfazPChZ0SYO7vHa2+LHzATdrFenf/Tm5sm00eangnUzC/mOGiDB6s3nFbNY+fyIsEjqNRrhfKGWX50E6RclA8uVkT3Ka2BDnFMnaCBQcmFzXWnlNSjUAxk5e7YLtuKlFvoZVLsCb0O3N/QAnnOZXlmyf+zr1wiIyp82yTpD2i1RPVLi4HqhbI3FT5pih17g== Received: from SJ0PR13CA0012.namprd13.prod.outlook.com (2603:10b6:a03:2c0::17) by CH2PR12MB4135.namprd12.prod.outlook.com (2603:10b6:610:7c::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.22; Mon, 12 Aug 2024 12:58:49 +0000 Received: from CO1PEPF000042AA.namprd03.prod.outlook.com (2603:10b6:a03:2c0:cafe::e7) by SJ0PR13CA0012.outlook.office365.com (2603:10b6:a03:2c0::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.20 via Frontend Transport; Mon, 12 Aug 2024 12:58:49 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by CO1PEPF000042AA.mail.protection.outlook.com (10.167.243.39) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7828.19 via Frontend Transport; Mon, 12 Aug 2024 12:58:49 +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; Mon, 12 Aug 2024 05:58:31 -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; Mon, 12 Aug 2024 05:58:29 -0700 From: Xueming Li To: Jiawen Wu CC: , dpdk stable Subject: patch 'net/txgbe: fix memory leaks' has been queued to stable release 23.11.2 Date: Mon, 12 Aug 2024 20:49:19 +0800 Message-ID: <20240812125035.389667-83-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240812125035.389667-1-xuemingl@nvidia.com> References: <20240712110153.309690-23-xuemingl@nvidia.com> <20240812125035.389667-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: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000042AA:EE_|CH2PR12MB4135:EE_ X-MS-Office365-Filtering-Correlation-Id: 3b4bbd1a-504c-44ad-afba-08dcbace825b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|82310400026|376014|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?MK525XqpKgSWUbCI/UuldyYZ7ygm6F8N2tqIpPP5oTXWb/VnPp2p8bKVq05k?= =?us-ascii?Q?ua8vqGdKa9OtCUB1NpF2wTkINxjWhTSpFsKlXzRvEbB9jJc8NAeoRIYOZcSV?= =?us-ascii?Q?5jUMG3ZBpK7LN5qgmXGe93tlS/TJVX+h84jQAZ8oEgvFig4MW9TVzIPwpVA3?= =?us-ascii?Q?aBkil/lwLbLhXEJe4iaqDthoAqTwqMdYlalk6guQU/wcVMwAYOY4lFtsl30Z?= =?us-ascii?Q?YP8TFQL9qUzaaSR8BfYNOLu5jo8SHNOXjO4SCwFFhPK3lFYLvaxf96X0URau?= =?us-ascii?Q?6B+ctLbwGoOyyf6+bQsYtMiwJjy+mQ6Gm8G3iIA45V+1OFiQuhaiLdWRRl0K?= =?us-ascii?Q?RjbKNukxn5JtNzr+mRwwWICFetz+pd/2dCw9q9XUX46G68Lb6V9nzAmS3cDx?= =?us-ascii?Q?b6QtbdDERf9PnqoxxysOveDplE8mdlT9Cf+jWOzz2bvFb8qQe925Mlswljhb?= =?us-ascii?Q?mGmA9IyzZpXp12Jten19h4oqSVMO6jdJFJdNFZEQZ/LbSVFL76Pm8WpnXI2O?= =?us-ascii?Q?6fhKznpnfwr0WStMLwZRwTONA9c0Xz18fapkdnNAoNasn35TsWvWoqWbOqk9?= =?us-ascii?Q?yVHYzl3mjYmJ9EeJfZIY68yNGjbbMypeqZo1hYG/q+CfW0Cy1v3kSJkx4Ehk?= =?us-ascii?Q?iaH862ZY4mRpS66vOdocRYsZ0LaLlnpmcd6Q9v5v0kZLWbnAKpNEY4Rbc++Y?= =?us-ascii?Q?e+xshJyemk8NGxyKjiwh16cijRywFp4a1AowL8QcCRJbTzTelntRTBtyKatu?= =?us-ascii?Q?AHDbPuF654T63D2eEOZz3p2cmoEtcCyY7vdFmS3KJGasbEE106XFNk56E8Av?= =?us-ascii?Q?rwBPcxpN+QZBrXktMLHWXF1I26Y1m/ZnBjopgp42VAJyU9Go5AB/B8fK4acb?= =?us-ascii?Q?q88vbCPwa2tT6EMMrXfY5qj+K9Ml5o8mu3U16Bk97WSAIYcAo4ajrqKjAwqI?= =?us-ascii?Q?mODFjn3E9lYFc23DInbd80n/hMC8AuCyJnjPNxGfvJXbKM0+M5Mul6PjPxiI?= =?us-ascii?Q?927vDHHEdNhz63QU+DcQe72wVlXua4dt0Re3r/3GgB1lITbW82mM+81xk5VU?= =?us-ascii?Q?FNkP0uxf1TTHii2cXTkYf+pMM/5dErFlpRPYcDN0Ltn2B6a6GzTrYaGZ+daO?= =?us-ascii?Q?ub+lwrFxbSKwTnnGQ9k9vxSBrmiaaRk16OZ4n2HQF+xshEJ9d1x3Q8koQ/kO?= =?us-ascii?Q?VgoEL7t5MZ0cwthlnw6RY9nyU1SAyVAgRdQEzbJTNQ5omOgMBea/58Sn9dMg?= =?us-ascii?Q?WflGzTySCUR7ugUNdZz5URmFPiXAuy/uuqPC5OUVBDDFN0t7aPLKh8qgA1f0?= =?us-ascii?Q?YSxWZjQTpLx0QpL0qVSwoQe5zhBJfJ/e2Due6Onq+oZY/+X3OZuWZMTxFUIl?= =?us-ascii?Q?sWlgne8JX2+z2/dxTgLc/sLa/PS3W3vDb6IAG/Yz91CQ2FYIM1iDweSsEsjF?= =?us-ascii?Q?4dU7NCiltSIbrZyanj9W1q2nWaxD38ri?= 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)(1800799024)(82310400026)(376014)(36860700013); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2024 12:58:49.0968 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3b4bbd1a-504c-44ad-afba-08dcbace825b 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: CO1PEPF000042AA.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4135 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 08/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=638e12515aa720573b3017b5a03705e4328724c9 Thanks. Xueming Li --- >From 638e12515aa720573b3017b5a03705e4328724c9 Mon Sep 17 00:00:00 2001 From: Jiawen Wu Date: Tue, 18 Jun 2024 15:11:45 +0800 Subject: [PATCH] net/txgbe: fix memory leaks Cc: Xueming Li [ upstream commit 9a4abe8dfd85376b8ef35bf958332d837f4a3ee1 ] Fix some memory leaks caused by not release resource in time. Fixes: e1698e383c2a ("net/txgbe: add device init and uninit") Fixes: 635c21354f9a ("net/txgbe: add flow director filter init and uninit") Fixes: c13f84a71b2d ("net/txgbe: add L2 tunnel filter init and uninit") Fixes: 3a123ba60a71 ("net/txgbe: support VF start and stop") Fixes: 039b769f7c01 ("net/txgbe: support VF MAC address") Fixes: 226bf98eda87 ("net/txgbe: add Rx and Tx queues setup and release") Signed-off-by: Jiawen Wu --- drivers/net/txgbe/txgbe_ethdev.c | 4 ++++ drivers/net/txgbe/txgbe_ethdev_vf.c | 7 ++++++- drivers/net/txgbe/txgbe_rxtx.c | 5 +++++ drivers/net/txgbe/txgbe_rxtx.h | 2 ++ 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/drivers/net/txgbe/txgbe_ethdev.c b/drivers/net/txgbe/txgbe_ethdev.c index 09cab60fa9..ee510fe83b 100644 --- a/drivers/net/txgbe/txgbe_ethdev.c +++ b/drivers/net/txgbe/txgbe_ethdev.c @@ -735,6 +735,8 @@ eth_txgbe_dev_init(struct rte_eth_dev *eth_dev, void *init_params __rte_unused) PMD_INIT_LOG(ERR, "Failed to allocate %d bytes needed to store MAC addresses", RTE_ETHER_ADDR_LEN * TXGBE_VMDQ_NUM_UC_MAC); + rte_free(eth_dev->data->mac_addrs); + eth_dev->data->mac_addrs = NULL; return -ENOMEM; } @@ -902,6 +904,7 @@ static int txgbe_fdir_filter_init(struct rte_eth_dev *eth_dev) if (!fdir_info->hash_map) { PMD_INIT_LOG(ERR, "Failed to allocate memory for fdir hash map!"); + rte_hash_free(fdir_info->hash_handle); return -ENOMEM; } fdir_info->mask_added = FALSE; @@ -937,6 +940,7 @@ static int txgbe_l2_tn_filter_init(struct rte_eth_dev *eth_dev) if (!l2_tn_info->hash_map) { PMD_INIT_LOG(ERR, "Failed to allocate memory for L2 TN hash map!"); + rte_hash_free(l2_tn_info->hash_handle); return -ENOMEM; } l2_tn_info->e_tag_en = FALSE; diff --git a/drivers/net/txgbe/txgbe_ethdev_vf.c b/drivers/net/txgbe/txgbe_ethdev_vf.c index 1d7f1dcd15..b42c94adc1 100644 --- a/drivers/net/txgbe/txgbe_ethdev_vf.c +++ b/drivers/net/txgbe/txgbe_ethdev_vf.c @@ -295,6 +295,8 @@ eth_txgbevf_dev_init(struct rte_eth_dev *eth_dev) err = hw->mac.start_hw(hw); if (err) { PMD_INIT_LOG(ERR, "VF Initialization Failure: %d", err); + rte_free(eth_dev->data->mac_addrs); + eth_dev->data->mac_addrs = NULL; return -EIO; } @@ -670,8 +672,10 @@ txgbevf_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)) { + txgbe_dev_clear_queues(dev); return -1; + } } if (rte_intr_dp_is_en(intr_handle)) { @@ -679,6 +683,7 @@ txgbevf_dev_start(struct rte_eth_dev *dev) dev->data->nb_rx_queues)) { PMD_INIT_LOG(ERR, "Failed to allocate %d rx_queues" " intr_vec", dev->data->nb_rx_queues); + txgbe_dev_clear_queues(dev); return -ENOMEM; } } diff --git a/drivers/net/txgbe/txgbe_rxtx.c b/drivers/net/txgbe/txgbe_rxtx.c index 50207eb6cf..2efc2bcf29 100644 --- a/drivers/net/txgbe/txgbe_rxtx.c +++ b/drivers/net/txgbe/txgbe_rxtx.c @@ -2135,6 +2135,7 @@ txgbe_tx_queue_release(struct txgbe_tx_queue *txq) if (txq != NULL && txq->ops != NULL) { txq->ops->release_mbufs(txq); txq->ops->free_swring(txq); + rte_memzone_free(txq->mz); rte_free(txq); } } @@ -2346,6 +2347,7 @@ txgbe_dev_tx_queue_setup(struct rte_eth_dev *dev, return -ENOMEM; } + txq->mz = tz; txq->nb_tx_desc = nb_desc; txq->tx_free_thresh = tx_free_thresh; txq->pthresh = tx_conf->tx_thresh.pthresh; @@ -2463,6 +2465,7 @@ txgbe_rx_queue_release(struct txgbe_rx_queue *rxq) txgbe_rx_queue_release_mbufs(rxq); rte_free(rxq->sw_ring); rte_free(rxq->sw_sc_ring); + rte_memzone_free(rxq->mz); rte_free(rxq); } } @@ -2556,6 +2559,7 @@ txgbe_reset_rx_queue(struct txgbe_adapter *adapter, struct txgbe_rx_queue *rxq) rxq->rx_free_trigger = (uint16_t)(rxq->rx_free_thresh - 1); rxq->rx_tail = 0; rxq->nb_rx_hold = 0; + rte_pktmbuf_free(rxq->pkt_first_seg); rxq->pkt_first_seg = NULL; rxq->pkt_last_seg = NULL; } @@ -2636,6 +2640,7 @@ txgbe_dev_rx_queue_setup(struct rte_eth_dev *dev, return -ENOMEM; } + rxq->mz = rz; /* * Zero init all the descriptors in the ring. */ diff --git a/drivers/net/txgbe/txgbe_rxtx.h b/drivers/net/txgbe/txgbe_rxtx.h index 27d4c842c0..c579e1a9f2 100644 --- a/drivers/net/txgbe/txgbe_rxtx.h +++ b/drivers/net/txgbe/txgbe_rxtx.h @@ -314,6 +314,7 @@ struct txgbe_rx_queue { struct rte_mbuf fake_mbuf; /** hold packets to return to application */ struct rte_mbuf *rx_stage[RTE_PMD_TXGBE_RX_MAX_BURST * 2]; + const struct rte_memzone *mz; }; /** @@ -402,6 +403,7 @@ struct txgbe_tx_queue { uint8_t using_ipsec; /**< indicates that IPsec TX feature is in use */ #endif + const struct rte_memzone *mz; }; struct txgbe_txq_ops { -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-12 20:44:05.230525883 +0800 +++ 0082-net-txgbe-fix-memory-leaks.patch 2024-08-12 20:44:02.295069334 +0800 @@ -1 +1 @@ -From 9a4abe8dfd85376b8ef35bf958332d837f4a3ee1 Mon Sep 17 00:00:00 2001 +From 638e12515aa720573b3017b5a03705e4328724c9 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 9a4abe8dfd85376b8ef35bf958332d837f4a3ee1 ] @@ -14 +16,0 @@ -Cc: stable@dpdk.org @@ -25 +27 @@ -index c2df5a314b..26cf7632c3 100644 +index 09cab60fa9..ee510fe83b 100644 @@ -54 +56 @@ -index 6ac34058ab..87f76673d7 100644 +index 1d7f1dcd15..b42c94adc1 100644 @@ -66 +68 @@ -@@ -671,8 +673,10 @@ txgbevf_dev_start(struct rte_eth_dev *dev) +@@ -670,8 +672,10 @@ txgbevf_dev_start(struct rte_eth_dev *dev) @@ -78 +80 @@ -@@ -680,6 +684,7 @@ txgbevf_dev_start(struct rte_eth_dev *dev) +@@ -679,6 +683,7 @@ txgbevf_dev_start(struct rte_eth_dev *dev) @@ -87 +89 @@ -index 35f80d73ac..5bc0f8772f 100644 +index 50207eb6cf..2efc2bcf29 100644 @@ -90 +92 @@ -@@ -2157,6 +2157,7 @@ txgbe_tx_queue_release(struct txgbe_tx_queue *txq) +@@ -2135,6 +2135,7 @@ txgbe_tx_queue_release(struct txgbe_tx_queue *txq) @@ -98 +100 @@ -@@ -2376,6 +2377,7 @@ txgbe_dev_tx_queue_setup(struct rte_eth_dev *dev, +@@ -2346,6 +2347,7 @@ txgbe_dev_tx_queue_setup(struct rte_eth_dev *dev, @@ -106 +108 @@ -@@ -2499,6 +2501,7 @@ txgbe_rx_queue_release(struct txgbe_rx_queue *rxq) +@@ -2463,6 +2465,7 @@ txgbe_rx_queue_release(struct txgbe_rx_queue *rxq) @@ -114 +116 @@ -@@ -2592,6 +2595,7 @@ txgbe_reset_rx_queue(struct txgbe_adapter *adapter, struct txgbe_rx_queue *rxq) +@@ -2556,6 +2559,7 @@ txgbe_reset_rx_queue(struct txgbe_adapter *adapter, struct txgbe_rx_queue *rxq) @@ -121,2 +123,2 @@ - -@@ -2677,6 +2681,7 @@ txgbe_dev_rx_queue_setup(struct rte_eth_dev *dev, + } +@@ -2636,6 +2640,7 @@ txgbe_dev_rx_queue_setup(struct rte_eth_dev *dev, @@ -131 +133 @@ -index 336f060633..9155eb1f70 100644 +index 27d4c842c0..c579e1a9f2 100644 @@ -134 +136 @@ -@@ -322,6 +322,7 @@ struct txgbe_rx_queue { +@@ -314,6 +314,7 @@ struct txgbe_rx_queue { @@ -142 +144 @@ -@@ -410,6 +411,7 @@ struct txgbe_tx_queue { +@@ -402,6 +403,7 @@ struct txgbe_tx_queue {