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 A41E6A0527 for ; Wed, 25 Nov 2020 10:03:10 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C6C2EC964; Wed, 25 Nov 2020 10:03:08 +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 A1B5CC902 for ; Wed, 25 Nov 2020 10:03:06 +0100 (CET) Received: by mail-wr1-f65.google.com with SMTP id e7so1097339wrv.6 for ; Wed, 25 Nov 2020 01:03:06 -0800 (PST) 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=vt46CpUMafBQZ1GIA9T7CBUozcQkEAAj5T2vturaax0=; b=Y2GmeRsL44DVBkrBEpOD3+DHldTEI3L/yLx5OXwKLM+4t1UGugX7JhmoQoHGu7QefH /QHJWVElMcrqk2ccUAv98l1UNfbf7WyQZMHXgBiglOSDy2LPC8mc5Sm5RlyANiiSfXgW XW+nWwBlovGHGG+eZcUTK0m13Cjrc7CaZDKS4x95saqkVKlw5MSlbtNUF/Leled8ZDF0 5dzXj/NhRXl75V6jF1zc2D+wNzwo+a/OW53DnkAHzT7Xzr8Hxxa7smw3TbdbU09kmAO3 7wlD6z0qBVbVZECiFiVUUT5aHXjxo/bt+KUzHWNE2tRaraTTJbof7utbd7LzMfIG0xuy /aaQ== 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=vt46CpUMafBQZ1GIA9T7CBUozcQkEAAj5T2vturaax0=; b=uBZfEhUIDqridayfa35TqeF5U/6tpMbMjIup687l5KnCncx5h5NEobprFGHIvEey5f vrjOVn6qXyL5A9+9wo+aj9jfWZGbbmllbJaozXBn/eCWU7oJzs+De9BGOBFn7KmUrKT1 MxcOEaXz/xijiBGTlpzBrIWuXnc2Rj+GYB5DTDp+QrI8q9e9pliqgnUc7GCJ2IDYjkuE sDI/ER9+3pcWgkJVoVarXQPF+i1KHrPeAMgnIqGSpQWQLOTNVdVmEjW6Tp71Wx73PL+X /0xaNp/PpjsuS/M6FYquakrZdhw3fw+bUE4zdJl4xdaNiX6G998ahf4sqF74m0wCKUdM 1t+g== X-Gm-Message-State: AOAM5314MU699S8B4nuU9wrAy96uQ6wBud+PRn1D78IX8qxJXDs6C5sq 0+MRkj5gUyEDpUZzTIDbuaE= X-Google-Smtp-Source: ABdhPJy3t/Srbg2WQtPJZxpNTf9zTsTIJl1oi54Fqe6yySQZRuEtN63LYJCB8NAnCspR6Vyf/7uHMw== X-Received: by 2002:a5d:4d02:: with SMTP id z2mr2945643wrt.109.1606294986433; Wed, 25 Nov 2020 01:03:06 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id t15sm3366009wmn.19.2020.11.25.01.03.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Nov 2020 01:03:05 -0800 (PST) From: luca.boccassi@gmail.com To: Maxime Leroy Cc: Nelio Laranjeiro , Viacheslav Ovsiienko , dpdk stable Date: Wed, 25 Nov 2020 09:02:46 +0000 Message-Id: <20201125090258.21457-4-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201125090258.21457-1-luca.boccassi@gmail.com> References: <20201117111416.1961049-42-luca.boccassi@gmail.com> <20201125090258.21457-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 11/26/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/0134408f53261d7dca1d7f37d47925e7bcf6f87f Thanks. Luca Boccassi --- >From 0134408f53261d7dca1d7f37d47925e7bcf6f87f Mon Sep 17 00:00:00 2001 From: Maxime Leroy Date: Tue, 17 Nov 2020 12:26:46 +0100 Subject: [PATCH] net/mlx5: fix Rx queue count calculation [ upstream commit 9ae9720d7f0c12f877df9214f7cbedae546d4020 ] The commit d2d57605522d ("net/mlx5: fix Rx queue count calculation") is incorrect because the count calculation is wrong for the next cqe: Example: Compressed Set of packets 1 | Compressed Set of packets 2 C | a | e0 | e1 | e2 | e3 | e4 | e5 | C | a | e0 There are 2 compressed set of packets in the first queue. For the first set, n is computed correctly. But for the second, n is not computed properly. Because the zip context is for the first set. The second set is not yet decompressed, so there are no context. To fix the issue, we should only use the zip context for the first CQEs series. Fixes: d2d57605522d ("net/mlx5: fix Rx queue count calculation") Signed-off-by: Maxime Leroy Signed-off-by: Nelio Laranjeiro Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_rxtx.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/drivers/net/mlx5/mlx5_rxtx.c b/drivers/net/mlx5/mlx5_rxtx.c index 9f4a04122c..6e5605d37e 100644 --- a/drivers/net/mlx5/mlx5_rxtx.c +++ b/drivers/net/mlx5/mlx5_rxtx.c @@ -468,11 +468,18 @@ 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 used = 0; + unsigned int cq_ci, used; + /* if we are processing a compressed cqe */ + if (zip->ai) { + used = zip->cqe_cnt - zip->ai; + 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; @@ -480,10 +487,7 @@ rx_queue_count(struct mlx5_rxq_data *rxq) op_own = cqe->op_own; if (MLX5_CQE_FORMAT(op_own) == MLX5_COMPRESSED) - if (unlikely(zip->ai)) - n = zip->cqe_cnt - zip->ai; - else - n = rte_be_to_cpu_32(cqe->byte_cnt); + n = rte_be_to_cpu_32(cqe->byte_cnt); else n = 1; cq_ci += n; -- 2.27.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-24 16:50:36.717569005 +0000 +++ 0004-net-mlx5-fix-Rx-queue-count-calculation.patch 2020-11-24 16:50:36.549495892 +0000 @@ -1 +1 @@ -From 9ae9720d7f0c12f877df9214f7cbedae546d4020 Mon Sep 17 00:00:00 2001 +From 0134408f53261d7dca1d7f37d47925e7bcf6f87f Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 9ae9720d7f0c12f877df9214f7cbedae546d4020 ] + @@ -25 +26,0 @@ -Cc: stable@dpdk.org @@ -35 +36 @@ -index 844a1c633d..2733dcd3ff 100644 +index 9f4a04122c..6e5605d37e 100644 @@ -38 +39 @@ -@@ -462,11 +462,18 @@ rx_queue_count(struct mlx5_rxq_data *rxq) +@@ -468,11 +468,18 @@ rx_queue_count(struct mlx5_rxq_data *rxq) @@ -59 +60 @@ -@@ -474,10 +481,7 @@ rx_queue_count(struct mlx5_rxq_data *rxq) +@@ -480,10 +487,7 @@ rx_queue_count(struct mlx5_rxq_data *rxq)