From: Dmitry Kozlyuk Date: Tue, 28 Dec 2021 09:20:43 +0000 (+0200) Subject: net/mlx5: relax headroom assertion X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=637582afcc886fc53c1dc7a3686cc771abad2cfd;p=dpdk.git net/mlx5: relax headroom assertion A debug assertion in Single-Packet Receive Queue (SPRQ) mode required all Rx mbufs to have a 128 byte headroom, based on the assumption that rte_pktmbuf_init() sets it. However, rte_pktmbuf_init() may set a smaller headroom if the dataroom is insufficient, e.g. this is a natural case for split buffer segments. The headroom can also be larger. Only check the headroom size when vectored Rx routines are used because they rely on it. Relax the assertion to require sufficient headroom size, not an exact one. Fixes: a0a45e8af723 ("net/mlx5: configure Rx queue for buffer split") Cc: stable@dpdk.org Signed-off-by: Dmitry Kozlyuk Acked-by: Matan Azrad --- diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c index eda609dd78..ee07c610b9 100644 --- a/drivers/net/mlx5/mlx5_rxq.c +++ b/drivers/net/mlx5/mlx5_rxq.c @@ -140,6 +140,7 @@ rxq_alloc_elts_sprq(struct mlx5_rxq_ctrl *rxq_ctrl) RTE_BIT32(rxq_ctrl->rxq.elts_n) * RTE_BIT32(rxq_ctrl->rxq.log_strd_num) : RTE_BIT32(rxq_ctrl->rxq.elts_n); + bool has_vec_support = mlx5_rxq_check_vec_support(&rxq_ctrl->rxq) > 0; unsigned int i; int err; @@ -161,8 +162,9 @@ rxq_alloc_elts_sprq(struct mlx5_rxq_ctrl *rxq_ctrl) rte_errno = ENOMEM; goto error; } - /* Headroom is reserved by rte_pktmbuf_alloc(). */ - MLX5_ASSERT(DATA_OFF(buf) == RTE_PKTMBUF_HEADROOM); + /* Only vectored Rx routines rely on headroom size. */ + MLX5_ASSERT(!has_vec_support || + DATA_OFF(buf) >= RTE_PKTMBUF_HEADROOM); /* Buffer is supposed to be empty. */ MLX5_ASSERT(rte_pktmbuf_data_len(buf) == 0); MLX5_ASSERT(rte_pktmbuf_pkt_len(buf) == 0); @@ -175,7 +177,7 @@ rxq_alloc_elts_sprq(struct mlx5_rxq_ctrl *rxq_ctrl) (*rxq_ctrl->rxq.elts)[i] = buf; } /* If Rx vector is activated. */ - if (mlx5_rxq_check_vec_support(&rxq_ctrl->rxq) > 0) { + if (has_vec_support) { struct mlx5_rxq_data *rxq = &rxq_ctrl->rxq; struct rte_mbuf *mbuf_init = &rxq->fake_mbuf; struct rte_pktmbuf_pool_private *priv =