From: Shahaf Shuler <shahafs@mellanox.com>
To: nelio.laranjeiro@6wind.com, adrien.mazarguil@6wind.com
Cc: dev@dpdk.org, yskoh@mellanox.com, stable@dpdk.org
Subject: [dpdk-stable] [PATCH 1/2] net/mlx5: fix num seg assumption on vPMD
Date: Wed, 23 Aug 2017 10:33:57 +0300 [thread overview]
Message-ID: <20170823073358.116786-1-shahafs@mellanox.com> (raw)
vPMD Tx function assumes that after the scatter of the
multi-segment packets the next packet will be a single segment packet.
This is not current as the function can return due to lack of resources
without sending all of the multi-segment mbufs sequence.
Fixes: 6cb559d67b83 ("net/mlx5: add vectorized Rx/Tx burst for x86")
Cc: stable@dpdk.org
Signed-off-by: Shahaf Shuler <shahafs@mellanox.com>
---
This patch should be applied only after the series:
http://dpdk.org/dev/patchwork/patch/27367/
---
drivers/net/mlx5/mlx5_rxtx_vec_sse.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/net/mlx5/mlx5_rxtx_vec_sse.c b/drivers/net/mlx5/mlx5_rxtx_vec_sse.c
index 8560f745a..30727e6dd 100644
--- a/drivers/net/mlx5/mlx5_rxtx_vec_sse.c
+++ b/drivers/net/mlx5/mlx5_rxtx_vec_sse.c
@@ -119,8 +119,7 @@ txq_wr_dseg_v(struct txq *txq, __m128i *dseg,
}
/**
- * Count the number of continuous single segment packets. The first packet must
- * be a single segment packet.
+ * Count the number of continuous single segment packets.
*
* @param pkts
* Pointer to array of packets.
@@ -137,7 +136,8 @@ txq_check_multiseg(struct rte_mbuf **pkts, uint16_t pkts_n)
if (!pkts_n)
return 0;
- assert(NB_SEGS(pkts[0]) == 1);
+ if (NB_SEGS(pkts[0]) > 1)
+ return 0;
/* Count the number of continuous single segment packets. */
for (pos = 1; pos < pkts_n; ++pos)
if (NB_SEGS(pkts[pos]) > 1)
@@ -502,6 +502,8 @@ mlx5_tx_burst_vec(void *dpdk_txq, struct rte_mbuf **pkts, uint16_t pkts_n)
n = RTE_MIN((uint16_t)(pkts_n - nb_tx), MLX5_VPMD_TX_MAX_BURST);
if (!(txq->flags & ETH_TXQ_FLAGS_NOMULTSEGS))
n = txq_check_multiseg(&pkts[nb_tx], n);
+ if (!n)
+ break;
if (!(txq->flags & ETH_TXQ_FLAGS_NOOFFLOADS))
n = txq_calc_offload(txq, &pkts[nb_tx], n, &cs_flags);
ret = txq_burst_v(txq, &pkts[nb_tx], n, cs_flags);
--
2.12.0
next reply other threads:[~2017-08-23 7:34 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-23 7:33 Shahaf Shuler [this message]
2017-08-23 7:33 ` [dpdk-stable] [PATCH 2/2] net/mlx5: enforce Tx num of segments limitation Shahaf Shuler
2017-08-24 13:28 ` Nélio Laranjeiro
2017-08-24 13:23 ` [dpdk-stable] [PATCH 1/2] net/mlx5: fix num seg assumption on vPMD Nélio Laranjeiro
2017-08-30 7:07 ` [dpdk-stable] [PATCH v2 " Shahaf Shuler
2017-09-04 14:57 ` Nélio Laranjeiro
2017-09-11 12:50 ` [dpdk-stable] [PATCH v3 1/3] " Shahaf Shuler
2017-09-13 10:50 ` [dpdk-stable] [PATCH v4 1/4] " Shahaf Shuler
2017-09-14 10:50 ` [dpdk-stable] [PATCH v5 " Shahaf Shuler
2017-09-15 10:51 ` Ferruh Yigit
2017-09-14 10:50 ` [dpdk-stable] [PATCH v5 2/4] net/mlx5: fix Tx stats error counter definition Shahaf Shuler
2017-09-14 10:50 ` [dpdk-stable] [PATCH v5 3/4] net/mlx5: fix Tx stats error counter logic Shahaf Shuler
2017-09-14 10:50 ` [dpdk-stable] [PATCH v5 4/4] net/mlx5: enforce Tx num of segments limitation Shahaf Shuler
2017-09-14 19:21 ` Yongseok Koh
2017-09-15 8:11 ` Nélio Laranjeiro
2017-09-13 10:50 ` [dpdk-stable] [PATCH v4 2/4] net/mlx5: fix Tx stats error counter definition Shahaf Shuler
2017-09-13 17:59 ` Yongseok Koh
2017-09-14 8:11 ` Nélio Laranjeiro
2017-09-13 10:50 ` [dpdk-stable] [PATCH v4 3/4] net/mlx5: fix Tx stats error counter logic Shahaf Shuler
2017-09-13 18:17 ` Yongseok Koh
2017-09-14 8:12 ` Nélio Laranjeiro
2017-09-13 10:50 ` [dpdk-stable] [PATCH v4 4/4] net/mlx5: enforce Tx num of segments limitation Shahaf Shuler
2017-09-13 19:51 ` Yongseok Koh
2017-09-14 5:23 ` Shahaf Shuler
2017-09-14 8:05 ` Yongseok Koh
2017-09-11 12:50 ` [dpdk-stable] [PATCH v3 2/3] net/mlx5: fix Tx stats error counter Shahaf Shuler
2017-09-11 12:50 ` [dpdk-stable] [PATCH v3 3/3] net/mlx5: enforce Tx num of segments limitation Shahaf Shuler
2017-08-30 7:07 ` [dpdk-stable] [PATCH v2 2/2] " Shahaf Shuler
2017-09-04 14:57 ` Nélio Laranjeiro
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=20170823073358.116786-1-shahafs@mellanox.com \
--to=shahafs@mellanox.com \
--cc=adrien.mazarguil@6wind.com \
--cc=dev@dpdk.org \
--cc=nelio.laranjeiro@6wind.com \
--cc=stable@dpdk.org \
--cc=yskoh@mellanox.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).