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 88E53A0542 for ; Fri, 11 Nov 2022 11:34:53 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 848C84014F; Fri, 11 Nov 2022 11:34:53 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id D06534014F for ; Fri, 11 Nov 2022 11:34:51 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1668162891; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Kohzjw3tT0/Tr9QVnzsSX84RSDsKMyuDwVPeQQCMy44=; b=jTiqA4RBNESH7bUHBvvreMhiUo0EDHAHOeC8RamZ4waCdbdOhMPnPeZIYzE4w6jyV+2xKR +7O13puvJWYTOl3EP2XbyBl07or6USF4Yabp4fGUguG0Zcr9WOkskzZoPhlzhJ58HCZMr6 iXHEC10bO84g6zzgZYebJ9Mzg3okB3k= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-310--foZsBzONJiqtxSZAb4w4A-1; Fri, 11 Nov 2022 05:34:48 -0500 X-MC-Unique: -foZsBzONJiqtxSZAb4w4A-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id DE1B2811E67; Fri, 11 Nov 2022 10:34:47 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.195.104]) by smtp.corp.redhat.com (Postfix) with ESMTP id D46742022EA2; Fri, 11 Nov 2022 10:34:46 +0000 (UTC) From: Kevin Traynor To: Radu Nicolau Cc: Qi Zhang , dpdk stable Subject: patch 'net/iavf: fix queue stop for large VF' has been queued to stable release 21.11.3 Date: Fri, 11 Nov 2022 10:33:19 +0000 Message-Id: <20221111103337.307408-29-ktraynor@redhat.com> In-Reply-To: <20221111103337.307408-1-ktraynor@redhat.com> References: <20221111103337.307408-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 21.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 11/14/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/f2a44e4a219c4c2265b73c99c8a457bd9d6ea464 Thanks. Kevin --- >From f2a44e4a219c4c2265b73c99c8a457bd9d6ea464 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 45d75d46f7..da3f1baabd 100644 --- a/drivers/net/iavf/iavf_rxtx.c +++ b/drivers/net/iavf/iavf_rxtx.c @@ -947,4 +947,5 @@ 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; @@ -955,5 +956,9 @@ iavf_dev_rx_queue_stop(struct rte_eth_dev *dev, uint16_t rx_queue_id) 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", @@ -975,4 +980,5 @@ 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; @@ -983,5 +989,9 @@ iavf_dev_tx_queue_stop(struct rte_eth_dev *dev, uint16_t tx_queue_id) 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", -- 2.38.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-11 10:32:17.771608540 +0000 +++ 0029-net-iavf-fix-queue-stop-for-large-VF.patch 2022-11-11 10:32:17.087300821 +0000 @@ -1 +1 @@ -From 96e66d38bc9218520d0e9e19ea3ae21bd175d0a2 Mon Sep 17 00:00:00 2001 +From f2a44e4a219c4c2265b73c99c8a457bd9d6ea464 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 45d75d46f7..da3f1baabd 100644 @@ -21 +22 @@ -@@ -959,4 +959,5 @@ iavf_dev_rx_queue_stop(struct rte_eth_dev *dev, uint16_t rx_queue_id) +@@ -947,4 +947,5 @@ iavf_dev_rx_queue_stop(struct rte_eth_dev *dev, uint16_t rx_queue_id) @@ -27 +28 @@ -@@ -967,5 +968,9 @@ iavf_dev_rx_queue_stop(struct rte_eth_dev *dev, uint16_t rx_queue_id) +@@ -955,5 +956,9 @@ iavf_dev_rx_queue_stop(struct rte_eth_dev *dev, uint16_t rx_queue_id) @@ -38 +39 @@ -@@ -987,4 +992,5 @@ iavf_dev_tx_queue_stop(struct rte_eth_dev *dev, uint16_t tx_queue_id) +@@ -975,4 +980,5 @@ iavf_dev_tx_queue_stop(struct rte_eth_dev *dev, uint16_t tx_queue_id) @@ -44 +45 @@ -@@ -995,5 +1001,9 @@ iavf_dev_tx_queue_stop(struct rte_eth_dev *dev, uint16_t tx_queue_id) +@@ -983,5 +989,9 @@ iavf_dev_tx_queue_stop(struct rte_eth_dev *dev, uint16_t tx_queue_id)