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 592AD42EC5 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 5552540EE3; Thu, 20 Jul 2023 12:59:22 +0200 (CEST) Received: from mail-lf1-f52.google.com (mail-lf1-f52.google.com [209.85.167.52]) by mails.dpdk.org (Postfix) with ESMTP id C36EE40E2D for ; Thu, 20 Jul 2023 12:59:20 +0200 (CEST) Received: by mail-lf1-f52.google.com with SMTP id 2adb3069b0e04-4fba86f069bso958285e87.3 for ; Thu, 20 Jul 2023 03:59:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1689850760; x=1690455560; 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=g9JioZ8dB+4COKrNGBRrGx4Dm8lwElAuIGbsBjfYujY=; b=NnoUDRLB+sKY+JiVzKPi8uEB9rQmaSfPjZpdryhPMf9RerZwSIBfbwXmZzSsrNBqrr BoXDw3rLToeG+TgGZcAwItkmOUZ8MPpunP4TshLVft0TZX626xjfcFujm38fsjjdq103 Nl9+zSEA/h47Q30N8xprspKo5ZHTc14bXYsgHktrFkDvsGdPLhoUX7juNtaM6Fbp6aeP brfgP7JhGM2iKoY3jfZLvIzaxahT9mhMxTalJn7V03HE0dKaPl6IivkfrnRuNFmUF6zi Kqe076M5J8Eu72LURFgCXGAAzmlYy+gG+8XLNJpczOloVFGl/Z0P5VHJ2NDyEPPt1gsm SLdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689850760; x=1690455560; 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=g9JioZ8dB+4COKrNGBRrGx4Dm8lwElAuIGbsBjfYujY=; b=i9VdISmis7F0iC5KMyKeMniu6hlPwPvNSYe8sCE7pS+bi0apMj7x8LsHC1OCSyGCv6 2nOq0AZjzfI3gGEbcJm3FYaWV3VnG9vaS/uz/xo5L+8pouhZpgb4vMcu/aKF7FjO+77X T3HV/juaXBzbKbB4Rd46EkpnOFl9HY6G3rwoxNSjDbLN+h+WqV0mae5yC8F+RjoeytMy swfE7GpOQNCLqB9/JI3kvncH2TMUjqxjAa/24vwHljeCfbMaLmU+WUUqQbdpqyCqwk85 r+HMSiIWSvU32l7n7n8Lv1fU+vUgiYSKuJra8K3WOUlaW+f8g/pPXCcLEHli+x6fWhvt XmSg== X-Gm-Message-State: ABy/qLZQlF12ZuV57+KSrHDNuXekl+3klgdHOpKmqrs9r9a/dnR7eReP Gu/rQUqWR5/mYNdFvUgOcqG2gli8TclEN4iS X-Google-Smtp-Source: APBJJlFy+E3NCMsm/mQ5D0KXF9QHWNx+GUFEVDaT26ZQn0nzRA4LQy0Od2FPXcots7/4ZIYsQdELfA== X-Received: by 2002:a2e:8841:0:b0:2b6:dc84:b93e with SMTP id z1-20020a2e8841000000b002b6dc84b93emr1953572ljj.21.1689850760009; Thu, 20 Jul 2023 03:59:20 -0700 (PDT) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id f18-20020a7bc8d2000000b003fc01189b0dsm879439wml.42.2023.07.20.03.59.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Jul 2023 03:59:19 -0700 (PDT) From: luca.boccassi@gmail.com To: Qiming Yang Cc: Mingjin Ye , Qi Zhang , dpdk stable Subject: patch 'net/igc: fix Rx and Tx queue status' has been queued to stable release 20.11.9 Date: Thu, 20 Jul 2023 11:58:55 +0100 Message-Id: <20230720105859.2537307-6-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/2091a78c0404ed4e5464559bb2a73978a30ca544 Thanks. Luca Boccassi --- >From 2091a78c0404ed4e5464559bb2a73978a30ca544 Mon Sep 17 00:00:00 2001 From: Qiming Yang Date: Wed, 12 Jul 2023 08:31:52 +0000 Subject: [PATCH] net/igc: fix Rx and Tx queue status [ upstream commit 921ff14280ed8ba7b9d0a898046cf5eadf3d4c8e ] Igc 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: a5aeb2b9e225 ("net/igc: support Rx and Tx") Signed-off-by: Qiming Yang Signed-off-by: Mingjin Ye Acked-by: Qi Zhang --- drivers/net/igc/igc_txrx.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/igc/igc_txrx.c b/drivers/net/igc/igc_txrx.c index 6c3d207a69..114aa7f0dc 100644 --- a/drivers/net/igc/igc_txrx.c +++ b/drivers/net/igc/igc_txrx.c @@ -1308,6 +1308,7 @@ igc_rx_init(struct rte_eth_dev *dev) dvmolr |= IGC_DVMOLR_STRCRC; IGC_WRITE_REG(hw, IGC_DVMOLR(rxq->reg_idx), dvmolr); + dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED; } return 0; @@ -1951,6 +1952,7 @@ igc_dev_clear_queues(struct rte_eth_dev *dev) if (txq != NULL) { igc_tx_queue_release_mbufs(txq); igc_reset_tx_queue(txq); + dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED; } } @@ -1959,6 +1961,7 @@ igc_dev_clear_queues(struct rte_eth_dev *dev) if (rxq != NULL) { igc_rx_queue_release_mbufs(rxq); igc_reset_rx_queue(rxq); + dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED; } } } @@ -2204,6 +2207,7 @@ igc_tx_init(struct rte_eth_dev *dev) IGC_TXDCTL_WTHRESH_MSK; txdctl |= IGC_TXDCTL_QUEUE_ENABLE; IGC_WRITE_REG(hw, IGC_TXDCTL(txq->reg_idx), txdctl); + dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED; } igc_config_collision_dist(hw); -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-07-20 11:54:24.487008559 +0100 +++ 0006-net-igc-fix-Rx-and-Tx-queue-status.patch 2023-07-20 11:54:24.241504623 +0100 @@ -1 +1 @@ -From 921ff14280ed8ba7b9d0a898046cf5eadf3d4c8e Mon Sep 17 00:00:00 2001 +From 2091a78c0404ed4e5464559bb2a73978a30ca544 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 921ff14280ed8ba7b9d0a898046cf5eadf3d4c8e ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index c11b6f7f25..5c60e3e997 100644 +index 6c3d207a69..114aa7f0dc 100644 @@ -26 +27 @@ -@@ -1215,6 +1215,7 @@ igc_rx_init(struct rte_eth_dev *dev) +@@ -1308,6 +1308,7 @@ igc_rx_init(struct rte_eth_dev *dev) @@ -34 +35 @@ -@@ -1888,6 +1889,7 @@ igc_dev_clear_queues(struct rte_eth_dev *dev) +@@ -1951,6 +1952,7 @@ igc_dev_clear_queues(struct rte_eth_dev *dev) @@ -42 +43 @@ -@@ -1896,6 +1898,7 @@ igc_dev_clear_queues(struct rte_eth_dev *dev) +@@ -1959,6 +1961,7 @@ igc_dev_clear_queues(struct rte_eth_dev *dev) @@ -50 +51 @@ -@@ -2143,6 +2146,7 @@ igc_tx_init(struct rte_eth_dev *dev) +@@ -2204,6 +2207,7 @@ igc_tx_init(struct rte_eth_dev *dev) @@ -57 +58 @@ - if (offloads & RTE_ETH_TX_OFFLOAD_SEND_ON_TIMESTAMP) { + igc_config_collision_dist(hw);