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 BC55DA04DD for ; Wed, 28 Oct 2020 11:52:43 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B5237CA14; Wed, 28 Oct 2020 11:52:42 +0100 (CET) Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by dpdk.org (Postfix) with ESMTP id B4634CA14 for ; Wed, 28 Oct 2020 11:52:41 +0100 (CET) Received: by mail-wr1-f65.google.com with SMTP id y12so5152199wrp.6 for ; Wed, 28 Oct 2020 03:52:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=E9wTXpO/2ANQVHDifqKbLx+pnbUPGmLvu3MpUBzRDZk=; b=MrbC3YA6QbsxRM+1+0ZRKfPcTyrQoShcdRxSpj5F95YB+RDQu+Q73xxW679WctxUTM Uwllw3Ai3WMDlUNLE2LjDQXE4nf8rN2Uhq9SlBgi+gvxyJLd6NQeyc8TyPg1oGN6cNNx EgMc4kFvCIe2D89mCA8M6D5cuQn6uLxiqMqo7VvcvqRRPWkXY70VMqzznZ6C3z0lXcRE VkfoXVvfH2uFX6yUmy8HWCw9cC5TraoDQK2vdv2f/FfuNjgGMPVTn3IwiWncmI8eQWY/ LFowtnRRLFFmL1IGgS+N7Kzb5taeAtD3XAfOUiAekcY/ttjbk7i9XWTA2eNrTTLEnP5r nUFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=E9wTXpO/2ANQVHDifqKbLx+pnbUPGmLvu3MpUBzRDZk=; b=CftbjV0ggKd3NA6uvfQKGi9pxmt0aaoejEnxIW37rDPx91iNeIM2mYvopS9oHp7OUJ /Hv8/JGgEEFdBmOW8AjUk8IOko/0YDsiziP88eLiOuvB42eRb7Qrt3P96pLGWTz9+kt1 IjpZya5SQlBeOieKiilo8j1BrTmoJsRtO/jju4j1uUbFPgkr+d+LxlVdsuBIPh85HP9B Nq12OXeB3Apjvgc4XtK/i0t/lyq5RfEwGjspZLbHaGuU8BEYcMR8vX4Bke2fhodojlVW WZzeWHyinz5lhMpOAjGTBHH2EKhJNsXc2R4pg800g2zlMTBrjM54XSFnuVDHAAeguCYM PmKg== X-Gm-Message-State: AOAM532LL2PymWx/uz6Cnn0HWOw3qTbSgqcES6oLTLN0BHOp4ZyXcNBb y7Fx+LtesAQ2gfvReevZB7I= X-Google-Smtp-Source: ABdhPJzBwt+6p+DMfdkWT8yFyUpuODP/whSoL8kfvyRtdCtjpP1obfqVvqAuGEEsxVeoHh/Ci7unnA== X-Received: by 2002:a5d:4ed2:: with SMTP id s18mr8054755wrv.36.1603882360465; Wed, 28 Oct 2020 03:52:40 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id v6sm6158044wrp.69.2020.10.28.03.52.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Oct 2020 03:52:39 -0700 (PDT) From: luca.boccassi@gmail.com To: Alexander Kozyrev Cc: Viacheslav Ovsiienko , dpdk stable Date: Wed, 28 Oct 2020 10:44:42 +0000 Message-Id: <20201028104606.3504127-123-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201028104606.3504127-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/mlx5: fix Rx queue count calculation' has been queued to stable release 19.11.6 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 stable release 19.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 10/30/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. Thanks. Luca Boccassi --- >From 3a66893d9808a77bf9caada6007d6ab040478cac 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 a9c6181289..fb4fe94235 100644 --- a/drivers/net/mlx5/mlx5_rxtx.c +++ b/drivers/net/mlx5/mlx5_rxtx.c @@ -468,19 +468,11 @@ 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) != MLX5_CQE_STATUS_HW_OWN) { int8_t op_own; @@ -488,14 +480,17 @@ 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; cq_ci += n; used += n; cqe = &(*rxq->cqes)[cq_ci & cqe_cnt]; } - used = RTE_MIN(used, (1U << rxq->elts_n) - 1); + used = RTE_MIN(used, cqe_n); return used; } @@ -518,11 +513,12 @@ mlx5_rx_descriptor_status(void *rx_queue, uint16_t offset) container_of(rxq, struct mlx5_rxq_ctrl, rxq); 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; } @@ -550,7 +546,8 @@ mlx5_rx_queue_count(struct rte_eth_dev *dev, uint16_t rx_queue_id) struct mlx5_priv *priv = dev->data->dev_private; 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.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-10-28 10:35:15.565830281 +0000 +++ 0123-net-mlx5-fix-Rx-queue-count-calculation.patch 2020-10-28 10:35:11.684832673 +0000 @@ -1,8 +1,10 @@ -From d2d57605522d4a43be17e22e649e54033f6d8835 Mon Sep 17 00:00:00 2001 +From 3a66893d9808a77bf9caada6007d6ab040478cac 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 @@ -19,7 +21,6 @@ queues. Fixes: 26f04883441a ("net/mlx5: support Rx queue count API") -Cc: stable@dpdk.org Signed-off-by: Alexander Kozyrev Acked-by: Viacheslav Ovsiienko @@ -28,10 +29,10 @@ 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/drivers/net/mlx5/mlx5_rxtx.c b/drivers/net/mlx5/mlx5_rxtx.c -index 0b87be15b4..2422a4d6ca 100644 +index a9c6181289..fb4fe94235 100644 --- a/drivers/net/mlx5/mlx5_rxtx.c +++ b/drivers/net/mlx5/mlx5_rxtx.c -@@ -465,19 +465,11 @@ rx_queue_count(struct mlx5_rxq_data *rxq) +@@ -468,19 +468,11 @@ rx_queue_count(struct mlx5_rxq_data *rxq) { struct rxq_zip *zip = &rxq->zip; volatile struct mlx5_cqe *cqe; @@ -53,7 +54,7 @@ cqe = &(*rxq->cqes)[cq_ci & cqe_cnt]; while (check_cqe(cqe, cqe_n, cq_ci) != MLX5_CQE_STATUS_HW_OWN) { int8_t op_own; -@@ -485,14 +477,17 @@ rx_queue_count(struct mlx5_rxq_data *rxq) +@@ -488,14 +480,17 @@ rx_queue_count(struct mlx5_rxq_data *rxq) op_own = cqe->op_own; if (MLX5_CQE_FORMAT(op_own) == MLX5_COMPRESSED) @@ -73,7 +74,7 @@ return used; } -@@ -515,11 +510,12 @@ mlx5_rx_descriptor_status(void *rx_queue, uint16_t offset) +@@ -518,11 +513,12 @@ mlx5_rx_descriptor_status(void *rx_queue, uint16_t offset) container_of(rxq, struct mlx5_rxq_ctrl, rxq); struct rte_eth_dev *dev = ETH_DEV(rxq_ctrl->priv); @@ -88,7 +89,7 @@ rte_errno = EINVAL; return -rte_errno; } -@@ -630,7 +626,8 @@ mlx5_rx_queue_count(struct rte_eth_dev *dev, uint16_t rx_queue_id) +@@ -550,7 +546,8 @@ mlx5_rx_queue_count(struct rte_eth_dev *dev, uint16_t rx_queue_id) struct mlx5_priv *priv = dev->data->dev_private; struct mlx5_rxq_data *rxq;