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 86FE642EC5 for ; Thu, 20 Jul 2023 12:59:22 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 831DA42BAC; Thu, 20 Jul 2023 12:59:22 +0200 (CEST) Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by mails.dpdk.org (Postfix) with ESMTP id 8DA1C40E2D for ; Thu, 20 Jul 2023 12:59:21 +0200 (CEST) Received: by mail-wr1-f52.google.com with SMTP id ffacd0b85a97d-3144bf65ce9so523584f8f.3 for ; Thu, 20 Jul 2023 03:59:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1689850761; x=1690455561; 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=rWOW4qChs6xoYQTc/CTa5QtiazrbiwqfZfPUgy5gTis=; b=e85wp+UrAeUAYklwKwb6UuoohHsgJXodVjhPzG83N49nohegV9DsYZOX2YzpirETcA Kp3hFsx57k8l+OVTzKleiclwxSk3W/k6UVNtuXZ0U/SeCJD9LAdNPyP1QU0a+Hh+ueHY 2SDORi3VvhMNjj0+zhFfyNP4Td9lOJawITCcRcAQisk4IhfzTFYY83rXORxdr8+o4va3 +gFDHMSQ7v/qi+fZ5/p+xa6wmUi3PHzx8UMAOq3nVNaV2ChvsmfUBSAtncXW3S6AMn60 S4/PJNJEHUCVNO3SZIRO8+OgGqH8BvhqsrxAyMNzo1ecAfvSZivD+mrkKMIDvNU3R8dS N+BQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689850761; x=1690455561; 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=rWOW4qChs6xoYQTc/CTa5QtiazrbiwqfZfPUgy5gTis=; b=d8LtiCUz1kZfJfgUVMwjwirdcKhJiPbn2Do9BfI4b7N2Qcvn3xiJ3PUcZgGMjZDdPJ w/g9vViBgCZ30CfyCMOOVWK7mv8m9teSYNqjLhFxwT75B75WYJGhXiNjeu+tTeeQvzA2 SIx2yr3htpsTGD9Q9dEy6iTWerU20hdnVyY/JVb9kwiNLep+VF69ZYLruX0LXQP1TjrC nmPgor+D2ZQDeH0ezS8umLE5jHhCA4ibwhKXTkpdCUraKe5IZc2odeZhUCTMAnIiO5rp b+8DgUbBLeXVuyDH9h2eFJ+ZP3OE36NvbtlAn4CWBBwKtM826/I3vPrcQO9bRb4CfOzb yLQw== X-Gm-Message-State: ABy/qLbIOY3pXl+k/Qtd8VxakYkuqxy2MQdNpYp8mPU6nwJ/nafHbNC3 piD/PRg73+AzA0Fa4AFcK4jznsBlrV67AOhi X-Google-Smtp-Source: APBJJlGAKPAVViR7YI2sQv3OsK40CAvLPM5DHuPiroFomKj9bmPeVsCh0wcxjUDk2Tt1aLiaaubBkw== X-Received: by 2002:a05:6000:1a4f:b0:316:efb9:ffa with SMTP id t15-20020a0560001a4f00b00316efb90ffamr1746046wry.35.1689850761168; Thu, 20 Jul 2023 03:59:21 -0700 (PDT) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id q7-20020adffec7000000b003143c532431sm983684wrs.27.2023.07.20.03.59.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Jul 2023 03:59:20 -0700 (PDT) From: luca.boccassi@gmail.com To: Qiming Yang Cc: Mingjin Ye , Qi Zhang , dpdk stable Subject: patch 'net/e1000: fix Rx and Tx queue status' has been queued to stable release 20.11.9 Date: Thu, 20 Jul 2023 11:58:56 +0100 Message-Id: <20230720105859.2537307-7-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/32e5493917bc105a6b71223900c7b0e0e3a5810f Thanks. Luca Boccassi --- >From 32e5493917bc105a6b71223900c7b0e0e3a5810f Mon Sep 17 00:00:00 2001 From: Qiming Yang Date: Wed, 12 Jul 2023 08:31:53 +0000 Subject: [PATCH] net/e1000: fix Rx and Tx queue status [ upstream commit b2a0271188f3428ad5dc1ea600e1e2254b9d6781 ] Igb 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: be2d648a2dd3 ("igb: add PF support") Signed-off-by: Qiming Yang Signed-off-by: Mingjin Ye Acked-by: Qi Zhang --- drivers/net/e1000/igb_rxtx.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/e1000/igb_rxtx.c b/drivers/net/e1000/igb_rxtx.c index 2c8b1a0c8c..a655279d9e 100644 --- a/drivers/net/e1000/igb_rxtx.c +++ b/drivers/net/e1000/igb_rxtx.c @@ -1872,6 +1872,7 @@ igb_dev_clear_queues(struct rte_eth_dev *dev) if (txq != NULL) { igb_tx_queue_release_mbufs(txq); igb_reset_tx_queue(txq, dev); + dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED; } } @@ -1880,6 +1881,7 @@ igb_dev_clear_queues(struct rte_eth_dev *dev) if (rxq != NULL) { igb_rx_queue_release_mbufs(rxq); igb_reset_rx_queue(rxq); + dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED; } } } @@ -2461,6 +2463,7 @@ eth_igb_rx_init(struct rte_eth_dev *dev) rxdctl |= ((rxq->hthresh & 0x1F) << 8); rxdctl |= ((rxq->wthresh & 0x1F) << 16); E1000_WRITE_REG(hw, E1000_RXDCTL(rxq->reg_idx), rxdctl); + dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED; } if (dev->data->dev_conf.rxmode.offloads & DEV_RX_OFFLOAD_SCATTER) { @@ -2625,6 +2628,7 @@ eth_igb_tx_init(struct rte_eth_dev *dev) txdctl |= ((txq->wthresh & 0x1F) << 16); txdctl |= E1000_TXDCTL_QUEUE_ENABLE; E1000_WRITE_REG(hw, E1000_TXDCTL(txq->reg_idx), txdctl); + dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED; } /* Program the Transmit Control Register. */ -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-07-20 11:54:24.526537556 +0100 +++ 0007-net-e1000-fix-Rx-and-Tx-queue-status.patch 2023-07-20 11:54:24.245504686 +0100 @@ -1 +1 @@ -From b2a0271188f3428ad5dc1ea600e1e2254b9d6781 Mon Sep 17 00:00:00 2001 +From 32e5493917bc105a6b71223900c7b0e0e3a5810f Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit b2a0271188f3428ad5dc1ea600e1e2254b9d6781 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index 25ad9eb4e5..61c6394310 100644 +index 2c8b1a0c8c..a655279d9e 100644 @@ -26 +27 @@ -@@ -1854,6 +1854,7 @@ igb_dev_clear_queues(struct rte_eth_dev *dev) +@@ -1872,6 +1872,7 @@ igb_dev_clear_queues(struct rte_eth_dev *dev) @@ -34 +35 @@ -@@ -1862,6 +1863,7 @@ igb_dev_clear_queues(struct rte_eth_dev *dev) +@@ -1880,6 +1881,7 @@ igb_dev_clear_queues(struct rte_eth_dev *dev) @@ -42 +43 @@ -@@ -2442,6 +2444,7 @@ eth_igb_rx_init(struct rte_eth_dev *dev) +@@ -2461,6 +2463,7 @@ eth_igb_rx_init(struct rte_eth_dev *dev) @@ -49,2 +50,2 @@ - if (dev->data->dev_conf.rxmode.offloads & RTE_ETH_RX_OFFLOAD_SCATTER) { -@@ -2606,6 +2609,7 @@ eth_igb_tx_init(struct rte_eth_dev *dev) + if (dev->data->dev_conf.rxmode.offloads & DEV_RX_OFFLOAD_SCATTER) { +@@ -2625,6 +2628,7 @@ eth_igb_tx_init(struct rte_eth_dev *dev)