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 BC74F45E41 for ; Sat, 7 Dec 2024 09:01:42 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B062B40281; Sat, 7 Dec 2024 09:01:42 +0100 (CET) Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam04on2088.outbound.protection.outlook.com [40.107.102.88]) by mails.dpdk.org (Postfix) with ESMTP id 110CC4066A for ; Sat, 7 Dec 2024 09:01:41 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=g6jX6QGF9jOhVJ+aNvNyx85AuGc7hTMrbuWU3Z6VIQsK4fFElqIhw0/QlYnigi2qhVCDqbVDktYg9CbwHvaia+w38yPkytWHcNI7giyhKKqJ0loiR9lqrkicQ+bs6QJgfeMwa2DUydd8CbdqivOIGgV8WH2F9orONDaYzS/tihW485w0we1rGrbsX605fxK/Po+ZaNBhdt+nWD4DudcPpbkNLxJBNYa929DpeA1Myey0igizZJMd+06TY6IszMGVi7ykYDfM2KVlQfNtm7cs2gJxNXKKFTQliFU3++kGGMptS3zju60JTo9Zp8/Uy5/eH/yjHoAy7KL1o+ijyTySqw== 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=3T2J318Mki0Ki8CHcJs14/U98Kff4Q7TIJe78h8lS0I=; b=pGrE1C30xQihqVEcJ3eifVs56C8joVwOLElA5Pcw83Cgm8avGlJZHh76xHuwEBAo7f39qyi/G9dcu4Gz4bAOMOms/W0KTMGRI0a3ESgziUQc4iVIzs8KG9k9oEgpMpkS4O5Q1Fh1GaY68x6ToAyZmJveSUpGczXRBfK9/LE8xugjPNGyInNiVpd1xFiGxE4vA3w3TzjAhBpdp5PFbSOU+p1pFlZaZ9nqnl53V/Up4dwzmlpClbbErAj7VjMYj2Yy+vNA23SIo9+9s0kO6VGvNGBrgFjxVZfp2r7R3/PWTlCilYvdVY8g5MYnSMbQr22JIJvBdcL0a4TEMfaqkcWp9g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=microsoft.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=3T2J318Mki0Ki8CHcJs14/U98Kff4Q7TIJe78h8lS0I=; b=DNVKWQhW1fVBzbZDg+1qsaEfcgL/82/Swjw6Gg8LquU7Q9Ann52hWjN16APiIewXE2NYlrs6YXcHDmVWs28WdG1bD6Bbd/R1UAQ4ZaDnSP0HMpTpOaGhRzuubkmoMl+qeCbNlY28h3D2EJAeTEXKlb9N5ck7KVYAoF16MOjwOXVusi0tzGNgCgPa+DEXpFyISTbD8FKGJkkf1h4RCLKevPxcZ/7Y2gRP4SxNEcO7fWKdldN1PMVOfMOtXNdaDXbjpWGd05CKF28xTnNaSE3rbuZuMCtHZm8YqXLcE0wf+7d+lpwLo5XtOgCUB9OmSItJYglGBqCPJex2FSXayrvfug== Received: from PH0PR07CA0018.namprd07.prod.outlook.com (2603:10b6:510:5::23) by IA0PR12MB8421.namprd12.prod.outlook.com (2603:10b6:208:40f::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8230.12; Sat, 7 Dec 2024 08:01:32 +0000 Received: from CY4PEPF0000E9D6.namprd05.prod.outlook.com (2603:10b6:510:5:cafe::67) by PH0PR07CA0018.outlook.office365.com (2603:10b6:510:5::23) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8230.10 via Frontend Transport; Sat, 7 Dec 2024 08:01:32 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) 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.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by CY4PEPF0000E9D6.mail.protection.outlook.com (10.167.241.69) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8230.7 via Frontend Transport; Sat, 7 Dec 2024 08:01:31 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Sat, 7 Dec 2024 00:01:17 -0800 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; Sat, 7 Dec 2024 00:01:15 -0800 From: Xueming Li To: Alan Elder CC: Xueming Li , Long Li , "dpdk stable" Subject: patch 'net/netvsc: fix using Tx queue higher than Rx queues' has been queued to stable release 23.11.3 Date: Sat, 7 Dec 2024 15:59:19 +0800 Message-ID: <20241207080055.488538-2-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241207080055.488538-1-xuemingl@nvidia.com> References: <20241111062847.216344-122-xuemingl@nvidia.com> <20241207080055.488538-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: CY4PEPF0000E9D6:EE_|IA0PR12MB8421:EE_ X-MS-Office365-Filtering-Correlation-Id: 705749c5-594b-4126-439d-08dd16955cd8 X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|1800799024|376014|82310400026|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?vC9OzoYCbXdKQlsJ2v3Ma5vp522ADdEIaeWq+FYDKeCjQ4OKwiCG8Q9oPe4+?= =?us-ascii?Q?cH54o2gcua91QwqFY0OSpmKpYgL1RrD9+WqNyJddEnZQyuEhZzyjrZ3zNgfe?= =?us-ascii?Q?ixEnf5EzNLN5xsfENi1BPVfZ+9pPnNXCxNazeQiRTFAGKEOvr8JlX1cmAqfF?= =?us-ascii?Q?fezEmB7HSsItsKG6Wk3luYALc0MWETvqsRwVsZuwgJ39bw7zsovIeZQ2Wj6A?= =?us-ascii?Q?vmKEVXS7fFz25Fs/APRQ6i+bhNfib73WELuwyD3a+GmVy6fH4DSvJ6m2/2jU?= =?us-ascii?Q?N7R+ZYiVvZGLvBNjnpfjgQN1A4q4FqFTf2576tktE9m9G0ZxsopQXK9qpXG5?= =?us-ascii?Q?mBO+j+v6EaJxlem0RykAj6i0IyhMfduY5Rx/Jj8JkiXxVaxZYce4BmPRJ07L?= =?us-ascii?Q?lJPko3pP5j+xAK05GHf/C0pdlB3gJ2I/YsadOOnP5mszOlWeK+Vr0727EJYI?= =?us-ascii?Q?/DGZNqwDG1pgEc+5QazgdbdY9qDtSy5IbRYIyNC/BUx36qCnX5bsaPqWm0YZ?= =?us-ascii?Q?gVjQeJf5E4Z+SS7JzfpwTjbx71UEUm3ZMVd6NDyIPS4Uo7rsRzSJ5cSGuvpW?= =?us-ascii?Q?SxzuQeneWMReU4deL0bJQmOr4M9kPl45WHdSZYmo78F9/e9GrCeRXEZwstGv?= =?us-ascii?Q?fo3ZT9yj+cw3gtRT5hIVW5BlrIeyplVKvd5TKRnhnVcWuvvfGg7cmUytEJeX?= =?us-ascii?Q?0LYFXjUnq9W79MuLY9btxgxr4g5LGWOj2gkRL2qU+wmDcJxR75MM6eZ41EVi?= =?us-ascii?Q?2FYRBvO5OiN9VYuZtCzYBMHv+QhKLEnEafPtbMV/+XJtluqE4peSWXx2F3/D?= =?us-ascii?Q?7JoU5NRJsLPPq1dp7yyydJ9HLjDbSox047pOVsChhky30t++3Rm3nzIQJnFc?= =?us-ascii?Q?D6+EKLMLlP+fOFX8ysHhW7adLR2dxK+ry5cB2GhBbKFERGHca412BKnCE9ls?= =?us-ascii?Q?Zi3idgScqCz257Sm5i1Cap/vzsOdeI+Wu3nio3pL9/sUCN8+JPFFki9eMx0R?= =?us-ascii?Q?3vBGExLB3MQG4lS0OxT0qtqVz4NMcINWqXFb7CwAg3D/+TTvWgn1Q1yVVvlz?= =?us-ascii?Q?UN629pLuENImIzAiph9KXtrTls1JIbThe2AN/L4cghqmRwZ4r+YTvoXAsL9D?= =?us-ascii?Q?qjKmGblfOIP9ZtvbZH3gtZe5rG86DhgZ3bhezukLaXnT4VWbmG1vj6Rj7DOF?= =?us-ascii?Q?GX7gqekShznMRuKW3lJJ0alp52Rs9mF+s4SWWuxm4A4W7guwClLLndXDtI3Y?= =?us-ascii?Q?cDeHy7UJiHqfTkr0np03XkvI8MBM030koRs/kqvIosxjjLyLGlXzSfkwmLgM?= =?us-ascii?Q?4Y0Ws8QSnoDhYxUflJZP/nPg4YoGJsU0e0GNXbTsTTsIqeWGM5xuS0g3nFRn?= =?us-ascii?Q?dJN7r2fil0QBgSGg/bEo0yYNAuM2R6Pkl85WrSirf5AC8PvVihVKMVA3lWo9?= =?us-ascii?Q?clf9GcpLhmk61GisaLGikXl4wWE5P1hJ?= X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230040)(36860700013)(1800799024)(376014)(82310400026)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2024 08:01:31.8999 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 705749c5-594b-4126-439d-08dd16955cd8 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.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CY4PEPF0000E9D6.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR12MB8421 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.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/10/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=379d49883364269eceafc38ffcc6f30c46655fbd Thanks. Xueming Li --- >From 379d49883364269eceafc38ffcc6f30c46655fbd Mon Sep 17 00:00:00 2001 From: Alan Elder Date: Thu, 17 Oct 2024 12:20:29 -0700 Subject: [PATCH] net/netvsc: fix using Tx queue higher than Rx queues Cc: Xueming Li [ upstream commit e90020535c03cf9e60448ba623cac3301f111dae ] The previous code allowed the number of Tx queues to be set higher than the number of Rx queues. If a packet was sent on a Tx queue with index >= number Rx queues there was a segfault due to accessing beyond the end of the dev->data->rx_queues[] array. This commit fixes the issue by creating an Rx queue for every Tx queue meaning that an event buffer is allocated to handle receiving Tx completion messages. mbuf pool and Rx ring are not allocated for these additional Rx queues and RSS configuration ensures that no packets are received on them. Fixes: 4e9c73e96e83 ("net/netvsc: add Hyper-V network device") Signed-off-by: Alan Elder Signed-off-by: Long Li --- drivers/net/netvsc/hn_ethdev.c | 9 +++++ drivers/net/netvsc/hn_rxtx.c | 69 +++++++++++++++++++++++++++++----- 2 files changed, 69 insertions(+), 9 deletions(-) diff --git a/drivers/net/netvsc/hn_ethdev.c b/drivers/net/netvsc/hn_ethdev.c index f8cb05a118..1736cb5d07 100644 --- a/drivers/net/netvsc/hn_ethdev.c +++ b/drivers/net/netvsc/hn_ethdev.c @@ -313,6 +313,15 @@ static int hn_rss_reta_update(struct rte_eth_dev *dev, if (reta_conf[idx].mask & mask) hv->rss_ind[i] = reta_conf[idx].reta[shift]; + + /* + * Ensure we don't allow config that directs traffic to an Rx + * queue that we aren't going to poll + */ + if (hv->rss_ind[i] >= dev->data->nb_rx_queues) { + PMD_DRV_LOG(ERR, "RSS distributing traffic to invalid Rx queue"); + return -EINVAL; + } } err = hn_rndis_conf_rss(hv, NDIS_RSS_FLAG_DISABLE); diff --git a/drivers/net/netvsc/hn_rxtx.c b/drivers/net/netvsc/hn_rxtx.c index 297ff3fb31..5777a14d70 100644 --- a/drivers/net/netvsc/hn_rxtx.c +++ b/drivers/net/netvsc/hn_rxtx.c @@ -234,6 +234,17 @@ static void hn_reset_txagg(struct hn_tx_queue *txq) txq->agg_prevpkt = NULL; } +static void +hn_rx_queue_free_common(struct hn_rx_queue *rxq) +{ + if (!rxq) + return; + + rte_free(rxq->rxbuf_info); + rte_free(rxq->event_buf); + rte_free(rxq); +} + int hn_dev_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx, uint16_t nb_desc, @@ -243,6 +254,7 @@ hn_dev_tx_queue_setup(struct rte_eth_dev *dev, { struct hn_data *hv = dev->data->dev_private; struct hn_tx_queue *txq; + struct hn_rx_queue *rxq = NULL; char name[RTE_MEMPOOL_NAMESIZE]; uint32_t tx_free_thresh; int err = -ENOMEM; @@ -301,6 +313,27 @@ hn_dev_tx_queue_setup(struct rte_eth_dev *dev, goto error; } + /* + * If there are more Tx queues than Rx queues, allocate rx_queues + * with event buffer so that Tx completion messages can still be + * received + */ + if (queue_idx >= dev->data->nb_rx_queues) { + rxq = hn_rx_queue_alloc(hv, queue_idx, socket_id); + + if (!rxq) { + err = -ENOMEM; + goto error; + } + + /* + * Don't allocate mbuf pool or rx ring. RSS is always configured + * to ensure packets aren't received by this Rx queue. + */ + rxq->mb_pool = NULL; + rxq->rx_ring = NULL; + } + txq->agg_szmax = RTE_MIN(hv->chim_szmax, hv->rndis_agg_size); txq->agg_pktmax = hv->rndis_agg_pkts; txq->agg_align = hv->rndis_agg_align; @@ -311,12 +344,15 @@ hn_dev_tx_queue_setup(struct rte_eth_dev *dev, socket_id, tx_conf); if (err == 0) { dev->data->tx_queues[queue_idx] = txq; + if (rxq != NULL) + dev->data->rx_queues[queue_idx] = rxq; return 0; } error: rte_mempool_free(txq->txdesc_pool); rte_memzone_free(txq->tx_rndis_mz); + hn_rx_queue_free_common(rxq); rte_free(txq); return err; } @@ -363,6 +399,12 @@ hn_dev_tx_queue_release(struct rte_eth_dev *dev, uint16_t qid) if (!txq) return; + /* + * Free any Rx queues allocated for a Tx queue without a corresponding + * Rx queue + */ + if (qid >= dev->data->nb_rx_queues) + hn_rx_queue_free_common(dev->data->rx_queues[qid]); rte_mempool_free(txq->txdesc_pool); @@ -552,10 +594,12 @@ static void hn_rxpkt(struct hn_rx_queue *rxq, struct hn_rx_bufinfo *rxb, const struct hn_rxinfo *info) { struct hn_data *hv = rxq->hv; - struct rte_mbuf *m; + struct rte_mbuf *m = NULL; bool use_extbuf = false; - m = rte_pktmbuf_alloc(rxq->mb_pool); + if (likely(rxq->mb_pool != NULL)) + m = rte_pktmbuf_alloc(rxq->mb_pool); + if (unlikely(!m)) { struct rte_eth_dev *dev = &rte_eth_devices[rxq->port_id]; @@ -942,7 +986,15 @@ hn_dev_rx_queue_setup(struct rte_eth_dev *dev, if (queue_idx == 0) { rxq = hv->primary; } else { - rxq = hn_rx_queue_alloc(hv, queue_idx, socket_id); + /* + * If the number of Tx queues was previously greater than the + * number of Rx queues, we may already have allocated an rxq. + */ + if (!dev->data->rx_queues[queue_idx]) + rxq = hn_rx_queue_alloc(hv, queue_idx, socket_id); + else + rxq = dev->data->rx_queues[queue_idx]; + if (!rxq) return -ENOMEM; } @@ -975,9 +1027,10 @@ hn_dev_rx_queue_setup(struct rte_eth_dev *dev, fail: rte_ring_free(rxq->rx_ring); - rte_free(rxq->rxbuf_info); - rte_free(rxq->event_buf); - rte_free(rxq); + /* Only free rxq if it was created in this function. */ + if (!dev->data->rx_queues[queue_idx]) + hn_rx_queue_free_common(rxq); + return error; } @@ -998,9 +1051,7 @@ hn_rx_queue_free(struct hn_rx_queue *rxq, bool keep_primary) if (keep_primary && rxq == rxq->hv->primary) return; - rte_free(rxq->rxbuf_info); - rte_free(rxq->event_buf); - rte_free(rxq); + hn_rx_queue_free_common(rxq); } void -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-12-06 23:26:44.183098225 +0800 +++ 0001-net-netvsc-fix-using-Tx-queue-higher-than-Rx-queues.patch 2024-12-06 23:26:43.833044829 +0800 @@ -1 +1 @@ -From e90020535c03cf9e60448ba623cac3301f111dae Mon Sep 17 00:00:00 2001 +From 379d49883364269eceafc38ffcc6f30c46655fbd Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit e90020535c03cf9e60448ba623cac3301f111dae ] @@ -19 +21,0 @@ -Cc: stable@dpdk.org @@ -49 +51 @@ -index 870f62e5fa..52aedb001f 100644 +index 297ff3fb31..5777a14d70 100644 @@ -52 +54 @@ -@@ -222,6 +222,17 @@ static void hn_reset_txagg(struct hn_tx_queue *txq) +@@ -234,6 +234,17 @@ static void hn_reset_txagg(struct hn_tx_queue *txq) @@ -70 +72 @@ -@@ -231,6 +242,7 @@ hn_dev_tx_queue_setup(struct rte_eth_dev *dev, +@@ -243,6 +254,7 @@ hn_dev_tx_queue_setup(struct rte_eth_dev *dev, @@ -78 +80 @@ -@@ -289,6 +301,27 @@ hn_dev_tx_queue_setup(struct rte_eth_dev *dev, +@@ -301,6 +313,27 @@ hn_dev_tx_queue_setup(struct rte_eth_dev *dev, @@ -106 +108 @@ -@@ -299,12 +332,15 @@ hn_dev_tx_queue_setup(struct rte_eth_dev *dev, +@@ -311,12 +344,15 @@ hn_dev_tx_queue_setup(struct rte_eth_dev *dev, @@ -122 +124 @@ -@@ -351,6 +387,12 @@ hn_dev_tx_queue_release(struct rte_eth_dev *dev, uint16_t qid) +@@ -363,6 +399,12 @@ hn_dev_tx_queue_release(struct rte_eth_dev *dev, uint16_t qid) @@ -135 +137 @@ -@@ -540,10 +582,12 @@ static void hn_rxpkt(struct hn_rx_queue *rxq, struct hn_rx_bufinfo *rxb, +@@ -552,10 +594,12 @@ static void hn_rxpkt(struct hn_rx_queue *rxq, struct hn_rx_bufinfo *rxb, @@ -150 +152 @@ -@@ -930,7 +974,15 @@ hn_dev_rx_queue_setup(struct rte_eth_dev *dev, +@@ -942,7 +986,15 @@ hn_dev_rx_queue_setup(struct rte_eth_dev *dev, @@ -167 +169 @@ -@@ -963,9 +1015,10 @@ hn_dev_rx_queue_setup(struct rte_eth_dev *dev, +@@ -975,9 +1027,10 @@ hn_dev_rx_queue_setup(struct rte_eth_dev *dev, @@ -181 +183 @@ -@@ -986,9 +1039,7 @@ hn_rx_queue_free(struct hn_rx_queue *rxq, bool keep_primary) +@@ -998,9 +1051,7 @@ hn_rx_queue_free(struct hn_rx_queue *rxq, bool keep_primary)