patches for DPDK stable branches
 help / color / mirror / Atom feed
From: Kevin Traynor <ktraynor@redhat.com>
To: Maxime Leroy <maxime.leroy@6wind.com>
Cc: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>,
	Viacheslav Ovsiienko <viacheslavo@nvidia.com>,
	dpdk stable <stable@dpdk.org>
Subject: [dpdk-stable] patch 'net/mlx5: fix Rx queue count calculation' has been queued to LTS release 18.11.11
Date: Mon, 23 Nov 2020 17:12:15 +0000
Message-ID: <20201123171222.79398-23-ktraynor@redhat.com> (raw)
In-Reply-To: <20201123171222.79398-1-ktraynor@redhat.com>

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/27/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/77fb0d8675924094ae787238477eebad1010bfa0

Thanks.

Kevin.

---
From 77fb0d8675924094ae787238477eebad1010bfa0 Mon Sep 17 00:00:00 2001
From: Maxime Leroy <maxime.leroy@6wind.com>
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 <maxime.leroy@6wind.com>
Signed-off-by: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>
---
 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 2896a9b4ef..dd7b183395 100644
--- a/drivers/net/mlx5/mlx5_rxtx.c
+++ b/drivers/net/mlx5/mlx5_rxtx.c
@@ -431,9 +431,16 @@ 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) == 0) {
@@ -443,8 +450,5 @@ 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;
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-23 17:10:14.532486728 +0000
+++ 0023-net-mlx5-fix-Rx-queue-count-calculation.patch	2020-11-23 17:10:14.007061601 +0000
@@ -1 +1 @@
-From 9ae9720d7f0c12f877df9214f7cbedae546d4020 Mon Sep 17 00:00:00 2001
+From 77fb0d8675924094ae787238477eebad1010bfa0 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 2896a9b4ef..dd7b183395 100644
@@ -38 +39 @@
-@@ -463,9 +463,16 @@ rx_queue_count(struct mlx5_rxq_data *rxq)
+@@ -431,9 +431,16 @@ rx_queue_count(struct mlx5_rxq_data *rxq)
@@ -56,2 +57,2 @@
- 	while (check_cqe(cqe, cqe_n, cq_ci) != MLX5_CQE_STATUS_HW_OWN) {
-@@ -475,8 +482,5 @@ rx_queue_count(struct mlx5_rxq_data *rxq)
+ 	while (check_cqe(cqe, cqe_n, cq_ci) == 0) {
+@@ -443,8 +450,5 @@ rx_queue_count(struct mlx5_rxq_data *rxq)


  parent reply	other threads:[~2020-11-23 17:13 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-23 17:11 [dpdk-stable] patch 'examples/l2fwd-keepalive: skip meson build if no librt' " Kevin Traynor
2020-11-23 17:11 ` [dpdk-stable] patch 'devtools: fix directory filter in forbidden token check' " Kevin Traynor
2020-11-23 17:11 ` [dpdk-stable] patch 'examples/qos_sched: fix usage string' " Kevin Traynor
2020-11-23 17:11 ` [dpdk-stable] patch 'usertools: fix CPU layout script to be PEP8 compliant' " Kevin Traynor
2020-11-23 17:11 ` [dpdk-stable] patch 'config: enable packet prefetching with Meson' " Kevin Traynor
2020-11-23 17:11 ` [dpdk-stable] patch 'net/ring: fix typo in log message' " Kevin Traynor
2020-11-23 17:11 ` [dpdk-stable] patch 'examples/vhost_crypto: add new line character in usage' " Kevin Traynor
2020-11-23 17:12 ` [dpdk-stable] patch 'vhost: fix virtqueue initialization' " Kevin Traynor
2020-11-23 17:12 ` [dpdk-stable] patch 'net/i40e: add C++ include guard' " Kevin Traynor
2020-11-23 17:12 ` [dpdk-stable] patch 'net/avf: fix releasing mbufs' " Kevin Traynor
2020-11-23 17:12 ` [dpdk-stable] patch 'net/avf: fix performance drop after port reset' " Kevin Traynor
2020-11-23 17:12 ` [dpdk-stable] patch 'net/i40e: fix build for log format specifier' " Kevin Traynor
2020-11-23 17:12 ` [dpdk-stable] patch 'net/ixgbe: remove redundant MAC flag check' " Kevin Traynor
2020-11-23 17:12 ` [dpdk-stable] patch 'vhost: fix error path when setting memory tables' " Kevin Traynor
2020-11-23 17:12 ` [dpdk-stable] patch 'vhost: fix fd leak in dirty logging setup' " Kevin Traynor
2020-11-23 17:12 ` [dpdk-stable] patch 'vhost: fix fd leak in kick " Kevin Traynor
2020-11-23 17:12 ` [dpdk-stable] patch 'app/testpmd: fix MTU after device configure' " Kevin Traynor
2020-11-23 18:35   ` David Marchand
2020-11-24  9:38     ` Kevin Traynor
2020-11-23 17:12 ` [dpdk-stable] patch 'app/eventdev: check timer adadpters number' " Kevin Traynor
2020-11-23 17:12 ` [dpdk-stable] patch 'examples/kni: fix build with pkg-config' " Kevin Traynor
2020-11-23 17:12 ` [dpdk-stable] patch 'examples/l2fwd-crypto: " Kevin Traynor
2020-11-23 17:12 ` [dpdk-stable] patch 'examples/performance-thread: " Kevin Traynor
2020-11-23 17:12 ` [dpdk-stable] patch 'doc: fix rule file parameters in l3fwd-acl guide' " Kevin Traynor
2020-11-23 17:12 ` Kevin Traynor [this message]
2020-11-23 17:12 ` [dpdk-stable] patch 'net/mlx5: fix Rx descriptor status' " Kevin Traynor
2020-11-23 17:12 ` [dpdk-stable] patch 'app/testpmd: revert setting MTU explicitly after configure' " Kevin Traynor
2020-11-23 18:36   ` David Marchand
2020-11-23 17:12 ` [dpdk-stable] patch 'compress/isal: check allocation in queue setup' " Kevin Traynor
2020-11-23 17:12 ` [dpdk-stable] patch 'examples/l3fwd-power: check packet types after start' " Kevin Traynor
2020-11-23 17:12 ` [dpdk-stable] patch 'net/mlx5: fix representor interrupts handler' " Kevin Traynor
2020-11-23 17:12 ` [dpdk-stable] patch 'malloc: fix style in free list index computation' " Kevin Traynor
2020-11-23 17:12 ` [dpdk-stable] patch 'usertools: fix pmdinfo parsing' " Kevin Traynor
  -- strict thread matches above, loose matches on Subject: below --
2020-11-05 12:39 [dpdk-stable] patch 'bus/pci: remove duplicate declaration' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'net/mlx5: fix Rx queue count calculation' " Kevin Traynor

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201123171222.79398-23-ktraynor@redhat.com \
    --to=ktraynor@redhat.com \
    --cc=maxime.leroy@6wind.com \
    --cc=nelio.laranjeiro@6wind.com \
    --cc=stable@dpdk.org \
    --cc=viacheslavo@nvidia.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

patches for DPDK stable branches

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://inbox.dpdk.org/stable/0 stable/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 stable stable/ https://inbox.dpdk.org/stable \
		stable@dpdk.org
	public-inbox-index stable

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.dpdk.org/inbox.dpdk.stable


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git