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 39D4AA0543 for ; Sat, 5 Nov 2022 18:13:38 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3580440151; Sat, 5 Nov 2022 18:13:38 +0100 (CET) Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by mails.dpdk.org (Postfix) with ESMTP id 79FB2400D5 for ; Sat, 5 Nov 2022 18:13:36 +0100 (CET) Received: by mail-wr1-f48.google.com with SMTP id h9so10941368wrt.0 for ; Sat, 05 Nov 2022 10:13:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=nzsaNNKdK6uQRt8PrvivVdheAb44dBJECUmWfaRobBw=; b=quWgTcNqH1zyEJp1iN02mW8qic2RqjJUKfBlUkGb1ItrzQZiYO+MAunm3foqaA+ugW vw0QT25+dc8iLR4FaQ9a/0AEjXiwGgkUfxsgCl/09FesyolJ8gtA61wlB+dEIvPUernK iRxMuNlsk3XDF4oBqtzXjHaS8YUB6cburI1RF/Sv5/HyzbPhpUFH7QZY/q3Oj3rQlbqU Coke/UXoMa+LVAvSBC8G2dW61L5oISqn6x9jP6XVgahCgXTrccJV5UebnizMiH/raTPZ 3pTT4IDms4u3RupqbnKz0q7MlECbJGajKSQJoGDjyRM1Bjf7W4XeT3df14GeWqdIZVhU k4Vw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nzsaNNKdK6uQRt8PrvivVdheAb44dBJECUmWfaRobBw=; b=BZbJJ5iz85xoyw57Kv+NjLDGJahWu7kM+HCV2dZ3sZDRTU/j6ejKoYSbhk91/tw5NH IKHP4YCIG1onSbnBvVT/P/oShVq8gMSDExGd0jgrRHNuEUeKDL5PXlRQTkNGu7ffBY0l ByFBOIv2cW7suAPvczOqMcM7qwofizpMfey1Y/0bvndBT6ka+9JUGzjlKw4HQEJjaXBD PqmdOlmcGkqbYqyXbPp2UkUxSD9W2ycbjS5WNhfuzlIpNY9/mzsBUtyZeq/yhUllbxRD tDJLzUXHD6ZzpknAYSlcUjVmSEjz2PQdb6g/UNrFoFI0gln0/PUduPjHk8PLbopAXflm s5iA== X-Gm-Message-State: ACrzQf3NJ1b4Nyz7I1Y7NY2PfT6xz/P/kqudVSIIOpdt8nf/zYTAWi4X PGEgfutzJfiS4UeqTPowI86qe0zAc6Q= X-Google-Smtp-Source: AMsMyM4PEoLqVgZiE1LrMY9RyPfq0JNOlbhyAnX/h+yUOd1PUlx9OvCgvilnh/8PR5mBTfhgaWUZiw== X-Received: by 2002:a5d:4d03:0:b0:236:b317:fcf6 with SMTP id z3-20020a5d4d03000000b00236b317fcf6mr24750840wrt.280.1667668416140; Sat, 05 Nov 2022 10:13:36 -0700 (PDT) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id a17-20020a05600c225100b003c6d21a19a0sm2942910wmm.29.2022.11.05.10.13.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Nov 2022 10:13:35 -0700 (PDT) From: luca.boccassi@gmail.com To: Radu Nicolau Cc: Qi Zhang , dpdk stable Subject: patch 'net/iavf: fix queue stop for large VF' has been queued to stable release 20.11.7 Date: Sat, 5 Nov 2022 17:11:32 +0000 Message-Id: <20221105171146.1520039-33-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221105171146.1520039-1-luca.boccassi@gmail.com> References: <20221103092758.1099402-100-luca.boccassi@gmail.com> <20221105171146.1520039-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 20.11.7 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/07/22. 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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/c57ecf8485a69d1c8be1c46ae874869516304cd1 Thanks. Luca Boccassi --- >From c57ecf8485a69d1c8be1c46ae874869516304cd1 Mon Sep 17 00:00:00 2001 From: Radu Nicolau Date: Thu, 20 Oct 2022 10:09:58 +0100 Subject: [PATCH] net/iavf: fix queue stop for large VF [ upstream commit 96e66d38bc9218520d0e9e19ea3ae21bd175d0a2 ] Use large VF queue stop request when large VF is enabled Fixes: 9cf9c02bf6ee ("net/iavf: add enable/disable queues for large VF") Signed-off-by: Radu Nicolau Acked-by: Qi Zhang --- drivers/net/iavf/iavf_rxtx.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c index 539048c14e..a885d6955c 100644 --- a/drivers/net/iavf/iavf_rxtx.c +++ b/drivers/net/iavf/iavf_rxtx.c @@ -833,6 +833,7 @@ iavf_dev_rx_queue_stop(struct rte_eth_dev *dev, uint16_t rx_queue_id) { struct iavf_adapter *adapter = IAVF_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private); + struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(dev->data->dev_private); struct iavf_rx_queue *rxq; int err; @@ -841,7 +842,11 @@ iavf_dev_rx_queue_stop(struct rte_eth_dev *dev, uint16_t rx_queue_id) if (rx_queue_id >= dev->data->nb_rx_queues) return -EINVAL; - err = iavf_switch_queue(adapter, rx_queue_id, true, false); + if (!vf->lv_enabled) + err = iavf_switch_queue(adapter, rx_queue_id, true, false); + else + err = iavf_switch_queue_lv(adapter, rx_queue_id, true, false); + if (err) { PMD_DRV_LOG(ERR, "Failed to switch RX queue %u off", rx_queue_id); @@ -861,6 +866,7 @@ iavf_dev_tx_queue_stop(struct rte_eth_dev *dev, uint16_t tx_queue_id) { struct iavf_adapter *adapter = IAVF_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private); + struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(dev->data->dev_private); struct iavf_tx_queue *txq; int err; @@ -869,7 +875,11 @@ iavf_dev_tx_queue_stop(struct rte_eth_dev *dev, uint16_t tx_queue_id) if (tx_queue_id >= dev->data->nb_tx_queues) return -EINVAL; - err = iavf_switch_queue(adapter, tx_queue_id, false, false); + if (!vf->lv_enabled) + err = iavf_switch_queue(adapter, tx_queue_id, false, false); + else + err = iavf_switch_queue_lv(adapter, tx_queue_id, false, false); + if (err) { PMD_DRV_LOG(ERR, "Failed to switch TX queue %u off", tx_queue_id); -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-05 17:11:11.592878017 +0000 +++ 0033-net-iavf-fix-queue-stop-for-large-VF.patch 2022-11-05 17:11:08.758944445 +0000 @@ -1 +1 @@ -From 96e66d38bc9218520d0e9e19ea3ae21bd175d0a2 Mon Sep 17 00:00:00 2001 +From c57ecf8485a69d1c8be1c46ae874869516304cd1 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 96e66d38bc9218520d0e9e19ea3ae21bd175d0a2 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index 437055f76b..3292541ad9 100644 +index 539048c14e..a885d6955c 100644 @@ -21 +22 @@ -@@ -958,6 +958,7 @@ iavf_dev_rx_queue_stop(struct rte_eth_dev *dev, uint16_t rx_queue_id) +@@ -833,6 +833,7 @@ iavf_dev_rx_queue_stop(struct rte_eth_dev *dev, uint16_t rx_queue_id) @@ -29 +30 @@ -@@ -966,7 +967,11 @@ iavf_dev_rx_queue_stop(struct rte_eth_dev *dev, uint16_t rx_queue_id) +@@ -841,7 +842,11 @@ iavf_dev_rx_queue_stop(struct rte_eth_dev *dev, uint16_t rx_queue_id) @@ -42 +43 @@ -@@ -986,6 +991,7 @@ iavf_dev_tx_queue_stop(struct rte_eth_dev *dev, uint16_t tx_queue_id) +@@ -861,6 +866,7 @@ iavf_dev_tx_queue_stop(struct rte_eth_dev *dev, uint16_t tx_queue_id) @@ -50 +51 @@ -@@ -994,7 +1000,11 @@ iavf_dev_tx_queue_stop(struct rte_eth_dev *dev, uint16_t tx_queue_id) +@@ -869,7 +875,11 @@ iavf_dev_tx_queue_stop(struct rte_eth_dev *dev, uint16_t tx_queue_id)