From: Viacheslav Ovsiienko <viacheslavo@nvidia.com>
To: dev@dpdk.org
Cc: rasland@nvidia.com, matan@nvidia.com, ferruh.yigit@intel.com,
thomas@monjalon.net
Subject: [dpdk-dev] [PATCH] net/mlx5: fix Tx queue size adjustment
Date: Fri, 5 Feb 2021 14:43:18 +0200 [thread overview]
Message-ID: <20210205124318.18650-1-viacheslavo@nvidia.com> (raw)
The inline data size alignments should be taken into account
either to conform the rdma-core implementation of sending
queue size calculation.
Fixes: 7e14d144f2ea ("net/mlx5: fix Tx queue size created with DevX")
Signed-off-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>
---
drivers/net/mlx5/mlx5_devx.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/drivers/net/mlx5/mlx5_devx.c b/drivers/net/mlx5/mlx5_devx.c
index 1b1a72dd07..e4acab90c8 100644
--- a/drivers/net/mlx5/mlx5_devx.c
+++ b/drivers/net/mlx5/mlx5_devx.c
@@ -1077,15 +1077,18 @@ mlx5_txq_devx_obj_new(struct rte_eth_dev *dev, uint16_t idx)
* internally in the mlx5_calc_sq_size(), we do the same
* for the queue being created with DevX at this point.
*/
- wqe_size = txq_data->tso_en ? txq_ctrl->max_tso_header : 0;
+ wqe_size = txq_data->tso_en ?
+ RTE_ALIGN(txq_ctrl->max_tso_header, MLX5_WSEG_SIZE) : 0;
wqe_size += sizeof(struct mlx5_wqe_cseg) +
sizeof(struct mlx5_wqe_eseg) +
sizeof(struct mlx5_wqe_dseg);
if (txq_data->inlen_send)
- wqe_size = RTE_MAX(wqe_size, txq_data->inlen_send +
- sizeof(struct mlx5_wqe_cseg) +
- sizeof(struct mlx5_wqe_eseg));
- wqe_size = RTE_ALIGN_CEIL(wqe_size, MLX5_WQE_SIZE) / MLX5_WQE_SIZE;
+ wqe_size = RTE_MAX(wqe_size, sizeof(struct mlx5_wqe_cseg) +
+ sizeof(struct mlx5_wqe_eseg) +
+ RTE_ALIGN(txq_data->inlen_send +
+ sizeof(uint32_t),
+ MLX5_WSEG_SIZE));
+ wqe_size = RTE_ALIGN(wqe_size, MLX5_WQE_SIZE) / MLX5_WQE_SIZE;
/* Create Send Queue object with DevX. */
wqe_n = RTE_MIN((1UL << txq_data->elts_n) * wqe_size,
(uint32_t)priv->sh->device_attr.max_qp_wr);
--
2.18.1
next reply other threads:[~2021-02-05 12:43 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-05 12:43 Viacheslav Ovsiienko [this message]
2021-02-05 13:02 ` Thomas Monjalon
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=20210205124318.18650-1-viacheslavo@nvidia.com \
--to=viacheslavo@nvidia.com \
--cc=dev@dpdk.org \
--cc=ferruh.yigit@intel.com \
--cc=matan@nvidia.com \
--cc=rasland@nvidia.com \
--cc=thomas@monjalon.net \
/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).