From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 3FE17A04B1 for ; Thu, 5 Nov 2020 13:42:11 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 37FD3C31B; Thu, 5 Nov 2020 13:42:10 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by dpdk.org (Postfix) with ESMTP id 10549C31B for ; Thu, 5 Nov 2020 13:42:08 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604580127; 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=TsC463FZou3kRuyXNdwxUUH3JgiLUhHi9y2bemLH5tU=; b=PcpMa+wg5z+yX8iteDLGE2MzuB7qm778GKpmtee/J4PhVR2gmxFuvJ0CcjSWk0hQOf1IeI 5HSA4sj+6OwHLMQ+d4jxzwZIvsR6r/dtg5KxmUcG/CmLiq8+u8nbjq/sZvKsT51stKMh5o pqU3XNxCz8IDl68yMr0zT6cVR3NE0T8= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-465-YCuhc2kgMTWsAW5aJ2P4RA-1; Thu, 05 Nov 2020 07:42:03 -0500 X-MC-Unique: YCuhc2kgMTWsAW5aJ2P4RA-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 96D971074646; Thu, 5 Nov 2020 12:42:02 +0000 (UTC) Received: from rh.redhat.com (ovpn-113-249.ams2.redhat.com [10.36.113.249]) by smtp.corp.redhat.com (Postfix) with ESMTP id 911AE5C3E1; Thu, 5 Nov 2020 12:42:01 +0000 (UTC) From: Kevin Traynor To: Alexander Kozyrev Cc: Viacheslav Ovsiienko , dpdk stable Date: Thu, 5 Nov 2020 12:39:58 +0000 Message-Id: <20201105124015.306404-51-ktraynor@redhat.com> In-Reply-To: <20201105124015.306404-1-ktraynor@redhat.com> References: <20201105124015.306404-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Subject: [dpdk-stable] patch 'net/mlx5: fix Rx queue count calculation' has been queued to LTS release 18.11.11 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.11 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/10/20. 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-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/e0a4de61c71f57aa0d3de220aaa23bb3d092cf60 Thanks. Kevin. --- >From e0a4de61c71f57aa0d3de220aaa23bb3d092cf60 Mon Sep 17 00:00:00 2001 From: Alexander Kozyrev Date: Tue, 29 Sep 2020 18:36:23 +0000 Subject: [PATCH] net/mlx5: fix Rx queue count calculation [ upstream commit d2d57605522d4a43be17e22e649e54033f6d8835 ] There are a few discrepancies in the Rx queue count calculation. The wrong index is used to calculate the number of used descriptors in an Rx queue in case of the compressed CQE processing. The global CQ index is used while we really need an internal index in a single compressed session to get the right number of elements processed. The total number of CQs should be used instead of the number of mbufs to find out about the maximum number of Rx descriptors. These numbers are not equal for the Multi-Packet Rx queue. Allow the Rx queue count calculation for all possible Rx bursts since CQ handling is the same for regular, vectorized, and multi-packet Rx queues. Fixes: 26f04883441a ("net/mlx5: support Rx queue count API") Signed-off-by: Alexander Kozyrev Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_rxtx.c | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/drivers/net/mlx5/mlx5_rxtx.c b/drivers/net/mlx5/mlx5_rxtx.c index 38ce0e29a2..2896a9b4ef 100644 --- a/drivers/net/mlx5/mlx5_rxtx.c +++ b/drivers/net/mlx5/mlx5_rxtx.c @@ -431,17 +431,9 @@ rx_queue_count(struct mlx5_rxq_data *rxq) struct rxq_zip *zip = &rxq->zip; volatile struct mlx5_cqe *cqe; + unsigned int cq_ci = rxq->cq_ci; const unsigned int cqe_n = (1 << rxq->cqe_n); const unsigned int cqe_cnt = cqe_n - 1; - unsigned int cq_ci; - unsigned int used; + unsigned int used = 0; - /* if we are processing a compressed cqe */ - if (zip->ai) { - used = zip->cqe_cnt - zip->ca; - cq_ci = zip->cq_ci; - } else { - used = 0; - cq_ci = rxq->cq_ci; - } cqe = &(*rxq->cqes)[cq_ci & cqe_cnt]; while (check_cqe(cqe, cqe_n, cq_ci) == 0) { @@ -451,5 +443,8 @@ rx_queue_count(struct mlx5_rxq_data *rxq) op_own = cqe->op_own; if (MLX5_CQE_FORMAT(op_own) == MLX5_COMPRESSED) - n = rte_be_to_cpu_32(cqe->byte_cnt); + if (unlikely(zip->ai)) + n = zip->cqe_cnt - zip->ai; + else + n = rte_be_to_cpu_32(cqe->byte_cnt); else n = 1; @@ -458,5 +453,5 @@ rx_queue_count(struct mlx5_rxq_data *rxq) cqe = &(*rxq->cqes)[cq_ci & cqe_cnt]; } - used = RTE_MIN(used, (1U << rxq->elts_n) - 1); + used = RTE_MIN(used, cqe_n); return used; } @@ -481,9 +476,10 @@ mlx5_rx_descriptor_status(void *rx_queue, uint16_t offset) struct rte_eth_dev *dev = ETH_DEV(rxq_ctrl->priv); - if (dev->rx_pkt_burst != mlx5_rx_burst) { + if (dev->rx_pkt_burst == NULL || + dev->rx_pkt_burst == removed_rx_burst) { rte_errno = ENOTSUP; return -rte_errno; } - if (offset >= (1 << rxq->elts_n)) { + if (offset >= (1 << rxq->cqe_n)) { rte_errno = EINVAL; return -rte_errno; @@ -513,5 +509,6 @@ mlx5_rx_queue_count(struct rte_eth_dev *dev, uint16_t rx_queue_id) struct mlx5_rxq_data *rxq; - if (dev->rx_pkt_burst != mlx5_rx_burst) { + if (dev->rx_pkt_burst == NULL || + dev->rx_pkt_burst == removed_rx_burst) { rte_errno = ENOTSUP; return -rte_errno; -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-05 12:38:55.210327070 +0000 +++ 0051-net-mlx5-fix-Rx-queue-count-calculation.patch 2020-11-05 12:38:54.251896028 +0000 @@ -1 +1 @@ -From d2d57605522d4a43be17e22e649e54033f6d8835 Mon Sep 17 00:00:00 2001 +From e0a4de61c71f57aa0d3de220aaa23bb3d092cf60 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit d2d57605522d4a43be17e22e649e54033f6d8835 ] + @@ -22 +23,0 @@ -Cc: stable@dpdk.org @@ -31 +32 @@ -index 0b87be15b4..2422a4d6ca 100644 +index 38ce0e29a2..2896a9b4ef 100644 @@ -34 +35 @@ -@@ -466,17 +466,9 @@ rx_queue_count(struct mlx5_rxq_data *rxq) +@@ -431,17 +431,9 @@ rx_queue_count(struct mlx5_rxq_data *rxq) @@ -53,2 +54,2 @@ - while (check_cqe(cqe, cqe_n, cq_ci) != MLX5_CQE_STATUS_HW_OWN) { -@@ -486,5 +478,8 @@ rx_queue_count(struct mlx5_rxq_data *rxq) + while (check_cqe(cqe, cqe_n, cq_ci) == 0) { +@@ -451,5 +443,8 @@ rx_queue_count(struct mlx5_rxq_data *rxq) @@ -64 +65 @@ -@@ -493,5 +488,5 @@ rx_queue_count(struct mlx5_rxq_data *rxq) +@@ -458,5 +453,5 @@ rx_queue_count(struct mlx5_rxq_data *rxq) @@ -71 +72 @@ -@@ -516,9 +511,10 @@ mlx5_rx_descriptor_status(void *rx_queue, uint16_t offset) +@@ -481,9 +476,10 @@ mlx5_rx_descriptor_status(void *rx_queue, uint16_t offset) @@ -84 +85 @@ -@@ -631,5 +627,6 @@ mlx5_rx_queue_count(struct rte_eth_dev *dev, uint16_t rx_queue_id) +@@ -513,5 +509,6 @@ mlx5_rx_queue_count(struct rte_eth_dev *dev, uint16_t rx_queue_id)