From: Xueming Li <xuemingl@nvidia.com>
To: Gavin Hu <gahu@nvidia.com>
Cc: <xuemingl@nvidia.com>,
Changqi Dingluo <dingluochangqi.ck@bytedance.com>,
Viacheslav Ovsiienko <viacheslavo@nvidia.com>,
dpdk stable <stable@dpdk.org>
Subject: patch 'net/mlx5: fix polling CQEs' has been queued to stable release 23.11.4
Date: Tue, 18 Feb 2025 20:34:10 +0800 [thread overview]
Message-ID: <20250218123523.36836-16-xuemingl@nvidia.com> (raw)
In-Reply-To: <20250218123523.36836-1-xuemingl@nvidia.com>
Hi,
FYI, your patch has been queued to stable release 23.11.4
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
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://git.dpdk.org/dpdk-stable/log/?h=23.11-staging
This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=ffb0f31822050174353cf595bc9c3258fd304f6b
Thanks.
Xueming Li <xuemingl@nvidia.com>
---
From ffb0f31822050174353cf595bc9c3258fd304f6b Mon Sep 17 00:00:00 2001
From: Gavin Hu <gahu@nvidia.com>
Date: Fri, 6 Dec 2024 02:58:11 +0200
Subject: [PATCH] net/mlx5: fix polling CQEs
Cc: Xueming Li <xuemingl@nvidia.com>
[ upstream commit 73f7ae1d721aa5c388123db11827937205985999 ]
In certain situations, the receive queue (rxq) fails to replenish its
internal ring with memory buffers (mbufs) from the pool. This can happen
when the pool has a limited number of mbufs allocated, and the user
application holds incoming packets for an extended period, resulting in a
delayed release of mbufs. Consequently, the pool becomes depleted,
preventing the rxq from replenishing from it.
There was a bug in the behavior of the vectorized rxq_cq_process_v routine,
which handled completion queue entries (CQEs) in batches of four. This
routine consistently accessed four mbufs from the internal queue ring,
regardless of whether they had been replenished. As a result, it could
access mbufs that no longer belonged to the poll mode driver (PMD).
The fix involves checking if there are four replenished mbufs available
before allowing rxq_cq_process_v to handle the batch. Once replenishment
succeeds during the polling process, the routine will resume its operation.
Fixes: 1ded26239aa0 ("net/mlx5: refactor vectorized Rx")
Reported-by: Changqi Dingluo <dingluochangqi.ck@bytedance.com>
Signed-off-by: Gavin Hu <gahu@nvidia.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>
---
.mailmap | 3 ++-
drivers/net/mlx5/mlx5_rxtx_vec.c | 3 +++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/.mailmap b/.mailmap
index 861d69289f..820c201bfe 100644
--- a/.mailmap
+++ b/.mailmap
@@ -212,6 +212,7 @@ Chandubabu Namburu <chandu@amd.com>
Chang Miao <chang.miao@corigine.com>
Changchun Ouyang <changchun.ouyang@intel.com>
Changpeng Liu <changpeng.liu@intel.com>
+Changqi Dingluo <dingluochangqi.ck@bytedance.com>
Changqing Wu <changqingx.wu@intel.com>
Chaoyong He <chaoyong.he@corigine.com>
Chao Zhu <chaozhu@linux.vnet.ibm.com> <bjzhuc@cn.ibm.com>
@@ -440,7 +441,7 @@ Gargi Sau <gargi.sau@intel.com>
Gary Mussar <gmussar@ciena.com>
Gaurav Singh <gaurav1086@gmail.com>
Gautam Dawar <gdawar@solarflare.com>
-Gavin Hu <gavin.hu@arm.com> <gavin.hu@linaro.org>
+Gavin Hu <gahu@nvidia.com> <gavin.hu@arm.com> <gavin.hu@linaro.org>
Geoffrey Le Gourriérec <geoffrey.le_gourrierec@6wind.com>
Geoffrey Lv <geoffrey.lv@gmail.com>
Geoff Thorpe <geoff.thorpe@nxp.com>
diff --git a/drivers/net/mlx5/mlx5_rxtx_vec.c b/drivers/net/mlx5/mlx5_rxtx_vec.c
index 2363d7ed27..9b9c63f862 100644
--- a/drivers/net/mlx5/mlx5_rxtx_vec.c
+++ b/drivers/net/mlx5/mlx5_rxtx_vec.c
@@ -325,6 +325,9 @@ rxq_burst_v(struct mlx5_rxq_data *rxq, struct rte_mbuf **pkts,
/* Not to cross queue end. */
pkts_n = RTE_MIN(pkts_n, q_n - elts_idx);
pkts_n = RTE_MIN(pkts_n, q_n - cq_idx);
+ /* Not to move past the allocated mbufs. */
+ pkts_n = RTE_MIN(pkts_n, RTE_ALIGN_FLOOR(rxq->rq_ci - rxq->rq_pi,
+ MLX5_VPMD_DESCS_PER_LOOP));
if (!pkts_n) {
*no_cq = !rcvd_pkt;
return rcvd_pkt;
--
2.34.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2025-02-18 19:39:01.285030635 +0800
+++ 0015-net-mlx5-fix-polling-CQEs.patch 2025-02-18 19:39:00.448244079 +0800
@@ -1 +1 @@
-From 73f7ae1d721aa5c388123db11827937205985999 Mon Sep 17 00:00:00 2001
+From ffb0f31822050174353cf595bc9c3258fd304f6b Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl@nvidia.com>
+
+[ upstream commit 73f7ae1d721aa5c388123db11827937205985999 ]
@@ -24 +26,0 @@
-Cc: stable@dpdk.org
@@ -35 +37 @@
-index 38e511a28b..1ed47e1cad 100644
+index 861d69289f..820c201bfe 100644
@@ -38 +40 @@
-@@ -225,6 +225,7 @@ Chandubabu Namburu <chandu@amd.com>
+@@ -212,6 +212,7 @@ Chandubabu Namburu <chandu@amd.com>
@@ -46 +48 @@
-@@ -465,7 +466,7 @@ Gargi Sau <gargi.sau@intel.com>
+@@ -440,7 +441,7 @@ Gargi Sau <gargi.sau@intel.com>
@@ -52 +53,0 @@
- Gavin Li <gavinl@nvidia.com>
@@ -54,0 +56 @@
+ Geoff Thorpe <geoff.thorpe@nxp.com>
@@ -56 +58 @@
-index 1872bf310c..1b701801c5 100644
+index 2363d7ed27..9b9c63f862 100644
next prev parent reply other threads:[~2025-02-18 12:37 UTC|newest]
Thread overview: 138+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-18 12:33 patch " Xueming Li
2025-02-18 12:33 ` patch 'test/ring: fix init with custom number of lcores' " Xueming Li
2025-02-18 12:33 ` patch 'vhost: clear ring addresses when getting vring base' " Xueming Li
2025-02-18 12:33 ` patch 'vhost: check GSO size validity' " Xueming Li
2025-02-18 12:33 ` patch 'vhost: fix log when setting max queue num' " Xueming Li
2025-02-18 12:34 ` patch 'vhost: reset packets count when not ready' " Xueming Li
2025-02-18 12:34 ` patch 'crypto/cnxk: fix build with GCC 15' " Xueming Li
2025-02-18 12:34 ` patch 'net/thunderx/base: " Xueming Li
2025-02-18 12:34 ` patch 'eal/x86: fix some intrinsics header include for Windows' " Xueming Li
2025-02-18 12:34 ` patch 'test/bonding: fix active backup receive test' " Xueming Li
2025-02-18 12:34 ` patch 'net/bonding: fix dedicated queue setup' " Xueming Li
2025-02-18 12:34 ` patch 'net/hns3: fix mbuf freeing in simple Tx path' " Xueming Li
2025-02-18 12:34 ` patch 'net/hns3: remove PVID info dump for VF' " Xueming Li
2025-02-18 12:34 ` patch 'net/hns3: rename RAS module' " Xueming Li
2025-02-18 12:34 ` patch 'net/sfc: remove unnecessary assignment' " Xueming Li
2025-02-18 12:34 ` Xueming Li [this message]
2025-02-18 12:34 ` patch 'net/iavf: remove reset of Tx prepare function pointer' " Xueming Li
2025-02-18 12:34 ` patch 'net/ice: fix memory leak in scalar Rx' " Xueming Li
2025-02-18 12:34 ` patch 'common/cnxk: fix atomic load in batch ops' " Xueming Li
2025-02-18 12:34 ` patch 'common/cnxk: fix DPI mailbox structure' " Xueming Li
2025-02-18 12:34 ` patch 'eventdev: fix format string data type in log messages' " Xueming Li
2025-02-18 12:34 ` patch 'crypto/virtio: fix redundant queue free' " Xueming Li
2025-02-18 12:34 ` patch 'crypto/openssl: fix CMAC auth context update' " Xueming Li
2025-02-18 12:34 ` patch 'crypto/virtio: fix data queues iteration' " Xueming Li
2025-02-18 12:34 ` patch 'net/octeon_ep: remove useless assignment' " Xueming Li
2025-02-18 12:34 ` patch 'net/enetfec: " Xueming Li
2025-02-18 12:34 ` patch 'net/nfp: fix multiple PFs check from NSP' " Xueming Li
2025-02-18 12:34 ` patch 'net/nfp: fix misuse of function return values' " Xueming Li
2025-02-18 12:34 ` patch 'net/nfp: fix multi-PF control flag' " Xueming Li
2025-02-18 12:34 ` patch 'net/ice: fix flows handling' " Xueming Li
2025-02-18 12:34 ` patch 'net/cnxk: fix NIX send header L3 type' " Xueming Li
2025-02-18 12:34 ` patch 'gro: fix unprocessed IPv4 packets' " Xueming Li
2025-02-18 12:34 ` patch 'eal/linux: fix memseg length in legacy mem init' " Xueming Li
2025-02-18 12:34 ` patch 'buildtools: fix some Python regex syntax warnings' " Xueming Li
2025-02-18 12:34 ` patch 'use Python raw string notation' " Xueming Li
2025-02-18 12:34 ` patch 'net/af_packet: fix socket close on device stop' " Xueming Li
2025-02-18 12:34 ` patch 'ethdev: fix functions available in new device event' " Xueming Li
2025-02-18 12:34 ` patch 'vhost: add null callback checks' " Xueming Li
2025-02-18 12:34 ` patch 'build: force GCC 15 to initialize padding bits' " Xueming Li
2025-02-18 12:34 ` patch 'net/bnxt: fix indication of allocation' " Xueming Li
2025-02-18 12:34 ` patch 'net/bnxt: fix crash when representor is re-attached' " Xueming Li
2025-02-18 12:34 ` patch 'net/mlx5: fix Netlink socket leak' " Xueming Li
2025-02-18 12:34 ` patch 'net/mlx5: adjust actions per rule limitation' " Xueming Li
2025-02-18 12:34 ` patch 'net/mlx5: fix flush of non-template flow rules' " Xueming Li
2025-02-18 12:34 ` patch 'net/mlx5: fix GRE flow match with SWS' " Xueming Li
2025-02-18 12:34 ` patch 'net/igc/base: fix deadlock when writing i225 register' " Xueming Li
2025-02-18 12:34 ` patch 'net/igc/base: fix infinite loop' " Xueming Li
2025-02-18 12:34 ` patch 'net/igc/base: fix bitwise operation type' " Xueming Li
2025-02-18 12:34 ` patch 'net/igc/base: increase PHY power up delay' " Xueming Li
2025-02-18 12:34 ` patch 'net/igc/base: reset loop variable' " Xueming Li
2025-02-18 12:34 ` patch 'net/igc/base: fix LTR for i225' " Xueming Li
2025-02-18 12:34 ` patch 'net/igc/base: fix typo in LTR calculation' " Xueming Li
2025-02-18 12:34 ` patch 'net/igc/base: fix unused value' " Xueming Li
2025-02-18 12:34 ` patch 'net/igc/base: fix semaphore timeout " Xueming Li
2025-02-18 12:34 ` patch 'net/igc/base: fix iterator type' " Xueming Li
2025-02-18 12:34 ` patch 'net/igc/base: fix MAC address hash bit shift' " Xueming Li
2025-02-18 12:34 ` patch 'net/igc/base: fix data type in MAC hash' " Xueming Li
2025-02-18 12:34 ` patch 'net/igc/base: fix NVM data type in bit shift' " Xueming Li
2025-02-18 12:34 ` patch 'net/e1000/base: fix semaphore timeout value' " Xueming Li
2025-02-18 12:34 ` patch 'net/e1000/base: correct mPHY access logic' " Xueming Li
2025-02-18 12:34 ` patch 'net/e1000/base: fix iterator type' " Xueming Li
2025-02-18 12:34 ` patch 'net/e1000/base: fix MAC address hash bit shift' " Xueming Li
2025-02-18 12:34 ` patch 'net/e1000/base: fix data type in MAC hash' " Xueming Li
2025-02-18 12:34 ` patch 'net/e1000/base: fix uninitialized variable' " Xueming Li
2025-02-18 12:34 ` patch 'net/e1000/base: fix bitwise operation type' " Xueming Li
2025-02-18 12:35 ` patch 'net/e1000/base: fix NVM data type in bit shift' " Xueming Li
2025-02-18 12:35 ` patch 'net/e1000/base: fix reset for 82580' " Xueming Li
2025-02-18 12:35 ` patch 'net/e1000/base: fix unchecked return' " Xueming Li
2025-02-18 12:35 ` patch 'net/e1000/base: skip management check for 82575' " Xueming Li
2025-02-18 12:35 ` patch 'common/idpf: fix void function returning a value' " Xueming Li
2025-02-18 12:35 ` patch 'net/intel: fix void functions " Xueming Li
2025-02-18 12:35 ` patch 'net/intel: fix build with icx' " Xueming Li
2025-02-18 12:35 ` patch 'net/hns3: fix copper port initialization' " Xueming Li
2025-02-18 12:35 ` patch 'net/hns3: fix reset timeout' " Xueming Li
2025-02-18 12:35 ` patch 'net/cpfl: fix representor parsing log' " Xueming Li
2025-02-18 12:35 ` patch 'raw/cnxk_gpio: fix file descriptor leak' " Xueming Li
2025-02-18 12:35 ` patch 'eal: fix devargs layers parsing out of bounds' " Xueming Li
2025-02-18 12:35 ` patch 'net/qede: fix debug messages array' " Xueming Li
2025-02-18 12:35 ` patch 'net/hinic: fix flow type bitmask overflow' " Xueming Li
2025-02-18 12:35 ` patch 'crypto/dpaa2_sec: fix bitmask truncation' " Xueming Li
2025-02-18 12:35 ` patch 'crypto/dpaa_sec: " Xueming Li
2025-02-18 12:35 ` patch 'event/dpaa: " Xueming Li
2025-02-18 12:35 ` patch 'net/dpaa: " Xueming Li
2025-02-18 12:35 ` patch 'net/dpaa2: " Xueming Li
2025-02-18 12:35 ` patch 'net/qede: fix nested loops' " Xueming Li
2025-02-18 12:35 ` patch 'examples/l3fwd: fix socket ID check' " Xueming Li
2025-02-18 12:35 ` patch 'common/cnxk: fix null " Xueming Li
2025-02-18 12:35 ` patch 'eal/linux: remove useless assignments' " Xueming Li
2025-02-18 12:35 ` patch 'mempool: fix errno in empty create' " Xueming Li
2025-04-08 7:44 ` patch " Xueming Li
2025-04-08 7:44 ` patch 'ci: build with MSVC in GHA' " Xueming Li
2025-04-08 7:44 ` patch 'net/netvsc: scan all net devices under the PCI device' " Xueming Li
2025-04-08 7:44 ` patch 'net/netvsc: remove device if its net devices removed' " Xueming Li
2025-04-08 7:44 ` patch 'doc: fix feature flags for queue start/stop' " Xueming Li
2025-04-08 7:44 ` patch 'app/testpmd: show all DCB priority TC map' " Xueming Li
2025-04-08 7:44 ` patch 'app/testpmd: avoid crash in DCB config' " Xueming Li
2025-04-08 7:44 ` patch 'net/mana: fix multi-process tracking' " Xueming Li
2025-04-08 7:44 ` patch 'app/testpmd: fix out-of-bound reference in offload config' " Xueming Li
2025-04-08 7:44 ` patch 'net/txgbe: remove useless condition for SW-FW sync' " Xueming Li
2025-04-08 7:44 ` patch 'bus/pci: fix registered device name' " Xueming Li
2025-04-08 7:44 ` patch 'vhost/crypto: skip fetch before vring init' " Xueming Li
2025-04-08 7:44 ` patch 'examples/vhost_crypto: fix user callbacks' " Xueming Li
2025-04-08 7:44 ` patch 'vhost: check descriptor chains length' " Xueming Li
2025-04-08 7:44 ` patch 'test/bbdev: update FFT test vectors' " Xueming Li
2025-04-08 8:01 ` patch 'test/event: fix number of queues in eventdev conf' " Xueming Li
2025-04-08 8:01 ` patch 'net/e1000: fix crashes in secondary processes' " Xueming Li
2025-04-08 8:01 ` patch 'net/ixgbe: " Xueming Li
2025-04-08 8:01 ` patch 'net/ixgbe: fix minimum Rx/Tx descriptors' " Xueming Li
2025-04-08 8:01 ` patch 'net/mlx5/hws: fix fragmented packet type matching' " Xueming Li
2025-04-08 8:01 ` patch 'net/mlx5: fix leak in HWS flow counter action' " Xueming Li
2025-04-08 8:01 ` patch 'net/mlx5: fix hardware packet type translation' " Xueming Li
2025-04-08 8:01 ` patch 'common/cnxk: fix inbound IPsec SA setup' " Xueming Li
2025-04-08 8:01 ` patch 'stack: fix pop in C11 implementation' " Xueming Li
2025-04-08 8:01 ` patch 'test/crypto: fix AES-ECB test lengths' " Xueming Li
2025-04-08 8:01 ` patch 'examples/ipsec-secgw: fix IV length in CTR 192/256' " Xueming Li
2025-04-08 8:01 ` patch 'crypto/cnxk: fix asymmetric operation status code' " Xueming Li
2025-04-08 8:01 ` patch 'test/crypto: remove unused variable' " Xueming Li
2025-04-08 8:01 ` patch 'crypto/openssl: validate incorrect RSA signature' " Xueming Li
2025-04-08 8:01 ` patch 'test/crypto: fix check for OOP header data' " Xueming Li
2025-04-08 8:01 ` patch 'crypto/qat: fix SM3 state size' " Xueming Li
2025-04-08 8:01 ` patch 'test/dma: fix pointers in IOVA as PA mode' " Xueming Li
2025-04-08 8:01 ` patch 'net/iavf: fix mbuf release in Arm multi-process' " Xueming Li
2025-04-08 8:01 ` patch 'net/ice: fix flow engines order' " Xueming Li
2025-04-08 8:01 ` patch 'net/ice: fix dropped packets when using VRRP' " Xueming Li
2025-04-08 8:10 ` patch 'net/iavf: check interrupt registration failure' " Xueming Li
2025-04-08 8:10 ` patch 'net/iavf: fix crash on app exit on FreeBSD' " Xueming Li
2025-04-08 8:10 ` patch 'net/mlx5: fix hairpin queue release' " Xueming Li
2025-04-08 8:10 ` patch 'net/mlx5: fix LACP packet handling in isolated mode' " Xueming Li
2025-04-08 8:10 ` patch 'net/mlx5/hws: fix crash using represented port without ID' " Xueming Li
2025-04-08 8:10 ` patch 'net/mlx5/hws: fix GTP flags matching' " Xueming Li
2025-04-08 8:10 ` patch 'net/mlx5: fix IPIP tunnel verification' " Xueming Li
2025-04-08 8:10 ` patch 'net/mlx5: fix GRE matching on root table' " Xueming Li
2025-04-08 8:10 ` patch 'pdump: clear statistics when enabled' " Xueming Li
2025-04-08 8:10 ` patch 'examples/ipsec-secgw: fix cryptodev and eventdev IDs' " Xueming Li
2025-04-08 8:16 ` patch 'eal: fix undetected NUMA nodes' " Xueming Li
2025-04-08 8:16 ` patch 'examples/ptpclient: fix message parsing' " Xueming Li
2025-04-08 8:16 ` patch 'net/nfp: fix VF link speed problem' " Xueming Li
2025-04-08 8:16 ` patch 'net/gve: allocate Rx QPL pages using malloc' " Xueming Li
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=20250218123523.36836-16-xuemingl@nvidia.com \
--to=xuemingl@nvidia.com \
--cc=dingluochangqi.ck@bytedance.com \
--cc=gahu@nvidia.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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).