patches for DPDK stable branches
 help / color / mirror / Atom feed
From: Kevin Traynor <ktraynor@redhat.com>
To: Didier Pallard <didier.pallard@6wind.com>
Cc: Maxime Leroy <maxime.leroy@6wind.com>,
	Viacheslav Ovsiienko <viacheslavo@nvidia.com>,
	dpdk stable <stable@dpdk.org>
Subject: [dpdk-stable] patch 'net/mlx5: fix Rx descriptor status' has been queued to LTS release 18.11.11
Date: Mon, 23 Nov 2020 17:12:16 +0000
Message-ID: <20201123171222.79398-24-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/b8a7d45b93255969067b0150fa9d086fa86586a1

Thanks.

Kevin.

---
From b8a7d45b93255969067b0150fa9d086fa86586a1 Mon Sep 17 00:00:00 2001
From: Didier Pallard <didier.pallard@6wind.com>
Date: Tue, 17 Nov 2020 12:26:47 +0100
Subject: [PATCH] net/mlx5: fix Rx descriptor status

[ upstream commit 7c085d3a4a06b60cd04a408d7edf4e9382172a42 ]

Three bugs in rx_queue_count function:
- One entry may contain several segments, so 'used' must be multiplied
  by number of segments per entry to properly reflect the queue usage.
- The number of cqes is equals to (1U << rxq->elts_n) - 1 in SPRQ mode.
  The range returned by rx_queue_count should be the number of entries
  used in queue, so it ranges from 0 to max number of entries
  in queue, not this number minus one.
- For MPRQ mode, we need to take into account of the number of strd.

Fixes: 8788fec1f269 ("net/mlx5: implement descriptor status API")

Signed-off-by: Didier Pallard <didier.pallard@6wind.com>
Signed-off-by: Maxime Leroy <maxime.leroy@6wind.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>
---
 drivers/net/mlx5/mlx5_rxtx.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/net/mlx5/mlx5_rxtx.c b/drivers/net/mlx5/mlx5_rxtx.c
index dd7b183395..c9305334d0 100644
--- a/drivers/net/mlx5/mlx5_rxtx.c
+++ b/drivers/net/mlx5/mlx5_rxtx.c
@@ -432,4 +432,7 @@ rx_queue_count(struct mlx5_rxq_data *rxq)
 	volatile struct mlx5_cqe *cqe;
 	const unsigned int cqe_n = (1 << rxq->cqe_n);
+	const unsigned int sges_n = (1 << rxq->sges_n);
+	const unsigned int elts_n = (1 << rxq->elts_n);
+	const unsigned int strd_n = (1 << rxq->strd_num_n);
 	const unsigned int cqe_cnt = cqe_n - 1;
 	unsigned int cq_ci, used;
@@ -457,5 +460,5 @@ rx_queue_count(struct mlx5_rxq_data *rxq)
 		cqe = &(*rxq->cqes)[cq_ci & cqe_cnt];
 	}
-	used = RTE_MIN(used, cqe_n);
+	used = RTE_MIN(used * sges_n, elts_n * strd_n);
 	return used;
 }
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-23 17:10:14.558324428 +0000
+++ 0024-net-mlx5-fix-Rx-descriptor-status.patch	2020-11-23 17:10:14.009061603 +0000
@@ -1 +1 @@
-From 7c085d3a4a06b60cd04a408d7edf4e9382172a42 Mon Sep 17 00:00:00 2001
+From b8a7d45b93255969067b0150fa9d086fa86586a1 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 7c085d3a4a06b60cd04a408d7edf4e9382172a42 ]
+
@@ -16 +17,0 @@
-Cc: stable@dpdk.org
@@ -26 +27 @@
-index 2733dcd3ff..2ecf901fb1 100644
+index dd7b183395..c9305334d0 100644
@@ -29 +30 @@
-@@ -464,4 +464,7 @@ rx_queue_count(struct mlx5_rxq_data *rxq)
+@@ -432,4 +432,7 @@ rx_queue_count(struct mlx5_rxq_data *rxq)
@@ -37 +38 @@
-@@ -489,5 +492,5 @@ rx_queue_count(struct mlx5_rxq_data *rxq)
+@@ -457,5 +460,5 @@ rx_queue_count(struct mlx5_rxq_data *rxq)


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

Thread overview: 33+ 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 ` [dpdk-stable] patch 'net/mlx5: fix Rx queue count calculation' " Kevin Traynor
2020-11-23 17:12 ` Kevin Traynor [this message]
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

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-24-ktraynor@redhat.com \
    --to=ktraynor@redhat.com \
    --cc=didier.pallard@6wind.com \
    --cc=maxime.leroy@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