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 2A7C442EC5 for ; Thu, 20 Jul 2023 12:59:10 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 26BFC42BB1; Thu, 20 Jul 2023 12:59:10 +0200 (CEST) Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by mails.dpdk.org (Postfix) with ESMTP id 4F84D40E2D for ; Thu, 20 Jul 2023 12:59:09 +0200 (CEST) Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-3fbea147034so5019725e9.0 for ; Thu, 20 Jul 2023 03:59:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1689850749; x=1690455549; 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=o9LQ9YbCLQnFCZDHcKZerETd0Nf7lp9xhVx+nMymoSM=; b=r/ntsPhe3zf0Fu2uRX6I4LjZIdFtcUo4dLt1xjqctD6xT7PATafM5tkQlNJfvzeLfn Qo9LRCql0M6pKPP7VOWtGLJ2LDI8evOoGeVSE2VS53/TU9n/+Pn1AmaTtfQg4dSIw88p m3o7u/ou4fwoLMqb1pcVt4VZ32qCxu+wmetCRw1F47xo5yPg0RnHoIVlqTmFz9Xb8gPz 04n7Am4L2iu56Wlz/n+GViBQdBEzHO8ZT1UWM8XpwPhLPIics7APZpfsAa5uNaN92PRo 5aqS+6axGztipimcJMuhqV2ce1KNE1Yu7Cjygoo6oVKCkJj5raazs+89/UbXQQtCiNBf f1qg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689850749; x=1690455549; 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=o9LQ9YbCLQnFCZDHcKZerETd0Nf7lp9xhVx+nMymoSM=; b=VbmrfLBkiDrE/XpVwwD2pdiQOPAEgOOyeD44bNFWhnOqH6BO521m7ANGN8lE/uak+P C+ZZVPwEx7t+SnGBDfOuh9SUwGCKlaEYEOgnFIE87GkTZ0AQddMNOEa3YobvNkt5AqW4 aueZFlTYTFBhpJp2CwVX8393czoaRfrcafW+QZJCtY1z9sHwjXkukumLZb5do8hJY/oQ iz4PWK406qImqfRFwC+xCpC+x2l3S5/Lu5Fl+Vv9XocKUERKqy+8MYJ8khrNkRuawQ2u TGLzT9DZcMB+0QXc5zGvTO3jswor1KRBjchMNw8PIz5E3cvqalJ+ONtsPbaPkQF3lNcF pjOQ== X-Gm-Message-State: ABy/qLYgADnZcSXzT6L4zte30+Zs4eIJvQsRC/YP60ljFxdk0kbzf66b vKE0bOcww+G77eqFUx6BREE= X-Google-Smtp-Source: APBJJlGy/VdG/MY8dztN8Ear11I6RrpB2+KNyy3wEioNToUthRc6mNzW5tkSM9l+q0AIb/kC+MhkSQ== X-Received: by 2002:a7b:c4da:0:b0:3fb:c384:89ef with SMTP id g26-20020a7bc4da000000b003fbc38489efmr3899589wmk.17.1689850748841; Thu, 20 Jul 2023 03:59:08 -0700 (PDT) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id o1-20020a056000010100b003144bfbd0b3sm993409wrx.37.2023.07.20.03.59.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Jul 2023 03:59:08 -0700 (PDT) From: luca.boccassi@gmail.com To: Qiming Yang Cc: Jie Hai , Qi Zhang , dpdk stable Subject: patch 'net/ixgbe: fix Rx and Tx queue status' has been queued to stable release 20.11.9 Date: Thu, 20 Jul 2023 11:58:54 +0100 Message-Id: <20230720105859.2537307-5-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230720105859.2537307-1-luca.boccassi@gmail.com> References: <20230714223447.1092828-18-luca.boccassi@gmail.com> <20230720105859.2537307-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.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/22/23. 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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/038799f4741b7b99970f384a77faffe28073d02d Thanks. Luca Boccassi --- >From 038799f4741b7b99970f384a77faffe28073d02d Mon Sep 17 00:00:00 2001 From: Qiming Yang Date: Wed, 12 Jul 2023 08:31:51 +0000 Subject: [PATCH] net/ixgbe: fix Rx and Tx queue status [ upstream commit 4a8490075692c32797be4280aea33772a5865038 ] Ixgbevf driver don't enable queue start/stop functions, queue status is not updated when the HW queue enabled or disabled. It caused application can't get correct queue status. This patch fixes the issue by updating the queue states when the queue is disabled or enabled. Fixes: 429c6d86b371 ("ixgbe: prepare for vector pmd") Fixes: f0c50e5f56fa ("ixgbe: move PMD specific fields out of base driver") Signed-off-by: Qiming Yang Signed-off-by: Jie Hai Acked-by: Qi Zhang --- drivers/net/ixgbe/ixgbe_rxtx.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/net/ixgbe/ixgbe_rxtx.c b/drivers/net/ixgbe/ixgbe_rxtx.c index 7414384493..7588bb2cb9 100644 --- a/drivers/net/ixgbe/ixgbe_rxtx.c +++ b/drivers/net/ixgbe/ixgbe_rxtx.c @@ -3368,6 +3368,7 @@ ixgbe_dev_clear_queues(struct rte_eth_dev *dev) if (txq != NULL) { txq->ops->release_mbufs(txq); txq->ops->reset(txq); + dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED; } } @@ -3377,6 +3378,7 @@ ixgbe_dev_clear_queues(struct rte_eth_dev *dev) if (rxq != NULL) { ixgbe_rx_queue_release_mbufs(rxq); ixgbe_reset_rx_queue(adapter, rxq); + dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED; } } /* If loopback mode was enabled, reconfigure the link accordingly */ @@ -5816,6 +5818,8 @@ ixgbevf_dev_rxtx_start(struct rte_eth_dev *dev) } while (--poll_ms && !(txdctl & IXGBE_TXDCTL_ENABLE)); if (!poll_ms) PMD_INIT_LOG(ERR, "Could not enable Tx Queue %d", i); + else + dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED; } for (i = 0; i < dev->data->nb_rx_queues; i++) { @@ -5833,6 +5837,8 @@ ixgbevf_dev_rxtx_start(struct rte_eth_dev *dev) } while (--poll_ms && !(rxdctl & IXGBE_RXDCTL_ENABLE)); if (!poll_ms) PMD_INIT_LOG(ERR, "Could not enable Rx Queue %d", i); + else + dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED; rte_wmb(); IXGBE_WRITE_REG(hw, IXGBE_VFRDT(i), rxq->nb_rx_desc - 1); -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-07-20 11:54:24.444640951 +0100 +++ 0005-net-ixgbe-fix-Rx-and-Tx-queue-status.patch 2023-07-20 11:54:24.237504558 +0100 @@ -1 +1 @@ -From 4a8490075692c32797be4280aea33772a5865038 Mon Sep 17 00:00:00 2001 +From 038799f4741b7b99970f384a77faffe28073d02d Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 4a8490075692c32797be4280aea33772a5865038 ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ -index 61f17cd90b..954ef241a0 100644 +index 7414384493..7588bb2cb9 100644 @@ -27 +28 @@ -@@ -3378,6 +3378,7 @@ ixgbe_dev_clear_queues(struct rte_eth_dev *dev) +@@ -3368,6 +3368,7 @@ ixgbe_dev_clear_queues(struct rte_eth_dev *dev) @@ -35 +36 @@ -@@ -3387,6 +3388,7 @@ ixgbe_dev_clear_queues(struct rte_eth_dev *dev) +@@ -3377,6 +3378,7 @@ ixgbe_dev_clear_queues(struct rte_eth_dev *dev) @@ -43 +44 @@ -@@ -5896,6 +5898,8 @@ ixgbevf_dev_rxtx_start(struct rte_eth_dev *dev) +@@ -5816,6 +5818,8 @@ ixgbevf_dev_rxtx_start(struct rte_eth_dev *dev) @@ -52 +53 @@ -@@ -5913,6 +5917,8 @@ ixgbevf_dev_rxtx_start(struct rte_eth_dev *dev) +@@ -5833,6 +5837,8 @@ ixgbevf_dev_rxtx_start(struct rte_eth_dev *dev)